~tomahawk-importer/tomahawk/master

« back to all changes in this revision

Viewing changes to src/libtomahawk/collection/Collection.cpp.orig

Committer: Harald Sitter
Date: 2014-10-30 00:21:51 UTC
Revision ID: apachelogger@ubuntu.com-20141030002151-u0fpgokztyv21mw5

Tags: 26f87e8b7ad79a64519bb6c156856247a1e870c0

Applying changes from a298f60b74c057cd594d19b251cc010e8929431e to 26f87e8b7ad79a64519bb6c156856247a1e870c0.

files modified:
CMakeLists.txt

CMakeLists.txt.orig

lang/tomahawk_fi.ts.rej

lang/tomahawk_it.ts.rej

src/accounts/xmpp/XmppConfigWidget.ui

src/accounts/xmpp/XmppConfigWidget.ui.orig

src/libtomahawk/Artist.cpp

src/libtomahawk/Artist.cpp.orig

src/libtomahawk/ContextMenu.cpp

src/libtomahawk/ContextMenu.cpp.orig

src/libtomahawk/DropJob.cpp

src/libtomahawk/DropJob.cpp.orig

src/libtomahawk/GlobalActionManager.cpp

src/libtomahawk/GlobalActionManager.cpp.orig

src/libtomahawk/MetaPlaylistInterface.cpp

src/libtomahawk/MetaPlaylistInterface.cpp.orig

src/libtomahawk/Result.h

src/libtomahawk/Result.h.orig

src/libtomahawk/Source.cpp

src/libtomahawk/Source.cpp.orig

src/libtomahawk/TrackData.h

src/libtomahawk/TrackData.h.orig

src/libtomahawk/ViewManager.cpp

src/libtomahawk/ViewManager.cpp.orig

src/libtomahawk/accounts/ResolverAccount.cpp

src/libtomahawk/accounts/ResolverAccount.cpp.orig

src/libtomahawk/accounts/spotify/SpotifyAccount.cpp

src/libtomahawk/accounts/spotify/SpotifyAccount.cpp.orig

src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp

src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp.orig

src/libtomahawk/collection/Collection.cpp

src/libtomahawk/collection/Collection.cpp.orig

src/libtomahawk/database/Database.cpp

src/libtomahawk/database/Database.cpp.orig

src/libtomahawk/database/Database.h

src/libtomahawk/database/Database.h.orig

src/libtomahawk/database/DatabaseCollection.h

src/libtomahawk/database/DatabaseCollection.h.orig

src/libtomahawk/database/DatabaseCommand_AllAlbums.cpp

src/libtomahawk/database/DatabaseCommand_AllAlbums.cpp.orig

src/libtomahawk/database/DatabaseCommand_AllArtists.cpp

src/libtomahawk/database/DatabaseCommand_AllArtists.cpp.orig

src/libtomahawk/database/DatabaseCommand_CreatePlaylist.h

src/libtomahawk/database/DatabaseCommand_CreatePlaylist.h.orig

src/libtomahawk/database/DatabaseCommand_DeleteInboxEntry.cpp

src/libtomahawk/database/DatabaseCommand_DeleteInboxEntry.cpp.orig

src/libtomahawk/database/DatabaseCommand_LoadFiles.cpp

src/libtomahawk/database/DatabaseCommand_LoadFiles.cpp.orig

src/libtomahawk/database/DatabaseCommand_LoadPlaylistEntries.cpp

src/libtomahawk/database/DatabaseCommand_LoadPlaylistEntries.cpp.orig

src/libtomahawk/database/DatabaseCommand_LoadPlaylistEntries.h

src/libtomahawk/database/DatabaseCommand_LoadPlaylistEntries.h.orig

src/libtomahawk/database/DatabaseCommand_LoadSocialActions.h

src/libtomahawk/database/DatabaseCommand_LoadSocialActions.h.orig

src/libtomahawk/database/DatabaseCommand_ModifyInboxEntry.cpp

src/libtomahawk/database/DatabaseCommand_ModifyInboxEntry.cpp.orig

src/libtomahawk/database/DatabaseCommand_PlaybackCharts.cpp

src/libtomahawk/database/DatabaseCommand_PlaybackCharts.cpp.orig

src/libtomahawk/database/DatabaseCommand_PlaybackHistory.cpp

src/libtomahawk/database/DatabaseCommand_PlaybackHistory.cpp.orig

src/libtomahawk/database/DatabaseCommand_SetPlaylistRevision.h

src/libtomahawk/database/DatabaseCommand_SetPlaylistRevision.h.orig

src/libtomahawk/database/DatabaseCommand_ShareTrack.cpp

src/libtomahawk/database/DatabaseCommand_ShareTrack.cpp.orig

src/libtomahawk/database/DatabaseCommand_SocialAction.cpp

src/libtomahawk/database/DatabaseCommand_SocialAction.cpp.orig

src/libtomahawk/database/DatabaseWorker.cpp

src/libtomahawk/database/DatabaseWorker.cpp.orig

src/libtomahawk/network/RemoteCollection.h

src/libtomahawk/network/RemoteCollection.h.orig

src/libtomahawk/network/Servent.cpp

src/libtomahawk/network/Servent.cpp.orig

src/libtomahawk/playlist/PlayableModel.h

src/libtomahawk/playlist/PlayableModel.h.orig

src/libtomahawk/playlist/PlayableProxyModel.cpp

src/libtomahawk/playlist/PlayableProxyModel.cpp.orig

src/libtomahawk/playlist/PlaylistItemDelegate.cpp

src/libtomahawk/playlist/PlaylistItemDelegate.cpp.orig

src/libtomahawk/playlist/PlaylistItemDelegate.h

src/libtomahawk/playlist/PlaylistItemDelegate.h.orig

src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp

src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp.orig

src/libtomahawk/resolvers/ExternalResolver.h

src/libtomahawk/resolvers/ExternalResolver.h.orig

src/libtomahawk/sip/PeerInfo.h

src/libtomahawk/sip/PeerInfo.h.orig

src/libtomahawk/utils/TomahawkStyle.cpp

src/libtomahawk/utils/TomahawkStyle.cpp.orig

src/libtomahawk/utils/XspfLoader.cpp

src/libtomahawk/utils/XspfLoader.cpp.orig

src/libtomahawk/widgets/PlayableCover.cpp

src/libtomahawk/widgets/PlayableCover.cpp.orig

Show diffs side-by-side

added added

removed removed

src/libtomahawk/collection/Collection.cpp.orig

28925

{

28926

qDebug() << Q_FUNC_INFO;

28927

}

28928

28929

28930

void

28931

Collection::loadPlaylists()

28932

{

28933

qDebug() << Q_FUNC_INFO;

28934

}

28935

28936

28937

void

28938

Collection::loadAutoPlaylists()

28939

{

28940

qDebug() << Q_FUNC_INFO;

28941

}

28942

28943

28944

void

28945

Collection::loadStations()

28946

{

28947

qDebug() << Q_FUNC_INFO;

28948

}

Older »