diff --git a/src/AccountDelegate.cpp b/src/AccountDelegate.cpp index 278b29497..807629f6f 100644 --- a/src/AccountDelegate.cpp +++ b/src/AccountDelegate.cpp @@ -26,7 +26,7 @@ #include "accounts/Account.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" #define CHILD_ACCOUNT_HEIGHT 24 diff --git a/src/AudioControls.cpp b/src/AudioControls.cpp index 85ffccd81..5ddbda272 100644 --- a/src/AudioControls.cpp +++ b/src/AudioControls.cpp @@ -24,12 +24,12 @@ #include #include -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" #include "playlist/PlaylistView.h" #include "database/Database.h" -#include "widgets/imagebutton.h" +#include "widgets/ImageButton.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "Album.h" #include "DropJob.h" #include "SocialWidget.h" diff --git a/src/AudioControls.ui b/src/AudioControls.ui index fd4f871a3..3a68a7f04 100644 --- a/src/AudioControls.ui +++ b/src/AudioControls.ui @@ -570,12 +570,12 @@ ImageButton QPushButton -
widgets/imagebutton.h
+
widgets/ImageButton.h
 QueryLabel QLabel -
widgets/querylabel.h
+
widgets/QueryLabel.h
 FadingPixmap diff --git a/src/DiagnosticsDialog.cpp b/src/DiagnosticsDialog.cpp index 7f0f1c786..9adf47db9 100644 --- a/src/DiagnosticsDialog.cpp +++ b/src/DiagnosticsDialog.cpp @@ -32,7 +32,7 @@ #include #include -#include "utils/logger.h" +#include "utils/Logger.h" DiagnosticsDialog::DiagnosticsDialog( QWidget *parent ) diff --git a/src/MusicScanner.cpp b/src/MusicScanner.cpp index 9ed17a09b..0843a7cbc 100644 --- a/src/MusicScanner.cpp +++ b/src/MusicScanner.cpp @@ -25,14 +25,14 @@ #include "TomahawkSettings.h" #include "SourceList.h" #include "database/Database.h" -#include "database/databasecommand_dirmtimes.h" -#include "database/databasecommand_filemtimes.h" -#include "database/databasecommand_collectionstats.h" -#include "database/databasecommand_addfiles.h" -#include "database/databasecommand_deletefiles.h" +#include "database/DatabaseCommand_DirMtimes.h" +#include "database/DatabaseCommand_FileMTimes.h" +#include "database/DatabaseCommand_CollectionStats.h" +#include "database/DatabaseCommand_AddFiles.h" +#include "database/DatabaseCommand_DeleteFiles.h" #include "taghandlers/tag.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/PipelineStatusView.cpp b/src/PipelineStatusView.cpp index 515c8f55e..e87614d70 100644 --- a/src/PipelineStatusView.cpp +++ b/src/PipelineStatusView.cpp @@ -24,7 +24,7 @@ #include "libtomahawk/Pipeline.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/PipelineStatusView.h b/src/PipelineStatusView.h index 4c64df1c9..857357082 100644 --- a/src/PipelineStatusView.h +++ b/src/PipelineStatusView.h @@ -23,7 +23,7 @@ #include #include "Typedefs.h" -#include "widgets/animatedsplitter.h" +#include "widgets/AnimatedSplitter.h" #include "Query.h" class StreamConnection; diff --git a/src/ResolverConfigDelegate.cpp b/src/ResolverConfigDelegate.cpp index d76b2db0a..70236cf02 100644 --- a/src/ResolverConfigDelegate.cpp +++ b/src/ResolverConfigDelegate.cpp @@ -25,7 +25,7 @@ #include #include -#include "utils/logger.h" +#include "utils/Logger.h" #define PADDING 4 #define ICONSIZE 24 diff --git a/src/ScanManager.cpp b/src/ScanManager.cpp index 018134254..f0152a9da 100644 --- a/src/ScanManager.cpp +++ b/src/ScanManager.cpp @@ -29,10 +29,10 @@ #include "libtomahawk/SourceList.h" #include "database/Database.h" -#include "database/databasecommand_filemtimes.h" -#include "database/databasecommand_deletefiles.h" +#include "database/DatabaseCommand_FileMTimes.h" +#include "database/DatabaseCommand_DeleteFiles.h" -#include "utils/logger.h" +#include "utils/Logger.h" ScanManager* ScanManager::s_instance = 0; diff --git a/src/Scrobbler.cpp b/src/Scrobbler.cpp index 99fbf211a..5c2041565 100644 --- a/src/Scrobbler.cpp +++ b/src/Scrobbler.cpp @@ -26,11 +26,11 @@ #include "Artist.h" #include "Album.h" #include "Typedefs.h" -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" #include "TomahawkSettings.h" -#include "infosystem/infosystem.h" +#include "infosystem/InfoSystem.h" -#include "utils/logger.h" +#include "utils/Logger.h" static QString s_scInfoIdentifier = QString( "SCROBBLER" ); diff --git a/src/Scrobbler.h b/src/Scrobbler.h index 791757278..d47e34d1f 100644 --- a/src/Scrobbler.h +++ b/src/Scrobbler.h @@ -22,7 +22,7 @@ #include "lastfm/ScrobblePoint" #include "Result.h" -#include "infosystem/infosystem.h" +#include "infosystem/InfoSystem.h" #include diff --git a/src/SettingsDialog.cpp b/src/SettingsDialog.cpp index 2fa5d609a..8e063c0da 100644 --- a/src/SettingsDialog.cpp +++ b/src/SettingsDialog.cpp @@ -50,7 +50,7 @@ #include "accounts/AccountManager.h" #include #include -#include "utils/logger.h" +#include "utils/Logger.h" #include "AccountFactoryWrapper.h" #include "ui_ProxyDialog.h" diff --git a/src/SettingsListDelegate.cpp b/src/SettingsListDelegate.cpp index 3279016ce..3756c5314 100644 --- a/src/SettingsListDelegate.cpp +++ b/src/SettingsListDelegate.cpp @@ -18,7 +18,7 @@ */ #include "SettingsListDelegate.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include #include diff --git a/src/SocialWidget.cpp b/src/SocialWidget.cpp index 3126e0d7f..8c4d518ed 100644 --- a/src/SocialWidget.cpp +++ b/src/SocialWidget.cpp @@ -24,7 +24,7 @@ #include #include "GlobalActionManager.h" -#include "utils/logger.h" +#include "utils/Logger.h" #define CORNER_ROUNDNESS 8.0 #define FADING_DURATION 500 diff --git a/src/StackedSettingsDialog.ui b/src/StackedSettingsDialog.ui index 0500d69c6..1c6ee85a2 100644 --- a/src/StackedSettingsDialog.ui +++ b/src/StackedSettingsDialog.ui @@ -438,7 +438,7 @@ CheckDirTree QTreeView -
widgets/checkdirtree.h
+
widgets/CheckDirTree.h
 diff --git a/src/TomahawkApp.cpp b/src/TomahawkApp.cpp index 22d4a3b4f..406e0f170 100644 --- a/src/TomahawkApp.cpp +++ b/src/TomahawkApp.cpp @@ -33,13 +33,13 @@ #include "Artist.h" #include "Album.h" #include "Collection.h" -#include "infosystem/infosystem.h" +#include "infosystem/InfoSystem.h" #include "accounts/AccountManager.h" #include "accounts/spotify/SpotifyAccount.h" #include "accounts/lastfm/LastFmAccount.h" #include "database/Database.h" #include "database/DatabaseCollection.h" -#include "database/databasecommand_collectionstats.h" +#include "database/DatabaseCommand_CollectionStats.h" #include "database/DatabaseResolver.h" #include "playlist/dynamic/GeneratorFactory.h" #include "playlist/dynamic/echonest/EchonestGenerator.h" @@ -58,10 +58,10 @@ #include "DropJob.h" #include "EchonestCatalogSynchronizer.h" -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" #include "utils/xspfloader.h" -#include "utils/jspfloader.h" -#include "utils/logger.h" +#include "utils/JspfLoader.h" +#include "utils/Logger.h" #include "utils/tomahawkutilsgui.h" #include "accounts/lastfm/LastFmAccount.h" #include "accounts/spotify/SpotifyAccount.h" @@ -71,9 +71,9 @@ #include "config.h" #ifndef ENABLE_HEADLESS - #include "resolvers/qtscriptresolver.h" - #include "resolvers/scriptresolver.h" - #include "utils/spotifyparser.h" + #include "resolvers/QtScriptResolver.h" + #include "resolvers/ScriptResolver.h" + #include "utils/SpotifyParser.h" #include "AtticaManager.h" #include "TomahawkWindow.h" #include "SettingsDialog.h" diff --git a/src/TomahawkTrayIcon.cpp b/src/TomahawkTrayIcon.cpp index d3fcc38e2..31df4e67d 100644 --- a/src/TomahawkTrayIcon.cpp +++ b/src/TomahawkTrayIcon.cpp @@ -23,11 +23,11 @@ #include "Artist.h" -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" #include "TomahawkApp.h" #include "TomahawkWindow.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include diff --git a/src/TomahawkWindow.cpp b/src/TomahawkWindow.cpp index a127deddd..f408452a0 100644 --- a/src/TomahawkWindow.cpp +++ b/src/TomahawkWindow.cpp @@ -42,11 +42,11 @@ #include "accounts/AccountManager.h" #include "sourcetree/sourcetreeview.h" #include "network/Servent.h" -#include "utils/proxystyle.h" -#include "widgets/animatedsplitter.h" -#include "widgets/newplaylistwidget.h" -#include "widgets/searchwidget.h" -#include "widgets/playlisttypeselectordlg.h" +#include "utils/ProxyStyle.h" +#include "widgets/AnimatedSplitter.h" +#include "widgets/NewPlaylistWidget.h" +#include "widgets/SearchWidget.h" +#include "widgets/PlaylistTypeSelectorDialog.h" #include "thirdparty/Qocoa/qsearchfield.h" #include "playlist/dynamic/GeneratorInterface.h" #include "playlist/PlaylistModel.h" @@ -69,7 +69,7 @@ #include #endif -#include "utils/logger.h" +#include "utils/Logger.h" #include "jobview/JobStatusModel.h" #include "LoadXSPFDialog.h" #include diff --git a/src/TomahawkWindow.h b/src/TomahawkWindow.h index d520fd11c..5a8fdf64e 100644 --- a/src/TomahawkWindow.h +++ b/src/TomahawkWindow.h @@ -28,7 +28,7 @@ #include #include "Result.h" -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" #include "utils/xspfloader.h" namespace Tomahawk { diff --git a/src/UbuntuUnityHack.cpp b/src/UbuntuUnityHack.cpp index 8faa178ec..847b1d7c2 100644 --- a/src/UbuntuUnityHack.cpp +++ b/src/UbuntuUnityHack.cpp @@ -16,7 +16,7 @@ */ #include "UbuntuUnityHack.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include diff --git a/src/accounts/lastfm/LastFmAccount.cpp b/src/accounts/lastfm/LastFmAccount.cpp index d3ea0e299..8ae824fda 100644 --- a/src/accounts/lastfm/LastFmAccount.cpp +++ b/src/accounts/lastfm/LastFmAccount.cpp @@ -19,10 +19,10 @@ #include "LastFmAccount.h" #include "LastFmConfig.h" -#include "infosystem/infosystem.h" +#include "infosystem/InfoSystem.h" #include "LastFmPlugin.h" #include "utils/tomahawkutils.h" -#include "resolvers/qtscriptresolver.h" +#include "resolvers/QtScriptResolver.h" #include "AtticaManager.h" #include "Pipeline.h" #include "accounts/AccountManager.h" diff --git a/src/accounts/lastfm/LastFmPlugin.cpp b/src/accounts/lastfm/LastFmPlugin.cpp index d1793d6dd..be886fb4e 100644 --- a/src/accounts/lastfm/LastFmPlugin.cpp +++ b/src/accounts/lastfm/LastFmPlugin.cpp @@ -25,9 +25,9 @@ #include "Album.h" #include "Typedefs.h" -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "accounts/lastfm/LastFmAccount.h" #include diff --git a/src/accounts/lastfm/LastFmPlugin.h b/src/accounts/lastfm/LastFmPlugin.h index 4d9b7d530..cd60717b4 100644 --- a/src/accounts/lastfm/LastFmPlugin.h +++ b/src/accounts/lastfm/LastFmPlugin.h @@ -18,8 +18,8 @@ #ifndef LASTFMPLUGIN_H #define LASTFMPLUGIN_H -#include "infosystem/infosystem.h" -#include "infosystem/infosystemworker.h" +#include "infosystem/InfoSystem.h" +#include "infosystem/InfoSystemWorker.h" #include #include diff --git a/src/accounts/spotify/SpotifyAccount.cpp b/src/accounts/spotify/SpotifyAccount.cpp index 0e55c65c2..d5b058bd8 100644 --- a/src/accounts/spotify/SpotifyAccount.cpp +++ b/src/accounts/spotify/SpotifyAccount.cpp @@ -23,7 +23,7 @@ #include "SourceList.h" #include "SpotifyAccountConfig.h" #include "SpotifyPlaylistUpdater.h" -#include "resolvers/scriptresolver.h" +#include "resolvers/ScriptResolver.h" #include "utils/tomahawkutils.h" #include "ActionCollection.h" diff --git a/src/accounts/spotify/SpotifyPlaylistUpdater.h b/src/accounts/spotify/SpotifyPlaylistUpdater.h index bdc517550..d0c987191 100644 --- a/src/accounts/spotify/SpotifyPlaylistUpdater.h +++ b/src/accounts/spotify/SpotifyPlaylistUpdater.h @@ -20,7 +20,7 @@ #define SPOTIFYPLAYLISTUPDATER_H #include "playlist/PlaylistUpdaterInterface.h" -#include "utils/closure.h" +#include "utils/Closure.h" #include #include diff --git a/src/accounts/twitter/TomahawkOAuthTwitter.cpp b/src/accounts/twitter/TomahawkOAuthTwitter.cpp index ab53e8740..fd2b2cf72 100644 --- a/src/accounts/twitter/TomahawkOAuthTwitter.cpp +++ b/src/accounts/twitter/TomahawkOAuthTwitter.cpp @@ -22,7 +22,7 @@ #include -#include "utils/logger.h" +#include "utils/Logger.h" TomahawkOAuthTwitter::TomahawkOAuthTwitter( QNetworkAccessManager *nam, QObject* parent ) diff --git a/src/accounts/twitter/TwitterAccount.cpp b/src/accounts/twitter/TwitterAccount.cpp index 6c4e74380..91dce3ca1 100644 --- a/src/accounts/twitter/TwitterAccount.cpp +++ b/src/accounts/twitter/TwitterAccount.cpp @@ -21,7 +21,7 @@ #include "TwitterAccount.h" #include "TwitterConfigWidget.h" #include "accounts/twitter/TomahawkOAuthTwitter.h" -#include "libtomahawk/infosystem/infosystem.h" +#include "libtomahawk/infosystem/InfoSystem.h" #include "sip/SipPlugin.h" diff --git a/src/accounts/twitter/TwitterConfigWidget.cpp b/src/accounts/twitter/TwitterConfigWidget.cpp index 0321dbac1..8ed442be9 100644 --- a/src/accounts/twitter/TwitterConfigWidget.cpp +++ b/src/accounts/twitter/TwitterConfigWidget.cpp @@ -32,7 +32,7 @@ #include -#include "utils/logger.h" +#include "utils/Logger.h" namespace Tomahawk { diff --git a/src/accounts/twitter/TwitterInfoPlugin.cpp b/src/accounts/twitter/TwitterInfoPlugin.cpp index 46bd68d4b..ef37dd1f8 100644 --- a/src/accounts/twitter/TwitterInfoPlugin.cpp +++ b/src/accounts/twitter/TwitterInfoPlugin.cpp @@ -26,7 +26,7 @@ #include #include "GlobalActionManager.h" -#include "utils/logger.h" +#include "utils/Logger.h" namespace Tomahawk { diff --git a/src/accounts/twitter/TwitterInfoPlugin.h b/src/accounts/twitter/TwitterInfoPlugin.h index e77f63a8d..e1b221105 100644 --- a/src/accounts/twitter/TwitterInfoPlugin.h +++ b/src/accounts/twitter/TwitterInfoPlugin.h @@ -20,7 +20,7 @@ #ifndef TWITTERINFOPLUGIN_H #define TWITTERINFOPLUGIN_H -#include "infosystem/infosystem.h" +#include "infosystem/InfoSystem.h" #include "accounts/twitter/TomahawkOAuthTwitter.h" #include diff --git a/src/accounts/twitter/sip/TwitterSip.cpp b/src/accounts/twitter/sip/TwitterSip.cpp index a54e1f319..47dd60a07 100644 --- a/src/accounts/twitter/sip/TwitterSip.cpp +++ b/src/accounts/twitter/sip/TwitterSip.cpp @@ -38,7 +38,7 @@ #include #include -#include "utils/logger.h" +#include "utils/Logger.h" #include "accounts/twitter/TomahawkOAuthTwitter.h" #include diff --git a/src/accounts/xmpp/XmppConfigWidget.cpp b/src/accounts/xmpp/XmppConfigWidget.cpp index 3e9b9ffc4..e5fb56002 100644 --- a/src/accounts/xmpp/XmppConfigWidget.cpp +++ b/src/accounts/xmpp/XmppConfigWidget.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include namespace Tomahawk { diff --git a/src/accounts/xmpp/XmppInfoPlugin.cpp b/src/accounts/xmpp/XmppInfoPlugin.cpp index c2440dad0..b46557cbf 100644 --- a/src/accounts/xmpp/XmppInfoPlugin.cpp +++ b/src/accounts/xmpp/XmppInfoPlugin.cpp @@ -22,7 +22,7 @@ #include "GlobalActionManager.h" #include "sip/XmppSip.h" -#include "utils/logger.h" +#include "utils/Logger.h" // remove now playing status after PAUSE_TIMEOUT seconds diff --git a/src/accounts/xmpp/XmppInfoPlugin.h b/src/accounts/xmpp/XmppInfoPlugin.h index c15f1571f..f553b43d0 100644 --- a/src/accounts/xmpp/XmppInfoPlugin.h +++ b/src/accounts/xmpp/XmppInfoPlugin.h @@ -20,7 +20,7 @@ #ifndef XMPPINFOPLUGIN_H #define XMPPINFOPLUGIN_H -#include "infosystem/infosystem.h" +#include "infosystem/InfoSystem.h" #include diff --git a/src/accounts/xmpp/sip/AvatarManager.cpp b/src/accounts/xmpp/sip/AvatarManager.cpp index faee16c6e..e1c3d86f2 100644 --- a/src/accounts/xmpp/sip/AvatarManager.cpp +++ b/src/accounts/xmpp/sip/AvatarManager.cpp @@ -30,7 +30,7 @@ #include #include -#include "utils/logger.h" +#include "utils/Logger.h" AvatarManager::AvatarManager(Jreen::Client *client) : diff --git a/src/accounts/xmpp/sip/TomahawkXmppMessage.cpp b/src/accounts/xmpp/sip/TomahawkXmppMessage.cpp index 573d23c64..ef2951812 100644 --- a/src/accounts/xmpp/sip/TomahawkXmppMessage.cpp +++ b/src/accounts/xmpp/sip/TomahawkXmppMessage.cpp @@ -19,7 +19,7 @@ #include "TomahawkXmppMessage.h" -#include "utils/logger.h" +#include "utils/Logger.h" class TomahawkXmppMessagePrivate diff --git a/src/accounts/xmpp/sip/TomahawkXmppMessageFactory.cpp b/src/accounts/xmpp/sip/TomahawkXmppMessageFactory.cpp index c47d543f5..79e987c28 100644 --- a/src/accounts/xmpp/sip/TomahawkXmppMessageFactory.cpp +++ b/src/accounts/xmpp/sip/TomahawkXmppMessageFactory.cpp @@ -23,7 +23,7 @@ #include #include -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Jreen; diff --git a/src/accounts/xmpp/sip/XmlConsole.cpp b/src/accounts/xmpp/sip/XmlConsole.cpp index 0a422824f..d502d2dcc 100644 --- a/src/accounts/xmpp/sip/XmlConsole.cpp +++ b/src/accounts/xmpp/sip/XmlConsole.cpp @@ -29,7 +29,7 @@ #include #include -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Jreen; diff --git a/src/accounts/xmpp/sip/XmppSip.cpp b/src/accounts/xmpp/sip/XmppSip.cpp index baaa2a7b7..1a4627f25 100644 --- a/src/accounts/xmpp/sip/XmppSip.cpp +++ b/src/accounts/xmpp/sip/XmppSip.cpp @@ -46,7 +46,7 @@ #include #include -#include +#include #include #ifndef ENABLE_HEADLESS @@ -56,14 +56,14 @@ #endif #include -#include "utils/logger.h" +#include "utils/Logger.h" #include "XmppInfoPlugin.h" using namespace Tomahawk; using namespace Accounts; // instead of simply copying this function for another thirdparty lib -// please make it a meta-function or a macro and put it in logger.h. kthxbbq +// please make it a meta-function or a macro and put it in Logger.h. kthxbbq #define JREEN_LOG_INFIX "Jreen" void JreenMessageHandler(QtMsgType type, const char *msg) diff --git a/src/accounts/zeroconf/Zeroconf.cpp b/src/accounts/zeroconf/Zeroconf.cpp index bcf8b4dfc..cbe1edd19 100644 --- a/src/accounts/zeroconf/Zeroconf.cpp +++ b/src/accounts/zeroconf/Zeroconf.cpp @@ -24,7 +24,7 @@ #include #include "TomahawkSettings.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "ZeroconfAccount.h" using namespace Tomahawk; diff --git a/src/breakpad/BreakPad.cpp b/src/breakpad/BreakPad.cpp index 0215d7796..e23096084 100644 --- a/src/breakpad/BreakPad.cpp +++ b/src/breakpad/BreakPad.cpp @@ -19,7 +19,7 @@ #include "BreakPad.h" #include "config.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include #include diff --git a/src/libtomahawk/AclRegistry.cpp b/src/libtomahawk/AclRegistry.cpp index 935408279..e47fddc1d 100644 --- a/src/libtomahawk/AclRegistry.cpp +++ b/src/libtomahawk/AclRegistry.cpp @@ -25,7 +25,7 @@ #include "TomahawkSettings.h" #include "TomahawkApp.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "jobview/AclJobItem.h" #include "jobview/JobStatusView.h" #include "jobview/JobStatusModel.h" diff --git a/src/libtomahawk/ActionCollection.cpp b/src/libtomahawk/ActionCollection.cpp index 46eb36d5c..60e929f24 100644 --- a/src/libtomahawk/ActionCollection.cpp +++ b/src/libtomahawk/ActionCollection.cpp @@ -20,7 +20,7 @@ #include "ActionCollection.h" #include "TomahawkSettings.h" -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" #include "utils/tomahawkutils.h" ActionCollection* ActionCollection::s_instance = 0; diff --git a/src/libtomahawk/Album.cpp b/src/libtomahawk/Album.cpp index 2b99ed5cb..4e3dc61fd 100644 --- a/src/libtomahawk/Album.cpp +++ b/src/libtomahawk/Album.cpp @@ -25,7 +25,7 @@ #include "database/DatabaseImpl.h" #include "Query.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/Album.h b/src/libtomahawk/Album.h index f0a5e50f0..a7f4f8902 100644 --- a/src/libtomahawk/Album.h +++ b/src/libtomahawk/Album.h @@ -31,7 +31,7 @@ #include "Typedefs.h" #include "PlaylistInterface.h" #include "DllMacro.h" -#include "infosystem/infosystem.h" +#include "infosystem/InfoSystem.h" namespace Tomahawk { diff --git a/src/libtomahawk/AlbumPlaylistInterface.cpp b/src/libtomahawk/AlbumPlaylistInterface.cpp index 4521723d4..35b24cdbd 100644 --- a/src/libtomahawk/AlbumPlaylistInterface.cpp +++ b/src/libtomahawk/AlbumPlaylistInterface.cpp @@ -22,10 +22,10 @@ #include "Artist.h" #include "database/Database.h" #include "database/DatabaseImpl.h" -#include "database/databasecommand_alltracks.h" +#include "database/DatabaseCommand_AllTracks.h" #include "Query.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/Artist.cpp b/src/libtomahawk/Artist.cpp index 227380b80..563dedac9 100644 --- a/src/libtomahawk/Artist.cpp +++ b/src/libtomahawk/Artist.cpp @@ -25,7 +25,7 @@ #include "database/DatabaseImpl.h" #include "Query.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/Artist.h b/src/libtomahawk/Artist.h index 40c565932..df428846e 100644 --- a/src/libtomahawk/Artist.h +++ b/src/libtomahawk/Artist.h @@ -30,7 +30,7 @@ #include "Typedefs.h" #include "DllMacro.h" -#include "infosystem/infosystem.h" +#include "infosystem/InfoSystem.h" namespace Tomahawk { diff --git a/src/libtomahawk/ArtistPlaylistInterface.cpp b/src/libtomahawk/ArtistPlaylistInterface.cpp index 56bf3ec35..86c26e1ea 100644 --- a/src/libtomahawk/ArtistPlaylistInterface.cpp +++ b/src/libtomahawk/ArtistPlaylistInterface.cpp @@ -23,9 +23,9 @@ #include "Collection.h" #include "Query.h" #include "database/Database.h" -#include "database/databasecommand_alltracks.h" +#include "database/DatabaseCommand_AllTracks.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/AtticaManager.cpp b/src/libtomahawk/AtticaManager.cpp index 10451773c..344201d23 100644 --- a/src/libtomahawk/AtticaManager.cpp +++ b/src/libtomahawk/AtticaManager.cpp @@ -31,7 +31,7 @@ #include #include -#include "utils/logger.h" +#include "utils/Logger.h" #include "accounts/ResolverAccount.h" #include "accounts/AccountManager.h" diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt index 5611b1c07..a7bcc2ace 100644 --- a/src/libtomahawk/CMakeLists.txt +++ b/src/libtomahawk/CMakeLists.txt @@ -43,7 +43,7 @@ set( libGuiSources jobview/ErrorStatusMessage.cpp jobview/IndexingJobItem.cpp - infobar/infobar.cpp + infobar/InfoBar.cpp playlist/TreeModel.cpp playlist/TreeProxyModel.cpp @@ -105,38 +105,38 @@ set( libGuiSources playlist/topbar/SearchButton.cpp ExternalResolverGui.cpp - resolvers/scriptresolver.cpp - resolvers/qtscriptresolver.cpp + resolvers/ScriptResolver.cpp + resolvers/QtScriptResolver.cpp utils/widgetdragfilter.cpp utils/xspfgenerator.cpp - utils/jspfloader.cpp - utils/spotifyparser.cpp - utils/m3uloader.cpp - utils/itunesparser.cpp - utils/rdioparser.cpp - utils/shortenedlinkparser.cpp - utils/stylehelper.cpp - utils/dropjobnotifier.cpp - utils/proxystyle.cpp + utils/JspfLoader.cpp + utils/SpotifyParser.cpp + utils/M3uLoader.cpp + utils/ItunesParser.cpp + utils/RdioParser.cpp + utils/ShortenedLinkParser.cpp + utils/StyleHelper.cpp + utils/DropJobNotifier.cpp + utils/ProxyStyle.cpp utils/tomahawkutilsgui.cpp - utils/closure.cpp + utils/Closure.cpp utils/PixmapDelegateFader.cpp utils/SmartPointerList.h - widgets/animatedcounterlabel.cpp - widgets/checkdirtree.cpp - widgets/querylabel.cpp - widgets/imagebutton.cpp - widgets/animatedsplitter.cpp - widgets/elidedlabel.cpp - widgets/newplaylistwidget.cpp - widgets/searchwidget.cpp + widgets/AnimatedCounterLabel.cpp + widgets/CheckDirTree.cpp + widgets/QueryLabel.cpp + widgets/ImageButton.cpp + widgets/AnimatedSplitter.cpp + widgets/ElidedLabel.cpp + widgets/NewPlaylistWidget.cpp + widgets/SearchWidget.cpp widgets/SeekSlider.cpp - widgets/playlisttypeselectordlg.cpp - widgets/welcomewidget.cpp - widgets/whatshotwidget.cpp - widgets/newreleaseswidget.cpp + widgets/PlaylistTypeSelectorDialog.cpp + widgets/WelcomeWidget.cpp + widgets/WhatsHotWidget.cpp + widgets/NewReleasesWidget.cpp widgets/ChartDataLoader.cpp widgets/RecentlyPlayedPlaylistsModel.cpp widgets/RecentPlaylistsModel.cpp @@ -144,11 +144,11 @@ set( libGuiSources widgets/OverlayWidget.cpp widgets/HeaderLabel.cpp widgets/HeaderWidget.cpp - widgets/combobox.cpp + widgets/ComboBox.cpp widgets/ToggleButton.cpp widgets/FadingPixmap.cpp widgets/SocialPlaylistWidget.cpp - widgets/infowidgets/sourceinfowidget.cpp + widgets/infowidgets/SourceInfoWidget.cpp widgets/infowidgets/ArtistInfoWidget.cpp widgets/infowidgets/AlbumInfoWidget.cpp widgets/Breadcrumb.cpp @@ -156,8 +156,8 @@ set( libGuiSources ) IF(QCA2_FOUND) - set( libGuiSources ${libGuiSources} utils/groovesharkparser.cpp ) - set( libGuiHeaders ${libGuiHeaders} utils/groovesharkparser.h ) + set( libGuiSources ${libGuiSources} utils/GroovesharkParser.cpp ) + set( libGuiHeaders ${libGuiHeaders} utils/GroovesharkParser.h ) ENDIF(QCA2_FOUND) set( libSources @@ -193,7 +193,7 @@ set( libSources sip/SipHandler.cpp sip/SipInfo.cpp - audio/audioengine.cpp + audio/AudioEngine.cpp database/Database.cpp @@ -205,59 +205,59 @@ set( libSources database/DatabaseResolver.cpp database/DatabaseCommand.cpp database/DatabaseCommandLoggable.cpp - database/databasecommand_resolve.cpp - database/databasecommand_allartists.cpp - database/databasecommand_allalbums.cpp - database/databasecommand_alltracks.cpp - database/databasecommand_addfiles.cpp - database/databasecommand_deletefiles.cpp - database/databasecommand_dirmtimes.cpp - database/databasecommand_filemtimes.cpp - database/databasecommand_loadfiles.cpp - database/databasecommand_logplayback.cpp - database/databasecommand_addsource.cpp - database/databasecommand_sourceoffline.cpp - database/databasecommand_collectionstats.cpp - database/databasecommand_loadplaylistentries.cpp - database/databasecommand_modifyplaylist.cpp - database/databasecommand_playbackhistory.cpp - database/databasecommand_setplaylistrevision.cpp - database/databasecommand_loadallplaylists.cpp - database/databasecommand_loadallsortedplaylists.cpp - database/databasecommand_loadallsources.cpp - database/databasecommand_createplaylist.cpp - database/databasecommand_deleteplaylist.cpp - database/databasecommand_renameplaylist.cpp - database/databasecommand_loadops.cpp - database/databasecommand_updatesearchindex.cpp - database/databasecommand_setdynamicplaylistrevision.cpp - database/databasecommand_createdynamicplaylist.cpp - database/databasecommand_loaddynamicplaylist.cpp - database/databasecommand_loaddynamicplaylistentries.cpp - database/databasecommand_loadallautoplaylists.cpp - database/databasecommand_loadallstations.cpp - database/databasecommand_deletedynamicplaylist.cpp - database/databasecommand_addclientauth.cpp - database/databasecommand_clientauthvalid.cpp - database/databasecommand_socialaction.cpp - database/databasecommand_loadsocialactions.cpp - database/databasecommand_genericselect.cpp - database/databasecommand_setcollectionattributes.cpp - database/databasecommand_collectionattributes.cpp - database/databasecommand_trackattributes.cpp - database/databasecommand_settrackattributes.cpp + database/DatabaseCommand_Resolve.cpp + database/DatabaseCommand_AllArtists.cpp + database/DatabaseCommand_AllAlbums.cpp + database/DatabaseCommand_AllTracks.cpp + database/DatabaseCommand_AddFiles.cpp + database/DatabaseCommand_DeleteFiles.cpp + database/DatabaseCommand_DirMtimes.cpp + database/DatabaseCommand_FileMTimes.cpp + database/DatabaseCommand_LoadFiles.cpp + database/DatabaseCommand_LogPlayback.cpp + database/DatabaseCommand_AddSource.cpp + database/DatabaseCommand_SourceOffline.cpp + database/DatabaseCommand_CollectionStats.cpp + database/DatabaseCommand_LoadPlaylistEntries.cpp + database/DatabaseCommand_ModifyPlaylist.cpp + database/DatabaseCommand_PlaybackHistory.cpp + database/DatabaseCommand_SetPlaylistRevision.cpp + database/DatabaseCommand_LoadAllPlaylists.cpp + database/DatabaseCommand_LoadAllSortedPlaylists.cpp + database/DatabaseCommand_LoadAllSources.cpp + database/DatabaseCommand_CreatePlaylist.cpp + database/DatabaseCommand_DeletePlaylist.cpp + database/DatabaseCommand_RenamePlaylist.cpp + database/DatabaseCommand_LoadOps.cpp + database/DatabaseCommand_UpdateSearchIndex.cpp + database/DatabaseCommand_SetDynamicPlaylistRevision.cpp + database/DatabaseCommand_CreateDynamicPlaylist.cpp + database/DatabaseCommand_LoadDynamicPlaylist.cpp + database/DatabaseCommand_LoadDynamicPlaylistEntries.cpp + database/DatabaseCommand_LoadAllAutoPlaylists.cpp + database/DatabaseCommand_LoadAllStations.cpp + database/DatabaseCommand_DeleteDynamicPlaylist.cpp + database/DatabaseCommand_AddClientAuth.cpp + database/DatabaseCommand_ClientAuthValid.cpp + database/DatabaseCommand_SocialAction.cpp + database/DatabaseCommand_LoadSocialActions.cpp + database/DatabaseCommand_GenericSelect.cpp + database/DatabaseCommand_SetCollectionAttributes.cpp + database/DatabaseCommand_CollectionAttributes.cpp + database/DatabaseCommand_TrackAttributes.cpp + database/DatabaseCommand_SetTrackAttributes.cpp database/Database.cpp - infosystem/infosystem.cpp - infosystem/infosystemcache.cpp - infosystem/infosystemworker.cpp + infosystem/InfoSystem.cpp + infosystem/InfoSystemCache.cpp + infosystem/InfoSystemWorker.cpp - infosystem/infoplugins/generic/echonestplugin.cpp - infosystem/infoplugins/generic/chartsplugin.cpp - infosystem/infoplugins/generic/newreleasesplugin.cpp + infosystem/infoplugins/generic/EchonestPlugin.cpp + infosystem/infoplugins/generic/ChartsPlugin.cpp + infosystem/infoplugins/generic/NewReleasesPlugin.cpp infosystem/infoplugins/generic/spotifyPlugin.cpp infosystem/infoplugins/generic/hypemPlugin.cpp - infosystem/infoplugins/generic/musixmatchplugin.cpp + infosystem/infoplugins/generic/MusixMatchPlugin.cpp infosystem/infoplugins/generic/musicbrainzPlugin.cpp infosystem/infoplugins/generic/RoviPlugin.cpp @@ -290,8 +290,8 @@ set( libSources taghandlers/oggtag.cpp utils/tomahawkutils.cpp - utils/logger.cpp - utils/qnr_iodevicestream.cpp + utils/Logger.cpp + utils/Qnr_IoDeviceStream.cpp utils/xspfloader.cpp utils/tomahawkcache.cpp @@ -302,20 +302,20 @@ set( libSources ) set( libUI ${libUI} - widgets/playlisttypeselectordlg.ui - widgets/newplaylistwidget.ui - widgets/searchwidget.ui - widgets/welcomewidget.ui - widgets/whatshotwidget.ui - widgets/newreleaseswidget.ui + widgets/PlaylistTypeSelectorDialog.ui + widgets/NewPlaylistWidget.ui + widgets/SearchWidget.ui + widgets/WelcomeWidget.ui + widgets/WhatsHotWidget.ui + widgets/NewReleasesWidget.ui widgets/SocialPlaylistWidget.ui - widgets/infowidgets/sourceinfowidget.ui + widgets/infowidgets/SourceInfoWidget.ui widgets/infowidgets/ArtistInfoWidget.ui widgets/infowidgets/AlbumInfoWidget.ui playlist/topbar/TopBar.ui playlist/QueueView.ui context/ContextWidget.ui - infobar/infobar.ui + infobar/InfoBar.ui ) include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/.. .. @@ -347,17 +347,17 @@ ENDIF(LIBATTICA_FOUND) IF( UNIX AND NOT APPLE ) LIST(APPEND libGuiSources - infosystem/infoplugins/unix/mprispluginrootadaptor.cpp - infosystem/infoplugins/unix/mprispluginplayeradaptor.cpp - infosystem/infoplugins/unix/mprisplugin.cpp - infosystem/infoplugins/unix/fdonotifyplugin.cpp - infosystem/infoplugins/unix/imageconverter.cpp ) + infosystem/infoplugins/unix/MprisPluginRootAdaptor.cpp + infosystem/infoplugins/unix/MprisPluginPlayerAdaptor.cpp + infosystem/infoplugins/unix/MprisPlugin.cpp + infosystem/infoplugins/unix/FdoNotifyPlugin.cpp + infosystem/infoplugins/unix/ImageConverter.cpp ) LIST(APPEND libGuiHeaders - infosystem/infoplugins/unix/mprispluginrootadaptor.h - infosystem/infoplugins/unix/mprispluginplayeradaptor.h - infosystem/infoplugins/unix/mprisplugin.h - infosystem/infoplugins/unix/fdonotifyplugin.h ) + infosystem/infoplugins/unix/MprisPluginRootAdaptor.h + infosystem/infoplugins/unix/MprisPluginPlayerAdaptor.h + infosystem/infoplugins/unix/MprisPlugin.h + infosystem/infoplugins/unix/FdoNotifyPlugin.h ) IF( BUILD_GUI AND X11_FOUND ) INCLUDE_DIRECTORIES( ${THIRDPARTY_DIR}/libqnetwm ) @@ -388,8 +388,8 @@ IF( APPLE ) MARK_AS_ADVANCED( COREAUDIO_LIBRARY COREFOUNDATION_LIBRARY FOUNDATION_LIBRARY SCRIPTINGBRIDGE_LIBRARY ) SET( libSources ${libSources} - infosystem/infoplugins/mac/adium.mm - infosystem/infoplugins/mac/adiumplugin.cpp + infosystem/infoplugins/mac/Adium.mm + infosystem/infoplugins/mac/AdiumPlugin.cpp utils/tomahawkutils_mac.mm thirdparty/Qocoa/qsearchfield_mac.mm ) diff --git a/src/libtomahawk/Collection.cpp b/src/libtomahawk/Collection.cpp index 8e4926660..ea83985ac 100644 --- a/src/libtomahawk/Collection.cpp +++ b/src/libtomahawk/Collection.cpp @@ -24,7 +24,7 @@ #include "Source.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include using namespace Tomahawk; diff --git a/src/libtomahawk/ContextMenu.cpp b/src/libtomahawk/ContextMenu.cpp index ab46994a0..c5716bdb6 100644 --- a/src/libtomahawk/ContextMenu.cpp +++ b/src/libtomahawk/ContextMenu.cpp @@ -26,7 +26,7 @@ #include "Source.h" #include "Artist.h" #include "Album.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/DropJob.cpp b/src/libtomahawk/DropJob.cpp index a3e7ff939..e691bc13f 100644 --- a/src/libtomahawk/DropJob.cpp +++ b/src/libtomahawk/DropJob.cpp @@ -24,15 +24,15 @@ #include "Album.h" #include "Source.h" -#include "utils/spotifyparser.h" -#include "utils/itunesparser.h" -#include "utils/rdioparser.h" -#include "utils/m3uloader.h" -#include "utils/shortenedlinkparser.h" -#include "utils/logger.h" +#include "utils/SpotifyParser.h" +#include "utils/ItunesParser.h" +#include "utils/RdioParser.h" +#include "utils/M3uLoader.h" +#include "utils/ShortenedLinkParser.h" +#include "utils/Logger.h" #include "utils/tomahawkutils.h" #include "GlobalActionManager.h" -#include "infosystem/infosystem.h" +#include "infosystem/InfoSystem.h" #include "utils/xspfloader.h" #include "jobview/JobStatusView.h" #include "jobview/JobStatusModel.h" @@ -40,7 +40,7 @@ #include "Pipeline.h" #ifdef QCA2_FOUND -#include "utils/groovesharkparser.h" +#include "utils/GroovesharkParser.h" #endif //QCA2_FOUND diff --git a/src/libtomahawk/DropJob.h b/src/libtomahawk/DropJob.h index 40528f3c9..1870c96e6 100644 --- a/src/libtomahawk/DropJob.h +++ b/src/libtomahawk/DropJob.h @@ -22,7 +22,7 @@ #include "Query.h" -#include "infosystem/infosystem.h" +#include "infosystem/InfoSystem.h" #include "utils/xspfloader.h" #include diff --git a/src/libtomahawk/EchonestCatalogSynchronizer.cpp b/src/libtomahawk/EchonestCatalogSynchronizer.cpp index 4170b3e26..c9477c883 100644 --- a/src/libtomahawk/EchonestCatalogSynchronizer.cpp +++ b/src/libtomahawk/EchonestCatalogSynchronizer.cpp @@ -20,9 +20,9 @@ #include "Collection.h" #include "database/Database.h" -#include "database/databasecommand_genericselect.h" -#include "database/databasecommand_setcollectionattributes.h" -#include "database/databasecommand_loadfiles.h" +#include "database/DatabaseCommand_GenericSelect.h" +#include "database/DatabaseCommand_SetCollectionAttributes.h" +#include "database/DatabaseCommand_LoadFiles.h" #include "TomahawkSettings.h" #include "SourceList.h" #include "Query.h" diff --git a/src/libtomahawk/EchonestCatalogSynchronizer.h b/src/libtomahawk/EchonestCatalogSynchronizer.h index 2e8b52cb6..1ce5da5e9 100644 --- a/src/libtomahawk/EchonestCatalogSynchronizer.h +++ b/src/libtomahawk/EchonestCatalogSynchronizer.h @@ -21,7 +21,7 @@ #include "DllMacro.h" #include "Query.h" -#include "database/databasecommand_trackattributes.h" +#include "database/DatabaseCommand_TrackAttributes.h" #include diff --git a/src/libtomahawk/ExternalResolver.cpp b/src/libtomahawk/ExternalResolver.cpp index 1906f358b..f01fc3e5b 100644 --- a/src/libtomahawk/ExternalResolver.cpp +++ b/src/libtomahawk/ExternalResolver.cpp @@ -18,7 +18,7 @@ #include "ExternalResolver.h" -#include "utils/logger.h" +#include "utils/Logger.h" Tomahawk::ExternalResolver::ErrorState Tomahawk::ExternalResolver::error() const diff --git a/src/libtomahawk/ExternalResolverGui.cpp b/src/libtomahawk/ExternalResolverGui.cpp index 63f5392c7..744b2ab5f 100644 --- a/src/libtomahawk/ExternalResolverGui.cpp +++ b/src/libtomahawk/ExternalResolverGui.cpp @@ -26,7 +26,7 @@ #include #include #include -#include "utils/logger.h" +#include "utils/Logger.h" Tomahawk::ExternalResolverGui::ExternalResolverGui(const QString& filePath) : Tomahawk::ExternalResolver(filePath) diff --git a/src/libtomahawk/GlobalActionManager.cpp b/src/libtomahawk/GlobalActionManager.cpp index 9800a1ef3..c183b3884 100644 --- a/src/libtomahawk/GlobalActionManager.cpp +++ b/src/libtomahawk/GlobalActionManager.cpp @@ -25,7 +25,7 @@ #include "SourceList.h" #include "Pipeline.h" #include "TomahawkSettings.h" -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" #include "database/LocalCollection.h" #include "playlist/dynamic/GeneratorInterface.h" @@ -33,15 +33,15 @@ #include "utils/xspfloader.h" #include "utils/xspfgenerator.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "utils/tomahawkutils.h" -#include "utils/jspfloader.h" -#include "utils/spotifyparser.h" -#include "utils/shortenedlinkparser.h" -#include "utils/rdioparser.h" +#include "utils/JspfLoader.h" +#include "utils/SpotifyParser.h" +#include "utils/ShortenedLinkParser.h" +#include "utils/RdioParser.h" -#include "widgets/searchwidget.h" +#include "widgets/SearchWidget.h" #include "ViewManager.h" #include "playlist/topbar/TopBar.h" #include "playlist/PlaylistView.h" diff --git a/src/libtomahawk/LatchManager.cpp b/src/libtomahawk/LatchManager.cpp index 04d1ef75c..a5a0c772b 100644 --- a/src/libtomahawk/LatchManager.cpp +++ b/src/libtomahawk/LatchManager.cpp @@ -20,12 +20,12 @@ #include "LatchManager.h" #include "ActionCollection.h" -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" #include "database/Database.h" #include #include "SourceList.h" -#include "database/databasecommand_socialaction.h" +#include "database/DatabaseCommand_SocialAction.h" #include "SourcePlaylistInterface.h" using namespace Tomahawk; diff --git a/src/libtomahawk/Pipeline.cpp b/src/libtomahawk/Pipeline.cpp index 46fe5e6c7..4adce9a12 100644 --- a/src/libtomahawk/Pipeline.cpp +++ b/src/libtomahawk/Pipeline.cpp @@ -23,10 +23,10 @@ #include "FuncTimeout.h" #include "database/Database.h" #include "ExternalResolver.h" -#include "resolvers/scriptresolver.h" -#include "resolvers/qtscriptresolver.h" +#include "resolvers/ScriptResolver.h" +#include "resolvers/QtScriptResolver.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "boost/bind.hpp" diff --git a/src/libtomahawk/Playlist.cpp b/src/libtomahawk/Playlist.cpp index 8dbc0cee8..a93431560 100644 --- a/src/libtomahawk/Playlist.cpp +++ b/src/libtomahawk/Playlist.cpp @@ -24,11 +24,11 @@ #include #include "database/Database.h" -#include "database/databasecommand_loadplaylistentries.h" -#include "database/databasecommand_setplaylistrevision.h" -#include "database/databasecommand_createplaylist.h" -#include "database/databasecommand_deleteplaylist.h" -#include "database/databasecommand_renameplaylist.h" +#include "database/DatabaseCommand_LoadPlaylistEntries.h" +#include "database/DatabaseCommand_SetPlaylistRevision.h" +#include "database/DatabaseCommand_CreatePlaylist.h" +#include "database/DatabaseCommand_DeletePlaylist.h" +#include "database/DatabaseCommand_RenamePlaylist.h" #include "TomahawkSettings.h" #include "Pipeline.h" @@ -36,7 +36,7 @@ #include "SourceList.h" #include "PlaylistPlaylistInterface.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "PlaylistUpdaterInterface.h" using namespace Tomahawk; diff --git a/src/libtomahawk/PlaylistInterface.cpp b/src/libtomahawk/PlaylistInterface.cpp index 5c0788343..f965b8613 100644 --- a/src/libtomahawk/PlaylistInterface.cpp +++ b/src/libtomahawk/PlaylistInterface.cpp @@ -18,7 +18,7 @@ */ #include "PlaylistInterface.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "Result.h" using namespace Tomahawk; diff --git a/src/libtomahawk/PlaylistInterface.h b/src/libtomahawk/PlaylistInterface.h index 61030b150..e6b405575 100644 --- a/src/libtomahawk/PlaylistInterface.h +++ b/src/libtomahawk/PlaylistInterface.h @@ -24,7 +24,7 @@ #include "Typedefs.h" #include "DllMacro.h" -#include "utils/logger.h" +#include "utils/Logger.h" namespace Tomahawk { diff --git a/src/libtomahawk/PlaylistPlaylistInterface.cpp b/src/libtomahawk/PlaylistPlaylistInterface.cpp index 4b0388175..fa1954fcc 100644 --- a/src/libtomahawk/PlaylistPlaylistInterface.cpp +++ b/src/libtomahawk/PlaylistPlaylistInterface.cpp @@ -22,7 +22,7 @@ #include "Playlist.h" #include "SourceList.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/Query.cpp b/src/libtomahawk/Query.cpp index ee825b7ea..38f3a1c89 100644 --- a/src/libtomahawk/Query.cpp +++ b/src/libtomahawk/Query.cpp @@ -23,19 +23,19 @@ #include "database/Database.h" #include "database/DatabaseImpl.h" -#include "database/databasecommand_logplayback.h" -#include "database/databasecommand_playbackhistory.h" -#include "database/databasecommand_loadplaylistentries.h" -#include "database/databasecommand_loadsocialactions.h" -#include "database/databasecommand_socialaction.h" +#include "database/DatabaseCommand_LogPlayback.h" +#include "database/DatabaseCommand_PlaybackHistory.h" +#include "database/DatabaseCommand_LoadPlaylistEntries.h" +#include "database/DatabaseCommand_LoadSocialActions.h" +#include "database/DatabaseCommand_SocialAction.h" #include "Album.h" #include "Collection.h" #include "Pipeline.h" #include "Resolver.h" #include "SourceList.h" -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/Result.cpp b/src/libtomahawk/Result.cpp index 420e9eb23..ffe79d1e2 100644 --- a/src/libtomahawk/Result.cpp +++ b/src/libtomahawk/Result.cpp @@ -22,11 +22,11 @@ #include "Collection.h" #include "Source.h" #include "database/Database.h" -#include "database/databasecommand_resolve.h" -#include "database/databasecommand_alltracks.h" -#include "database/databasecommand_addfiles.h" +#include "database/DatabaseCommand_Resolve.h" +#include "database/DatabaseCommand_AllTracks.h" +#include "database/DatabaseCommand_AddFiles.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/Source.cpp b/src/libtomahawk/Source.cpp index a5a5a21b9..6b1bc9514 100644 --- a/src/libtomahawk/Source.cpp +++ b/src/libtomahawk/Source.cpp @@ -24,17 +24,17 @@ #include "SourcePlaylistInterface.h" #include "network/ControlConnection.h" -#include "database/databasecommand_addsource.h" -#include "database/databasecommand_collectionstats.h" -#include "database/databasecommand_sourceoffline.h" -#include "database/databasecommand_updatesearchindex.h" +#include "database/DatabaseCommand_AddSource.h" +#include "database/DatabaseCommand_CollectionStats.h" +#include "database/DatabaseCommand_SourceOffline.h" +#include "database/DatabaseCommand_UpdateSearchIndex.h" #include "database/Database.h" #include -#include "utils/logger.h" +#include "utils/Logger.h" #include "utils/tomahawkutilsgui.h" -#include "database/databasecommand_socialaction.h" +#include "database/DatabaseCommand_SocialAction.h" using namespace Tomahawk; diff --git a/src/libtomahawk/SourceList.cpp b/src/libtomahawk/SourceList.cpp index ba65336c8..222880946 100644 --- a/src/libtomahawk/SourceList.cpp +++ b/src/libtomahawk/SourceList.cpp @@ -19,11 +19,11 @@ #include "SourceList.h" #include "database/Database.h" -#include "database/databasecommand_loadallsources.h" +#include "database/DatabaseCommand_LoadAllSources.h" #include "network/RemoteCollection.h" #include "network/ControlConnection.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/SourcePlaylistInterface.cpp b/src/libtomahawk/SourcePlaylistInterface.cpp index 566729c11..40bd9bc20 100644 --- a/src/libtomahawk/SourcePlaylistInterface.cpp +++ b/src/libtomahawk/SourcePlaylistInterface.cpp @@ -21,9 +21,9 @@ #include "Source.h" #include "Pipeline.h" -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/TomahawkSettings.cpp b/src/libtomahawk/TomahawkSettings.cpp index 67cd49372..9ddf28991 100644 --- a/src/libtomahawk/TomahawkSettings.cpp +++ b/src/libtomahawk/TomahawkSettings.cpp @@ -25,10 +25,10 @@ #include "sip/SipHandler.h" #include "PlaylistInterface.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "utils/tomahawkutils.h" -#include "database/databasecommand_updatesearchindex.h" +#include "database/DatabaseCommand_UpdateSearchIndex.h" #include "database/Database.h" using namespace Tomahawk; diff --git a/src/libtomahawk/ViewManager.cpp b/src/libtomahawk/ViewManager.cpp index 717ceed1a..ef2676c3c 100644 --- a/src/libtomahawk/ViewManager.cpp +++ b/src/libtomahawk/ViewManager.cpp @@ -22,9 +22,9 @@ #include #include -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" #include "context/ContextWidget.h" -#include "infobar/infobar.h" +#include "infobar/InfoBar.h" #include "topbar/TopBar.h" #include "TreeModel.h" @@ -46,15 +46,15 @@ #include "RecentlyPlayedModel.h" #include "dynamic/widgets/DynamicWidget.h" -#include "widgets/welcomewidget.h" -#include "widgets/whatshotwidget.h" -#include "widgets/infowidgets/sourceinfowidget.h" +#include "widgets/WelcomeWidget.h" +#include "widgets/WhatsHotWidget.h" +#include "widgets/infowidgets/SourceInfoWidget.h" #include "widgets/infowidgets/ArtistInfoWidget.h" #include "widgets/infowidgets/AlbumInfoWidget.h" -#include "widgets/newplaylistwidget.h" -#include "widgets/animatedsplitter.h" +#include "widgets/NewPlaylistWidget.h" +#include "widgets/AnimatedSplitter.h" -#include "utils/logger.h" +#include "utils/Logger.h" #define FILTER_TIMEOUT 280 diff --git a/src/libtomahawk/ViewManager.h b/src/libtomahawk/ViewManager.h index 7755406d7..f84511476 100644 --- a/src/libtomahawk/ViewManager.h +++ b/src/libtomahawk/ViewManager.h @@ -29,9 +29,9 @@ #include "PlaylistInterface.h" #include "playlist/QueueView.h" #include "ViewPage.h" -#include "widgets/welcomewidget.h" -#include "widgets/whatshotwidget.h" -#include "widgets/newreleaseswidget.h" +#include "widgets/WelcomeWidget.h" +#include "widgets/WhatsHotWidget.h" +#include "widgets/NewReleasesWidget.h" #include "DllMacro.h" diff --git a/src/libtomahawk/ViewPage.cpp b/src/libtomahawk/ViewPage.cpp index 0b9800e6a..2a1733ba9 100644 --- a/src/libtomahawk/ViewPage.cpp +++ b/src/libtomahawk/ViewPage.cpp @@ -18,7 +18,7 @@ #include "ViewPage.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/accounts/Account.h b/src/libtomahawk/accounts/Account.h index c2889728c..8378e14c3 100644 --- a/src/libtomahawk/accounts/Account.h +++ b/src/libtomahawk/accounts/Account.h @@ -31,7 +31,7 @@ #include "DllMacro.h" #include "TomahawkSettings.h" -#include "libtomahawk/infosystem/infosystem.h" +#include "libtomahawk/infosystem/InfoSystem.h" class SipPlugin; diff --git a/src/libtomahawk/accounts/AccountManager.h b/src/libtomahawk/accounts/AccountManager.h index c6bca3de5..01881791a 100644 --- a/src/libtomahawk/accounts/AccountManager.h +++ b/src/libtomahawk/accounts/AccountManager.h @@ -24,7 +24,7 @@ #include "Typedefs.h" #include "DllMacro.h" -#include "infosystem/infosystem.h" +#include "infosystem/InfoSystem.h" #include "sip/SipPlugin.h" #include "Account.h" diff --git a/src/libtomahawk/audio/audioengine.cpp b/src/libtomahawk/audio/AudioEngine.cpp similarity index 99% rename from src/libtomahawk/audio/audioengine.cpp rename to src/libtomahawk/audio/AudioEngine.cpp index 3b6c7c063..08420d878 100644 --- a/src/libtomahawk/audio/audioengine.cpp +++ b/src/libtomahawk/audio/AudioEngine.cpp @@ -17,7 +17,7 @@ * along with Tomahawk. If not, see . */ -#include "audioengine.h" +#include "AudioEngine.h" #include "config.h" @@ -29,15 +29,15 @@ #include "SourcePlaylistInterface.h" #include "TomahawkSettings.h" #include "database/Database.h" -#include "database/databasecommand_logplayback.h" +#include "database/DatabaseCommand_LogPlayback.h" #include "network/Servent.h" -#include "utils/qnr_iodevicestream.h" -#include "utils/closure.h" +#include "utils/Qnr_IoDeviceStream.h" +#include "utils/Closure.h" #include "HeadlessCheck.h" -#include "infosystem/infosystem.h" +#include "infosystem/InfoSystem.h" #include "Album.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/audio/audioengine.h b/src/libtomahawk/audio/AudioEngine.h similarity index 99% rename from src/libtomahawk/audio/audioengine.h rename to src/libtomahawk/audio/AudioEngine.h index 518ff7ccb..5abdc207a 100644 --- a/src/libtomahawk/audio/audioengine.h +++ b/src/libtomahawk/audio/AudioEngine.h @@ -27,7 +27,7 @@ #include #include -#include "libtomahawk/infosystem/infosystem.h" +#include "libtomahawk/infosystem/InfoSystem.h" #include "Result.h" #include "Typedefs.h" diff --git a/src/libtomahawk/context/ContextPage.cpp b/src/libtomahawk/context/ContextPage.cpp index 631c4026c..cc1aca64d 100644 --- a/src/libtomahawk/context/ContextPage.cpp +++ b/src/libtomahawk/context/ContextPage.cpp @@ -21,7 +21,7 @@ #include #include "PlaylistInterface.h" -#include "utils/stylehelper.h" +#include "utils/StyleHelper.h" using namespace Tomahawk; diff --git a/src/libtomahawk/context/ContextWidget.cpp b/src/libtomahawk/context/ContextWidget.cpp index b0b346529..9a4569ec8 100644 --- a/src/libtomahawk/context/ContextWidget.cpp +++ b/src/libtomahawk/context/ContextWidget.cpp @@ -32,7 +32,7 @@ #include "playlist/ArtistView.h" #include "playlist/TreeModel.h" -#include "utils/stylehelper.h" +#include "utils/StyleHelper.h" #include "utils/tomahawkutilsgui.h" #define ANIMATION_TIME 450 diff --git a/src/libtomahawk/context/pages/RelatedArtistsContext.h b/src/libtomahawk/context/pages/RelatedArtistsContext.h index b1bbb8456..53d3c9a5e 100644 --- a/src/libtomahawk/context/pages/RelatedArtistsContext.h +++ b/src/libtomahawk/context/pages/RelatedArtistsContext.h @@ -28,7 +28,7 @@ #include "Album.h" #include "Query.h" #include "context/ContextPage.h" -#include "infosystem/infosystem.h" +#include "infosystem/InfoSystem.h" class TreeModel; class ArtistView; diff --git a/src/libtomahawk/context/pages/TopTracksContext.h b/src/libtomahawk/context/pages/TopTracksContext.h index 6c2f7c701..662f00c02 100644 --- a/src/libtomahawk/context/pages/TopTracksContext.h +++ b/src/libtomahawk/context/pages/TopTracksContext.h @@ -28,7 +28,7 @@ #include "Album.h" #include "Query.h" #include "context/ContextPage.h" -#include "infosystem/infosystem.h" +#include "infosystem/InfoSystem.h" class PlaylistModel; class PlaylistView; diff --git a/src/libtomahawk/database/Database.cpp b/src/libtomahawk/database/Database.cpp index 1c146543c..2dd9e0ac0 100644 --- a/src/libtomahawk/database/Database.cpp +++ b/src/libtomahawk/database/Database.cpp @@ -22,7 +22,7 @@ #include "DatabaseCommand.h" #include "DatabaseImpl.h" #include "DatabaseWorker.h" -#include "utils/logger.h" +#include "utils/Logger.h" #define DEFAULT_WORKER_THREADS 4 #define MAX_WORKER_THREADS 16 diff --git a/src/libtomahawk/database/DatabaseCollection.cpp b/src/libtomahawk/database/DatabaseCollection.cpp index f6968059e..cb864cc66 100644 --- a/src/libtomahawk/database/DatabaseCollection.cpp +++ b/src/libtomahawk/database/DatabaseCollection.cpp @@ -19,14 +19,14 @@ #include "DatabaseCollection.h" #include "database/Database.h" -#include "databasecommand_alltracks.h" -#include "databasecommand_addfiles.h" -#include "databasecommand_deletefiles.h" -#include "databasecommand_loadallplaylists.h" -#include "databasecommand_loadallautoplaylists.h" -#include "databasecommand_loadallstations.h" +#include "DatabaseCommand_AllTracks.h" +#include "DatabaseCommand_AddFiles.h" +#include "DatabaseCommand_DeleteFiles.h" +#include "DatabaseCommand_LoadAllPlaylists.h" +#include "DatabaseCommand_LoadAllAutoPlaylists.h" +#include "DatabaseCommand_LoadAllStations.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/DatabaseCommand.cpp b/src/libtomahawk/database/DatabaseCommand.cpp index 2cb716bb6..e287cfe45 100644 --- a/src/libtomahawk/database/DatabaseCommand.cpp +++ b/src/libtomahawk/database/DatabaseCommand.cpp @@ -18,21 +18,21 @@ #include "DatabaseCommand.h" -#include "databasecommand_addfiles.h" -#include "databasecommand_createplaylist.h" -#include "databasecommand_deletefiles.h" -#include "databasecommand_deleteplaylist.h" -#include "databasecommand_logplayback.h" -#include "databasecommand_renameplaylist.h" -#include "databasecommand_setplaylistrevision.h" -#include "databasecommand_createdynamicplaylist.h" -#include "databasecommand_deletedynamicplaylist.h" -#include "databasecommand_setdynamicplaylistrevision.h" -#include "databasecommand_socialaction.h" +#include "DatabaseCommand_AddFiles.h" +#include "DatabaseCommand_CreatePlaylist.h" +#include "DatabaseCommand_DeleteFiles.h" +#include "DatabaseCommand_DeletePlaylist.h" +#include "DatabaseCommand_LogPlayback.h" +#include "DatabaseCommand_RenamePlaylist.h" +#include "DatabaseCommand_SetPlaylistRevision.h" +#include "DatabaseCommand_CreateDynamicPlaylist.h" +#include "DatabaseCommand_DeleteDynamicPlaylist.h" +#include "DatabaseCommand_SetDynamicPlaylistRevision.h" +#include "DatabaseCommand_SocialAction.h" -#include "utils/logger.h" -#include "databasecommand_setcollectionattributes.h" -#include "databasecommand_settrackattributes.h" +#include "utils/Logger.h" +#include "DatabaseCommand_SetCollectionAttributes.h" +#include "DatabaseCommand_SetTrackAttributes.h" DatabaseCommand::DatabaseCommand( QObject* parent ) diff --git a/src/libtomahawk/database/DatabaseCommandLoggable.cpp b/src/libtomahawk/database/DatabaseCommandLoggable.cpp index bb2074ee1..f2fe825f4 100644 --- a/src/libtomahawk/database/DatabaseCommandLoggable.cpp +++ b/src/libtomahawk/database/DatabaseCommandLoggable.cpp @@ -18,4 +18,4 @@ #include "DatabaseCommandLoggable.h" -#include "utils/logger.h" +#include "utils/Logger.h" diff --git a/src/libtomahawk/database/databasecommand_addclientauth.cpp b/src/libtomahawk/database/DatabaseCommand_AddClientAuth.cpp similarity index 96% rename from src/libtomahawk/database/databasecommand_addclientauth.cpp rename to src/libtomahawk/database/DatabaseCommand_AddClientAuth.cpp index 4874313b8..43c4c5e8f 100644 --- a/src/libtomahawk/database/databasecommand_addclientauth.cpp +++ b/src/libtomahawk/database/DatabaseCommand_AddClientAuth.cpp @@ -16,11 +16,11 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_addclientauth.h" +#include "DatabaseCommand_AddClientAuth.h" #include "DatabaseImpl.h" #include "TomahawkSqlQuery.h" -#include "utils/logger.h" +#include "utils/Logger.h" DatabaseCommand_AddClientAuth::DatabaseCommand_AddClientAuth( const QString& clientToken, diff --git a/src/libtomahawk/database/databasecommand_addclientauth.h b/src/libtomahawk/database/DatabaseCommand_AddClientAuth.h similarity index 100% rename from src/libtomahawk/database/databasecommand_addclientauth.h rename to src/libtomahawk/database/DatabaseCommand_AddClientAuth.h diff --git a/src/libtomahawk/database/databasecommand_addfiles.cpp b/src/libtomahawk/database/DatabaseCommand_AddFiles.cpp similarity index 98% rename from src/libtomahawk/database/databasecommand_addfiles.cpp rename to src/libtomahawk/database/DatabaseCommand_AddFiles.cpp index a9eebbdff..0bd6f7463 100644 --- a/src/libtomahawk/database/databasecommand_addfiles.cpp +++ b/src/libtomahawk/database/DatabaseCommand_AddFiles.cpp @@ -16,7 +16,7 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_addfiles.h" +#include "DatabaseCommand_AddFiles.h" #include @@ -29,7 +29,7 @@ #include "network/Servent.h" #include "SourceList.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_addfiles.h b/src/libtomahawk/database/DatabaseCommand_AddFiles.h similarity index 100% rename from src/libtomahawk/database/databasecommand_addfiles.h rename to src/libtomahawk/database/DatabaseCommand_AddFiles.h diff --git a/src/libtomahawk/database/databasecommand_addsource.cpp b/src/libtomahawk/database/DatabaseCommand_AddSource.cpp similarity index 96% rename from src/libtomahawk/database/databasecommand_addsource.cpp rename to src/libtomahawk/database/DatabaseCommand_AddSource.cpp index 34041003b..36a7e9ea7 100644 --- a/src/libtomahawk/database/databasecommand_addsource.cpp +++ b/src/libtomahawk/database/DatabaseCommand_AddSource.cpp @@ -16,12 +16,12 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_addsource.h" +#include "DatabaseCommand_AddSource.h" #include #include "DatabaseImpl.h" -#include "utils/logger.h" +#include "utils/Logger.h" DatabaseCommand_addSource::DatabaseCommand_addSource( const QString& username, const QString& fname, QObject* parent ) diff --git a/src/libtomahawk/database/databasecommand_addsource.h b/src/libtomahawk/database/DatabaseCommand_AddSource.h similarity index 100% rename from src/libtomahawk/database/databasecommand_addsource.h rename to src/libtomahawk/database/DatabaseCommand_AddSource.h diff --git a/src/libtomahawk/database/databasecommand_allalbums.cpp b/src/libtomahawk/database/DatabaseCommand_AllAlbums.cpp similarity index 98% rename from src/libtomahawk/database/databasecommand_allalbums.cpp rename to src/libtomahawk/database/DatabaseCommand_AllAlbums.cpp index d97d78312..a7fd69d24 100644 --- a/src/libtomahawk/database/databasecommand_allalbums.cpp +++ b/src/libtomahawk/database/DatabaseCommand_AllAlbums.cpp @@ -16,7 +16,7 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_allalbums.h" +#include "DatabaseCommand_AllAlbums.h" #include @@ -24,7 +24,7 @@ #include "DatabaseImpl.h" #include "Source.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" DatabaseCommand_AllAlbums::DatabaseCommand_AllAlbums( const Tomahawk::collection_ptr &collection, const Tomahawk::artist_ptr &artist, QObject *parent ) diff --git a/src/libtomahawk/database/databasecommand_allalbums.h b/src/libtomahawk/database/DatabaseCommand_AllAlbums.h similarity index 100% rename from src/libtomahawk/database/databasecommand_allalbums.h rename to src/libtomahawk/database/DatabaseCommand_AllAlbums.h diff --git a/src/libtomahawk/database/databasecommand_allartists.cpp b/src/libtomahawk/database/DatabaseCommand_AllArtists.cpp similarity index 98% rename from src/libtomahawk/database/databasecommand_allartists.cpp rename to src/libtomahawk/database/DatabaseCommand_AllArtists.cpp index 6d17f41a4..e8391e7fb 100644 --- a/src/libtomahawk/database/databasecommand_allartists.cpp +++ b/src/libtomahawk/database/DatabaseCommand_AllArtists.cpp @@ -16,7 +16,7 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_allartists.h" +#include "DatabaseCommand_AllArtists.h" #include @@ -24,7 +24,7 @@ #include "DatabaseImpl.h" #include "Source.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" DatabaseCommand_AllArtists::DatabaseCommand_AllArtists( const Tomahawk::collection_ptr &collection, QObject *parent ) : DatabaseCommand( parent ) diff --git a/src/libtomahawk/database/databasecommand_allartists.h b/src/libtomahawk/database/DatabaseCommand_AllArtists.h similarity index 100% rename from src/libtomahawk/database/databasecommand_allartists.h rename to src/libtomahawk/database/DatabaseCommand_AllArtists.h diff --git a/src/libtomahawk/database/databasecommand_alltracks.cpp b/src/libtomahawk/database/DatabaseCommand_AllTracks.cpp similarity index 98% rename from src/libtomahawk/database/databasecommand_alltracks.cpp rename to src/libtomahawk/database/DatabaseCommand_AllTracks.cpp index e2f6b81ef..ffc64a2cb 100644 --- a/src/libtomahawk/database/databasecommand_alltracks.cpp +++ b/src/libtomahawk/database/DatabaseCommand_AllTracks.cpp @@ -17,7 +17,7 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_alltracks.h" +#include "DatabaseCommand_AllTracks.h" #include @@ -25,7 +25,7 @@ #include "Artist.h" #include "Album.h" #include "SourceList.h" -#include "utils/logger.h" +#include "utils/Logger.h" void diff --git a/src/libtomahawk/database/databasecommand_alltracks.h b/src/libtomahawk/database/DatabaseCommand_AllTracks.h similarity index 100% rename from src/libtomahawk/database/databasecommand_alltracks.h rename to src/libtomahawk/database/DatabaseCommand_AllTracks.h diff --git a/src/libtomahawk/database/databasecommand_clientauthvalid.cpp b/src/libtomahawk/database/DatabaseCommand_ClientAuthValid.cpp similarity index 95% rename from src/libtomahawk/database/databasecommand_clientauthvalid.cpp rename to src/libtomahawk/database/DatabaseCommand_ClientAuthValid.cpp index 5660b4c83..7571b1fd5 100644 --- a/src/libtomahawk/database/databasecommand_clientauthvalid.cpp +++ b/src/libtomahawk/database/DatabaseCommand_ClientAuthValid.cpp @@ -16,11 +16,11 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_clientauthvalid.h" +#include "DatabaseCommand_ClientAuthValid.h" #include "DatabaseImpl.h" #include "TomahawkSqlQuery.h" -#include "utils/logger.h" +#include "utils/Logger.h" DatabaseCommand_ClientAuthValid::DatabaseCommand_ClientAuthValid( const QString& clientToken, QObject* parent ) diff --git a/src/libtomahawk/database/databasecommand_clientauthvalid.h b/src/libtomahawk/database/DatabaseCommand_ClientAuthValid.h similarity index 100% rename from src/libtomahawk/database/databasecommand_clientauthvalid.h rename to src/libtomahawk/database/DatabaseCommand_ClientAuthValid.h diff --git a/src/libtomahawk/database/databasecommand_collectionattributes.cpp b/src/libtomahawk/database/DatabaseCommand_CollectionAttributes.cpp similarity index 97% rename from src/libtomahawk/database/databasecommand_collectionattributes.cpp rename to src/libtomahawk/database/DatabaseCommand_CollectionAttributes.cpp index a8bfa9282..64286acdb 100644 --- a/src/libtomahawk/database/databasecommand_collectionattributes.cpp +++ b/src/libtomahawk/database/DatabaseCommand_CollectionAttributes.cpp @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with Tomahawk. If not, see . */ -#include "databasecommand_collectionattributes.h" +#include "DatabaseCommand_CollectionAttributes.h" #include "DatabaseImpl.h" #include "Source.h" diff --git a/src/libtomahawk/database/databasecommand_collectionattributes.h b/src/libtomahawk/database/DatabaseCommand_CollectionAttributes.h similarity index 96% rename from src/libtomahawk/database/databasecommand_collectionattributes.h rename to src/libtomahawk/database/DatabaseCommand_CollectionAttributes.h index 0d02ea0d0..3dc0f7ee6 100644 --- a/src/libtomahawk/database/databasecommand_collectionattributes.h +++ b/src/libtomahawk/database/DatabaseCommand_CollectionAttributes.h @@ -21,7 +21,7 @@ #include "Typedefs.h" #include "DatabaseCommand.h" -#include "databasecommand_setcollectionattributes.h" +#include "DatabaseCommand_SetCollectionAttributes.h" #include class DatabaseCommand_CollectionAttributes : public DatabaseCommand diff --git a/src/libtomahawk/database/databasecommand_collectionstats.cpp b/src/libtomahawk/database/DatabaseCommand_CollectionStats.cpp similarity index 96% rename from src/libtomahawk/database/databasecommand_collectionstats.cpp rename to src/libtomahawk/database/DatabaseCommand_CollectionStats.cpp index c97a5e5fc..1a54b69da 100644 --- a/src/libtomahawk/database/databasecommand_collectionstats.cpp +++ b/src/libtomahawk/database/DatabaseCommand_CollectionStats.cpp @@ -16,11 +16,11 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_collectionstats.h" +#include "DatabaseCommand_CollectionStats.h" #include "DatabaseImpl.h" #include "Source.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_collectionstats.h b/src/libtomahawk/database/DatabaseCommand_CollectionStats.h similarity index 100% rename from src/libtomahawk/database/databasecommand_collectionstats.h rename to src/libtomahawk/database/DatabaseCommand_CollectionStats.h diff --git a/src/libtomahawk/database/databasecommand_createdynamicplaylist.cpp b/src/libtomahawk/database/DatabaseCommand_CreateDynamicPlaylist.cpp similarity index 98% rename from src/libtomahawk/database/databasecommand_createdynamicplaylist.cpp rename to src/libtomahawk/database/DatabaseCommand_CreateDynamicPlaylist.cpp index 76828030e..d9b2f2a36 100644 --- a/src/libtomahawk/database/databasecommand_createdynamicplaylist.cpp +++ b/src/libtomahawk/database/DatabaseCommand_CreateDynamicPlaylist.cpp @@ -16,7 +16,7 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_createdynamicplaylist.h" +#include "DatabaseCommand_CreateDynamicPlaylist.h" #include #include @@ -29,7 +29,7 @@ #include "Source.h" #include "network/Servent.h" -#include "utils/logger.h" +#include "utils/Logger.h" #ifndef ENABLE_HEADLESS #include "ViewManager.h" diff --git a/src/libtomahawk/database/databasecommand_createdynamicplaylist.h b/src/libtomahawk/database/DatabaseCommand_CreateDynamicPlaylist.h similarity index 98% rename from src/libtomahawk/database/databasecommand_createdynamicplaylist.h rename to src/libtomahawk/database/DatabaseCommand_CreateDynamicPlaylist.h index 21f16ba8c..e94e0e5d4 100644 --- a/src/libtomahawk/database/databasecommand_createdynamicplaylist.h +++ b/src/libtomahawk/database/DatabaseCommand_CreateDynamicPlaylist.h @@ -20,7 +20,7 @@ #define DATABASECOMMAND_CREATEDYNAMICPLAYLIST_H #include "Typedefs.h" -#include "databasecommand_createplaylist.h" +#include "DatabaseCommand_CreatePlaylist.h" /** * Create a new dynamic playlist in the database, based on an existing playlist. diff --git a/src/libtomahawk/database/databasecommand_createplaylist.cpp b/src/libtomahawk/database/DatabaseCommand_CreatePlaylist.cpp similarity index 98% rename from src/libtomahawk/database/databasecommand_createplaylist.cpp rename to src/libtomahawk/database/DatabaseCommand_CreatePlaylist.cpp index 7b87c1a81..31fb7e285 100644 --- a/src/libtomahawk/database/databasecommand_createplaylist.cpp +++ b/src/libtomahawk/database/DatabaseCommand_CreatePlaylist.cpp @@ -16,7 +16,7 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_createplaylist.h" +#include "DatabaseCommand_CreatePlaylist.h" #include @@ -24,7 +24,7 @@ #include "DatabaseImpl.h" #include "TomahawkSqlQuery.h" #include "network/Servent.h" -#include "utils/logger.h" +#include "utils/Logger.h" #ifndef ENABLE_HEADLESS #include "ViewManager.h" diff --git a/src/libtomahawk/database/databasecommand_createplaylist.h b/src/libtomahawk/database/DatabaseCommand_CreatePlaylist.h similarity index 100% rename from src/libtomahawk/database/databasecommand_createplaylist.h rename to src/libtomahawk/database/DatabaseCommand_CreatePlaylist.h diff --git a/src/libtomahawk/database/databasecommand_deletedynamicplaylist.cpp b/src/libtomahawk/database/DatabaseCommand_DeleteDynamicPlaylist.cpp similarity index 96% rename from src/libtomahawk/database/databasecommand_deletedynamicplaylist.cpp rename to src/libtomahawk/database/DatabaseCommand_DeleteDynamicPlaylist.cpp index 512f1c8ea..458b31a83 100644 --- a/src/libtomahawk/database/databasecommand_deletedynamicplaylist.cpp +++ b/src/libtomahawk/database/DatabaseCommand_DeleteDynamicPlaylist.cpp @@ -16,13 +16,13 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_deletedynamicplaylist.h" +#include "DatabaseCommand_DeleteDynamicPlaylist.h" #include #include "dynamic/DynamicPlaylist.h" #include "network/Servent.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_deletedynamicplaylist.h b/src/libtomahawk/database/DatabaseCommand_DeleteDynamicPlaylist.h similarity index 97% rename from src/libtomahawk/database/databasecommand_deletedynamicplaylist.h rename to src/libtomahawk/database/DatabaseCommand_DeleteDynamicPlaylist.h index 9aaec4523..72a6e7bf5 100644 --- a/src/libtomahawk/database/databasecommand_deletedynamicplaylist.h +++ b/src/libtomahawk/database/DatabaseCommand_DeleteDynamicPlaylist.h @@ -19,7 +19,7 @@ #ifndef DATABASECOMMAND_DELETEDYNAMICPLAYLIST_H #define DATABASECOMMAND_DELETEDYNAMICPLAYLIST_H -#include "databasecommand_deleteplaylist.h" +#include "DatabaseCommand_DeletePlaylist.h" #include "Typedefs.h" class DatabaseCommand_DeleteDynamicPlaylist : public DatabaseCommand_DeletePlaylist diff --git a/src/libtomahawk/database/databasecommand_deletefiles.cpp b/src/libtomahawk/database/DatabaseCommand_DeleteFiles.cpp similarity index 98% rename from src/libtomahawk/database/databasecommand_deletefiles.cpp rename to src/libtomahawk/database/DatabaseCommand_DeleteFiles.cpp index 442fbff58..a7405964b 100644 --- a/src/libtomahawk/database/databasecommand_deletefiles.cpp +++ b/src/libtomahawk/database/DatabaseCommand_DeleteFiles.cpp @@ -17,7 +17,7 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_deletefiles.h" +#include "DatabaseCommand_DeleteFiles.h" #include @@ -28,7 +28,7 @@ #include "database/Database.h" #include "database/DatabaseImpl.h" #include "network/Servent.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "utils/tomahawkutils.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_deletefiles.h b/src/libtomahawk/database/DatabaseCommand_DeleteFiles.h similarity index 99% rename from src/libtomahawk/database/databasecommand_deletefiles.h rename to src/libtomahawk/database/DatabaseCommand_DeleteFiles.h index 0bc51f84a..47b69d445 100644 --- a/src/libtomahawk/database/databasecommand_deletefiles.h +++ b/src/libtomahawk/database/DatabaseCommand_DeleteFiles.h @@ -29,7 +29,7 @@ #include "DllMacro.h" -#include "utils/logger.h" +#include "utils/Logger.h" class DLLEXPORT DatabaseCommand_DeleteFiles : public DatabaseCommandLoggable { diff --git a/src/libtomahawk/database/databasecommand_deleteplaylist.cpp b/src/libtomahawk/database/DatabaseCommand_DeletePlaylist.cpp similarity index 96% rename from src/libtomahawk/database/databasecommand_deleteplaylist.cpp rename to src/libtomahawk/database/DatabaseCommand_DeletePlaylist.cpp index 922bccef7..94fa4a1f7 100644 --- a/src/libtomahawk/database/databasecommand_deleteplaylist.cpp +++ b/src/libtomahawk/database/DatabaseCommand_DeletePlaylist.cpp @@ -16,12 +16,12 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_deleteplaylist.h" +#include "DatabaseCommand_DeletePlaylist.h" #include #include "network/Servent.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_deleteplaylist.h b/src/libtomahawk/database/DatabaseCommand_DeletePlaylist.h similarity index 100% rename from src/libtomahawk/database/databasecommand_deleteplaylist.h rename to src/libtomahawk/database/DatabaseCommand_DeletePlaylist.h diff --git a/src/libtomahawk/database/databasecommand_dirmtimes.cpp b/src/libtomahawk/database/DatabaseCommand_DirMtimes.cpp similarity index 97% rename from src/libtomahawk/database/databasecommand_dirmtimes.cpp rename to src/libtomahawk/database/DatabaseCommand_DirMtimes.cpp index 4d5a2bfb4..ae9ba13a4 100644 --- a/src/libtomahawk/database/databasecommand_dirmtimes.cpp +++ b/src/libtomahawk/database/DatabaseCommand_DirMtimes.cpp @@ -17,12 +17,12 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_dirmtimes.h" +#include "DatabaseCommand_DirMtimes.h" #include #include "DatabaseImpl.h" -#include "utils/logger.h" +#include "utils/Logger.h" void diff --git a/src/libtomahawk/database/databasecommand_dirmtimes.h b/src/libtomahawk/database/DatabaseCommand_DirMtimes.h similarity index 100% rename from src/libtomahawk/database/databasecommand_dirmtimes.h rename to src/libtomahawk/database/DatabaseCommand_DirMtimes.h diff --git a/src/libtomahawk/database/databasecommand_filemtimes.cpp b/src/libtomahawk/database/DatabaseCommand_FileMTimes.cpp similarity index 97% rename from src/libtomahawk/database/databasecommand_filemtimes.cpp rename to src/libtomahawk/database/DatabaseCommand_FileMTimes.cpp index 277536173..b314723c7 100644 --- a/src/libtomahawk/database/databasecommand_filemtimes.cpp +++ b/src/libtomahawk/database/DatabaseCommand_FileMTimes.cpp @@ -17,12 +17,12 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_filemtimes.h" +#include "DatabaseCommand_FileMTimes.h" #include #include "DatabaseImpl.h" -#include "utils/logger.h" +#include "utils/Logger.h" void diff --git a/src/libtomahawk/database/databasecommand_filemtimes.h b/src/libtomahawk/database/DatabaseCommand_FileMTimes.h similarity index 100% rename from src/libtomahawk/database/databasecommand_filemtimes.h rename to src/libtomahawk/database/DatabaseCommand_FileMTimes.h diff --git a/src/libtomahawk/database/databasecommand_genericselect.cpp b/src/libtomahawk/database/DatabaseCommand_GenericSelect.cpp similarity index 98% rename from src/libtomahawk/database/databasecommand_genericselect.cpp rename to src/libtomahawk/database/DatabaseCommand_GenericSelect.cpp index 87dc803ec..88ee17de5 100644 --- a/src/libtomahawk/database/databasecommand_genericselect.cpp +++ b/src/libtomahawk/database/DatabaseCommand_GenericSelect.cpp @@ -16,14 +16,14 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_genericselect.h" +#include "DatabaseCommand_GenericSelect.h" #include "DatabaseImpl.h" #include "SourceList.h" #include "Artist.h" #include "Album.h" #include "Pipeline.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_genericselect.h b/src/libtomahawk/database/DatabaseCommand_GenericSelect.h similarity index 100% rename from src/libtomahawk/database/databasecommand_genericselect.h rename to src/libtomahawk/database/DatabaseCommand_GenericSelect.h diff --git a/src/libtomahawk/database/databasecommand_importplaylist.cpp b/src/libtomahawk/database/DatabaseCommand_ImportPlaylist.cpp similarity index 96% rename from src/libtomahawk/database/databasecommand_importplaylist.cpp rename to src/libtomahawk/database/DatabaseCommand_ImportPlaylist.cpp index f016ae62f..3e3e9f449 100644 --- a/src/libtomahawk/database/databasecommand_importplaylist.cpp +++ b/src/libtomahawk/database/DatabaseCommand_ImportPlaylist.cpp @@ -16,14 +16,14 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_importplaylist.h" +#include "DatabaseCommand_ImportPlaylist.h" #include #include "tomahawk/Query.h" #include "tomahawk/Playlist.h" #include "DatabaseImpl.h" -#include "utils/logger.h" +#include "utils/Logger.h" void diff --git a/src/libtomahawk/database/databasecommand_importplaylist.h b/src/libtomahawk/database/DatabaseCommand_ImportPlaylist.h similarity index 100% rename from src/libtomahawk/database/databasecommand_importplaylist.h rename to src/libtomahawk/database/DatabaseCommand_ImportPlaylist.h diff --git a/src/libtomahawk/database/databasecommand_loadallautoplaylists.cpp b/src/libtomahawk/database/DatabaseCommand_LoadAllAutoPlaylists.cpp similarity index 97% rename from src/libtomahawk/database/databasecommand_loadallautoplaylists.cpp rename to src/libtomahawk/database/DatabaseCommand_LoadAllAutoPlaylists.cpp index 4ad04962f..467c71543 100644 --- a/src/libtomahawk/database/databasecommand_loadallautoplaylists.cpp +++ b/src/libtomahawk/database/DatabaseCommand_LoadAllAutoPlaylists.cpp @@ -16,14 +16,14 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_loadallautoplaylists.h" +#include "DatabaseCommand_LoadAllAutoPlaylists.h" #include #include "DatabaseImpl.h" #include "Source.h" #include "dynamic/DynamicPlaylist.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_loadallautoplaylists.h b/src/libtomahawk/database/DatabaseCommand_LoadAllAutoPlaylists.h similarity index 97% rename from src/libtomahawk/database/databasecommand_loadallautoplaylists.h rename to src/libtomahawk/database/DatabaseCommand_LoadAllAutoPlaylists.h index badaabb3a..a2a692608 100644 --- a/src/libtomahawk/database/databasecommand_loadallautoplaylists.h +++ b/src/libtomahawk/database/DatabaseCommand_LoadAllAutoPlaylists.h @@ -24,7 +24,7 @@ #include "DatabaseCommand.h" #include "Typedefs.h" -#include "databasecommand_loadallplaylists.h" +#include "DatabaseCommand_LoadAllPlaylists.h" class DatabaseCommand_LoadAllAutoPlaylists : public DatabaseCommand { diff --git a/src/libtomahawk/database/databasecommand_loadallplaylists.cpp b/src/libtomahawk/database/DatabaseCommand_LoadAllPlaylists.cpp similarity index 97% rename from src/libtomahawk/database/databasecommand_loadallplaylists.cpp rename to src/libtomahawk/database/DatabaseCommand_LoadAllPlaylists.cpp index 4235ccbb5..43179d10d 100644 --- a/src/libtomahawk/database/databasecommand_loadallplaylists.cpp +++ b/src/libtomahawk/database/DatabaseCommand_LoadAllPlaylists.cpp @@ -17,14 +17,14 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_loadallplaylists.h" +#include "DatabaseCommand_LoadAllPlaylists.h" #include #include "Playlist.h" #include "Source.h" #include "DatabaseImpl.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_loadallplaylists.h b/src/libtomahawk/database/DatabaseCommand_LoadAllPlaylists.h similarity index 100% rename from src/libtomahawk/database/databasecommand_loadallplaylists.h rename to src/libtomahawk/database/DatabaseCommand_LoadAllPlaylists.h diff --git a/src/libtomahawk/database/databasecommand_loadallsortedplaylists.cpp b/src/libtomahawk/database/DatabaseCommand_LoadAllSortedPlaylists.cpp similarity index 98% rename from src/libtomahawk/database/databasecommand_loadallsortedplaylists.cpp rename to src/libtomahawk/database/DatabaseCommand_LoadAllSortedPlaylists.cpp index 18416e1b8..8e0c33c50 100644 --- a/src/libtomahawk/database/databasecommand_loadallsortedplaylists.cpp +++ b/src/libtomahawk/database/DatabaseCommand_LoadAllSortedPlaylists.cpp @@ -16,7 +16,7 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_loadallsortedplaylists.h" +#include "DatabaseCommand_LoadAllSortedPlaylists.h" #include "DatabaseImpl.h" #include "Playlist.h" diff --git a/src/libtomahawk/database/databasecommand_loadallsortedplaylists.h b/src/libtomahawk/database/DatabaseCommand_LoadAllSortedPlaylists.h similarity index 98% rename from src/libtomahawk/database/databasecommand_loadallsortedplaylists.h rename to src/libtomahawk/database/DatabaseCommand_LoadAllSortedPlaylists.h index 5d61f3210..80d1e3337 100644 --- a/src/libtomahawk/database/databasecommand_loadallsortedplaylists.h +++ b/src/libtomahawk/database/DatabaseCommand_LoadAllSortedPlaylists.h @@ -20,7 +20,7 @@ #define DATABASECOMMAND_LOADALLSORTEDPLAYLISTS_H #include "DatabaseCommand.h" -#include "databasecommand_loadallplaylists.h" +#include "DatabaseCommand_LoadAllPlaylists.h" /** * Loads *all* playlists, automatic playlists, and stations. Another dbcmd because otherwise loading them all diff --git a/src/libtomahawk/database/databasecommand_loadallsources.cpp b/src/libtomahawk/database/DatabaseCommand_LoadAllSources.cpp similarity index 95% rename from src/libtomahawk/database/databasecommand_loadallsources.cpp rename to src/libtomahawk/database/DatabaseCommand_LoadAllSources.cpp index dbe53aad6..155701a12 100644 --- a/src/libtomahawk/database/databasecommand_loadallsources.cpp +++ b/src/libtomahawk/database/DatabaseCommand_LoadAllSources.cpp @@ -16,14 +16,14 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_loadallsources.h" +#include "DatabaseCommand_LoadAllSources.h" #include #include "network/Servent.h" #include "Source.h" #include "DatabaseImpl.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_loadallsources.h b/src/libtomahawk/database/DatabaseCommand_LoadAllSources.h similarity index 100% rename from src/libtomahawk/database/databasecommand_loadallsources.h rename to src/libtomahawk/database/DatabaseCommand_LoadAllSources.h diff --git a/src/libtomahawk/database/databasecommand_loadallstations.cpp b/src/libtomahawk/database/DatabaseCommand_LoadAllStations.cpp similarity index 97% rename from src/libtomahawk/database/databasecommand_loadallstations.cpp rename to src/libtomahawk/database/DatabaseCommand_LoadAllStations.cpp index e79494210..36cee7e0c 100644 --- a/src/libtomahawk/database/databasecommand_loadallstations.cpp +++ b/src/libtomahawk/database/DatabaseCommand_LoadAllStations.cpp @@ -16,14 +16,14 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_loadallstations.h" +#include "DatabaseCommand_LoadAllStations.h" #include #include "DatabaseImpl.h" #include "Source.h" #include "dynamic/DynamicPlaylist.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_loadallstations.h b/src/libtomahawk/database/DatabaseCommand_LoadAllStations.h similarity index 97% rename from src/libtomahawk/database/databasecommand_loadallstations.h rename to src/libtomahawk/database/DatabaseCommand_LoadAllStations.h index 31fcc1745..3ddab07ea 100644 --- a/src/libtomahawk/database/databasecommand_loadallstations.h +++ b/src/libtomahawk/database/DatabaseCommand_LoadAllStations.h @@ -24,7 +24,7 @@ #include "DatabaseCommand.h" #include "Typedefs.h" -#include "databasecommand_loadallplaylists.h" +#include "DatabaseCommand_LoadAllPlaylists.h" class DatabaseCommand_LoadAllStations : public DatabaseCommand { diff --git a/src/libtomahawk/database/databasecommand_loaddynamicplaylist.cpp b/src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylist.cpp similarity index 97% rename from src/libtomahawk/database/databasecommand_loaddynamicplaylist.cpp rename to src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylist.cpp index 9a0727aa2..4deb3b93b 100644 --- a/src/libtomahawk/database/databasecommand_loaddynamicplaylist.cpp +++ b/src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylist.cpp @@ -16,14 +16,14 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_loaddynamicplaylist.h" +#include "DatabaseCommand_LoadDynamicPlaylist.h" #include #include "DatabaseImpl.h" #include "Source.h" #include "dynamic/DynamicPlaylist.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_loaddynamicplaylist.h b/src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylist.h similarity index 100% rename from src/libtomahawk/database/databasecommand_loaddynamicplaylist.h rename to src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylist.h diff --git a/src/libtomahawk/database/databasecommand_loaddynamicplaylistentries.cpp b/src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylistEntries.cpp similarity index 98% rename from src/libtomahawk/database/databasecommand_loaddynamicplaylistentries.cpp rename to src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylistEntries.cpp index 4bd0f1919..29f6eeff7 100644 --- a/src/libtomahawk/database/databasecommand_loaddynamicplaylistentries.cpp +++ b/src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylistEntries.cpp @@ -16,7 +16,7 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_loaddynamicplaylistentries.h" +#include "DatabaseCommand_LoadDynamicPlaylistEntries.h" #include #include @@ -27,7 +27,7 @@ #include "dynamic/GeneratorInterface.h" #include "dynamic/GeneratorFactory.h" #include "qjson/parser.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_loaddynamicplaylistentries.h b/src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylistEntries.h similarity index 97% rename from src/libtomahawk/database/databasecommand_loaddynamicplaylistentries.h rename to src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylistEntries.h index 41241b3ea..c15adc0b6 100644 --- a/src/libtomahawk/database/databasecommand_loaddynamicplaylistentries.h +++ b/src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylistEntries.h @@ -24,7 +24,7 @@ #include "Typedefs.h" #include "DatabaseCommand.h" -#include "databasecommand_loadplaylistentries.h" +#include "DatabaseCommand_LoadPlaylistEntries.h" #include "Playlist.h" class DatabaseCommand_LoadDynamicPlaylistEntries : public DatabaseCommand_LoadPlaylistEntries diff --git a/src/libtomahawk/database/databasecommand_loadfiles.cpp b/src/libtomahawk/database/DatabaseCommand_LoadFiles.cpp similarity index 96% rename from src/libtomahawk/database/databasecommand_loadfiles.cpp rename to src/libtomahawk/database/DatabaseCommand_LoadFiles.cpp index c3e52604d..52e8ed547 100644 --- a/src/libtomahawk/database/databasecommand_loadfiles.cpp +++ b/src/libtomahawk/database/DatabaseCommand_LoadFiles.cpp @@ -16,11 +16,11 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_loadfiles.h" +#include "DatabaseCommand_LoadFiles.h" #include "DatabaseImpl.h" #include "Collection.h" -#include "utils/logger.h" +#include "utils/Logger.h" DatabaseCommand_LoadFiles::DatabaseCommand_LoadFiles( unsigned int id, QObject* parent ) diff --git a/src/libtomahawk/database/databasecommand_loadfiles.h b/src/libtomahawk/database/DatabaseCommand_LoadFiles.h similarity index 100% rename from src/libtomahawk/database/databasecommand_loadfiles.h rename to src/libtomahawk/database/DatabaseCommand_LoadFiles.h diff --git a/src/libtomahawk/database/databasecommand_loadops.cpp b/src/libtomahawk/database/DatabaseCommand_LoadOps.cpp similarity index 97% rename from src/libtomahawk/database/databasecommand_loadops.cpp rename to src/libtomahawk/database/DatabaseCommand_LoadOps.cpp index ae0f029f4..4458ce814 100644 --- a/src/libtomahawk/database/databasecommand_loadops.cpp +++ b/src/libtomahawk/database/DatabaseCommand_LoadOps.cpp @@ -16,12 +16,12 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_loadops.h" +#include "DatabaseCommand_LoadOps.h" #include "DatabaseImpl.h" #include "TomahawkSqlQuery.h" #include "Source.h" -#include "utils/logger.h" +#include "utils/Logger.h" void diff --git a/src/libtomahawk/database/databasecommand_loadops.h b/src/libtomahawk/database/DatabaseCommand_LoadOps.h similarity index 100% rename from src/libtomahawk/database/databasecommand_loadops.h rename to src/libtomahawk/database/DatabaseCommand_LoadOps.h diff --git a/src/libtomahawk/database/databasecommand_loadplaylistentries.cpp b/src/libtomahawk/database/DatabaseCommand_LoadPlaylistEntries.cpp similarity index 98% rename from src/libtomahawk/database/databasecommand_loadplaylistentries.cpp rename to src/libtomahawk/database/DatabaseCommand_LoadPlaylistEntries.cpp index 3203b7b07..6d2f997a0 100644 --- a/src/libtomahawk/database/databasecommand_loadplaylistentries.cpp +++ b/src/libtomahawk/database/DatabaseCommand_LoadPlaylistEntries.cpp @@ -16,14 +16,14 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_loadplaylistentries.h" +#include "DatabaseCommand_LoadPlaylistEntries.h" #include #include "DatabaseImpl.h" #include "Query.h" #include "qjson/parser.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_loadplaylistentries.h b/src/libtomahawk/database/DatabaseCommand_LoadPlaylistEntries.h similarity index 100% rename from src/libtomahawk/database/databasecommand_loadplaylistentries.h rename to src/libtomahawk/database/DatabaseCommand_LoadPlaylistEntries.h diff --git a/src/libtomahawk/database/databasecommand_loadsocialactions.cpp b/src/libtomahawk/database/DatabaseCommand_LoadSocialActions.cpp similarity index 96% rename from src/libtomahawk/database/databasecommand_loadsocialactions.cpp rename to src/libtomahawk/database/DatabaseCommand_LoadSocialActions.cpp index d57b1870b..49e6b7e25 100644 --- a/src/libtomahawk/database/databasecommand_loadsocialactions.cpp +++ b/src/libtomahawk/database/DatabaseCommand_LoadSocialActions.cpp @@ -16,7 +16,7 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_loadsocialactions.h" +#include "DatabaseCommand_LoadSocialActions.h" #include @@ -24,7 +24,7 @@ #include "DatabaseImpl.h" #include "network/Servent.h" #include "Result.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_loadsocialactions.h b/src/libtomahawk/database/DatabaseCommand_LoadSocialActions.h similarity index 100% rename from src/libtomahawk/database/databasecommand_loadsocialactions.h rename to src/libtomahawk/database/DatabaseCommand_LoadSocialActions.h diff --git a/src/libtomahawk/database/databasecommand_logplayback.cpp b/src/libtomahawk/database/DatabaseCommand_LogPlayback.cpp similarity index 98% rename from src/libtomahawk/database/databasecommand_logplayback.cpp rename to src/libtomahawk/database/DatabaseCommand_LogPlayback.cpp index 3d3a07dbb..81ee8fbd6 100644 --- a/src/libtomahawk/database/databasecommand_logplayback.cpp +++ b/src/libtomahawk/database/DatabaseCommand_LogPlayback.cpp @@ -17,7 +17,7 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_logplayback.h" +#include "DatabaseCommand_LogPlayback.h" #include @@ -25,7 +25,7 @@ #include "database/Database.h" #include "DatabaseImpl.h" #include "network/Servent.h" -#include "utils/logger.h" +#include "utils/Logger.h" #define STARTED_THRESHOLD 600 // Don't advertise tracks older than X seconds as currently playing #define FINISHED_THRESHOLD 10 // Don't store tracks played less than X seconds in the playback log diff --git a/src/libtomahawk/database/databasecommand_logplayback.h b/src/libtomahawk/database/DatabaseCommand_LogPlayback.h similarity index 100% rename from src/libtomahawk/database/databasecommand_logplayback.h rename to src/libtomahawk/database/DatabaseCommand_LogPlayback.h diff --git a/src/libtomahawk/database/databasecommand_modifyplaylist.cpp b/src/libtomahawk/database/DatabaseCommand_ModifyPlaylist.cpp similarity index 95% rename from src/libtomahawk/database/databasecommand_modifyplaylist.cpp rename to src/libtomahawk/database/DatabaseCommand_ModifyPlaylist.cpp index 1b47fd8a5..1a5a34ea3 100644 --- a/src/libtomahawk/database/databasecommand_modifyplaylist.cpp +++ b/src/libtomahawk/database/DatabaseCommand_ModifyPlaylist.cpp @@ -17,9 +17,9 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_modifyplaylist.h" +#include "DatabaseCommand_ModifyPlaylist.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "Playlist.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_modifyplaylist.h b/src/libtomahawk/database/DatabaseCommand_ModifyPlaylist.h similarity index 100% rename from src/libtomahawk/database/databasecommand_modifyplaylist.h rename to src/libtomahawk/database/DatabaseCommand_ModifyPlaylist.h diff --git a/src/libtomahawk/database/databasecommand_playbackhistory.cpp b/src/libtomahawk/database/DatabaseCommand_PlaybackHistory.cpp similarity index 97% rename from src/libtomahawk/database/databasecommand_playbackhistory.cpp rename to src/libtomahawk/database/DatabaseCommand_PlaybackHistory.cpp index 040fa1bf2..1aa3e37c8 100644 --- a/src/libtomahawk/database/databasecommand_playbackhistory.cpp +++ b/src/libtomahawk/database/DatabaseCommand_PlaybackHistory.cpp @@ -16,14 +16,14 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_playbackhistory.h" +#include "DatabaseCommand_PlaybackHistory.h" #include #include "DatabaseImpl.h" #include "SourceList.h" -#include "utils/logger.h" +#include "utils/Logger.h" void diff --git a/src/libtomahawk/database/databasecommand_playbackhistory.h b/src/libtomahawk/database/DatabaseCommand_PlaybackHistory.h similarity index 100% rename from src/libtomahawk/database/databasecommand_playbackhistory.h rename to src/libtomahawk/database/DatabaseCommand_PlaybackHistory.h diff --git a/src/libtomahawk/database/databasecommand_renameplaylist.cpp b/src/libtomahawk/database/DatabaseCommand_RenamePlaylist.cpp similarity index 97% rename from src/libtomahawk/database/databasecommand_renameplaylist.cpp rename to src/libtomahawk/database/DatabaseCommand_RenamePlaylist.cpp index 0004bd73d..8edc48db8 100644 --- a/src/libtomahawk/database/databasecommand_renameplaylist.cpp +++ b/src/libtomahawk/database/DatabaseCommand_RenamePlaylist.cpp @@ -16,7 +16,7 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_renameplaylist.h" +#include "DatabaseCommand_RenamePlaylist.h" #include @@ -24,7 +24,7 @@ #include "Collection.h" #include "Source.h" #include "network/Servent.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_renameplaylist.h b/src/libtomahawk/database/DatabaseCommand_RenamePlaylist.h similarity index 100% rename from src/libtomahawk/database/databasecommand_renameplaylist.h rename to src/libtomahawk/database/DatabaseCommand_RenamePlaylist.h diff --git a/src/libtomahawk/database/databasecommand_resolve.cpp b/src/libtomahawk/database/DatabaseCommand_Resolve.cpp similarity index 99% rename from src/libtomahawk/database/databasecommand_resolve.cpp rename to src/libtomahawk/database/DatabaseCommand_Resolve.cpp index 98fe9e800..f9f631f70 100644 --- a/src/libtomahawk/database/databasecommand_resolve.cpp +++ b/src/libtomahawk/database/DatabaseCommand_Resolve.cpp @@ -16,13 +16,13 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_resolve.h" +#include "DatabaseCommand_Resolve.h" #include "Artist.h" #include "Album.h" #include "Pipeline.h" #include "SourceList.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_resolve.h b/src/libtomahawk/database/DatabaseCommand_Resolve.h similarity index 100% rename from src/libtomahawk/database/databasecommand_resolve.h rename to src/libtomahawk/database/DatabaseCommand_Resolve.h diff --git a/src/libtomahawk/database/databasecommand_setcollectionattributes.cpp b/src/libtomahawk/database/DatabaseCommand_SetCollectionAttributes.cpp similarity index 98% rename from src/libtomahawk/database/databasecommand_setcollectionattributes.cpp rename to src/libtomahawk/database/DatabaseCommand_SetCollectionAttributes.cpp index 002026bff..a4e906e58 100644 --- a/src/libtomahawk/database/databasecommand_setcollectionattributes.cpp +++ b/src/libtomahawk/database/DatabaseCommand_SetCollectionAttributes.cpp @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with Tomahawk. If not, see . */ -#include "databasecommand_setcollectionattributes.h" +#include "DatabaseCommand_SetCollectionAttributes.h" #include "DatabaseImpl.h" #include "Source.h" diff --git a/src/libtomahawk/database/databasecommand_setcollectionattributes.h b/src/libtomahawk/database/DatabaseCommand_SetCollectionAttributes.h similarity index 100% rename from src/libtomahawk/database/databasecommand_setcollectionattributes.h rename to src/libtomahawk/database/DatabaseCommand_SetCollectionAttributes.h diff --git a/src/libtomahawk/database/databasecommand_setdynamicplaylistrevision.cpp b/src/libtomahawk/database/DatabaseCommand_SetDynamicPlaylistRevision.cpp similarity index 99% rename from src/libtomahawk/database/databasecommand_setdynamicplaylistrevision.cpp rename to src/libtomahawk/database/DatabaseCommand_SetDynamicPlaylistRevision.cpp index 16529f22b..7bdc90681 100644 --- a/src/libtomahawk/database/databasecommand_setdynamicplaylistrevision.cpp +++ b/src/libtomahawk/database/DatabaseCommand_SetDynamicPlaylistRevision.cpp @@ -16,7 +16,7 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_setdynamicplaylistrevision.h" +#include "DatabaseCommand_SetDynamicPlaylistRevision.h" #include @@ -26,7 +26,7 @@ #include "dynamic/DynamicPlaylist.h" #include "dynamic/DynamicControl.h" #include "network/Servent.h" -#include "utils/logger.h" +#include "utils/Logger.h" DatabaseCommand_SetDynamicPlaylistRevision::DatabaseCommand_SetDynamicPlaylistRevision( const Tomahawk::source_ptr& s, diff --git a/src/libtomahawk/database/databasecommand_setdynamicplaylistrevision.h b/src/libtomahawk/database/DatabaseCommand_SetDynamicPlaylistRevision.h similarity index 98% rename from src/libtomahawk/database/databasecommand_setdynamicplaylistrevision.h rename to src/libtomahawk/database/DatabaseCommand_SetDynamicPlaylistRevision.h index 92eb5c2bc..4f863e871 100644 --- a/src/libtomahawk/database/databasecommand_setdynamicplaylistrevision.h +++ b/src/libtomahawk/database/DatabaseCommand_SetDynamicPlaylistRevision.h @@ -19,7 +19,7 @@ #ifndef DATABASECOMMAND_SETDYNAMICPLAYLISTREVISION_H #define DATABASECOMMAND_SETDYNAMICPLAYLISTREVISION_H -#include "databasecommand_setplaylistrevision.h" +#include "DatabaseCommand_SetPlaylistRevision.h" #include "dynamic/GeneratorInterface.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_setplaylistrevision.cpp b/src/libtomahawk/database/DatabaseCommand_SetPlaylistRevision.cpp similarity index 99% rename from src/libtomahawk/database/databasecommand_setplaylistrevision.cpp rename to src/libtomahawk/database/DatabaseCommand_SetPlaylistRevision.cpp index 3ebe5921d..f166d0fa0 100644 --- a/src/libtomahawk/database/databasecommand_setplaylistrevision.cpp +++ b/src/libtomahawk/database/DatabaseCommand_SetPlaylistRevision.cpp @@ -16,7 +16,7 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_setplaylistrevision.h" +#include "DatabaseCommand_SetPlaylistRevision.h" #include @@ -24,7 +24,7 @@ #include "DatabaseImpl.h" #include "TomahawkSqlQuery.h" #include "network/Servent.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_setplaylistrevision.h b/src/libtomahawk/database/DatabaseCommand_SetPlaylistRevision.h similarity index 100% rename from src/libtomahawk/database/databasecommand_setplaylistrevision.h rename to src/libtomahawk/database/DatabaseCommand_SetPlaylistRevision.h diff --git a/src/libtomahawk/database/databasecommand_settrackattributes.cpp b/src/libtomahawk/database/DatabaseCommand_SetTrackAttributes.cpp similarity index 98% rename from src/libtomahawk/database/databasecommand_settrackattributes.cpp rename to src/libtomahawk/database/DatabaseCommand_SetTrackAttributes.cpp index 88f47e0ee..c7009b0d3 100644 --- a/src/libtomahawk/database/databasecommand_settrackattributes.cpp +++ b/src/libtomahawk/database/DatabaseCommand_SetTrackAttributes.cpp @@ -16,7 +16,7 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_settrackattributes.h" +#include "DatabaseCommand_SetTrackAttributes.h" #include "TomahawkSqlQuery.h" #include "DatabaseImpl.h" diff --git a/src/libtomahawk/database/databasecommand_settrackattributes.h b/src/libtomahawk/database/DatabaseCommand_SetTrackAttributes.h similarity index 100% rename from src/libtomahawk/database/databasecommand_settrackattributes.h rename to src/libtomahawk/database/DatabaseCommand_SetTrackAttributes.h diff --git a/src/libtomahawk/database/databasecommand_socialaction.cpp b/src/libtomahawk/database/DatabaseCommand_SocialAction.cpp similarity index 97% rename from src/libtomahawk/database/databasecommand_socialaction.cpp rename to src/libtomahawk/database/DatabaseCommand_SocialAction.cpp index 858c7a57a..1f4e1fa43 100644 --- a/src/libtomahawk/database/databasecommand_socialaction.cpp +++ b/src/libtomahawk/database/DatabaseCommand_SocialAction.cpp @@ -16,14 +16,14 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_socialaction.h" +#include "DatabaseCommand_SocialAction.h" #include #include "database/Database.h" #include "DatabaseImpl.h" #include "network/Servent.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_socialaction.h b/src/libtomahawk/database/DatabaseCommand_SocialAction.h similarity index 100% rename from src/libtomahawk/database/databasecommand_socialaction.h rename to src/libtomahawk/database/DatabaseCommand_SocialAction.h diff --git a/src/libtomahawk/database/databasecommand_sourceoffline.cpp b/src/libtomahawk/database/DatabaseCommand_SourceOffline.cpp similarity index 94% rename from src/libtomahawk/database/databasecommand_sourceoffline.cpp rename to src/libtomahawk/database/DatabaseCommand_SourceOffline.cpp index 22eb14617..f8eb6e902 100644 --- a/src/libtomahawk/database/databasecommand_sourceoffline.cpp +++ b/src/libtomahawk/database/DatabaseCommand_SourceOffline.cpp @@ -16,11 +16,11 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_sourceoffline.h" +#include "DatabaseCommand_SourceOffline.h" #include "DatabaseImpl.h" #include "TomahawkSqlQuery.h" -#include "utils/logger.h" +#include "utils/Logger.h" DatabaseCommand_SourceOffline::DatabaseCommand_SourceOffline( int id ) diff --git a/src/libtomahawk/database/databasecommand_sourceoffline.h b/src/libtomahawk/database/DatabaseCommand_SourceOffline.h similarity index 100% rename from src/libtomahawk/database/databasecommand_sourceoffline.h rename to src/libtomahawk/database/DatabaseCommand_SourceOffline.h diff --git a/src/libtomahawk/database/databasecommand_trackattributes.cpp b/src/libtomahawk/database/DatabaseCommand_TrackAttributes.cpp similarity index 98% rename from src/libtomahawk/database/databasecommand_trackattributes.cpp rename to src/libtomahawk/database/DatabaseCommand_TrackAttributes.cpp index 199cc1fe8..82719a42b 100644 --- a/src/libtomahawk/database/databasecommand_trackattributes.cpp +++ b/src/libtomahawk/database/DatabaseCommand_TrackAttributes.cpp @@ -16,7 +16,7 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_trackattributes.h" +#include "DatabaseCommand_TrackAttributes.h" #include "DatabaseImpl.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_trackattributes.h b/src/libtomahawk/database/DatabaseCommand_TrackAttributes.h similarity index 94% rename from src/libtomahawk/database/databasecommand_trackattributes.h rename to src/libtomahawk/database/DatabaseCommand_TrackAttributes.h index 2259fbad8..e1904952d 100644 --- a/src/libtomahawk/database/databasecommand_trackattributes.h +++ b/src/libtomahawk/database/DatabaseCommand_TrackAttributes.h @@ -21,8 +21,8 @@ #include "Typedefs.h" #include "DatabaseCommand.h" -#include "databasecommand_collectionattributes.h" -#include "databasecommand_settrackattributes.h" +#include "DatabaseCommand_CollectionAttributes.h" +#include "DatabaseCommand_SetTrackAttributes.h" #include class DatabaseCommand_TrackAttributes : public DatabaseCommand diff --git a/src/libtomahawk/database/databasecommand_updatesearchindex.cpp b/src/libtomahawk/database/DatabaseCommand_UpdateSearchIndex.cpp similarity index 97% rename from src/libtomahawk/database/databasecommand_updatesearchindex.cpp rename to src/libtomahawk/database/DatabaseCommand_UpdateSearchIndex.cpp index e7428ae0c..1c11d1c1b 100644 --- a/src/libtomahawk/database/databasecommand_updatesearchindex.cpp +++ b/src/libtomahawk/database/DatabaseCommand_UpdateSearchIndex.cpp @@ -16,11 +16,11 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand_updatesearchindex.h" +#include "DatabaseCommand_UpdateSearchIndex.h" #include "DatabaseImpl.h" #include "TomahawkSqlQuery.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "jobview/IndexingJobItem.h" #include "jobview/JobStatusView.h" #include "jobview/JobStatusModel.h" diff --git a/src/libtomahawk/database/databasecommand_updatesearchindex.h b/src/libtomahawk/database/DatabaseCommand_UpdateSearchIndex.h similarity index 100% rename from src/libtomahawk/database/databasecommand_updatesearchindex.h rename to src/libtomahawk/database/DatabaseCommand_UpdateSearchIndex.h diff --git a/src/libtomahawk/database/DatabaseImpl.cpp b/src/libtomahawk/database/DatabaseImpl.cpp index b8462527e..a884cdd37 100644 --- a/src/libtomahawk/database/DatabaseImpl.cpp +++ b/src/libtomahawk/database/DatabaseImpl.cpp @@ -27,13 +27,13 @@ #include #include "database/Database.h" -#include "databasecommand_updatesearchindex.h" +#include "DatabaseCommand_UpdateSearchIndex.h" #include "SourceList.h" #include "Result.h" #include "Artist.h" #include "Album.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" /* !!!! You need to manually generate Schema.sql.h when the schema changes: cd src/libtomahawk/database diff --git a/src/libtomahawk/database/DatabaseResolver.cpp b/src/libtomahawk/database/DatabaseResolver.cpp index 81c509124..2825c4851 100644 --- a/src/libtomahawk/database/DatabaseResolver.cpp +++ b/src/libtomahawk/database/DatabaseResolver.cpp @@ -21,9 +21,9 @@ #include "Pipeline.h" #include "network/Servent.h" #include "database/Database.h" -#include "database/databasecommand_resolve.h" +#include "database/DatabaseCommand_Resolve.h" -#include "utils/logger.h" +#include "utils/Logger.h" DatabaseResolver::DatabaseResolver( int weight ) diff --git a/src/libtomahawk/database/DatabaseWorker.cpp b/src/libtomahawk/database/DatabaseWorker.cpp index e1d485a70..bf4972fb0 100644 --- a/src/libtomahawk/database/DatabaseWorker.cpp +++ b/src/libtomahawk/database/DatabaseWorker.cpp @@ -28,7 +28,7 @@ #include "DatabaseImpl.h" #include "DatabaseCommandLoggable.h" #include "TomahawkSqlQuery.h" -#include "utils/logger.h" +#include "utils/Logger.h" #ifndef QT_NO_DEBUG //#define DEBUG_TIMING TRUE diff --git a/src/libtomahawk/database/FuzzyIndex.cpp b/src/libtomahawk/database/FuzzyIndex.cpp index 4f33f7f36..9251a0c9d 100644 --- a/src/libtomahawk/database/FuzzyIndex.cpp +++ b/src/libtomahawk/database/FuzzyIndex.cpp @@ -26,7 +26,7 @@ #include "DatabaseImpl.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace lucene::analysis; using namespace lucene::analysis::standard; diff --git a/src/libtomahawk/database/LocalCollection.cpp b/src/libtomahawk/database/LocalCollection.cpp index d347ccc1d..05bc5318d 100644 --- a/src/libtomahawk/database/LocalCollection.cpp +++ b/src/libtomahawk/database/LocalCollection.cpp @@ -22,7 +22,7 @@ #include "SourceList.h" #include -#include "utils/logger.h" +#include "utils/Logger.h" #ifndef ENABLE_HEADLESS #include "ViewManager.h" diff --git a/src/libtomahawk/database/TomahawkSqlQuery.h b/src/libtomahawk/database/TomahawkSqlQuery.h index f3bef2f62..b88d56eb8 100644 --- a/src/libtomahawk/database/TomahawkSqlQuery.h +++ b/src/libtomahawk/database/TomahawkSqlQuery.h @@ -24,7 +24,7 @@ #include #include -#include "utils/logger.h" +#include "utils/Logger.h" #define TOMAHAWK_QUERY_THRESHOLD 60 diff --git a/src/libtomahawk/infobar/infobar.cpp b/src/libtomahawk/infobar/InfoBar.cpp similarity index 98% rename from src/libtomahawk/infobar/infobar.cpp rename to src/libtomahawk/infobar/InfoBar.cpp index 15e510487..24135d215 100644 --- a/src/libtomahawk/infobar/infobar.cpp +++ b/src/libtomahawk/infobar/InfoBar.cpp @@ -16,8 +16,8 @@ * along with Tomahawk. If not, see . */ -#include "infobar.h" -#include "ui_infobar.h" +#include "InfoBar.h" +#include "ui_InfoBar.h" #include #include @@ -25,11 +25,11 @@ #include "ViewManager.h" #include "thirdparty/Qocoa/qsearchfield.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include #include #include -#include +#include #define ANIMATION_TIME 400 #define IMAGE_HEIGHT 64 diff --git a/src/libtomahawk/infobar/infobar.h b/src/libtomahawk/infobar/InfoBar.h similarity index 100% rename from src/libtomahawk/infobar/infobar.h rename to src/libtomahawk/infobar/InfoBar.h diff --git a/src/libtomahawk/infobar/infobar.ui b/src/libtomahawk/infobar/InfoBar.ui similarity index 99% rename from src/libtomahawk/infobar/infobar.ui rename to src/libtomahawk/infobar/InfoBar.ui index f04e93d81..de9a45c78 100644 --- a/src/libtomahawk/infobar/infobar.ui +++ b/src/libtomahawk/infobar/InfoBar.ui @@ -165,7 +165,7 @@ ElidedLabel QLabel -
widgets/elidedlabel.h
+
widgets/ElidedLabel.h
 diff --git a/src/libtomahawk/infosystem/infosystem.cpp b/src/libtomahawk/infosystem/InfoSystem.cpp similarity index 98% rename from src/libtomahawk/infosystem/infosystem.cpp rename to src/libtomahawk/infosystem/InfoSystem.cpp index 4d6b47ddc..625ea00bb 100644 --- a/src/libtomahawk/infosystem/infosystem.cpp +++ b/src/libtomahawk/infosystem/InfoSystem.cpp @@ -20,12 +20,12 @@ #include -#include "infosystem.h" +#include "InfoSystem.h" #include "TomahawkSettings.h" -#include "infosystemcache.h" -#include "infosystemworker.h" +#include "InfoSystemCache.h" +#include "InfoSystemWorker.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" namespace Tomahawk { diff --git a/src/libtomahawk/infosystem/infosystem.h b/src/libtomahawk/infosystem/InfoSystem.h similarity index 100% rename from src/libtomahawk/infosystem/infosystem.h rename to src/libtomahawk/infosystem/InfoSystem.h diff --git a/src/libtomahawk/infosystem/infosystemcache.cpp b/src/libtomahawk/infosystem/InfoSystemCache.cpp similarity index 99% rename from src/libtomahawk/infosystem/infosystemcache.cpp rename to src/libtomahawk/infosystem/InfoSystemCache.cpp index 02c597bc6..6fb4837e9 100644 --- a/src/libtomahawk/infosystem/infosystemcache.cpp +++ b/src/libtomahawk/infosystem/InfoSystemCache.cpp @@ -27,9 +27,9 @@ #include #endif -#include "infosystemcache.h" +#include "InfoSystemCache.h" #include "TomahawkSettings.h" -#include "utils/logger.h" +#include "utils/Logger.h" namespace Tomahawk diff --git a/src/libtomahawk/infosystem/infosystemcache.h b/src/libtomahawk/infosystem/InfoSystemCache.h similarity index 99% rename from src/libtomahawk/infosystem/infosystemcache.h rename to src/libtomahawk/infosystem/InfoSystemCache.h index 591f21efb..740188f26 100644 --- a/src/libtomahawk/infosystem/infosystemcache.h +++ b/src/libtomahawk/infosystem/InfoSystemCache.h @@ -26,7 +26,7 @@ #include #include -#include "infosystem.h" +#include "InfoSystem.h" namespace Tomahawk { diff --git a/src/libtomahawk/infosystem/infosystemworker.cpp b/src/libtomahawk/infosystem/InfoSystemWorker.cpp similarity index 97% rename from src/libtomahawk/infosystem/infosystemworker.cpp rename to src/libtomahawk/infosystem/InfoSystemWorker.cpp index fb8ec49e0..61b968c24 100644 --- a/src/libtomahawk/infosystem/infosystemworker.cpp +++ b/src/libtomahawk/infosystem/InfoSystemWorker.cpp @@ -23,25 +23,25 @@ #include #include "config.h" -#include "infosystemworker.h" -#include "infosystemcache.h" -#include "infoplugins/generic/echonestplugin.h" -#include "infoplugins/generic/musixmatchplugin.h" -#include "infoplugins/generic/chartsplugin.h" -#include "infoplugins/generic/newreleasesplugin.h" +#include "InfoSystemWorker.h" +#include "InfoSystemCache.h" +#include "infoplugins/generic/EchonestPlugin.h" +#include "infoplugins/generic/MusixMatchPlugin.h" +#include "infoplugins/generic/ChartsPlugin.h" +#include "infoplugins/generic/NewReleasesPlugin.h" #include "infoplugins/generic/spotifyPlugin.h" #include "infoplugins/generic/musicbrainzPlugin.h" #include "infoplugins/generic/hypemPlugin.h" #include "GlobalActionManager.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" #ifdef Q_WS_MAC -#include "infoplugins/mac/adiumplugin.h" +#include "infoplugins/mac/AdiumPlugin.h" #endif #ifdef Q_WS_X11 -#include "infoplugins/unix/fdonotifyplugin.h" -#include "infoplugins/unix/mprisplugin.h" +#include "infoplugins/unix/FdoNotifyPlugin.h" +#include "infoplugins/unix/MprisPlugin.h" #endif #include "infoplugins/generic/RoviPlugin.h" diff --git a/src/libtomahawk/infosystem/infosystemworker.h b/src/libtomahawk/infosystem/InfoSystemWorker.h similarity index 98% rename from src/libtomahawk/infosystem/infosystemworker.h rename to src/libtomahawk/infosystem/InfoSystemWorker.h index 2e976968d..f580ffd78 100644 --- a/src/libtomahawk/infosystem/infosystemworker.h +++ b/src/libtomahawk/infosystem/InfoSystemWorker.h @@ -20,7 +20,7 @@ #ifndef TOMAHAWK_INFOSYSTEMWORKER_H #define TOMAHAWK_INFOSYSTEMWORKER_H -#include "infosystem/infosystem.h" +#include "infosystem/InfoSystem.h" #include #include diff --git a/src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp b/src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin.cpp similarity index 99% rename from src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp rename to src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin.cpp index 1329abebd..e6a8256ea 100644 --- a/src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp +++ b/src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin.cpp @@ -19,7 +19,7 @@ * along with Tomahawk. If not, see . */ -#include "chartsplugin.h" +#include "ChartsPlugin.h" #include #include @@ -27,12 +27,12 @@ #include #include "Album.h" -#include "chartsplugin_data_p.h" +#include "ChartsPlugin_Data_p.h" #include "Typedefs.h" -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" #include "TomahawkSettings.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "utils/tomahawkcache.h" #define CHART_URL "http://charts.tomahawk-player.org/" diff --git a/src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.h b/src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin.h similarity index 97% rename from src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.h rename to src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin.h index 352ac2a3a..31cb1c696 100644 --- a/src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.h +++ b/src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin.h @@ -20,8 +20,8 @@ #ifndef ChartsPlugin_H #define ChartsPlugin_H -#include "infosystem/infosystem.h" -#include "infosystem/infosystemworker.h" +#include "infosystem/InfoSystem.h" +#include "infosystem/InfoSystemWorker.h" #include #include diff --git a/src/libtomahawk/infosystem/infoplugins/generic/chartsplugin_data_p.h b/src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin_Data_p.h similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/generic/chartsplugin_data_p.h rename to src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin_Data_p.h diff --git a/src/libtomahawk/infosystem/infoplugins/generic/echonestplugin.cpp b/src/libtomahawk/infosystem/infoplugins/generic/EchonestPlugin.cpp similarity index 99% rename from src/libtomahawk/infosystem/infoplugins/generic/echonestplugin.cpp rename to src/libtomahawk/infosystem/infoplugins/generic/EchonestPlugin.cpp index e70acfef0..b0d313e1a 100644 --- a/src/libtomahawk/infosystem/infoplugins/generic/echonestplugin.cpp +++ b/src/libtomahawk/infosystem/infoplugins/generic/EchonestPlugin.cpp @@ -17,12 +17,12 @@ * along with Tomahawk. If not, see . */ -#include "echonestplugin.h" +#include "EchonestPlugin.h" #include #include #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include diff --git a/src/libtomahawk/infosystem/infoplugins/generic/echonestplugin.h b/src/libtomahawk/infosystem/infoplugins/generic/EchonestPlugin.h similarity index 97% rename from src/libtomahawk/infosystem/infoplugins/generic/echonestplugin.h rename to src/libtomahawk/infosystem/infoplugins/generic/EchonestPlugin.h index 6778c12dc..4497af432 100644 --- a/src/libtomahawk/infosystem/infoplugins/generic/echonestplugin.h +++ b/src/libtomahawk/infosystem/infoplugins/generic/EchonestPlugin.h @@ -20,8 +20,8 @@ #ifndef ECHONESTPLUGIN_H #define ECHONESTPLUGIN_H -#include "infosystem/infosystem.h" -#include "infosystem/infosystemworker.h" +#include "infosystem/InfoSystem.h" +#include "infosystem/InfoSystemWorker.h" #include diff --git a/src/libtomahawk/infosystem/infoplugins/generic/musixmatchplugin.cpp b/src/libtomahawk/infosystem/infoplugins/generic/MusixMatchPlugin.cpp similarity index 98% rename from src/libtomahawk/infosystem/infoplugins/generic/musixmatchplugin.cpp rename to src/libtomahawk/infosystem/infoplugins/generic/MusixMatchPlugin.cpp index b0d427e56..63773e775 100644 --- a/src/libtomahawk/infosystem/infoplugins/generic/musixmatchplugin.cpp +++ b/src/libtomahawk/infosystem/infoplugins/generic/MusixMatchPlugin.cpp @@ -17,13 +17,13 @@ * along with Tomahawk. If not, see . */ -#include "musixmatchplugin.h" +#include "MusixMatchPlugin.h" #include #include #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk::InfoSystem; diff --git a/src/libtomahawk/infosystem/infoplugins/generic/musixmatchplugin.h b/src/libtomahawk/infosystem/infoplugins/generic/MusixMatchPlugin.h similarity index 95% rename from src/libtomahawk/infosystem/infoplugins/generic/musixmatchplugin.h rename to src/libtomahawk/infosystem/infoplugins/generic/MusixMatchPlugin.h index baac17970..038f74df6 100644 --- a/src/libtomahawk/infosystem/infoplugins/generic/musixmatchplugin.h +++ b/src/libtomahawk/infosystem/infoplugins/generic/MusixMatchPlugin.h @@ -20,8 +20,8 @@ #ifndef MUSIXMATCHPLUGIN_H #define MUSIXMATCHPLUGIN_H -#include "infosystem/infosystem.h" -#include "infosystem/infosystemworker.h" +#include "infosystem/InfoSystem.h" +#include "infosystem/InfoSystemWorker.h" class QNetworkReply; diff --git a/src/libtomahawk/infosystem/infoplugins/generic/newreleasesplugin.cpp b/src/libtomahawk/infosystem/infoplugins/generic/NewReleasesPlugin.cpp similarity index 99% rename from src/libtomahawk/infosystem/infoplugins/generic/newreleasesplugin.cpp rename to src/libtomahawk/infosystem/infoplugins/generic/NewReleasesPlugin.cpp index 966e15bfd..b93dd3f8c 100644 --- a/src/libtomahawk/infosystem/infoplugins/generic/newreleasesplugin.cpp +++ b/src/libtomahawk/infosystem/infoplugins/generic/NewReleasesPlugin.cpp @@ -1,4 +1,4 @@ -#include "newreleasesplugin.h" +#include "NewReleasesPlugin.h" #include #include @@ -6,12 +6,12 @@ #include #include "Album.h" -#include "chartsplugin_data_p.h" +#include "ChartsPlugin_Data_p.h" #include "Typedefs.h" -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" #include "TomahawkSettings.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "utils/tomahawkcache.h" #include diff --git a/src/libtomahawk/infosystem/infoplugins/generic/newreleasesplugin.h b/src/libtomahawk/infosystem/infoplugins/generic/NewReleasesPlugin.h similarity index 97% rename from src/libtomahawk/infosystem/infoplugins/generic/newreleasesplugin.h rename to src/libtomahawk/infosystem/infoplugins/generic/NewReleasesPlugin.h index 7fcedbddc..d60c86299 100644 --- a/src/libtomahawk/infosystem/infoplugins/generic/newreleasesplugin.h +++ b/src/libtomahawk/infosystem/infoplugins/generic/NewReleasesPlugin.h @@ -19,8 +19,8 @@ #ifndef NEWRELEASESPLUGIN_H #define NEWRELEASESPLUGIN_H -#include "infosystem/infosystem.h" -#include "infosystem/infosystemworker.h" +#include "infosystem/InfoSystem.h" +#include "infosystem/InfoSystemWorker.h" #include #include diff --git a/src/libtomahawk/infosystem/infoplugins/generic/RoviPlugin.cpp b/src/libtomahawk/infosystem/infoplugins/generic/RoviPlugin.cpp index 8d70d680c..914311e4e 100644 --- a/src/libtomahawk/infosystem/infoplugins/generic/RoviPlugin.cpp +++ b/src/libtomahawk/infosystem/infoplugins/generic/RoviPlugin.cpp @@ -19,7 +19,7 @@ #include "RoviPlugin.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include #include diff --git a/src/libtomahawk/infosystem/infoplugins/generic/RoviPlugin.h b/src/libtomahawk/infosystem/infoplugins/generic/RoviPlugin.h index 55ebc31cf..aba88c010 100644 --- a/src/libtomahawk/infosystem/infoplugins/generic/RoviPlugin.h +++ b/src/libtomahawk/infosystem/infoplugins/generic/RoviPlugin.h @@ -20,7 +20,7 @@ #ifndef ROVIPLUGIN_H #define ROVIPLUGIN_H -#include "infosystem/infosystem.h" +#include "infosystem/InfoSystem.h" #include diff --git a/src/libtomahawk/infosystem/infoplugins/generic/hypemPlugin.cpp b/src/libtomahawk/infosystem/infoplugins/generic/hypemPlugin.cpp index 36fa505f2..983fb5530 100644 --- a/src/libtomahawk/infosystem/infoplugins/generic/hypemPlugin.cpp +++ b/src/libtomahawk/infosystem/infoplugins/generic/hypemPlugin.cpp @@ -29,7 +29,7 @@ #include "Typedefs.h" #include "TomahawkSettings.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" #define HYPEM_URL "http://hypem.com/playlist/" #define HYPEM_END_URL "json/1/data.js" diff --git a/src/libtomahawk/infosystem/infoplugins/generic/hypemPlugin.h b/src/libtomahawk/infosystem/infoplugins/generic/hypemPlugin.h index 1aefb6c37..f0b9867ab 100644 --- a/src/libtomahawk/infosystem/infoplugins/generic/hypemPlugin.h +++ b/src/libtomahawk/infosystem/infoplugins/generic/hypemPlugin.h @@ -20,8 +20,8 @@ #ifndef hypemPlugin_H #define hypemPlugin_H -#include "infosystem/infosystem.h" -#include "infosystem/infosystemworker.h" +#include "infosystem/InfoSystem.h" +#include "infosystem/InfoSystemWorker.h" #include #include diff --git a/src/libtomahawk/infosystem/infoplugins/generic/musicbrainzPlugin.cpp b/src/libtomahawk/infosystem/infoplugins/generic/musicbrainzPlugin.cpp index 53196281a..1a6a9c832 100644 --- a/src/libtomahawk/infosystem/infoplugins/generic/musicbrainzPlugin.cpp +++ b/src/libtomahawk/infosystem/infoplugins/generic/musicbrainzPlugin.cpp @@ -23,7 +23,7 @@ #include #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk::InfoSystem; diff --git a/src/libtomahawk/infosystem/infoplugins/generic/musicbrainzPlugin.h b/src/libtomahawk/infosystem/infoplugins/generic/musicbrainzPlugin.h index a72cf29e7..11a3bef4b 100644 --- a/src/libtomahawk/infosystem/infoplugins/generic/musicbrainzPlugin.h +++ b/src/libtomahawk/infosystem/infoplugins/generic/musicbrainzPlugin.h @@ -20,8 +20,8 @@ #ifndef MUSICBRAINZPLUGIN_H #define MUSICBRAINZPLUGIN_H -#include "infosystem/infosystem.h" -#include "infosystem/infosystemworker.h" +#include "infosystem/InfoSystem.h" +#include "infosystem/InfoSystemWorker.h" class QNetworkReply; diff --git a/src/libtomahawk/infosystem/infoplugins/generic/spotifyPlugin.cpp b/src/libtomahawk/infosystem/infoplugins/generic/spotifyPlugin.cpp index ceb78320a..cf172abf3 100644 --- a/src/libtomahawk/infosystem/infoplugins/generic/spotifyPlugin.cpp +++ b/src/libtomahawk/infosystem/infoplugins/generic/spotifyPlugin.cpp @@ -27,11 +27,11 @@ #include "Album.h" #include "Typedefs.h" -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" #include "TomahawkSettings.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" -#include "chartsplugin_data_p.h" +#include "utils/Logger.h" +#include "ChartsPlugin_Data_p.h" #define SPOTIFY_API_URL "http://spotikea.tomahawk-player.org/" #include diff --git a/src/libtomahawk/infosystem/infoplugins/generic/spotifyPlugin.h b/src/libtomahawk/infosystem/infoplugins/generic/spotifyPlugin.h index c3c944462..5737fef42 100644 --- a/src/libtomahawk/infosystem/infoplugins/generic/spotifyPlugin.h +++ b/src/libtomahawk/infosystem/infoplugins/generic/spotifyPlugin.h @@ -20,8 +20,8 @@ #ifndef SpotifyPlugin_H #define SpotifyPlugin_H -#include "infosystem/infosystem.h" -#include "infosystem/infosystemworker.h" +#include "infosystem/InfoSystem.h" +#include "infosystem/InfoSystemWorker.h" #include #include diff --git a/src/libtomahawk/infosystem/infoplugins/mac/adium.h b/src/libtomahawk/infosystem/infoplugins/mac/Adium.h similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/mac/adium.h rename to src/libtomahawk/infosystem/infoplugins/mac/Adium.h diff --git a/src/libtomahawk/infosystem/infoplugins/mac/adium.mm b/src/libtomahawk/infosystem/infoplugins/mac/Adium.mm similarity index 98% rename from src/libtomahawk/infosystem/infoplugins/mac/adium.mm rename to src/libtomahawk/infosystem/infoplugins/mac/Adium.mm index 1a420c6de..4145db3fd 100644 --- a/src/libtomahawk/infosystem/infoplugins/mac/adium.mm +++ b/src/libtomahawk/infosystem/infoplugins/mac/Adium.mm @@ -19,7 +19,7 @@ #import #import -#import "adium.h" +#import "Adium.h" void script( const char* status ) diff --git a/src/libtomahawk/infosystem/infoplugins/mac/adiumplugin.cpp b/src/libtomahawk/infosystem/infoplugins/mac/AdiumPlugin.cpp similarity index 97% rename from src/libtomahawk/infosystem/infoplugins/mac/adiumplugin.cpp rename to src/libtomahawk/infosystem/infoplugins/mac/AdiumPlugin.cpp index 628d8e86f..1422eb710 100644 --- a/src/libtomahawk/infosystem/infoplugins/mac/adiumplugin.cpp +++ b/src/libtomahawk/infosystem/infoplugins/mac/AdiumPlugin.cpp @@ -21,15 +21,15 @@ #include -#include "infosystem/infosystemworker.h" +#include "infosystem/InfoSystemWorker.h" #include "Artist.h" #include "Result.h" #include "TomahawkSettings.h" #include "GlobalActionManager.h" -#include "utils/logger.h" +#include "utils/Logger.h" -#include "adiumplugin.h" -#include "adium.h" +#include "AdiumPlugin.h" +#include "Adium.h" QString adium_beforeStatus; QString adium_afterStatus; diff --git a/src/libtomahawk/infosystem/infoplugins/mac/adiumplugin.h b/src/libtomahawk/infosystem/infoplugins/mac/AdiumPlugin.h similarity index 98% rename from src/libtomahawk/infosystem/infoplugins/mac/adiumplugin.h rename to src/libtomahawk/infosystem/infoplugins/mac/AdiumPlugin.h index b606cf950..38d3aa149 100644 --- a/src/libtomahawk/infosystem/infoplugins/mac/adiumplugin.h +++ b/src/libtomahawk/infosystem/infoplugins/mac/AdiumPlugin.h @@ -20,7 +20,7 @@ #ifndef ADIUMPLUGIN_H #define ADIUMPLUGIN_H -#include "infosystem/infosystem.h" +#include "infosystem/InfoSystem.h" #include #include diff --git a/src/libtomahawk/infosystem/infoplugins/unix/fdonotifyplugin.cpp b/src/libtomahawk/infosystem/infoplugins/unix/FdoNotifyPlugin.cpp similarity index 98% rename from src/libtomahawk/infosystem/infoplugins/unix/fdonotifyplugin.cpp rename to src/libtomahawk/infosystem/infoplugins/unix/FdoNotifyPlugin.cpp index 5c252f820..e70faeb65 100644 --- a/src/libtomahawk/infosystem/infoplugins/unix/fdonotifyplugin.cpp +++ b/src/libtomahawk/infosystem/infoplugins/unix/FdoNotifyPlugin.cpp @@ -37,15 +37,15 @@ * */ -#include "fdonotifyplugin.h" +#include "FdoNotifyPlugin.h" #include "utils/tomahawkutils.h" -#include "imageconverter.h" +#include "ImageConverter.h" #include #include #include -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk::InfoSystem; diff --git a/src/libtomahawk/infosystem/infoplugins/unix/fdonotifyplugin.h b/src/libtomahawk/infosystem/infoplugins/unix/FdoNotifyPlugin.h similarity index 97% rename from src/libtomahawk/infosystem/infoplugins/unix/fdonotifyplugin.h rename to src/libtomahawk/infosystem/infoplugins/unix/FdoNotifyPlugin.h index bba7bc304..2679d7373 100644 --- a/src/libtomahawk/infosystem/infoplugins/unix/fdonotifyplugin.h +++ b/src/libtomahawk/infosystem/infoplugins/unix/FdoNotifyPlugin.h @@ -20,7 +20,7 @@ #ifndef FDONOTIFYPLUGIN_H #define FDONOTIFYPLUGIN_H -#include "infosystem/infosystem.h" +#include "infosystem/InfoSystem.h" namespace Tomahawk { diff --git a/src/libtomahawk/infosystem/infoplugins/unix/imageconverter.cpp b/src/libtomahawk/infosystem/infoplugins/unix/ImageConverter.cpp similarity index 98% rename from src/libtomahawk/infosystem/infoplugins/unix/imageconverter.cpp rename to src/libtomahawk/infosystem/infoplugins/unix/ImageConverter.cpp index d93d3f913..c15f4439a 100644 --- a/src/libtomahawk/infosystem/infoplugins/unix/imageconverter.cpp +++ b/src/libtomahawk/infosystem/infoplugins/unix/ImageConverter.cpp @@ -17,13 +17,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "imageconverter.h" +#include "ImageConverter.h" #include #include #include -#include "utils/logger.h" +#include "utils/Logger.h" namespace ImageConverter { diff --git a/src/libtomahawk/infosystem/infoplugins/unix/imageconverter.h b/src/libtomahawk/infosystem/infoplugins/unix/ImageConverter.h similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/unix/imageconverter.h rename to src/libtomahawk/infosystem/infoplugins/unix/ImageConverter.h diff --git a/src/libtomahawk/infosystem/infoplugins/unix/mprisplugin.cpp b/src/libtomahawk/infosystem/infoplugins/unix/MprisPlugin.cpp similarity index 98% rename from src/libtomahawk/infosystem/infoplugins/unix/mprisplugin.cpp rename to src/libtomahawk/infosystem/infoplugins/unix/MprisPlugin.cpp index e1a3d2a4b..ab1f06924 100644 --- a/src/libtomahawk/infosystem/infoplugins/unix/mprisplugin.cpp +++ b/src/libtomahawk/infosystem/infoplugins/unix/MprisPlugin.cpp @@ -21,19 +21,19 @@ #include #include -#include "audio/audioengine.h" -#include "infosystem/infosystemworker.h" +#include "audio/AudioEngine.h" +#include "infosystem/InfoSystemWorker.h" #include "Album.h" #include "Artist.h" #include "Result.h" #include "TomahawkSettings.h" #include "GlobalActionManager.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "utils/tomahawkutils.h" -#include "mprisplugin.h" -#include "mprispluginrootadaptor.h" -#include "mprispluginplayeradaptor.h" +#include "MprisPlugin.h" +#include "MprisPluginRootAdaptor.h" +#include "MprisPluginPlayerAdaptor.h" using namespace Tomahawk::InfoSystem; diff --git a/src/libtomahawk/infosystem/infoplugins/unix/mprisplugin.h b/src/libtomahawk/infosystem/infoplugins/unix/MprisPlugin.h similarity index 98% rename from src/libtomahawk/infosystem/infoplugins/unix/mprisplugin.h rename to src/libtomahawk/infosystem/infoplugins/unix/MprisPlugin.h index 92b8a9e3b..e6b1fa573 100644 --- a/src/libtomahawk/infosystem/infoplugins/unix/mprisplugin.h +++ b/src/libtomahawk/infosystem/infoplugins/unix/MprisPlugin.h @@ -20,8 +20,8 @@ #ifndef MPRISPLUGIN_H #define MPRISPLUGIN_H -#include "audio/audioengine.h" -#include "infosystem/infosystem.h" +#include "audio/AudioEngine.h" +#include "infosystem/InfoSystem.h" #include #include diff --git a/src/libtomahawk/infosystem/infoplugins/unix/mprispluginplayeradaptor.cpp b/src/libtomahawk/infosystem/infoplugins/unix/MprisPluginPlayerAdaptor.cpp similarity index 98% rename from src/libtomahawk/infosystem/infoplugins/unix/mprispluginplayeradaptor.cpp rename to src/libtomahawk/infosystem/infoplugins/unix/MprisPluginPlayerAdaptor.cpp index c1a155b2d..f707ce3a4 100644 --- a/src/libtomahawk/infosystem/infoplugins/unix/mprispluginplayeradaptor.cpp +++ b/src/libtomahawk/infosystem/infoplugins/unix/MprisPluginPlayerAdaptor.cpp @@ -1,6 +1,6 @@ /* * This file was generated by qdbusxml2cpp version 0.7 - * Command line was: qdbusxml2cpp -a mprispluginplayeradaptor -c MprisPluginPlayerAdaptor mprispluginplayeradaptor.xml + * Command line was: qdbusxml2cpp -a mprispluginplayeradaptor -c MprisPluginPlayerAdaptor MprisPluginPlayerAdaptor.xml * * qdbusxml2cpp is Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). * @@ -8,7 +8,7 @@ * Do not edit! All changes made to it will be lost. */ -#include "mprispluginplayeradaptor.h" +#include "MprisPluginPlayerAdaptor.h" #include #include #include diff --git a/src/libtomahawk/infosystem/infoplugins/unix/mprispluginplayeradaptor.h b/src/libtomahawk/infosystem/infoplugins/unix/MprisPluginPlayerAdaptor.h similarity index 98% rename from src/libtomahawk/infosystem/infoplugins/unix/mprispluginplayeradaptor.h rename to src/libtomahawk/infosystem/infoplugins/unix/MprisPluginPlayerAdaptor.h index 1cf145794..ebef4698e 100644 --- a/src/libtomahawk/infosystem/infoplugins/unix/mprispluginplayeradaptor.h +++ b/src/libtomahawk/infosystem/infoplugins/unix/MprisPluginPlayerAdaptor.h @@ -1,6 +1,6 @@ /* * This file was generated by qdbusxml2cpp version 0.7 - * Command line was: qdbusxml2cpp -a mprispluginplayeradaptor -c MprisPluginPlayerAdaptor mprispluginplayeradaptor.xml + * Command line was: qdbusxml2cpp -a mprispluginplayeradaptor -c MprisPluginPlayerAdaptor MprisPluginPlayerAdaptor.xml * * qdbusxml2cpp is Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). * diff --git a/src/libtomahawk/infosystem/infoplugins/unix/mprispluginplayeradaptor.xml b/src/libtomahawk/infosystem/infoplugins/unix/MprisPluginPlayerAdaptor.xml similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/unix/mprispluginplayeradaptor.xml rename to src/libtomahawk/infosystem/infoplugins/unix/MprisPluginPlayerAdaptor.xml diff --git a/src/libtomahawk/infosystem/infoplugins/unix/mprispluginrootadaptor.cpp b/src/libtomahawk/infosystem/infoplugins/unix/MprisPluginRootAdaptor.cpp similarity index 96% rename from src/libtomahawk/infosystem/infoplugins/unix/mprispluginrootadaptor.cpp rename to src/libtomahawk/infosystem/infoplugins/unix/MprisPluginRootAdaptor.cpp index 0307ca836..38caea346 100644 --- a/src/libtomahawk/infosystem/infoplugins/unix/mprispluginrootadaptor.cpp +++ b/src/libtomahawk/infosystem/infoplugins/unix/MprisPluginRootAdaptor.cpp @@ -1,6 +1,6 @@ /* * This file was generated by qdbusxml2cpp version 0.7 - * Command line was: qdbusxml2cpp -a mprispluginrootadaptor -c MprisPluginRootAdaptor mprispluginrootadaptor.xml + * Command line was: qdbusxml2cpp -a mprispluginrootadaptor -c MprisPluginRootAdaptor MprisPluginRootAdaptor.xml * * qdbusxml2cpp is Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). * @@ -8,7 +8,7 @@ * Do not edit! All changes made to it will be lost. */ -#include "mprispluginrootadaptor.h" +#include "MprisPluginRootAdaptor.h" #include #include #include diff --git a/src/libtomahawk/infosystem/infoplugins/unix/mprispluginrootadaptor.h b/src/libtomahawk/infosystem/infoplugins/unix/MprisPluginRootAdaptor.h similarity index 97% rename from src/libtomahawk/infosystem/infoplugins/unix/mprispluginrootadaptor.h rename to src/libtomahawk/infosystem/infoplugins/unix/MprisPluginRootAdaptor.h index 4d348e879..a875f0065 100644 --- a/src/libtomahawk/infosystem/infoplugins/unix/mprispluginrootadaptor.h +++ b/src/libtomahawk/infosystem/infoplugins/unix/MprisPluginRootAdaptor.h @@ -1,6 +1,6 @@ /* * This file was generated by qdbusxml2cpp version 0.7 - * Command line was: qdbusxml2cpp -a mprispluginrootadaptor -c MprisPluginRootAdaptor mprispluginrootadaptor.xml + * Command line was: qdbusxml2cpp -a mprispluginrootadaptor -c MprisPluginRootAdaptor MprisPluginRootAdaptor.xml * * qdbusxml2cpp is Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). * diff --git a/src/libtomahawk/infosystem/infoplugins/unix/mprispluginrootadaptor.xml b/src/libtomahawk/infosystem/infoplugins/unix/MprisPluginRootAdaptor.xml similarity index 100% rename from src/libtomahawk/infosystem/infoplugins/unix/mprispluginrootadaptor.xml rename to src/libtomahawk/infosystem/infoplugins/unix/MprisPluginRootAdaptor.xml diff --git a/src/libtomahawk/jobview/JobStatusDelegate.cpp b/src/libtomahawk/jobview/JobStatusDelegate.cpp index 9c686c15d..cf07b6b92 100644 --- a/src/libtomahawk/jobview/JobStatusDelegate.cpp +++ b/src/libtomahawk/jobview/JobStatusDelegate.cpp @@ -19,7 +19,7 @@ #include "JobStatusDelegate.h" #include "JobStatusModel.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include #include diff --git a/src/libtomahawk/jobview/JobStatusModel.cpp b/src/libtomahawk/jobview/JobStatusModel.cpp index 2bd8890c5..ab2275790 100644 --- a/src/libtomahawk/jobview/JobStatusModel.cpp +++ b/src/libtomahawk/jobview/JobStatusModel.cpp @@ -20,7 +20,7 @@ #include "JobStatusModel.h" #include "JobStatusItem.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include diff --git a/src/libtomahawk/jobview/JobStatusView.cpp b/src/libtomahawk/jobview/JobStatusView.cpp index 6f4496cd7..5d27ef08d 100644 --- a/src/libtomahawk/jobview/JobStatusView.cpp +++ b/src/libtomahawk/jobview/JobStatusView.cpp @@ -26,7 +26,7 @@ #include "PipelineStatusItem.h" #include "TransferStatusItem.h" #include "LatchedStatusItem.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include #include diff --git a/src/libtomahawk/jobview/JobStatusView.h b/src/libtomahawk/jobview/JobStatusView.h index 393fc49cb..1a5edf665 100644 --- a/src/libtomahawk/jobview/JobStatusView.h +++ b/src/libtomahawk/jobview/JobStatusView.h @@ -21,7 +21,7 @@ #define JOBSTATUSVIEW_H #include "Typedefs.h" -#include "widgets/animatedsplitter.h" +#include "widgets/AnimatedSplitter.h" #include "DllMacro.h" class QAbstractItemModel; diff --git a/src/libtomahawk/network/BufferIoDevice.cpp b/src/libtomahawk/network/BufferIoDevice.cpp index 84035dfe0..d8a7d622f 100644 --- a/src/libtomahawk/network/BufferIoDevice.cpp +++ b/src/libtomahawk/network/BufferIoDevice.cpp @@ -22,7 +22,7 @@ #include #include -#include "utils/logger.h" +#include "utils/Logger.h" // Msgs are framed, this is the size each msg we send containing audio data: #define BLOCKSIZE 4096 diff --git a/src/libtomahawk/network/Connection.cpp b/src/libtomahawk/network/Connection.cpp index c9fd74700..9a34c28cf 100644 --- a/src/libtomahawk/network/Connection.cpp +++ b/src/libtomahawk/network/Connection.cpp @@ -23,7 +23,7 @@ #include #include "network/Servent.h" -#include "utils/logger.h" +#include "utils/Logger.h" #define PROTOVER "4" // must match remote peer, or we can't talk. diff --git a/src/libtomahawk/network/ControlConnection.cpp b/src/libtomahawk/network/ControlConnection.cpp index bda505862..384a91cf2 100644 --- a/src/libtomahawk/network/ControlConnection.cpp +++ b/src/libtomahawk/network/ControlConnection.cpp @@ -21,13 +21,13 @@ #include "StreamConnection.h" #include "database/Database.h" -#include "database/databasecommand_collectionstats.h" +#include "database/DatabaseCommand_CollectionStats.h" #include "DbSyncConnection.h" #include "SourceList.h" #include "network/DbSyncConnection.h" #include "network/Servent.h" #include "sip/SipHandler.h" -#include "utils/logger.h" +#include "utils/Logger.h" #define TCP_TIMEOUT 600 diff --git a/src/libtomahawk/network/DbSyncConnection.cpp b/src/libtomahawk/network/DbSyncConnection.cpp index c94d28be5..242787946 100644 --- a/src/libtomahawk/network/DbSyncConnection.cpp +++ b/src/libtomahawk/network/DbSyncConnection.cpp @@ -33,12 +33,12 @@ #include "database/Database.h" #include "database/DatabaseCommand.h" -#include "database/databasecommand_collectionstats.h" -#include "database/databasecommand_loadops.h" +#include "database/DatabaseCommand_CollectionStats.h" +#include "database/DatabaseCommand_LoadOps.h" #include "RemoteCollection.h" #include "Source.h" #include "SourceList.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/network/MsgProcessor.cpp b/src/libtomahawk/network/MsgProcessor.cpp index ccde5b142..37f787c38 100644 --- a/src/libtomahawk/network/MsgProcessor.cpp +++ b/src/libtomahawk/network/MsgProcessor.cpp @@ -19,7 +19,7 @@ #include "MsgProcessor.h" #include "network/Servent.h" -#include "utils/logger.h" +#include "utils/Logger.h" MsgProcessor::MsgProcessor( quint32 mode, quint32 t ) : diff --git a/src/libtomahawk/network/PortFwdThread.cpp b/src/libtomahawk/network/PortFwdThread.cpp index 2abeadd06..fe02655b6 100644 --- a/src/libtomahawk/network/PortFwdThread.cpp +++ b/src/libtomahawk/network/PortFwdThread.cpp @@ -26,7 +26,7 @@ #include #include "portfwd/portfwd.h" -#include "utils/logger.h" +#include "utils/Logger.h" PortFwdThread::PortFwdThread( unsigned int port ) diff --git a/src/libtomahawk/network/RemoteCollection.cpp b/src/libtomahawk/network/RemoteCollection.cpp index fc5adabe3..ec9af8918 100644 --- a/src/libtomahawk/network/RemoteCollection.cpp +++ b/src/libtomahawk/network/RemoteCollection.cpp @@ -19,7 +19,7 @@ #include "RemoteCollection.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/network/Servent.cpp b/src/libtomahawk/network/Servent.cpp index 53fd42edc..60ea441e1 100644 --- a/src/libtomahawk/network/Servent.cpp +++ b/src/libtomahawk/network/Servent.cpp @@ -40,7 +40,7 @@ #include "PortFwdThread.h" #include "TomahawkSettings.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/network/StreamConnection.cpp b/src/libtomahawk/network/StreamConnection.cpp index 6552a5481..6fa368110 100644 --- a/src/libtomahawk/network/StreamConnection.cpp +++ b/src/libtomahawk/network/StreamConnection.cpp @@ -26,10 +26,10 @@ #include "BufferIoDevice.h" #include "network/ControlConnection.h" #include "network/Servent.h" -#include "database/databasecommand_loadfiles.h" +#include "database/DatabaseCommand_LoadFiles.h" #include "database/Database.h" #include "SourceList.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/AlbumItem.cpp b/src/libtomahawk/playlist/AlbumItem.cpp index 873c3c1b4..0a8f3e913 100644 --- a/src/libtomahawk/playlist/AlbumItem.cpp +++ b/src/libtomahawk/playlist/AlbumItem.cpp @@ -19,7 +19,7 @@ #include "AlbumItem.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/AlbumItemDelegate.cpp b/src/libtomahawk/playlist/AlbumItemDelegate.cpp index 92e9ae7c5..5c6a4fbd6 100644 --- a/src/libtomahawk/playlist/AlbumItemDelegate.cpp +++ b/src/libtomahawk/playlist/AlbumItemDelegate.cpp @@ -28,9 +28,9 @@ #include "Result.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "utils/PixmapDelegateFader.h" -#include +#include #include "playlist/AlbumItem.h" #include "playlist/AlbumProxyModel.h" diff --git a/src/libtomahawk/playlist/AlbumModel.cpp b/src/libtomahawk/playlist/AlbumModel.cpp index e6f15e9e1..2c261449e 100644 --- a/src/libtomahawk/playlist/AlbumModel.cpp +++ b/src/libtomahawk/playlist/AlbumModel.cpp @@ -29,7 +29,7 @@ #include "SourceList.h" #include "database/Database.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/AlbumModel.h b/src/libtomahawk/playlist/AlbumModel.h index dd4d4c369..297e600c6 100644 --- a/src/libtomahawk/playlist/AlbumModel.h +++ b/src/libtomahawk/playlist/AlbumModel.h @@ -25,7 +25,7 @@ #include "Album.h" #include "PlaylistInterface.h" -#include "database/databasecommand_allalbums.h" +#include "database/DatabaseCommand_AllAlbums.h" #include "DllMacro.h" diff --git a/src/libtomahawk/playlist/AlbumProxyModel.cpp b/src/libtomahawk/playlist/AlbumProxyModel.cpp index 8e0a2fd38..b7d3d8f4f 100644 --- a/src/libtomahawk/playlist/AlbumProxyModel.cpp +++ b/src/libtomahawk/playlist/AlbumProxyModel.cpp @@ -25,7 +25,7 @@ #include "Artist.h" #include "AlbumItem.h" #include "Query.h" -#include "utils/logger.h" +#include "utils/Logger.h" AlbumProxyModel::AlbumProxyModel( QObject* parent ) diff --git a/src/libtomahawk/playlist/AlbumProxyModelPlaylistInterface.cpp b/src/libtomahawk/playlist/AlbumProxyModelPlaylistInterface.cpp index c820d57fe..141d44021 100644 --- a/src/libtomahawk/playlist/AlbumProxyModelPlaylistInterface.cpp +++ b/src/libtomahawk/playlist/AlbumProxyModelPlaylistInterface.cpp @@ -23,7 +23,7 @@ #include "Artist.h" #include "AlbumItem.h" #include "Query.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/AlbumView.cpp b/src/libtomahawk/playlist/AlbumView.cpp index 85fc23b8b..a3b2c6080 100644 --- a/src/libtomahawk/playlist/AlbumView.cpp +++ b/src/libtomahawk/playlist/AlbumView.cpp @@ -25,7 +25,7 @@ #include #include -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" #include "context/ContextWidget.h" #include "TomahawkSettings.h" #include "Artist.h" @@ -33,7 +33,7 @@ #include "AlbumItemDelegate.h" #include "AlbumModel.h" #include "ViewManager.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "dynamic/widgets/LoadingSpinner.h" #define SCROLL_TIMEOUT 280 diff --git a/src/libtomahawk/playlist/ArtistView.cpp b/src/libtomahawk/playlist/ArtistView.cpp index fbafd9bfa..ce22cccd8 100644 --- a/src/libtomahawk/playlist/ArtistView.cpp +++ b/src/libtomahawk/playlist/ArtistView.cpp @@ -24,7 +24,7 @@ #include #include -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" #include "context/ContextWidget.h" #include "dynamic/widgets/LoadingSpinner.h" #include "widgets/OverlayWidget.h" @@ -35,7 +35,7 @@ #include "TreeItemDelegate.h" #include "TreeModel.h" #include "ViewManager.h" -#include "utils/logger.h" +#include "utils/Logger.h" #define SCROLL_TIMEOUT 280 diff --git a/src/libtomahawk/playlist/CollectionFlatModel.cpp b/src/libtomahawk/playlist/CollectionFlatModel.cpp index 170be4a8e..01d426c3d 100644 --- a/src/libtomahawk/playlist/CollectionFlatModel.cpp +++ b/src/libtomahawk/playlist/CollectionFlatModel.cpp @@ -20,7 +20,7 @@ #include "database/Database.h" #include "SourceList.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/CollectionFlatModel.h b/src/libtomahawk/playlist/CollectionFlatModel.h index dcc72c52a..a93d2f39d 100644 --- a/src/libtomahawk/playlist/CollectionFlatModel.h +++ b/src/libtomahawk/playlist/CollectionFlatModel.h @@ -30,7 +30,7 @@ #include "Source.h" #include "PlaylistInterface.h" -#include "database/databasecommand_alltracks.h" +#include "database/DatabaseCommand_AllTracks.h" #include "DllMacro.h" diff --git a/src/libtomahawk/playlist/CollectionProxyModel.cpp b/src/libtomahawk/playlist/CollectionProxyModel.cpp index 44c0cbe6d..483b95dcb 100644 --- a/src/libtomahawk/playlist/CollectionProxyModel.cpp +++ b/src/libtomahawk/playlist/CollectionProxyModel.cpp @@ -25,7 +25,7 @@ #include "Album.h" #include "Query.h" -#include "utils/logger.h" +#include "utils/Logger.h" CollectionProxyModel::CollectionProxyModel( QObject* parent ) diff --git a/src/libtomahawk/playlist/CollectionProxyModelPlaylistInterface.cpp b/src/libtomahawk/playlist/CollectionProxyModelPlaylistInterface.cpp index 675faa0d2..b3e0cad67 100644 --- a/src/libtomahawk/playlist/CollectionProxyModelPlaylistInterface.cpp +++ b/src/libtomahawk/playlist/CollectionProxyModelPlaylistInterface.cpp @@ -22,7 +22,7 @@ #include "CollectionProxyModel.h" #include "Album.h" #include "Query.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/CollectionView.cpp b/src/libtomahawk/playlist/CollectionView.cpp index 0a466e75d..a9572682d 100644 --- a/src/libtomahawk/playlist/CollectionView.cpp +++ b/src/libtomahawk/playlist/CollectionView.cpp @@ -25,7 +25,7 @@ #include "CollectionProxyModel.h" #include "TrackModel.h" #include "widgets/OverlayWidget.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/CustomPlaylistView.cpp b/src/libtomahawk/playlist/CustomPlaylistView.cpp index 0715f73c0..9a3fa6dc7 100644 --- a/src/libtomahawk/playlist/CustomPlaylistView.cpp +++ b/src/libtomahawk/playlist/CustomPlaylistView.cpp @@ -19,11 +19,11 @@ #include "CustomPlaylistView.h" -#include "database/databasecommand_genericselect.h" +#include "database/DatabaseCommand_GenericSelect.h" #include "database/Database.h" #include "utils/tomahawkutils.h" #include "SourceList.h" -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/PlaylistChartItemDelegate.cpp b/src/libtomahawk/playlist/PlaylistChartItemDelegate.cpp index b0238b7c4..9f219c39f 100644 --- a/src/libtomahawk/playlist/PlaylistChartItemDelegate.cpp +++ b/src/libtomahawk/playlist/PlaylistChartItemDelegate.cpp @@ -35,9 +35,9 @@ #include "TrackHeader.h" #include "utils/tomahawkutilsgui.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include -#include +#include using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/PlaylistItemDelegate.cpp b/src/libtomahawk/playlist/PlaylistItemDelegate.cpp index 2452dd80a..23687199d 100644 --- a/src/libtomahawk/playlist/PlaylistItemDelegate.cpp +++ b/src/libtomahawk/playlist/PlaylistItemDelegate.cpp @@ -35,7 +35,7 @@ #include "TrackHeader.h" #include "utils/tomahawkutilsgui.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp b/src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp index 6f4b9edf7..78fd70666 100644 --- a/src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp +++ b/src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp @@ -36,9 +36,9 @@ #include "TrackHeader.h" #include "utils/tomahawkutilsgui.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include -#include +#include using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/PlaylistModel.cpp b/src/libtomahawk/playlist/PlaylistModel.cpp index 34f755097..a3a23ab99 100644 --- a/src/libtomahawk/playlist/PlaylistModel.cpp +++ b/src/libtomahawk/playlist/PlaylistModel.cpp @@ -28,11 +28,11 @@ #include "Source.h" #include "SourceList.h" #include "database/Database.h" -#include "database/databasecommand_playbackhistory.h" +#include "database/DatabaseCommand_PlaybackHistory.h" #include "dynamic/GeneratorInterface.h" #include "DropJob.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/PlaylistProxyModel.cpp b/src/libtomahawk/playlist/PlaylistProxyModel.cpp index df8eead27..4ed1011c8 100644 --- a/src/libtomahawk/playlist/PlaylistProxyModel.cpp +++ b/src/libtomahawk/playlist/PlaylistProxyModel.cpp @@ -20,7 +20,7 @@ #include "PlaylistProxyModel.h" #include "PlaylistProxyModelPlaylistInterface.h" -#include "utils/logger.h" +#include "utils/Logger.h" PlaylistProxyModel::PlaylistProxyModel( QObject* parent ) diff --git a/src/libtomahawk/playlist/PlaylistProxyModelPlaylistInterface.cpp b/src/libtomahawk/playlist/PlaylistProxyModelPlaylistInterface.cpp index 377014228..73e443712 100644 --- a/src/libtomahawk/playlist/PlaylistProxyModelPlaylistInterface.cpp +++ b/src/libtomahawk/playlist/PlaylistProxyModelPlaylistInterface.cpp @@ -20,7 +20,7 @@ #include "PlaylistProxyModelPlaylistInterface.h" #include "PlaylistProxyModel.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/PlaylistView.cpp b/src/libtomahawk/playlist/PlaylistView.cpp index 6b0b5d8c2..e8c66c3ce 100644 --- a/src/libtomahawk/playlist/PlaylistView.cpp +++ b/src/libtomahawk/playlist/PlaylistView.cpp @@ -25,7 +25,7 @@ #include "playlist/PlaylistProxyModel.h" #include "widgets/OverlayWidget.h" #include "ViewManager.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "PlaylistUpdaterInterface.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/QueueProxyModel.cpp b/src/libtomahawk/playlist/QueueProxyModel.cpp index 8a7640fba..b70d4a45a 100644 --- a/src/libtomahawk/playlist/QueueProxyModel.cpp +++ b/src/libtomahawk/playlist/QueueProxyModel.cpp @@ -22,7 +22,7 @@ #include "QueueProxyModelPlaylistInterface.h" #include "playlist/TrackView.h" #include "ViewManager.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/QueueProxyModelPlaylistInterface.cpp b/src/libtomahawk/playlist/QueueProxyModelPlaylistInterface.cpp index e80bc1ed0..25f94cd78 100644 --- a/src/libtomahawk/playlist/QueueProxyModelPlaylistInterface.cpp +++ b/src/libtomahawk/playlist/QueueProxyModelPlaylistInterface.cpp @@ -20,7 +20,7 @@ #include "QueueProxyModelPlaylistInterface.h" #include "QueueProxyModel.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/QueueView.cpp b/src/libtomahawk/playlist/QueueView.cpp index 4b8656ccf..8832b8c20 100644 --- a/src/libtomahawk/playlist/QueueView.cpp +++ b/src/libtomahawk/playlist/QueueView.cpp @@ -24,7 +24,7 @@ #include "widgets/HeaderLabel.h" #include "playlist/QueueProxyModel.h" #include "widgets/OverlayWidget.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "PlaylistView.h" #include "utils/tomahawkutilsgui.h" diff --git a/src/libtomahawk/playlist/QueueView.h b/src/libtomahawk/playlist/QueueView.h index 33974e042..49952dc37 100644 --- a/src/libtomahawk/playlist/QueueView.h +++ b/src/libtomahawk/playlist/QueueView.h @@ -21,7 +21,7 @@ #include -#include "widgets/animatedsplitter.h" +#include "widgets/AnimatedSplitter.h" #include "DllMacro.h" diff --git a/src/libtomahawk/playlist/RecentlyAddedModel.cpp b/src/libtomahawk/playlist/RecentlyAddedModel.cpp index c5cc75153..38b870a11 100644 --- a/src/libtomahawk/playlist/RecentlyAddedModel.cpp +++ b/src/libtomahawk/playlist/RecentlyAddedModel.cpp @@ -24,9 +24,9 @@ #include "Source.h" #include "SourceList.h" #include "database/Database.h" -#include "database/databasecommand_alltracks.h" +#include "database/DatabaseCommand_AllTracks.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" #define LATEST_TRACK_ITEMS 250 diff --git a/src/libtomahawk/playlist/RecentlyPlayedModel.cpp b/src/libtomahawk/playlist/RecentlyPlayedModel.cpp index 1f877af53..ff56d9f29 100644 --- a/src/libtomahawk/playlist/RecentlyPlayedModel.cpp +++ b/src/libtomahawk/playlist/RecentlyPlayedModel.cpp @@ -24,9 +24,9 @@ #include "Source.h" #include "SourceList.h" #include "database/Database.h" -#include "database/databasecommand_playbackhistory.h" +#include "database/DatabaseCommand_PlaybackHistory.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" #define HISTORY_TRACK_ITEMS 25 diff --git a/src/libtomahawk/playlist/TrackHeader.cpp b/src/libtomahawk/playlist/TrackHeader.cpp index 562cf80fe..74ccf1ff2 100644 --- a/src/libtomahawk/playlist/TrackHeader.cpp +++ b/src/libtomahawk/playlist/TrackHeader.cpp @@ -20,7 +20,7 @@ #include "TrackHeader.h" #include "playlist/TrackView.h" -#include "utils/logger.h" +#include "utils/Logger.h" TrackHeader::TrackHeader( TrackView* parent ) diff --git a/src/libtomahawk/playlist/TrackModel.cpp b/src/libtomahawk/playlist/TrackModel.cpp index 5d958f250..d077ac657 100644 --- a/src/libtomahawk/playlist/TrackModel.cpp +++ b/src/libtomahawk/playlist/TrackModel.cpp @@ -24,13 +24,13 @@ #include #include -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" #include "utils/tomahawkutils.h" #include "Artist.h" #include "Album.h" #include "Pipeline.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/TrackModelItem.cpp b/src/libtomahawk/playlist/TrackModelItem.cpp index a037f3145..e29439c31 100644 --- a/src/libtomahawk/playlist/TrackModelItem.cpp +++ b/src/libtomahawk/playlist/TrackModelItem.cpp @@ -22,7 +22,7 @@ #include "Playlist.h" #include "Query.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/TrackProxyModel.cpp b/src/libtomahawk/playlist/TrackProxyModel.cpp index eff052a32..d28358162 100644 --- a/src/libtomahawk/playlist/TrackProxyModel.cpp +++ b/src/libtomahawk/playlist/TrackProxyModel.cpp @@ -25,7 +25,7 @@ #include "Artist.h" #include "Album.h" #include "Query.h" -#include "utils/logger.h" +#include "utils/Logger.h" TrackProxyModel::TrackProxyModel( QObject* parent ) diff --git a/src/libtomahawk/playlist/TrackProxyModelPlaylistInterface.cpp b/src/libtomahawk/playlist/TrackProxyModelPlaylistInterface.cpp index cd36b068c..492adfb1b 100644 --- a/src/libtomahawk/playlist/TrackProxyModelPlaylistInterface.cpp +++ b/src/libtomahawk/playlist/TrackProxyModelPlaylistInterface.cpp @@ -23,7 +23,7 @@ #include "Artist.h" #include "Album.h" #include "Query.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/TrackView.cpp b/src/libtomahawk/playlist/TrackView.cpp index 0ac609aa8..d3e40c03e 100644 --- a/src/libtomahawk/playlist/TrackView.cpp +++ b/src/libtomahawk/playlist/TrackView.cpp @@ -27,13 +27,13 @@ #include "ViewManager.h" #include "TrackModel.h" #include "TrackProxyModel.h" -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" #include "context/ContextWidget.h" #include "widgets/OverlayWidget.h" #include "dynamic/widgets/LoadingSpinner.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" -#include "utils/closure.h" +#include "utils/Logger.h" +#include "utils/Closure.h" #include "DropJob.h" #include "Artist.h" #include "Album.h" diff --git a/src/libtomahawk/playlist/TreeHeader.cpp b/src/libtomahawk/playlist/TreeHeader.cpp index 1d00dfe97..105268ade 100644 --- a/src/libtomahawk/playlist/TreeHeader.cpp +++ b/src/libtomahawk/playlist/TreeHeader.cpp @@ -19,7 +19,7 @@ #include "TreeHeader.h" #include "playlist/ArtistView.h" -#include "utils/logger.h" +#include "utils/Logger.h" TreeHeader::TreeHeader( ArtistView* parent ) diff --git a/src/libtomahawk/playlist/TreeItemDelegate.cpp b/src/libtomahawk/playlist/TreeItemDelegate.cpp index c12e49d6f..22eeb222c 100644 --- a/src/libtomahawk/playlist/TreeItemDelegate.cpp +++ b/src/libtomahawk/playlist/TreeItemDelegate.cpp @@ -28,8 +28,8 @@ #include "Result.h" #include "utils/tomahawkutilsgui.h" -#include "utils/logger.h" -#include "utils/closure.h" +#include "utils/Logger.h" +#include "utils/Closure.h" #include "utils/PixmapDelegateFader.h" #include "TreeModelItem.h" diff --git a/src/libtomahawk/playlist/TreeModel.cpp b/src/libtomahawk/playlist/TreeModel.cpp index 61482abea..7e0609e8e 100644 --- a/src/libtomahawk/playlist/TreeModel.cpp +++ b/src/libtomahawk/playlist/TreeModel.cpp @@ -25,12 +25,12 @@ #include "Pipeline.h" #include "Source.h" #include "SourceList.h" -#include "audio/audioengine.h" -#include "database/databasecommand_allalbums.h" -#include "database/databasecommand_alltracks.h" +#include "audio/AudioEngine.h" +#include "database/DatabaseCommand_AllAlbums.h" +#include "database/DatabaseCommand_AllTracks.h" #include "database/Database.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/TreeModel.h b/src/libtomahawk/playlist/TreeModel.h index f500ca5a8..6ed5cd56e 100644 --- a/src/libtomahawk/playlist/TreeModel.h +++ b/src/libtomahawk/playlist/TreeModel.h @@ -28,10 +28,10 @@ #include "Query.h" #include "Result.h" #include "PlaylistInterface.h" -#include "database/databasecommand_allartists.h" +#include "database/DatabaseCommand_AllArtists.h" #include "TreeModelItem.h" -#include "infosystem/infosystem.h" +#include "infosystem/InfoSystem.h" #include "DllMacro.h" #include "Typedefs.h" diff --git a/src/libtomahawk/playlist/TreeModelItem.cpp b/src/libtomahawk/playlist/TreeModelItem.cpp index 0aa01c42e..f906d4f7f 100644 --- a/src/libtomahawk/playlist/TreeModelItem.cpp +++ b/src/libtomahawk/playlist/TreeModelItem.cpp @@ -19,7 +19,7 @@ #include "TreeModelItem.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "Artist.h" #include "Album.h" #include "Query.h" diff --git a/src/libtomahawk/playlist/TreeProxyModel.cpp b/src/libtomahawk/playlist/TreeProxyModel.cpp index 3a74d27c8..57adf9630 100644 --- a/src/libtomahawk/playlist/TreeProxyModel.cpp +++ b/src/libtomahawk/playlist/TreeProxyModel.cpp @@ -26,8 +26,8 @@ #include "Query.h" #include "database/Database.h" #include "database/DatabaseImpl.h" -#include "database/databasecommand_allalbums.h" -#include "utils/logger.h" +#include "database/DatabaseCommand_AllAlbums.h" +#include "utils/Logger.h" TreeProxyModel::TreeProxyModel( QObject* parent ) diff --git a/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.cpp b/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.cpp index a6cd7108e..c1d7ac574 100644 --- a/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.cpp +++ b/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.cpp @@ -25,8 +25,8 @@ #include "Query.h" #include "database/Database.h" #include "database/DatabaseImpl.h" -#include "database/databasecommand_allalbums.h" -#include "utils/logger.h" +#include "database/DatabaseCommand_AllAlbums.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/ViewHeader.cpp b/src/libtomahawk/playlist/ViewHeader.cpp index 2db25a5c3..ddae1323b 100644 --- a/src/libtomahawk/playlist/ViewHeader.cpp +++ b/src/libtomahawk/playlist/ViewHeader.cpp @@ -22,7 +22,7 @@ #include #include "TomahawkSettings.h" -#include "utils/logger.h" +#include "utils/Logger.h" ViewHeader::ViewHeader( QAbstractItemView* parent ) diff --git a/src/libtomahawk/playlist/dynamic/DynamicControl.cpp b/src/libtomahawk/playlist/dynamic/DynamicControl.cpp index 31ec92315..df1d59ae6 100644 --- a/src/libtomahawk/playlist/dynamic/DynamicControl.cpp +++ b/src/libtomahawk/playlist/dynamic/DynamicControl.cpp @@ -18,7 +18,7 @@ #include "DynamicControl.h" -#include "utils/logger.h" +#include "utils/Logger.h" Tomahawk::DynamicControl::DynamicControl( const QStringList& typeSelectors ) diff --git a/src/libtomahawk/playlist/dynamic/DynamicModel.cpp b/src/libtomahawk/playlist/dynamic/DynamicModel.cpp index 9b405ed91..30fb755b0 100644 --- a/src/libtomahawk/playlist/dynamic/DynamicModel.cpp +++ b/src/libtomahawk/playlist/dynamic/DynamicModel.cpp @@ -23,9 +23,9 @@ #include "Pipeline.h" #include "Query.h" #include "Source.h" -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp b/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp index eff8a7808..b2c33e5ce 100644 --- a/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp +++ b/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp @@ -23,12 +23,12 @@ #include "GeneratorFactory.h" #include "database/Database.h" #include "database/DatabaseCommand.h" -#include "database/databasecommand_createdynamicplaylist.h" -#include "database/databasecommand_setdynamicplaylistrevision.h" -#include "database/databasecommand_loaddynamicplaylistentries.h" -#include "database/databasecommand_deletedynamicplaylist.h" +#include "database/DatabaseCommand_CreateDynamicPlaylist.h" +#include "database/DatabaseCommand_SetDynamicPlaylistRevision.h" +#include "database/DatabaseCommand_LoadDynamicPlaylistEntries.h" +#include "database/DatabaseCommand_DeleteDynamicPlaylist.h" #include "TomahawkSettings.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/dynamic/DynamicView.cpp b/src/libtomahawk/playlist/dynamic/DynamicView.cpp index 927f32927..4b326344d 100644 --- a/src/libtomahawk/playlist/dynamic/DynamicView.cpp +++ b/src/libtomahawk/playlist/dynamic/DynamicView.cpp @@ -30,7 +30,7 @@ #include "TrackHeader.h" #include "DynamicModel.h" #include "widgets/OverlayWidget.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/dynamic/GeneratorFactory.cpp b/src/libtomahawk/playlist/dynamic/GeneratorFactory.cpp index ebcde7288..8dfb24b0a 100644 --- a/src/libtomahawk/playlist/dynamic/GeneratorFactory.cpp +++ b/src/libtomahawk/playlist/dynamic/GeneratorFactory.cpp @@ -19,7 +19,7 @@ #include "dynamic/GeneratorFactory.h" #include "dynamic/GeneratorInterface.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/dynamic/GeneratorInterface.cpp b/src/libtomahawk/playlist/dynamic/GeneratorInterface.cpp index 6b50f0949..fe4064006 100644 --- a/src/libtomahawk/playlist/dynamic/GeneratorInterface.cpp +++ b/src/libtomahawk/playlist/dynamic/GeneratorInterface.cpp @@ -19,7 +19,7 @@ #include "dynamic/GeneratorInterface.h" -#include "utils/logger.h" +#include "utils/Logger.h" Tomahawk::GeneratorInterface::GeneratorInterface( QObject* parent ) diff --git a/src/libtomahawk/playlist/dynamic/database/DatabaseGenerator.cpp b/src/libtomahawk/playlist/dynamic/database/DatabaseGenerator.cpp index a0b8857b1..4a84950c4 100644 --- a/src/libtomahawk/playlist/dynamic/database/DatabaseGenerator.cpp +++ b/src/libtomahawk/playlist/dynamic/database/DatabaseGenerator.cpp @@ -19,8 +19,8 @@ #include "DatabaseGenerator.h" #include "DatabaseControl.h" -#include "utils/logger.h" -#include +#include "utils/Logger.h" +#include #include using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/dynamic/database/DatabaseGenerator.h b/src/libtomahawk/playlist/dynamic/database/DatabaseGenerator.h index 0053670d4..7513763dc 100644 --- a/src/libtomahawk/playlist/dynamic/database/DatabaseGenerator.h +++ b/src/libtomahawk/playlist/dynamic/database/DatabaseGenerator.h @@ -24,7 +24,7 @@ #include "playlist/dynamic/GeneratorInterface.h" #include "playlist/dynamic/GeneratorFactory.h" #include "playlist/dynamic/DynamicControl.h" -#include "database/databasecommand_genericselect.h" +#include "database/DatabaseCommand_GenericSelect.h" #include "DllMacro.h" namespace Tomahawk diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp index 156445e40..5f37bd92d 100644 --- a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp +++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp @@ -28,7 +28,7 @@ #include #include "EchonestGenerator.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp index 78d259eec..92f568da3 100644 --- a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp +++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp @@ -22,9 +22,9 @@ #include "Query.h" #include "utils/tomahawkutils.h" #include "TomahawkSettings.h" -#include "database/databasecommand_collectionattributes.h" +#include "database/DatabaseCommand_CollectionAttributes.h" #include "database/Database.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "SourceList.h" #include #include diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h index ae274ab63..90cb7c338 100644 --- a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h +++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h @@ -25,7 +25,7 @@ #include "playlist/dynamic/GeneratorInterface.h" #include "playlist/dynamic/GeneratorFactory.h" #include "playlist/dynamic/DynamicControl.h" -#include "database/databasecommand_collectionattributes.h" +#include "database/DatabaseCommand_CollectionAttributes.h" #include "DllMacro.h" diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp b/src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp index 2bf84654a..5d68719ce 100644 --- a/src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp +++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp @@ -31,7 +31,7 @@ #include "dynamic/widgets/DynamicWidget.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.cpp b/src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.cpp index 4cc377af3..9e02c625f 100644 --- a/src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.cpp +++ b/src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.cpp @@ -24,7 +24,7 @@ #include "dynamic/GeneratorInterface.h" #include "dynamic/DynamicControl.h" #include "utils/tomahawkutils.h" -#include "widgets/elidedlabel.h" +#include "widgets/ElidedLabel.h" #include #include @@ -34,7 +34,7 @@ #include #include -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp b/src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp index 4314fb616..9c1894754 100644 --- a/src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp +++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp @@ -30,7 +30,7 @@ #include "DynamicControlWrapper.h" #include "dynamic/GeneratorInterface.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicControlWrapper.cpp b/src/libtomahawk/playlist/dynamic/widgets/DynamicControlWrapper.cpp index ed15d9184..222fa7940 100644 --- a/src/libtomahawk/playlist/dynamic/widgets/DynamicControlWrapper.cpp +++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicControlWrapper.cpp @@ -28,7 +28,7 @@ #include "dynamic/DynamicControl.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp b/src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp index 6352938b0..9b6c77cf1 100644 --- a/src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp +++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp @@ -34,7 +34,7 @@ #include #include -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp index adf571599..7e9671ee1 100644 --- a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp +++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp @@ -34,7 +34,7 @@ #include "dynamic/GeneratorFactory.h" #include "Pipeline.h" #include "Source.h" -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" #include "ReadOrWriteWidget.h" #include "CollapsibleControls.h" #include "DynamicControlWrapper.h" @@ -43,7 +43,7 @@ #include "DynamicSetupWidget.h" #include "AudioControls.h" #include "LoadingSpinner.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/dynamic/widgets/LoadingSpinner.cpp b/src/libtomahawk/playlist/dynamic/widgets/LoadingSpinner.cpp index 210ffbeef..5280d19cf 100644 --- a/src/libtomahawk/playlist/dynamic/widgets/LoadingSpinner.cpp +++ b/src/libtomahawk/playlist/dynamic/widgets/LoadingSpinner.cpp @@ -26,7 +26,7 @@ #include #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" #define ANIM_LENGTH 300 diff --git a/src/libtomahawk/playlist/dynamic/widgets/MiscControlWidgets.cpp b/src/libtomahawk/playlist/dynamic/widgets/MiscControlWidgets.cpp index da8872ff6..d8875330c 100644 --- a/src/libtomahawk/playlist/dynamic/widgets/MiscControlWidgets.cpp +++ b/src/libtomahawk/playlist/dynamic/widgets/MiscControlWidgets.cpp @@ -22,7 +22,7 @@ #include #include -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/dynamic/widgets/ReadOrWriteWidget.cpp b/src/libtomahawk/playlist/dynamic/widgets/ReadOrWriteWidget.cpp index 3685822bb..9e35b4308 100644 --- a/src/libtomahawk/playlist/dynamic/widgets/ReadOrWriteWidget.cpp +++ b/src/libtomahawk/playlist/dynamic/widgets/ReadOrWriteWidget.cpp @@ -21,7 +21,7 @@ #include #include -#include "utils/logger.h" +#include "utils/Logger.h" ReadOrWriteWidget::ReadOrWriteWidget( QWidget* writableWidget, bool writable, QWidget* parent) diff --git a/src/libtomahawk/playlist/topbar/TopBar.cpp b/src/libtomahawk/playlist/topbar/TopBar.cpp index 1e068c1b1..43de0a5d9 100644 --- a/src/libtomahawk/playlist/topbar/TopBar.cpp +++ b/src/libtomahawk/playlist/topbar/TopBar.cpp @@ -27,7 +27,7 @@ #include #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" #define MAXDUDES 3 #define DUDEWIDTH 10 diff --git a/src/libtomahawk/playlist/topbar/TopBar.ui b/src/libtomahawk/playlist/topbar/TopBar.ui index 12b7b97d2..7498a6da0 100644 --- a/src/libtomahawk/playlist/topbar/TopBar.ui +++ b/src/libtomahawk/playlist/topbar/TopBar.ui @@ -311,7 +311,7 @@ AnimatedCounterLabel QLabel -
widgets/animatedcounterlabel.h
+
widgets/AnimatedCounterLabel.h
 SearchLineEdit diff --git a/src/libtomahawk/resolvers/qtscriptresolver.cpp b/src/libtomahawk/resolvers/QtScriptResolver.cpp similarity index 99% rename from src/libtomahawk/resolvers/qtscriptresolver.cpp rename to src/libtomahawk/resolvers/QtScriptResolver.cpp index eef0e81ae..6914ba71c 100644 --- a/src/libtomahawk/resolvers/qtscriptresolver.cpp +++ b/src/libtomahawk/resolvers/QtScriptResolver.cpp @@ -17,7 +17,7 @@ * along with Tomahawk. If not, see . */ -#include "qtscriptresolver.h" +#include "QtScriptResolver.h" #include "Artist.h" #include "Album.h" @@ -28,7 +28,7 @@ #include "network/Servent.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include diff --git a/src/libtomahawk/resolvers/qtscriptresolver.h b/src/libtomahawk/resolvers/QtScriptResolver.h similarity index 100% rename from src/libtomahawk/resolvers/qtscriptresolver.h rename to src/libtomahawk/resolvers/QtScriptResolver.h diff --git a/src/libtomahawk/resolvers/scriptresolver.cpp b/src/libtomahawk/resolvers/ScriptResolver.cpp similarity index 99% rename from src/libtomahawk/resolvers/scriptresolver.cpp rename to src/libtomahawk/resolvers/ScriptResolver.cpp index 3547ada75..bbc5b9a65 100644 --- a/src/libtomahawk/resolvers/scriptresolver.cpp +++ b/src/libtomahawk/resolvers/ScriptResolver.cpp @@ -17,7 +17,7 @@ * along with Tomahawk. If not, see . */ -#include "scriptresolver.h" +#include "ScriptResolver.h" #include #include @@ -29,7 +29,7 @@ #include "SourceList.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" #ifdef Q_OS_WIN #include diff --git a/src/libtomahawk/resolvers/scriptresolver.h b/src/libtomahawk/resolvers/ScriptResolver.h similarity index 100% rename from src/libtomahawk/resolvers/scriptresolver.h rename to src/libtomahawk/resolvers/ScriptResolver.h diff --git a/src/libtomahawk/sip/SipHandler.cpp b/src/libtomahawk/sip/SipHandler.cpp index a0aa98cd7..dbfdad92b 100644 --- a/src/libtomahawk/sip/SipHandler.cpp +++ b/src/libtomahawk/sip/SipHandler.cpp @@ -36,7 +36,7 @@ #include "network/Servent.h" #include "SourceList.h" #include "TomahawkSettings.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "accounts/AccountManager.h" #include "config.h" diff --git a/src/libtomahawk/sip/SipInfo.h b/src/libtomahawk/sip/SipInfo.h index de050c6ec..d354aab70 100644 --- a/src/libtomahawk/sip/SipInfo.h +++ b/src/libtomahawk/sip/SipInfo.h @@ -22,7 +22,7 @@ #include #include -#include "utils/logger.h" +#include "utils/Logger.h" #include "DllMacro.h" class SipInfoPrivate; diff --git a/src/libtomahawk/sip/SipPlugin.cpp b/src/libtomahawk/sip/SipPlugin.cpp index 3485762f2..e7f6df977 100644 --- a/src/libtomahawk/sip/SipPlugin.cpp +++ b/src/libtomahawk/sip/SipPlugin.cpp @@ -21,7 +21,7 @@ #include "sip/SipPlugin.h" -#include "utils/logger.h" +#include "utils/Logger.h" SipPlugin::SipPlugin() : QObject() {} diff --git a/src/libtomahawk/utils/closure.cpp b/src/libtomahawk/utils/Closure.cpp similarity index 99% rename from src/libtomahawk/utils/closure.cpp rename to src/libtomahawk/utils/Closure.cpp index abddb41c8..2b2a608bb 100644 --- a/src/libtomahawk/utils/closure.cpp +++ b/src/libtomahawk/utils/Closure.cpp @@ -15,7 +15,7 @@ along with Clementine. If not, see . */ -#include "closure.h" +#include "Closure.h" namespace _detail { diff --git a/src/libtomahawk/utils/closure.h b/src/libtomahawk/utils/Closure.h similarity index 100% rename from src/libtomahawk/utils/closure.h rename to src/libtomahawk/utils/Closure.h diff --git a/src/libtomahawk/utils/dropjobnotifier.cpp b/src/libtomahawk/utils/DropJobNotifier.cpp similarity index 96% rename from src/libtomahawk/utils/dropjobnotifier.cpp rename to src/libtomahawk/utils/DropJobNotifier.cpp index b023accf7..654d7d75a 100644 --- a/src/libtomahawk/utils/dropjobnotifier.cpp +++ b/src/libtomahawk/utils/DropJobNotifier.cpp @@ -18,9 +18,9 @@ * along with Tomahawk. If not, see . */ -#include "dropjobnotifier.h" +#include "DropJobNotifier.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "utils/tomahawkutils.h" #include "Query.h" #include "SourceList.h" @@ -28,7 +28,7 @@ #include "jobview/JobStatusModel.h" #include "DropJob.h" #include -#include "dropjobnotifier.h" +#include "DropJobNotifier.h" #include #include diff --git a/src/libtomahawk/utils/dropjobnotifier.h b/src/libtomahawk/utils/DropJobNotifier.h similarity index 100% rename from src/libtomahawk/utils/dropjobnotifier.h rename to src/libtomahawk/utils/DropJobNotifier.h diff --git a/src/libtomahawk/utils/groovesharkparser.cpp b/src/libtomahawk/utils/GroovesharkParser.cpp similarity index 99% rename from src/libtomahawk/utils/groovesharkparser.cpp rename to src/libtomahawk/utils/GroovesharkParser.cpp index 77ad5b1cf..e37b71887 100644 --- a/src/libtomahawk/utils/groovesharkparser.cpp +++ b/src/libtomahawk/utils/GroovesharkParser.cpp @@ -18,9 +18,9 @@ * along with Tomahawk. If not, see . */ -#include "groovesharkparser.h" +#include "GroovesharkParser.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "utils/tomahawkutils.h" #include "Query.h" #include "SourceList.h" @@ -28,7 +28,7 @@ #include "jobview/JobStatusView.h" #include "jobview/JobStatusModel.h" #include "jobview/ErrorStatusMessage.h" -#include "dropjobnotifier.h" +#include "DropJobNotifier.h" #include "ViewManager.h" #include diff --git a/src/libtomahawk/utils/groovesharkparser.h b/src/libtomahawk/utils/GroovesharkParser.h similarity index 100% rename from src/libtomahawk/utils/groovesharkparser.h rename to src/libtomahawk/utils/GroovesharkParser.h diff --git a/src/libtomahawk/utils/itunesparser.cpp b/src/libtomahawk/utils/ItunesParser.cpp similarity index 99% rename from src/libtomahawk/utils/itunesparser.cpp rename to src/libtomahawk/utils/ItunesParser.cpp index 93593f12f..43d36dce7 100644 --- a/src/libtomahawk/utils/itunesparser.cpp +++ b/src/libtomahawk/utils/ItunesParser.cpp @@ -18,8 +18,8 @@ * along with Tomahawk. If not, see . */ -#include "itunesparser.h" -#include "utils/logger.h" +#include "ItunesParser.h" +#include "utils/Logger.h" #include "utils/tomahawkutils.h" #include "Query.h" #include "SourceList.h" diff --git a/src/libtomahawk/utils/itunesparser.h b/src/libtomahawk/utils/ItunesParser.h similarity index 98% rename from src/libtomahawk/utils/itunesparser.h rename to src/libtomahawk/utils/ItunesParser.h index 26b067069..31c859588 100644 --- a/src/libtomahawk/utils/itunesparser.h +++ b/src/libtomahawk/utils/ItunesParser.h @@ -24,7 +24,7 @@ #include "DllMacro.h" #include "Typedefs.h" #include "Query.h" -#include "dropjobnotifier.h" +#include "DropJobNotifier.h" #include #include diff --git a/src/libtomahawk/utils/jspfloader.cpp b/src/libtomahawk/utils/JspfLoader.cpp similarity index 99% rename from src/libtomahawk/utils/jspfloader.cpp rename to src/libtomahawk/utils/JspfLoader.cpp index c75446af9..c75286435 100644 --- a/src/libtomahawk/utils/jspfloader.cpp +++ b/src/libtomahawk/utils/JspfLoader.cpp @@ -17,7 +17,7 @@ */ -#include "jspfloader.h" +#include "JspfLoader.h" #include @@ -27,7 +27,7 @@ #include #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "SourceList.h" #include "Playlist.h" diff --git a/src/libtomahawk/utils/jspfloader.h b/src/libtomahawk/utils/JspfLoader.h similarity index 100% rename from src/libtomahawk/utils/jspfloader.h rename to src/libtomahawk/utils/JspfLoader.h diff --git a/src/libtomahawk/utils/logger.cpp b/src/libtomahawk/utils/Logger.cpp similarity index 99% rename from src/libtomahawk/utils/logger.cpp rename to src/libtomahawk/utils/Logger.cpp index ea7c3bada..7378a7e42 100644 --- a/src/libtomahawk/utils/logger.cpp +++ b/src/libtomahawk/utils/Logger.cpp @@ -16,7 +16,7 @@ * along with Tomahawk. If not, see . */ -#include "logger.h" +#include "Logger.h" #include #include diff --git a/src/libtomahawk/utils/logger.h b/src/libtomahawk/utils/Logger.h similarity index 100% rename from src/libtomahawk/utils/logger.h rename to src/libtomahawk/utils/Logger.h diff --git a/src/libtomahawk/utils/m3uloader.cpp b/src/libtomahawk/utils/M3uLoader.cpp similarity index 98% rename from src/libtomahawk/utils/m3uloader.cpp rename to src/libtomahawk/utils/M3uLoader.cpp index e376e911b..04a0247b8 100644 --- a/src/libtomahawk/utils/m3uloader.cpp +++ b/src/libtomahawk/utils/M3uLoader.cpp @@ -17,8 +17,8 @@ * along with Tomahawk. If not, see . */ -#include "m3uloader.h" -#include "utils/logger.h" +#include "M3uLoader.h" +#include "utils/Logger.h" #include "utils/tomahawkutils.h" #include "Query.h" #include "SourceList.h" diff --git a/src/libtomahawk/utils/m3uloader.h b/src/libtomahawk/utils/M3uLoader.h similarity index 100% rename from src/libtomahawk/utils/m3uloader.h rename to src/libtomahawk/utils/M3uLoader.h diff --git a/src/libtomahawk/utils/proxystyle.cpp b/src/libtomahawk/utils/ProxyStyle.cpp similarity index 98% rename from src/libtomahawk/utils/proxystyle.cpp rename to src/libtomahawk/utils/ProxyStyle.cpp index 99bd5f69c..cb7cd45e1 100644 --- a/src/libtomahawk/utils/proxystyle.cpp +++ b/src/libtomahawk/utils/ProxyStyle.cpp @@ -16,14 +16,14 @@ * along with Tomahawk. If not, see . */ -#include "proxystyle.h" +#include "ProxyStyle.h" #include #include #include #include -#include "utils/logger.h" +#include "utils/Logger.h" #define ARROW_WIDTH 7 #define ARROW_HEIGHT 7 diff --git a/src/libtomahawk/utils/proxystyle.h b/src/libtomahawk/utils/ProxyStyle.h similarity index 100% rename from src/libtomahawk/utils/proxystyle.h rename to src/libtomahawk/utils/ProxyStyle.h diff --git a/src/libtomahawk/utils/qnr_iodevicestream.cpp b/src/libtomahawk/utils/Qnr_IoDeviceStream.cpp similarity index 98% rename from src/libtomahawk/utils/qnr_iodevicestream.cpp rename to src/libtomahawk/utils/Qnr_IoDeviceStream.cpp index 41ea2221a..b60ca3a57 100644 --- a/src/libtomahawk/utils/qnr_iodevicestream.cpp +++ b/src/libtomahawk/utils/Qnr_IoDeviceStream.cpp @@ -20,7 +20,7 @@ */ -#include "qnr_iodevicestream.h" +#include "Qnr_IoDeviceStream.h" #include diff --git a/src/libtomahawk/utils/qnr_iodevicestream.h b/src/libtomahawk/utils/Qnr_IoDeviceStream.h similarity index 100% rename from src/libtomahawk/utils/qnr_iodevicestream.h rename to src/libtomahawk/utils/Qnr_IoDeviceStream.h diff --git a/src/libtomahawk/utils/rdioparser.cpp b/src/libtomahawk/utils/RdioParser.cpp similarity index 99% rename from src/libtomahawk/utils/rdioparser.cpp rename to src/libtomahawk/utils/RdioParser.cpp index 6960f166a..78166d0a9 100644 --- a/src/libtomahawk/utils/rdioparser.cpp +++ b/src/libtomahawk/utils/RdioParser.cpp @@ -17,17 +17,17 @@ * along with Tomahawk. If not, see . */ -#include "rdioparser.h" +#include "RdioParser.h" -#include "shortenedlinkparser.h" +#include "ShortenedLinkParser.h" #include "config.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "DropJob.h" #include "jobview/JobStatusView.h" #include "jobview/JobStatusModel.h" #include "jobview/ErrorStatusMessage.h" -#include "dropjobnotifier.h" +#include "DropJobNotifier.h" #include "ViewManager.h" #include "SourceList.h" diff --git a/src/libtomahawk/utils/rdioparser.h b/src/libtomahawk/utils/RdioParser.h similarity index 100% rename from src/libtomahawk/utils/rdioparser.h rename to src/libtomahawk/utils/RdioParser.h diff --git a/src/libtomahawk/utils/shortenedlinkparser.cpp b/src/libtomahawk/utils/ShortenedLinkParser.cpp similarity index 97% rename from src/libtomahawk/utils/shortenedlinkparser.cpp rename to src/libtomahawk/utils/ShortenedLinkParser.cpp index a32f335ed..2a7f77eb4 100644 --- a/src/libtomahawk/utils/shortenedlinkparser.cpp +++ b/src/libtomahawk/utils/ShortenedLinkParser.cpp @@ -17,11 +17,11 @@ * along with Tomahawk. If not, see . */ -#include "shortenedlinkparser.h" +#include "ShortenedLinkParser.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "utils/tomahawkutils.h" -#include "dropjobnotifier.h" +#include "DropJobNotifier.h" #include "Query.h" #include "jobview/ErrorStatusMessage.h" #include "jobview/JobStatusModel.h" diff --git a/src/libtomahawk/utils/shortenedlinkparser.h b/src/libtomahawk/utils/ShortenedLinkParser.h similarity index 100% rename from src/libtomahawk/utils/shortenedlinkparser.h rename to src/libtomahawk/utils/ShortenedLinkParser.h diff --git a/src/libtomahawk/utils/spotifyparser.cpp b/src/libtomahawk/utils/SpotifyParser.cpp similarity index 99% rename from src/libtomahawk/utils/spotifyparser.cpp rename to src/libtomahawk/utils/SpotifyParser.cpp index 95ce99a52..e5c2ccb5e 100644 --- a/src/libtomahawk/utils/spotifyparser.cpp +++ b/src/libtomahawk/utils/SpotifyParser.cpp @@ -17,9 +17,9 @@ * along with Tomahawk. If not, see . */ -#include "spotifyparser.h" +#include "SpotifyParser.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "utils/tomahawkutils.h" #include "Query.h" #include "SourceList.h" @@ -27,7 +27,7 @@ #include "jobview/JobStatusView.h" #include "jobview/JobStatusModel.h" #include "jobview/ErrorStatusMessage.h" -#include "dropjobnotifier.h" +#include "DropJobNotifier.h" #include "ViewManager.h" #include diff --git a/src/libtomahawk/utils/spotifyparser.h b/src/libtomahawk/utils/SpotifyParser.h similarity index 100% rename from src/libtomahawk/utils/spotifyparser.h rename to src/libtomahawk/utils/SpotifyParser.h diff --git a/src/libtomahawk/utils/stylehelper.cpp b/src/libtomahawk/utils/StyleHelper.cpp similarity index 99% rename from src/libtomahawk/utils/stylehelper.cpp rename to src/libtomahawk/utils/StyleHelper.cpp index 470575ea5..85cd3041d 100644 --- a/src/libtomahawk/utils/stylehelper.cpp +++ b/src/libtomahawk/utils/StyleHelper.cpp @@ -16,7 +16,7 @@ * along with Tomahawk. If not, see . */ -#include "stylehelper.h" +#include "StyleHelper.h" #include #include diff --git a/src/libtomahawk/utils/stylehelper.h b/src/libtomahawk/utils/StyleHelper.h similarity index 100% rename from src/libtomahawk/utils/stylehelper.h rename to src/libtomahawk/utils/StyleHelper.h diff --git a/src/libtomahawk/utils/tomahawkcache.cpp b/src/libtomahawk/utils/tomahawkcache.cpp index 8701a552d..59caefaa0 100644 --- a/src/libtomahawk/utils/tomahawkcache.cpp +++ b/src/libtomahawk/utils/tomahawkcache.cpp @@ -19,7 +19,7 @@ #include "tomahawkcache.h" #include "TomahawkSettings.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include #include diff --git a/src/libtomahawk/utils/tomahawkutils.cpp b/src/libtomahawk/utils/tomahawkutils.cpp index cfd8450a3..42760fb01 100644 --- a/src/libtomahawk/utils/tomahawkutils.cpp +++ b/src/libtomahawk/utils/tomahawkutils.cpp @@ -23,7 +23,7 @@ #include "TomahawkSettings.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" #ifdef LIBLASTFM_FOUND #include diff --git a/src/libtomahawk/utils/tomahawkutilsgui.cpp b/src/libtomahawk/utils/tomahawkutilsgui.cpp index b89ac3628..446dae1dd 100644 --- a/src/libtomahawk/utils/tomahawkutilsgui.cpp +++ b/src/libtomahawk/utils/tomahawkutilsgui.cpp @@ -22,7 +22,7 @@ #include "config.h" #include "Query.h" #include "Result.h" -#include "logger.h" +#include "Logger.h" #include "TrackModelItem.h" #include diff --git a/src/libtomahawk/utils/widgetdragfilter.cpp b/src/libtomahawk/utils/widgetdragfilter.cpp index e3d1f5665..9a2d924d6 100644 --- a/src/libtomahawk/utils/widgetdragfilter.cpp +++ b/src/libtomahawk/utils/widgetdragfilter.cpp @@ -22,7 +22,7 @@ #include #include -#include "utils/logger.h" +#include "utils/Logger.h" WidgetDragFilter::WidgetDragFilter( QObject* parent ) diff --git a/src/libtomahawk/utils/xspfgenerator.cpp b/src/libtomahawk/utils/xspfgenerator.cpp index fd73fe523..579051c79 100644 --- a/src/libtomahawk/utils/xspfgenerator.cpp +++ b/src/libtomahawk/utils/xspfgenerator.cpp @@ -25,7 +25,7 @@ #include "Playlist.h" #include "Query.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/utils/xspfloader.cpp b/src/libtomahawk/utils/xspfloader.cpp index f414d4c7f..29cba9b6d 100644 --- a/src/libtomahawk/utils/xspfloader.cpp +++ b/src/libtomahawk/utils/xspfloader.cpp @@ -25,7 +25,7 @@ #include #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" #ifndef ENABLE_HEADLESS #include "jobview/JobStatusView.h" diff --git a/src/libtomahawk/widgets/animatedcounterlabel.cpp b/src/libtomahawk/widgets/AnimatedCounterLabel.cpp similarity index 98% rename from src/libtomahawk/widgets/animatedcounterlabel.cpp rename to src/libtomahawk/widgets/AnimatedCounterLabel.cpp index f3b46f516..44ed9c581 100644 --- a/src/libtomahawk/widgets/animatedcounterlabel.cpp +++ b/src/libtomahawk/widgets/AnimatedCounterLabel.cpp @@ -17,7 +17,7 @@ */ -#include "animatedcounterlabel.h" +#include "AnimatedCounterLabel.h" AnimatedCounterLabel::AnimatedCounterLabel(QWidget* parent, Qt::WindowFlags f) diff --git a/src/libtomahawk/widgets/animatedcounterlabel.h b/src/libtomahawk/widgets/AnimatedCounterLabel.h similarity index 100% rename from src/libtomahawk/widgets/animatedcounterlabel.h rename to src/libtomahawk/widgets/AnimatedCounterLabel.h diff --git a/src/libtomahawk/widgets/animatedsplitter.cpp b/src/libtomahawk/widgets/AnimatedSplitter.cpp similarity index 99% rename from src/libtomahawk/widgets/animatedsplitter.cpp rename to src/libtomahawk/widgets/AnimatedSplitter.cpp index 8c3ab3b02..93a941c83 100644 --- a/src/libtomahawk/widgets/animatedsplitter.cpp +++ b/src/libtomahawk/widgets/AnimatedSplitter.cpp @@ -16,9 +16,9 @@ * along with Tomahawk. If not, see . */ -#include "animatedsplitter.h" +#include "AnimatedSplitter.h" -#include "utils/logger.h" +#include "utils/Logger.h" #define ANIMATION_TIME 400 diff --git a/src/libtomahawk/widgets/animatedsplitter.h b/src/libtomahawk/widgets/AnimatedSplitter.h similarity index 100% rename from src/libtomahawk/widgets/animatedsplitter.h rename to src/libtomahawk/widgets/AnimatedSplitter.h diff --git a/src/libtomahawk/widgets/Breadcrumb.cpp b/src/libtomahawk/widgets/Breadcrumb.cpp index fdccebd46..5b9aac4a9 100644 --- a/src/libtomahawk/widgets/Breadcrumb.cpp +++ b/src/libtomahawk/widgets/Breadcrumb.cpp @@ -19,8 +19,8 @@ #include "Breadcrumb.h" #include "BreadcrumbButton.h" -#include "utils/stylehelper.h" -#include "utils/logger.h" +#include "utils/StyleHelper.h" +#include "utils/Logger.h" #include "utils/tomahawkutilsgui.h" #include diff --git a/src/libtomahawk/widgets/BreadcrumbButton.cpp b/src/libtomahawk/widgets/BreadcrumbButton.cpp index 12127538b..cf181f385 100644 --- a/src/libtomahawk/widgets/BreadcrumbButton.cpp +++ b/src/libtomahawk/widgets/BreadcrumbButton.cpp @@ -20,10 +20,10 @@ #include "BreadcrumbButton.h" #include "Breadcrumb.h" -#include "combobox.h" -#include "utils/stylehelper.h" +#include "ComboBox.h" +#include "utils/StyleHelper.h" #include "utils/tomahawkutilsgui.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include #include diff --git a/src/libtomahawk/widgets/ChartDataLoader.h b/src/libtomahawk/widgets/ChartDataLoader.h index b36451ef9..e8afa80bb 100644 --- a/src/libtomahawk/widgets/ChartDataLoader.h +++ b/src/libtomahawk/widgets/ChartDataLoader.h @@ -18,7 +18,7 @@ #ifndef CHARTDATALOADER_H #define CHARTDATALOADER_H -#include "infosystem/infosystem.h" +#include "infosystem/InfoSystem.h" #include "Query.h" #include "Artist.h" #include "Album.h" diff --git a/src/libtomahawk/widgets/checkdirtree.cpp b/src/libtomahawk/widgets/CheckDirTree.cpp similarity index 99% rename from src/libtomahawk/widgets/checkdirtree.cpp rename to src/libtomahawk/widgets/CheckDirTree.cpp index fbcf3e324..6bed37868 100644 --- a/src/libtomahawk/widgets/checkdirtree.cpp +++ b/src/libtomahawk/widgets/CheckDirTree.cpp @@ -17,9 +17,9 @@ * along with Tomahawk. If not, see . */ -#include "checkdirtree.h" +#include "CheckDirTree.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "TomahawkSettings.h" #include diff --git a/src/libtomahawk/widgets/checkdirtree.h b/src/libtomahawk/widgets/CheckDirTree.h similarity index 100% rename from src/libtomahawk/widgets/checkdirtree.h rename to src/libtomahawk/widgets/CheckDirTree.h diff --git a/src/libtomahawk/widgets/combobox.cpp b/src/libtomahawk/widgets/ComboBox.cpp similarity index 97% rename from src/libtomahawk/widgets/combobox.cpp rename to src/libtomahawk/widgets/ComboBox.cpp index 11cb959f5..b63bfa1e8 100644 --- a/src/libtomahawk/widgets/combobox.cpp +++ b/src/libtomahawk/widgets/ComboBox.cpp @@ -16,11 +16,11 @@ * along with Tomahawk. If not, see . */ -#include "combobox.h" +#include "ComboBox.h" -#include "utils/stylehelper.h" +#include "utils/StyleHelper.h" #include "utils/tomahawkutilsgui.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include #include diff --git a/src/libtomahawk/widgets/combobox.h b/src/libtomahawk/widgets/ComboBox.h similarity index 100% rename from src/libtomahawk/widgets/combobox.h rename to src/libtomahawk/widgets/ComboBox.h diff --git a/src/libtomahawk/widgets/elidedlabel.cpp b/src/libtomahawk/widgets/ElidedLabel.cpp similarity index 98% rename from src/libtomahawk/widgets/elidedlabel.cpp rename to src/libtomahawk/widgets/ElidedLabel.cpp index e829f06de..dca256af1 100644 --- a/src/libtomahawk/widgets/elidedlabel.cpp +++ b/src/libtomahawk/widgets/ElidedLabel.cpp @@ -16,7 +16,7 @@ * along with Tomahawk. If not, see . */ -#include "elidedlabel.h" +#include "ElidedLabel.h" #include #include @@ -25,7 +25,7 @@ #include #include -#include "utils/logger.h" +#include "utils/Logger.h" ElidedLabel::ElidedLabel( QWidget* parent, Qt::WindowFlags flags ) diff --git a/src/libtomahawk/widgets/elidedlabel.h b/src/libtomahawk/widgets/ElidedLabel.h similarity index 100% rename from src/libtomahawk/widgets/elidedlabel.h rename to src/libtomahawk/widgets/ElidedLabel.h diff --git a/src/libtomahawk/widgets/FadingPixmap.cpp b/src/libtomahawk/widgets/FadingPixmap.cpp index e6054751b..68ac58581 100644 --- a/src/libtomahawk/widgets/FadingPixmap.cpp +++ b/src/libtomahawk/widgets/FadingPixmap.cpp @@ -19,7 +19,7 @@ #include "FadingPixmap.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include #include diff --git a/src/libtomahawk/widgets/HeaderLabel.cpp b/src/libtomahawk/widgets/HeaderLabel.cpp index 94ce95fe6..ee21d7152 100644 --- a/src/libtomahawk/widgets/HeaderLabel.cpp +++ b/src/libtomahawk/widgets/HeaderLabel.cpp @@ -21,8 +21,8 @@ #include #include -#include "utils/logger.h" -#include "utils/stylehelper.h" +#include "utils/Logger.h" +#include "utils/StyleHelper.h" #include "utils/tomahawkutilsgui.h" diff --git a/src/libtomahawk/widgets/HeaderWidget.cpp b/src/libtomahawk/widgets/HeaderWidget.cpp index fb126db72..c35b86013 100644 --- a/src/libtomahawk/widgets/HeaderWidget.cpp +++ b/src/libtomahawk/widgets/HeaderWidget.cpp @@ -18,7 +18,7 @@ #include "HeaderWidget.h" -#include "utils/stylehelper.h" +#include "utils/StyleHelper.h" #include #include diff --git a/src/libtomahawk/widgets/imagebutton.cpp b/src/libtomahawk/widgets/ImageButton.cpp similarity index 97% rename from src/libtomahawk/widgets/imagebutton.cpp rename to src/libtomahawk/widgets/ImageButton.cpp index 6ae31adbf..e4696bf06 100644 --- a/src/libtomahawk/widgets/imagebutton.cpp +++ b/src/libtomahawk/widgets/ImageButton.cpp @@ -17,7 +17,7 @@ * along with Tomahawk. If not, see . */ -#include "imagebutton.h" +#include "ImageButton.h" #include #include @@ -26,7 +26,7 @@ #include #include -#include "utils/logger.h" +#include "utils/Logger.h" ImageButton::ImageButton( QWidget* parent ) diff --git a/src/libtomahawk/widgets/imagebutton.h b/src/libtomahawk/widgets/ImageButton.h similarity index 100% rename from src/libtomahawk/widgets/imagebutton.h rename to src/libtomahawk/widgets/ImageButton.h diff --git a/src/libtomahawk/widgets/newplaylistwidget.cpp b/src/libtomahawk/widgets/NewPlaylistWidget.cpp similarity index 97% rename from src/libtomahawk/widgets/newplaylistwidget.cpp rename to src/libtomahawk/widgets/NewPlaylistWidget.cpp index 973de8e27..4aa974778 100644 --- a/src/libtomahawk/widgets/newplaylistwidget.cpp +++ b/src/libtomahawk/widgets/NewPlaylistWidget.cpp @@ -16,8 +16,8 @@ * along with Tomahawk. If not, see . */ -#include "newplaylistwidget.h" -#include "ui_newplaylistwidget.h" +#include "NewPlaylistWidget.h" +#include "ui_NewPlaylistWidget.h" #include #include @@ -29,7 +29,7 @@ #include "utils/xspfloader.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" #define FILTER_TIMEOUT 280 diff --git a/src/libtomahawk/widgets/newplaylistwidget.h b/src/libtomahawk/widgets/NewPlaylistWidget.h similarity index 100% rename from src/libtomahawk/widgets/newplaylistwidget.h rename to src/libtomahawk/widgets/NewPlaylistWidget.h diff --git a/src/libtomahawk/widgets/newplaylistwidget.ui b/src/libtomahawk/widgets/NewPlaylistWidget.ui similarity index 100% rename from src/libtomahawk/widgets/newplaylistwidget.ui rename to src/libtomahawk/widgets/NewPlaylistWidget.ui diff --git a/src/libtomahawk/widgets/newreleaseswidget.cpp b/src/libtomahawk/widgets/NewReleasesWidget.cpp similarity index 98% rename from src/libtomahawk/widgets/newreleaseswidget.cpp rename to src/libtomahawk/widgets/NewReleasesWidget.cpp index 50b319650..ce18f7f82 100644 --- a/src/libtomahawk/widgets/newreleaseswidget.cpp +++ b/src/libtomahawk/widgets/NewReleasesWidget.cpp @@ -19,9 +19,9 @@ * along with Tomahawk. If not, see . */ -#include "newreleaseswidget.h" -#include "whatshotwidget_p.h" -#include "ui_newreleaseswidget.h" +#include "NewReleasesWidget.h" +#include "WhatsHotWidget_p.h" +#include "ui_NewReleasesWidget.h" #include #include @@ -33,14 +33,14 @@ #include "RecentPlaylistsModel.h" #include "ChartDataLoader.h" -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" #include "dynamic/GeneratorInterface.h" #include "playlist/PlaylistModel.h" #include "playlist/TreeProxyModel.h" #include "playlist/PlaylistChartItemDelegate.h" #include "widgets/OverlayWidget.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "Pipeline.h" #define HISTORY_TRACK_ITEMS 25 diff --git a/src/libtomahawk/widgets/newreleaseswidget.h b/src/libtomahawk/widgets/NewReleasesWidget.h similarity index 99% rename from src/libtomahawk/widgets/newreleaseswidget.h rename to src/libtomahawk/widgets/NewReleasesWidget.h index 6bf4cb841..88e9f6c3c 100644 --- a/src/libtomahawk/widgets/newreleaseswidget.h +++ b/src/libtomahawk/widgets/NewReleasesWidget.h @@ -27,7 +27,7 @@ #include #include "PlaylistInterface.h" -#include "infosystem/infosystem.h" +#include "infosystem/InfoSystem.h" #include "ViewPage.h" #include "utils/tomahawkutils.h" diff --git a/src/libtomahawk/widgets/newreleaseswidget.ui b/src/libtomahawk/widgets/NewReleasesWidget.ui similarity index 100% rename from src/libtomahawk/widgets/newreleaseswidget.ui rename to src/libtomahawk/widgets/NewReleasesWidget.ui diff --git a/src/libtomahawk/widgets/OverlayButton.cpp b/src/libtomahawk/widgets/OverlayButton.cpp index f2d5c09e8..fc0102bb9 100644 --- a/src/libtomahawk/widgets/OverlayButton.cpp +++ b/src/libtomahawk/widgets/OverlayButton.cpp @@ -23,7 +23,7 @@ #include #include -#include "utils/logger.h" +#include "utils/Logger.h" #define CORNER_ROUNDNESS 8.0 #define FADING_DURATION 500 diff --git a/src/libtomahawk/widgets/OverlayWidget.cpp b/src/libtomahawk/widgets/OverlayWidget.cpp index aba3b3eaa..83e43a2fc 100644 --- a/src/libtomahawk/widgets/OverlayWidget.cpp +++ b/src/libtomahawk/widgets/OverlayWidget.cpp @@ -22,7 +22,7 @@ #include #include -#include "utils/logger.h" +#include "utils/Logger.h" #define CORNER_ROUNDNESS 8.0 #define FADING_DURATION 500 diff --git a/src/libtomahawk/widgets/playlisttypeselectordlg.cpp b/src/libtomahawk/widgets/PlaylistTypeSelectorDialog.cpp similarity index 94% rename from src/libtomahawk/widgets/playlisttypeselectordlg.cpp rename to src/libtomahawk/widgets/PlaylistTypeSelectorDialog.cpp index e5f922c77..0d912dec6 100644 --- a/src/libtomahawk/widgets/playlisttypeselectordlg.cpp +++ b/src/libtomahawk/widgets/PlaylistTypeSelectorDialog.cpp @@ -16,15 +16,15 @@ * along with Tomahawk. If not, see . */ -#include "playlisttypeselectordlg.h" -#include "ui_playlisttypeselectordlg.h" +#include "PlaylistTypeSelectorDialog.h" +#include "ui_PlaylistTypeSelectorDialog.h" -#include "widgets/newplaylistwidget.h" +#include "widgets/NewPlaylistWidget.h" #include "ViewManager.h" #include "ViewPage.h" #include "SourceList.h" -#include "utils/logger.h" +#include "utils/Logger.h" PlaylistTypeSelectorDlg::PlaylistTypeSelectorDlg( QWidget* parent, Qt::WindowFlags f ) diff --git a/src/libtomahawk/widgets/playlisttypeselectordlg.h b/src/libtomahawk/widgets/PlaylistTypeSelectorDialog.h similarity index 100% rename from src/libtomahawk/widgets/playlisttypeselectordlg.h rename to src/libtomahawk/widgets/PlaylistTypeSelectorDialog.h diff --git a/src/libtomahawk/widgets/playlisttypeselectordlg.ui b/src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui similarity index 100% rename from src/libtomahawk/widgets/playlisttypeselectordlg.ui rename to src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui diff --git a/src/libtomahawk/widgets/querylabel.cpp b/src/libtomahawk/widgets/QueryLabel.cpp similarity index 99% rename from src/libtomahawk/widgets/querylabel.cpp rename to src/libtomahawk/widgets/QueryLabel.cpp index f8b80ff09..66d941d3d 100644 --- a/src/libtomahawk/widgets/querylabel.cpp +++ b/src/libtomahawk/widgets/QueryLabel.cpp @@ -16,7 +16,7 @@ * along with Tomahawk. If not, see . */ -#include "querylabel.h" +#include "QueryLabel.h" #include #include @@ -29,7 +29,7 @@ #include "Query.h" #include "ContextMenu.h" #include "utils/tomahawkutilsgui.h" -#include "utils/logger.h" +#include "utils/Logger.h" #define BOXMARGIN 2 #define DASH " - " diff --git a/src/libtomahawk/widgets/querylabel.h b/src/libtomahawk/widgets/QueryLabel.h similarity index 100% rename from src/libtomahawk/widgets/querylabel.h rename to src/libtomahawk/widgets/QueryLabel.h diff --git a/src/libtomahawk/widgets/RecentPlaylistsModel.cpp b/src/libtomahawk/widgets/RecentPlaylistsModel.cpp index 09a9d665f..79fc8d654 100644 --- a/src/libtomahawk/widgets/RecentPlaylistsModel.cpp +++ b/src/libtomahawk/widgets/RecentPlaylistsModel.cpp @@ -20,12 +20,12 @@ #include "RecentPlaylistsModel.h" #include "TomahawkSettings.h" -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" #include "SourceList.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "dynamic/DynamicPlaylist.h" #include "database/Database.h" -#include "database/databasecommand_loadallsortedplaylists.h" +#include "database/DatabaseCommand_LoadAllSortedPlaylists.h" #include "RecentlyPlayedPlaylistsModel.h" #include diff --git a/src/libtomahawk/widgets/RecentPlaylistsModel.h b/src/libtomahawk/widgets/RecentPlaylistsModel.h index e11dd97a4..c55c8ffb5 100644 --- a/src/libtomahawk/widgets/RecentPlaylistsModel.h +++ b/src/libtomahawk/widgets/RecentPlaylistsModel.h @@ -25,7 +25,7 @@ #include "Playlist.h" #include "Source.h" -#include "database/databasecommand_loadallsortedplaylists.h" +#include "database/DatabaseCommand_LoadAllSortedPlaylists.h" class RecentPlaylistsModel : public QAbstractListModel { diff --git a/src/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.cpp b/src/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.cpp index fc458b7e3..af5137c97 100644 --- a/src/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.cpp +++ b/src/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.cpp @@ -21,9 +21,9 @@ #include "RecentlyPlayedPlaylistsModel.h" #include "TomahawkSettings.h" -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" #include "SourceList.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "dynamic/DynamicPlaylist.h" using namespace Tomahawk; diff --git a/src/libtomahawk/widgets/searchwidget.cpp b/src/libtomahawk/widgets/SearchWidget.cpp similarity index 98% rename from src/libtomahawk/widgets/searchwidget.cpp rename to src/libtomahawk/widgets/SearchWidget.cpp index 0dfe5bb8b..01ecb3859 100644 --- a/src/libtomahawk/widgets/searchwidget.cpp +++ b/src/libtomahawk/widgets/SearchWidget.cpp @@ -17,8 +17,8 @@ * along with Tomahawk. If not, see . */ -#include "searchwidget.h" -#include "ui_searchwidget.h" +#include "SearchWidget.h" +#include "ui_SearchWidget.h" #include #include @@ -31,7 +31,7 @@ #include "widgets/OverlayWidget.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" SearchWidget::SearchWidget( const QString& search, QWidget* parent ) diff --git a/src/libtomahawk/widgets/searchwidget.h b/src/libtomahawk/widgets/SearchWidget.h similarity index 100% rename from src/libtomahawk/widgets/searchwidget.h rename to src/libtomahawk/widgets/SearchWidget.h diff --git a/src/libtomahawk/widgets/searchwidget.ui b/src/libtomahawk/widgets/SearchWidget.ui similarity index 100% rename from src/libtomahawk/widgets/searchwidget.ui rename to src/libtomahawk/widgets/SearchWidget.ui diff --git a/src/libtomahawk/widgets/SeekSlider.cpp b/src/libtomahawk/widgets/SeekSlider.cpp index 8d21e8a81..fea1ec901 100644 --- a/src/libtomahawk/widgets/SeekSlider.cpp +++ b/src/libtomahawk/widgets/SeekSlider.cpp @@ -23,7 +23,7 @@ #include #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" SeekSlider::SeekSlider( QWidget* parent ) diff --git a/src/libtomahawk/widgets/SocialPlaylistWidget.cpp b/src/libtomahawk/widgets/SocialPlaylistWidget.cpp index 2cdeaf57d..b646fb106 100644 --- a/src/libtomahawk/widgets/SocialPlaylistWidget.cpp +++ b/src/libtomahawk/widgets/SocialPlaylistWidget.cpp @@ -20,13 +20,13 @@ #include "SocialPlaylistWidget.h" #include "ui_SocialPlaylistWidget.h" -#include "database/databasecommand_loaddynamicplaylist.h" +#include "database/DatabaseCommand_LoadDynamicPlaylist.h" #include "database/Database.h" #include "SourceList.h" #include "dynamic/GeneratorInterface.h" #include "dynamic/database/DatabaseGenerator.h" -#include "utils/logger.h" -#include "database/databasecommand_genericselect.h" +#include "utils/Logger.h" +#include "database/DatabaseCommand_GenericSelect.h" #include "widgets/OverlayWidget.h" using namespace Tomahawk; diff --git a/src/libtomahawk/widgets/SocialPlaylistWidget.ui b/src/libtomahawk/widgets/SocialPlaylistWidget.ui index 83fa005ff..bf1015e98 100644 --- a/src/libtomahawk/widgets/SocialPlaylistWidget.ui +++ b/src/libtomahawk/widgets/SocialPlaylistWidget.ui @@ -99,7 +99,7 @@ PlaylistWidget QListWidget -
widgets/welcomewidget.h
+
widgets/WelcomeWidget.h
 diff --git a/src/libtomahawk/widgets/ToggleButton.cpp b/src/libtomahawk/widgets/ToggleButton.cpp index 858332e2c..ad4aa855a 100644 --- a/src/libtomahawk/widgets/ToggleButton.cpp +++ b/src/libtomahawk/widgets/ToggleButton.cpp @@ -20,7 +20,7 @@ #include "ToggleButton.h" #include "widgets/HeaderLabel.h" -#include "utils/stylehelper.h" +#include "utils/StyleHelper.h" #include #include diff --git a/src/libtomahawk/widgets/welcomewidget.cpp b/src/libtomahawk/widgets/WelcomeWidget.cpp similarity index 98% rename from src/libtomahawk/widgets/welcomewidget.cpp rename to src/libtomahawk/widgets/WelcomeWidget.cpp index b699d9f0e..a98cdd5e8 100644 --- a/src/libtomahawk/widgets/welcomewidget.cpp +++ b/src/libtomahawk/widgets/WelcomeWidget.cpp @@ -18,8 +18,8 @@ * along with Tomahawk. If not, see . */ -#include "welcomewidget.h" -#include "ui_welcomewidget.h" +#include "WelcomeWidget.h" +#include "ui_WelcomeWidget.h" #include @@ -28,12 +28,12 @@ #include "TomahawkSettings.h" #include "RecentPlaylistsModel.h" -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" #include "playlist/AlbumModel.h" #include "playlist/RecentlyPlayedModel.h" #include "widgets/OverlayWidget.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "dynamic/GeneratorInterface.h" #include "RecentlyPlayedPlaylistsModel.h" diff --git a/src/libtomahawk/widgets/welcomewidget.h b/src/libtomahawk/widgets/WelcomeWidget.h similarity index 100% rename from src/libtomahawk/widgets/welcomewidget.h rename to src/libtomahawk/widgets/WelcomeWidget.h diff --git a/src/libtomahawk/widgets/welcomewidget.ui b/src/libtomahawk/widgets/WelcomeWidget.ui similarity index 98% rename from src/libtomahawk/widgets/welcomewidget.ui rename to src/libtomahawk/widgets/WelcomeWidget.ui index 964a28743..a46ad774f 100644 --- a/src/libtomahawk/widgets/welcomewidget.ui +++ b/src/libtomahawk/widgets/WelcomeWidget.ui @@ -106,7 +106,7 @@ PlaylistWidget QListWidget -
widgets/welcomewidget.h
+
widgets/WelcomeWidget.h
 diff --git a/src/libtomahawk/widgets/whatshotwidget.cpp b/src/libtomahawk/widgets/WhatsHotWidget.cpp similarity index 99% rename from src/libtomahawk/widgets/whatshotwidget.cpp rename to src/libtomahawk/widgets/WhatsHotWidget.cpp index 98c73cd9f..216bc77b6 100644 --- a/src/libtomahawk/widgets/whatshotwidget.cpp +++ b/src/libtomahawk/widgets/WhatsHotWidget.cpp @@ -18,9 +18,9 @@ * along with Tomahawk. If not, see . */ -#include "whatshotwidget.h" -#include "whatshotwidget_p.h" -#include "ui_whatshotwidget.h" +#include "WhatsHotWidget.h" +#include "WhatsHotWidget_p.h" +#include "ui_WhatsHotWidget.h" #include #include @@ -32,14 +32,14 @@ #include "RecentPlaylistsModel.h" #include "ChartDataLoader.h" -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" #include "dynamic/GeneratorInterface.h" #include "playlist/PlaylistModel.h" #include "playlist/TreeProxyModel.h" #include "playlist/PlaylistChartItemDelegate.h" #include "widgets/OverlayWidget.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "Pipeline.h" #define HISTORY_TRACK_ITEMS 25 diff --git a/src/libtomahawk/widgets/whatshotwidget.h b/src/libtomahawk/widgets/WhatsHotWidget.h similarity index 99% rename from src/libtomahawk/widgets/whatshotwidget.h rename to src/libtomahawk/widgets/WhatsHotWidget.h index c8b353ab6..1a6b50c92 100644 --- a/src/libtomahawk/widgets/whatshotwidget.h +++ b/src/libtomahawk/widgets/WhatsHotWidget.h @@ -26,7 +26,7 @@ #include #include "PlaylistInterface.h" -#include "infosystem/infosystem.h" +#include "infosystem/InfoSystem.h" #include "ViewPage.h" #include "utils/tomahawkutils.h" diff --git a/src/libtomahawk/widgets/whatshotwidget.ui b/src/libtomahawk/widgets/WhatsHotWidget.ui similarity index 100% rename from src/libtomahawk/widgets/whatshotwidget.ui rename to src/libtomahawk/widgets/WhatsHotWidget.ui diff --git a/src/libtomahawk/widgets/whatshotwidget_p.h b/src/libtomahawk/widgets/WhatsHotWidget_p.h similarity index 98% rename from src/libtomahawk/widgets/whatshotwidget_p.h rename to src/libtomahawk/widgets/WhatsHotWidget_p.h index 35a64cb4c..c72c1fde1 100644 --- a/src/libtomahawk/widgets/whatshotwidget_p.h +++ b/src/libtomahawk/widgets/WhatsHotWidget_p.h @@ -20,9 +20,9 @@ #ifndef WHATSHOTWIDGET_P_H #define WHATSHOTWIDGET_P_H -#include "whatshotwidget.h" +#include "WhatsHotWidget.h" #include "PlaylistInterface.h" -#include "ui_whatshotwidget.h" +#include "ui_WhatsHotWidget.h" #include "TreeProxyModel.h" #include "PlaylistView.h" #include "Result.h" diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp index 41762003f..165ed79b3 100644 --- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp @@ -21,17 +21,17 @@ #include "AlbumInfoWidget.h" #include "ui_AlbumInfoWidget.h" -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" #include "ViewManager.h" #include "database/Database.h" #include "playlist/TreeModel.h" #include "playlist/AlbumModel.h" -#include "database/databasecommand_alltracks.h" -#include "database/databasecommand_allalbums.h" +#include "database/DatabaseCommand_AllTracks.h" +#include "database/DatabaseCommand_AllAlbums.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "widgets/OverlayButton.h" #include "widgets/OverlayWidget.h" diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h index c659873a9..6883e9b16 100644 --- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h +++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h @@ -34,7 +34,7 @@ #include "PlaylistInterface.h" #include "ViewPage.h" -#include "infosystem/infosystem.h" +#include "infosystem/InfoSystem.h" #include "DllMacro.h" #include "Typedefs.h" diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp index 141922d1a..cf99956e7 100644 --- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp @@ -21,18 +21,18 @@ #include "ArtistInfoWidget_p.h" #include "ui_ArtistInfoWidget.h" -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" #include "playlist/TrackHeader.h" #include "playlist/TreeModel.h" #include "playlist/PlaylistModel.h" #include "playlist/TreeProxyModel.h" -#include "database/databasecommand_alltracks.h" -#include "database/databasecommand_allalbums.h" +#include "database/DatabaseCommand_AllTracks.h" +#include "database/DatabaseCommand_AllAlbums.h" -#include "utils/stylehelper.h" +#include "utils/StyleHelper.h" #include "utils/tomahawkutilsgui.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "widgets/OverlayButton.h" #include "widgets/OverlayWidget.h" diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.h b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.h index dfec3b605..a76b177c4 100644 --- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.h +++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.h @@ -35,7 +35,7 @@ #include "Typedefs.h" #include "PlaylistInterface.h" #include "ViewPage.h" -#include "infosystem/infosystem.h" +#include "infosystem/InfoSystem.h" #include "DllMacro.h" diff --git a/src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp b/src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp similarity index 96% rename from src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp rename to src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp index 00a41b927..e99a5767f 100644 --- a/src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp @@ -16,8 +16,8 @@ * along with Tomahawk. If not, see . */ -#include "sourceinfowidget.h" -#include "ui_sourceinfowidget.h" +#include "SourceInfoWidget.h" +#include "ui_SourceInfoWidget.h" #include "Source.h" #include "ViewManager.h" @@ -28,10 +28,10 @@ #include "playlist/RecentlyPlayedModel.h" #include "database/Database.h" -#include "database/databasecommand_allalbums.h" +#include "database/DatabaseCommand_AllAlbums.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "widgets/OverlayWidget.h" diff --git a/src/libtomahawk/widgets/infowidgets/sourceinfowidget.h b/src/libtomahawk/widgets/infowidgets/SourceInfoWidget.h similarity index 100% rename from src/libtomahawk/widgets/infowidgets/sourceinfowidget.h rename to src/libtomahawk/widgets/infowidgets/SourceInfoWidget.h diff --git a/src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui b/src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui similarity index 100% rename from src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui rename to src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui diff --git a/src/mac/macshortcuthandler.cpp b/src/mac/macshortcuthandler.cpp index 441609b40..a302f76ae 100644 --- a/src/mac/macshortcuthandler.cpp +++ b/src/mac/macshortcuthandler.cpp @@ -20,7 +20,7 @@ #include -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/mac/tomahawkapp_mac.mm b/src/mac/tomahawkapp_mac.mm index e7c0925b1..52baa7f80 100644 --- a/src/mac/tomahawkapp_mac.mm +++ b/src/mac/tomahawkapp_mac.mm @@ -22,7 +22,7 @@ #include "macshortcuthandler.h" #include "config.h" #include "TomahawkWindow.h" -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" #import #import @@ -264,7 +264,7 @@ void Tomahawk::enableFullscreen() QSysInfo::MacintoshVersion != QSysInfo::MV_LEOPARD ) { qDebug() << "Enabling Lion Full-screeen"; - // Can't include TomahawkApp.h in a .mm file, pulls in infosystem.h which uses + // Can't include TomahawkApp.h in a .mm file, pulls in InfoSystem.h which uses // the objc keyword 'id' foreach( QWidget* w, QApplication::topLevelWidgets() ) { diff --git a/src/sourcetree/items/categoryitems.cpp b/src/sourcetree/items/categoryitems.cpp index 74f683586..b604a95c1 100644 --- a/src/sourcetree/items/categoryitems.cpp +++ b/src/sourcetree/items/categoryitems.cpp @@ -27,10 +27,10 @@ #include "SourceList.h" #include "sourcetreeview.h" #include "utils/tomahawkutils.h" -#include "widgets/newplaylistwidget.h" -#include "widgets/playlisttypeselectordlg.h" +#include "widgets/NewPlaylistWidget.h" +#include "widgets/PlaylistTypeSelectorDialog.h" #include -#include "utils/logger.h" +#include "utils/Logger.h" #include "DropJob.h" #include diff --git a/src/sourcetree/items/genericpageitems.cpp b/src/sourcetree/items/genericpageitems.cpp index fa91c027a..56760cb0c 100644 --- a/src/sourcetree/items/genericpageitems.cpp +++ b/src/sourcetree/items/genericpageitems.cpp @@ -19,9 +19,9 @@ #include "genericpageitems.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "ViewManager.h" -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" using namespace Tomahawk; diff --git a/src/sourcetree/items/groupitem.cpp b/src/sourcetree/items/groupitem.cpp index 86cd6bf12..b08f2e049 100644 --- a/src/sourcetree/items/groupitem.cpp +++ b/src/sourcetree/items/groupitem.cpp @@ -20,9 +20,9 @@ #include "groupitem.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "ViewManager.h" -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" using namespace Tomahawk; diff --git a/src/sourcetree/items/historyitem.cpp b/src/sourcetree/items/historyitem.cpp index d441199d0..019c307c6 100644 --- a/src/sourcetree/items/historyitem.cpp +++ b/src/sourcetree/items/historyitem.cpp @@ -22,7 +22,7 @@ #include "ViewManager.h" #include "genericpageitems.h" #include "utils/tomahawkutilsgui.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "playlist/CustomPlaylistView.h" #include "temporarypageitem.h" #include "SourceList.h" diff --git a/src/sourcetree/items/playlistitems.cpp b/src/sourcetree/items/playlistitems.cpp index 2c142f3cf..4c68b475a 100644 --- a/src/sourcetree/items/playlistitems.cpp +++ b/src/sourcetree/items/playlistitems.cpp @@ -29,10 +29,10 @@ #include "categoryitems.h" #include "sourceitem.h" #include "utils/tomahawkutils.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "DropJob.h" #include "Source.h" -#include "audio/audioengine.h" +#include "audio/AudioEngine.h" using namespace Tomahawk; diff --git a/src/sourcetree/items/sourceitem.cpp b/src/sourcetree/items/sourceitem.cpp index 322cf0a10..420fec1cf 100644 --- a/src/sourcetree/items/sourceitem.cpp +++ b/src/sourcetree/items/sourceitem.cpp @@ -25,7 +25,7 @@ #include "Playlist.h" #include "genericpageitems.h" #include "utils/tomahawkutilsgui.h" -#include "utils/logger.h" +#include "utils/Logger.h" #include "widgets/SocialPlaylistWidget.h" #include "playlist/CustomPlaylistView.h" #include "playlist/CollectionView.h" diff --git a/src/sourcetree/items/sourcetreeitem.cpp b/src/sourcetree/items/sourcetreeitem.cpp index 644331472..de06b6058 100644 --- a/src/sourcetree/items/sourcetreeitem.cpp +++ b/src/sourcetree/items/sourcetreeitem.cpp @@ -18,7 +18,7 @@ #include "sourcetreeitem.h" -#include "utils/logger.h" +#include "utils/Logger.h" using namespace Tomahawk; diff --git a/src/sourcetree/items/temporarypageitem.cpp b/src/sourcetree/items/temporarypageitem.cpp index d3a334046..eea9e64b1 100644 --- a/src/sourcetree/items/temporarypageitem.cpp +++ b/src/sourcetree/items/temporarypageitem.cpp @@ -20,7 +20,7 @@ #include "ViewManager.h" #include "widgets/infowidgets/AlbumInfoWidget.h" #include "widgets/infowidgets/ArtistInfoWidget.h" -#include "widgets/searchwidget.h" +#include "widgets/SearchWidget.h" using namespace Tomahawk; diff --git a/src/sourcetree/sourcedelegate.cpp b/src/sourcetree/sourcedelegate.cpp index 31ff1eaba..de4c0f0a4 100644 --- a/src/sourcetree/sourcedelegate.cpp +++ b/src/sourcetree/sourcedelegate.cpp @@ -35,7 +35,7 @@ #include #include #include -#include