Catalog.h   Catalog.h 
skipping to change at line 220 skipping to change at line 220
static Catalog parseCreate( QNetworkReply* reply ) throw( Echonest::Par seError ); static Catalog parseCreate( QNetworkReply* reply ) throw( Echonest::Par seError );
private: private:
static QNetworkReply* updatePrivate( QUrl&, const CatalogUpdateEntries& entries ); static QNetworkReply* updatePrivate( QUrl&, const CatalogUpdateEntries& entries );
QNetworkReply* readPrivate( QUrl& url, int results, int start ) const; QNetworkReply* readPrivate( QUrl& url, int results, int start ) const;
static void addLimits( QUrl&, int results, int start ); static void addLimits( QUrl&, int results, int start );
QSharedDataPointer< CatalogData > d; QSharedDataPointer< CatalogData > d;
}; };
ECHONEST_EXPORT QDebug operator<<(QDebug d, const Catalog &catalog); ECHONEST_EXPORT QDebug operator<<(QDebug d, const Catalog &catalog);
}; }
Q_DECLARE_METATYPE( Echonest::Catalog ) Q_DECLARE_METATYPE( Echonest::Catalog )
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 CatalogArtist.h   CatalogArtist.h 
skipping to change at line 47 skipping to change at line 47
CatalogArtist& operator=( const CatalogArtist& other ); CatalogArtist& operator=( const CatalogArtist& other );
/** /**
* The type of this catalog item: Artist. * The type of this catalog item: Artist.
*/ */
virtual CatalogTypes::Type type() const; virtual CatalogTypes::Type type() const;
}; };
typedef QVector< CatalogArtist > CatalogArtists; typedef QVector< CatalogArtist > CatalogArtists;
}; }
Q_DECLARE_METATYPE( Echonest::CatalogArtist ) Q_DECLARE_METATYPE( Echonest::CatalogArtist )
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 CatalogItem.h   CatalogItem.h 
skipping to change at line 87 skipping to change at line 87
* The play count of this item. * The play count of this item.
*/ */
int playCount() const; int playCount() const;
void setPlayCount( int count ); void setPlayCount( int count );
protected: protected:
QSharedPointer<CatalogItemData> dd; QSharedPointer<CatalogItemData> dd;
}; };
typedef QVector< CatalogItem > CatalogItems; typedef QVector< CatalogItem > CatalogItems;
}; }
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 CatalogSong.h   CatalogSong.h 
skipping to change at line 45 skipping to change at line 45
CatalogSong& operator=( const CatalogSong& other ); CatalogSong& operator=( const CatalogSong& other );
/** /**
* The type of this item: Song. * The type of this item: Song.
*/ */
virtual CatalogTypes::Type type() const; virtual CatalogTypes::Type type() const;
}; };
typedef QVector< CatalogSong > CatalogSongs; typedef QVector< CatalogSong > CatalogSongs;
}; }
Q_DECLARE_METATYPE( Echonest::CatalogSong ) Q_DECLARE_METATYPE( Echonest::CatalogSong )
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Playlist.h   Playlist.h 
skipping to change at line 247 skipping to change at line 247
* *
*/ */
QNetworkReply* fetchNextSong( int rating = -1 ) const; QNetworkReply* fetchNextSong( int rating = -1 ) const;
QNetworkReply* fetchNextSong( const DynamicControls& controls ) con st; QNetworkReply* fetchNextSong( const DynamicControls& controls ) con st;
Song parseNextSong( QNetworkReply* reply ); Song parseNextSong( QNetworkReply* reply );
/** /**
* Returns a description of this dynamic playlist session * Returns a description of this dynamic playlist session
*/ */
QNetworkReply* fetchSessionInfo() const; QNetworkReply* fetchSessionInfo() const;
SessionInfo parseSessionInfo( QNetworkReply* reply ) throw( ParseEr ror );; SessionInfo parseSessionInfo( QNetworkReply* reply ) throw( ParseEr ror );
/** /**
* Generate a static playlist, according to the desired criteria. U se parseXSPFPlaylist if * Generate a static playlist, according to the desired criteria. U se parseXSPFPlaylist if
* you pass format=xspf to \c staticPlaylist(). * you pass format=xspf to \c staticPlaylist().
*/ */
static QNetworkReply* staticPlaylist( const PlaylistParams& params ); static QNetworkReply* staticPlaylist( const PlaylistParams& params );
static SongList parseStaticPlaylist( QNetworkReply* reply ) throw( ParseError ); static SongList parseStaticPlaylist( QNetworkReply* reply ) throw( ParseError );
/** /**
* Parse an xspf playlist. Returns the full xspf content with no mo difications. * Parse an xspf playlist. Returns the full xspf content with no mo difications.
skipping to change at line 273 skipping to change at line 273
static QNetworkReply* generateInternal( const PlaylistParams& param s, const QByteArray& type ); static QNetworkReply* generateInternal( const PlaylistParams& param s, const QByteArray& type );
static QByteArray playlistSortToString(SortingType sorting); static QByteArray playlistSortToString(SortingType sorting);
static QByteArray playlistArtistPickToString(ArtistPick pick); static QByteArray playlistArtistPickToString(ArtistPick pick);
static QByteArray dynamicControlToString(DynamicControlItem control ); static QByteArray dynamicControlToString(DynamicControlItem control );
QSharedDataPointer<DynamicPlaylistData> d; QSharedDataPointer<DynamicPlaylistData> d;
}; };
ECHONEST_EXPORT QDebug operator<<(QDebug d, const Echonest::DynamicPlay list& playlist); ECHONEST_EXPORT QDebug operator<<(QDebug d, const Echonest::DynamicPlay list& playlist);
}; // namespace } // namespace
Q_DECLARE_METATYPE( Echonest::DynamicPlaylist ) Q_DECLARE_METATYPE( Echonest::DynamicPlaylist )
#endif #endif
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 Song.h   Song.h 
skipping to change at line 79 skipping to change at line 79
MaxFamiliarity, MaxFamiliarity,
MinFamiliarity, MinFamiliarity,
MaxHotttnesss, MaxHotttnesss,
MinHotttnesss, MinHotttnesss,
MaxLongitude, MaxLongitude,
MinLongitude, MinLongitude,
MaxEnergy, MaxEnergy,
MinEnergy, MinEnergy,
Mode, Mode,
Key, Key,
Sort, Sort
}; };
typedef QPair< Echonest::Song::SearchParam, QVariant > SearchParamData; typedef QPair< Echonest::Song::SearchParam, QVariant > SearchParamData;
typedef QVector< SearchParamData > SearchParams; typedef QVector< SearchParamData > SearchParams;
enum IdentifyParam { enum IdentifyParam {
Code, Code,
IdentifyArtist, IdentifyArtist,
IdentifyTitle, IdentifyTitle,
IdentifyRelease, IdentifyRelease,
IdentifyDuration, IdentifyDuration,
skipping to change at line 238 skipping to change at line 238
static QByteArray identifyParamToString( IdentifyParam param ); static QByteArray identifyParamToString( IdentifyParam param );
static void addQueryInformation( QUrl& url, SongInformation information ); static void addQueryInformation( QUrl& url, SongInformation information );
QSharedDataPointer<SongData> d; QSharedDataPointer<SongData> d;
}; };
typedef QVector< Song > SongList; typedef QVector< Song > SongList;
ECHONEST_EXPORT QDebug operator<<(QDebug d, const Song &song); ECHONEST_EXPORT QDebug operator<<(QDebug d, const Song &song);
}; // namespace } // namespace
Q_DECLARE_METATYPE( Echonest::Song ) Q_DECLARE_METATYPE( Echonest::Song )
#endif #endif
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 TypeInformation.h   TypeInformation.h 
skipping to change at line 50 skipping to change at line 50
Audio = 0x0001, Audio = 0x0001,
Biographies = 0x0002, Biographies = 0x0002,
Blogs = 0x0004, Blogs = 0x0004,
Familiarity = 0x0008, Familiarity = 0x0008,
Hotttnesss = 0x0010, Hotttnesss = 0x0010,
Images = 0x0020, Images = 0x0020,
News = 0x0040, News = 0x0040,
Reviews = 0x0080, Reviews = 0x0080,
Terms = 0x0100, Terms = 0x0100,
Urls = 0x200, Urls = 0x200,
Videos = 0x0400, Videos = 0x0400
}; };
Q_DECLARE_FLAGS( ArtistInformationFlags, ArtistInformationFlag ) Q_DECLARE_FLAGS( ArtistInformationFlags, ArtistInformationFlag )
ArtistInformation(); ArtistInformation();
ArtistInformation( ArtistInformationFlags flags ); ArtistInformation( ArtistInformationFlags flags );
ArtistInformation( ArtistInformationFlags flags, const QStringList& idSpaces ); ArtistInformation( ArtistInformationFlags flags, const QStringList& idSpaces );
ArtistInformation( const ArtistInformation& other ); ArtistInformation( const ArtistInformation& other );
~ArtistInformation(); ~ArtistInformation();
ArtistInformation& operator=( const ArtistInformation& typeInfo ); ArtistInformation& operator=( const ArtistInformation& typeInfo );
skipping to change at line 129 skipping to change at line 129
QStringList idSpaces() const; QStringList idSpaces() const;
void setIdSpaces( const QStringList& idspaces ); void setIdSpaces( const QStringList& idspaces );
private: private:
SongInformationPrivate* d_ptr; SongInformationPrivate* d_ptr;
Q_DECLARE_PRIVATE( SongInformation ) Q_DECLARE_PRIVATE( SongInformation )
}; };
Q_DECLARE_OPERATORS_FOR_FLAGS(SongInformation::SongInformationFlags) Q_DECLARE_OPERATORS_FOR_FLAGS(SongInformation::SongInformationFlags)
}; }
Q_DECLARE_METATYPE( Echonest::ArtistInformation ) Q_DECLARE_METATYPE( Echonest::ArtistInformation )
Q_DECLARE_METATYPE( Echonest::SongInformation ) Q_DECLARE_METATYPE( Echonest::SongInformation )
#endif #endif
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 Util.h   Util.h 
skipping to change at line 113 skipping to change at line 113
} ForeignId; } ForeignId;
typedef struct { typedef struct {
qreal latitude; qreal latitude;
qreal longitude; qreal longitude;
QString location; QString location;
} ArtistLocation; } ArtistLocation;
typedef QVector< ForeignId > ForeignIds; typedef QVector< ForeignId > ForeignIds;
QByteArray escapeSpacesAndPluses( const QString& in );
Analysis::AnalysisStatus statusToEnum( const QString& status ); Analysis::AnalysisStatus statusToEnum( const QString& status );
QString statusToString( Analysis::AnalysisStatus status ); QString statusToString( Analysis::AnalysisStatus status );
QByteArray catalogTypeToLiteral( CatalogTypes::Type ); QByteArray catalogTypeToLiteral( CatalogTypes::Type );
CatalogTypes::Type literalToCatalogType( const QByteArray& type ); CatalogTypes::Type literalToCatalogType( const QByteArray& type );
QByteArray catalogStatusToLiteral( CatalogTypes::TicketStatus ); QByteArray catalogStatusToLiteral( CatalogTypes::TicketStatus );
CatalogTypes::TicketStatus literalToCatalogStatus( const QByteArray& ty pe ); CatalogTypes::TicketStatus literalToCatalogStatus( const QByteArray& ty pe );
QByteArray catalogUpdateActionToLiteral( CatalogTypes::Action ); QByteArray catalogUpdateActionToLiteral( CatalogTypes::Action );
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 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/