Artist.h   Artist.h 
skipping to change at line 36 skipping to change at line 36
#include <QExplicitlySharedDataPointer> #include <QExplicitlySharedDataPointer>
class QNetworkReply; class QNetworkReply;
namespace lastfm namespace lastfm
{ {
class LASTFM_DLLEXPORT Artist : public AbstractType class LASTFM_DLLEXPORT Artist : public AbstractType
{ {
private: private:
QExplicitlySharedDataPointer<class ArtistData> d; QExplicitlySharedDataPointer<class ArtistData> d;
QString parseBiography( QString bio ) const;
public: public:
Artist(); Artist();
~Artist(); ~Artist();
Artist( const QString& name ); Artist( const QString& name );
Artist( const class XmlQuery& xml ); Artist( const class XmlQuery& xml );
Artist( const Artist& artist ); Artist( const Artist& artist );
/** will be QUrl() unless you got this back from a getInfo or somet hing call */ /** will be QUrl() unless you got this back from a getInfo or somet hing call */
QUrl imageUrl( ImageSize size = LargeImage, bool square = false ) c onst; QUrl imageUrl( ImageSize size = LargeImage, bool square = false ) c onst;
 End of changes. 1 change blocks. 
1 lines changed or deleted 0 lines changed or added


 NetworkAccessManager.h   NetworkAccessManager.h 
skipping to change at line 37 skipping to change at line 37
class QNetworkReply; class QNetworkReply;
namespace lastfm { namespace lastfm {
/** Sets useragent and proxy. Auto detecting the proxy where possible. */ /** Sets useragent and proxy. Auto detecting the proxy where possible. */
class LASTFM_DLLEXPORT NetworkAccessManager : public QNetworkAccessManager class LASTFM_DLLEXPORT NetworkAccessManager : public QNetworkAccessManager
{ {
Q_OBJECT Q_OBJECT
#ifdef Q_WS_WIN
class InternetConnectionMonitor* m_monitor;
#endif
public: public:
NetworkAccessManager( QObject *parent = 0 ); NetworkAccessManager( QObject *parent = 0 );
~NetworkAccessManager(); ~NetworkAccessManager();
void setUserProxy( const QNetworkProxy& proxy ); void setUserProxy( const QNetworkProxy& proxy );
/** PAC allows different proxy configurations depending on the request /** PAC allows different proxy configurations depending on the request
* URL and even UserAgent! Thus we allow you to pass that in, we * URL and even UserAgent! Thus we allow you to pass that in, we
* automatically configure the proxy for every request through * automatically configure the proxy for every request through
* WsAccessManager */ * WsAccessManager */
skipping to change at line 60 skipping to change at line 64
virtual QNetworkReply* createRequest( Operation, const QNetworkRequest& , QIODevice* outgoingdata = 0 ); virtual QNetworkReply* createRequest( Operation, const QNetworkRequest& , QIODevice* outgoingdata = 0 );
private slots: private slots:
void onConnectivityChanged( bool ); void onConnectivityChanged( bool );
private: private:
/** this function calls QNetworkAccessManager::setProxy, and thus /** this function calls QNetworkAccessManager::setProxy, and thus
* configures the proxy correctly for the next request created by * configures the proxy correctly for the next request created by
* createRequest. This is necessary due */ * createRequest. This is necessary due */
void applyProxy( const QNetworkRequest& ); void applyProxy( const QNetworkRequest& );
private:
#ifdef Q_WS_WIN
class Pac *m_pac;
class InternetConnectionMonitor* m_monitor;
#endif
QNetworkProxy m_userProxy;
}; };
} //namespace lastfm } //namespace lastfm
#endif #endif
 End of changes. 2 change blocks. 
7 lines changed or deleted 4 lines changed or added


 RadioTuner.h   RadioTuner.h 
skipping to change at line 60 skipping to change at line 60
signals: signals:
void title( const QString& ); void title( const QString& );
void supportsDisco( bool supportsDisco ); void supportsDisco( bool supportsDisco );
void trackAvailable(); void trackAvailable();
void error( lastfm::ws::Error, const QString& message ); void error( lastfm::ws::Error, const QString& message );
private slots: private slots:
void onTuneReturn(); void onTuneReturn();
void onGetPlaylistReturn(); void onGetPlaylistReturn();
// no-op
Q_DECL_DEPRECATED void onXspfExpired();
private: private:
class RadioTunerPrivate * const d; class RadioTunerPrivate * const d;
}; };
} }
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 ScrobblePoint.h   ScrobblePoint.h 
skipping to change at line 40 skipping to change at line 40
public: public:
ScrobblePoint(); ScrobblePoint();
~ScrobblePoint(); ~ScrobblePoint();
/** j is in seconds, and should be 50% the duration of a track */ /** j is in seconds, and should be 50% the duration of a track */
explicit ScrobblePoint( uint j ); explicit ScrobblePoint( uint j );
ScrobblePoint( const ScrobblePoint& that ); ScrobblePoint( const ScrobblePoint& that );
operator uint() const; operator uint() const;
ScrobblePoint& operator=( const ScrobblePoint& that ); ScrobblePoint& operator=( const ScrobblePoint& that );
void setEnforceScrobbleTimeMax( bool enforceScrobbleTimeMax );
// scrobbles can occur between these two percentages of track duration // scrobbles can occur between these two percentages of track duration
static uint scrobblePercentMin(); // 50 static uint scrobblePercentMin(); // 50
static uint scrobblePercentMax(); // 100 static uint scrobblePercentMax(); // 100
static uint defaultScrobblePercent(); // 50 static uint defaultScrobblePercent(); // 50
// Shortest track length allowed to scrobble in seconds // Shortest track length allowed to scrobble in seconds
static uint scrobbleTimeMin(); // 31 static uint scrobbleTimeMin(); // 31
// Upper limit for scrobble time in seconds // Upper limit for scrobble time in seconds
static uint scrobbleTimeMax(); // 240 static uint scrobbleTimeMax(); // 240
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 Xspf.h   Xspf.h 
skipping to change at line 43 skipping to change at line 43
Xspf( const QDomElement& playlist_node, QObject* parent ); Xspf( const QDomElement& playlist_node, QObject* parent );
~Xspf(); ~Xspf();
QString title() const; QString title() const;
bool isEmpty() const; bool isEmpty() const;
Track takeFirst(); Track takeFirst();
QList<Track> tracks() const; QList<Track> tracks() const;
signals:
Q_DECL_DEPRECATED void expired();
private slots:
Q_DECL_DEPRECATED void onExpired();
private: private:
class XspfPrivate * const d; class XspfPrivate * const d;
}; };
} }
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 6 lines changed or added


 ws.h   ws.h 
skipping to change at line 111 skipping to change at line 111
NotEnoughFans, NotEnoughFans,
NotEnoughNeighbours, NotEnoughNeighbours,
/** Last.fm fucked up, or something mangled the response on its way */ /** Last.fm fucked up, or something mangled the response on its way */
MalformedResponse = 100, MalformedResponse = 100,
/** call QNetworkReply::error() as it's nothing to do with us * / /** call QNetworkReply::error() as it's nothing to do with us * /
UnknownError UnknownError
}; };
enum Scheme
{
Http,
Https
};
/** Set the scheme for all web service calls. Note that it will onl
y use
* Https if SSL is supported on the user's machine otherwise it wi
ll
* default to Http.
*/
LASTFM_DLLEXPORT void setScheme( Scheme scheme );
LASTFM_DLLEXPORT Scheme scheme();
LASTFM_DLLEXPORT QString host(); LASTFM_DLLEXPORT QString host();
/** the map needs a method entry, as per http://last.fm/api */ /** the map needs a method entry, as per http://last.fm/api */
LASTFM_DLLEXPORT QUrl url( QMap<QString, QString>, bool sessionKey = true); LASTFM_DLLEXPORT QUrl url( QMap<QString, QString>, bool sessionKey = true);
LASTFM_DLLEXPORT QNetworkReply* get( QMap<QString, QString> ); LASTFM_DLLEXPORT QNetworkReply* get( QMap<QString, QString> );
/** generates api sig, includes api key, and posts, don't add the a pi /** generates api sig, includes api key, and posts, don't add the a pi
* key yourself as well--it'll break */ * key yourself as well--it'll break */
LASTFM_DLLEXPORT QNetworkReply* post( QMap<QString, QString>, bool sessionKey = true ); LASTFM_DLLEXPORT QNetworkReply* post( QMap<QString, QString>, bool sessionKey = true );
LASTFM_DLLEXPORT void sign( QMap<QString, QString>&, bool sessionKe y = true ); LASTFM_DLLEXPORT void sign( QMap<QString, QString>&, bool sessionKe y = true );
 End of changes. 1 change blocks. 
0 lines changed or deleted 15 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/