CamelCase Round 4: Let there be light! (Less than 100 left)

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
 

src/AudioControls.cpp

@@ -24,12 +24,12 @@
 #include <QtGui/QDropEvent>
 #include <QtGui/QMouseEvent>
 
-#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"

src/AudioControls.ui

@@ -570,12 +570,12 @@
   <customwidget>
    <class>ImageButton</class>
    <extends>QPushButton</extends>
-   <header>widgets/imagebutton.h</header>
+   <header>widgets/ImageButton.h</header>
   </customwidget>
   <customwidget>
    <class>QueryLabel</class>
    <extends>QLabel</extends>
-   <header>widgets/querylabel.h</header>
+   <header>widgets/QueryLabel.h</header>
   </customwidget>
   <customwidget>
    <class>FadingPixmap</class>

src/DiagnosticsDialog.cpp

@@ -32,7 +32,7 @@
 #include <QApplication>
 #include <QClipboard>
 
-#include "utils/logger.h"
+#include "utils/Logger.h"
 
 
 DiagnosticsDialog::DiagnosticsDialog( QWidget *parent )

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;
 

src/PipelineStatusView.cpp

@@ -24,7 +24,7 @@
 
 #include "libtomahawk/Pipeline.h"
 
-#include "utils/logger.h"
+#include "utils/Logger.h"
 
 using namespace Tomahawk;
 

src/PipelineStatusView.h

@@ -23,7 +23,7 @@
 #include <QTreeWidget>
 
 #include "Typedefs.h"
-#include "widgets/animatedsplitter.h"
+#include "widgets/AnimatedSplitter.h"
 #include "Query.h"
 
 class StreamConnection;

src/ResolverConfigDelegate.cpp

@@ -25,7 +25,7 @@
 #include <QPainter>
 #include <QMouseEvent>
 
-#include "utils/logger.h"
+#include "utils/Logger.h"
 
 #define PADDING 4
 #define ICONSIZE 24

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;
 

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" );
 

src/Scrobbler.h

@@ -22,7 +22,7 @@
 
 #include "lastfm/ScrobblePoint"
 #include "Result.h"
-#include "infosystem/infosystem.h"
+#include "infosystem/InfoSystem.h"
 
 #include <QObject>
 

src/SettingsDialog.cpp

@@ -50,7 +50,7 @@
 #include "accounts/AccountManager.h"
 #include <accounts/AccountModelFilterProxy.h>
 #include <accounts/ResolverAccount.h>
-#include "utils/logger.h"
+#include "utils/Logger.h"
 #include "AccountFactoryWrapper.h"
 
 #include "ui_ProxyDialog.h"

src/SettingsListDelegate.cpp

@@ -18,7 +18,7 @@
  */
 
 #include "SettingsListDelegate.h"
-#include "utils/logger.h"
+#include "utils/Logger.h"
 
 #include <QPainter>
 #include <QIcon>

src/SocialWidget.cpp

@@ -24,7 +24,7 @@
 #include <QPropertyAnimation>
 
 #include "GlobalActionManager.h"
-#include "utils/logger.h"
+#include "utils/Logger.h"
 
 #define CORNER_ROUNDNESS 8.0
 #define FADING_DURATION 500

src/StackedSettingsDialog.ui

@@ -438,7 +438,7 @@
   <customwidget>
    <class>CheckDirTree</class>
    <extends>QTreeView</extends>
-   <header location="global">widgets/checkdirtree.h</header>
+   <header location="global">widgets/CheckDirTree.h</header>
   </customwidget>
  </customwidgets>
  <resources/>

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"

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 <ActionCollection.h>
 
 

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 <qtsparkle/Updater>
 #endif
 
-#include "utils/logger.h"
+#include "utils/Logger.h"
 #include "jobview/JobStatusModel.h"
 #include "LoadXSPFDialog.h"
 #include <ActionCollection.h>

src/TomahawkWindow.h

@@ -28,7 +28,7 @@
 #include <QStackedWidget>
 
 #include "Result.h"
-#include "audio/audioengine.h"
+#include "audio/AudioEngine.h"
 #include "utils/xspfloader.h"
 
 namespace Tomahawk {

src/UbuntuUnityHack.cpp

@@ -16,7 +16,7 @@
 */
 
 #include "UbuntuUnityHack.h"
-#include "utils/logger.h"
+#include "utils/Logger.h"
 
 #include <QProcess>
 

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"

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 <lastfm/ws.h>

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 <lastfm/Track>
 #include <lastfm/Audioscrobbler>

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"
 

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 <QQueue>
 #include <QVariant>

src/accounts/twitter/TomahawkOAuthTwitter.cpp

@@ -22,7 +22,7 @@
 
 #include <QtGui/QInputDialog>
 
-#include "utils/logger.h"
+#include "utils/Logger.h"
 
 
 TomahawkOAuthTwitter::TomahawkOAuthTwitter( QNetworkAccessManager *nam, QObject* parent )

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"
 

src/accounts/twitter/TwitterConfigWidget.cpp

@@ -32,7 +32,7 @@
 
 #include <QMessageBox>
 
-#include "utils/logger.h"
+#include "utils/Logger.h"
 
 namespace Tomahawk
 {

src/accounts/twitter/TwitterInfoPlugin.cpp

@@ -26,7 +26,7 @@
 #include <QTweetLib/qtweetstatusupdate.h>
 
 #include "GlobalActionManager.h"
-#include "utils/logger.h"
+#include "utils/Logger.h"
 
 namespace Tomahawk
 {

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 <QTweetLib/qtweetuser.h>

src/accounts/twitter/sip/TwitterSip.cpp

@@ -38,7 +38,7 @@
 #include <database/Database.h>
 #include <network/Servent.h>
 
-#include "utils/logger.h"
+#include "utils/Logger.h"
 #include "accounts/twitter/TomahawkOAuthTwitter.h"
 #include <accounts/twitter/TwitterAccount.h>
 

src/accounts/xmpp/XmppConfigWidget.cpp

@@ -24,7 +24,7 @@
 #include <QMessageBox>
 
 #include <accounts/AccountManager.h>
-#include <utils/logger.h>
+#include <utils/Logger.h>
 
 namespace Tomahawk
 {

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

src/accounts/xmpp/XmppInfoPlugin.h

@@ -20,7 +20,7 @@
 #ifndef XMPPINFOPLUGIN_H
 #define XMPPINFOPLUGIN_H
 
-#include "infosystem/infosystem.h"
+#include "infosystem/InfoSystem.h"
 
 #include <QTimer>
 

src/accounts/xmpp/sip/AvatarManager.cpp

@@ -30,7 +30,7 @@
 #include <QCryptographicHash>
 #include <QPixmap>
 
-#include "utils/logger.h"
+#include "utils/Logger.h"
 
 
 AvatarManager::AvatarManager(Jreen::Client *client) :

src/accounts/xmpp/sip/TomahawkXmppMessage.cpp

@@ -19,7 +19,7 @@
 
 #include "TomahawkXmppMessage.h"
 
-#include "utils/logger.h"
+#include "utils/Logger.h"
 
 
 class TomahawkXmppMessagePrivate

src/accounts/xmpp/sip/TomahawkXmppMessageFactory.cpp

@@ -23,7 +23,7 @@
 #include <QXmlStreamWriter>
 #include <QVariant>
 
-#include "utils/logger.h"
+#include "utils/Logger.h"
 
 using namespace Jreen;
 

src/accounts/xmpp/sip/XmlConsole.cpp

@@ -29,7 +29,7 @@
 #include <QFileDialog>
 #include <QTextDocumentWriter>
 
-#include "utils/logger.h"
+#include "utils/Logger.h"
 
 using namespace Jreen;
 

src/accounts/xmpp/sip/XmppSip.cpp

@@ -46,7 +46,7 @@
 #include <QtCore/QTimer>
 
 #include <utils/tomahawkutils.h>
-#include <utils/logger.h>
+#include <utils/Logger.h>
 #include <accounts/AccountManager.h>
 
 #ifndef ENABLE_HEADLESS
@@ -56,14 +56,14 @@
 #endif
 
 #include <utils/tomahawkutilsgui.h>
-#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)

src/accounts/zeroconf/Zeroconf.cpp

@@ -24,7 +24,7 @@
 #include <QtCore/QTimer>
 
 #include "TomahawkSettings.h"
-#include "utils/logger.h"
+#include "utils/Logger.h"
 #include "ZeroconfAccount.h"
 
 using namespace Tomahawk;

src/breakpad/BreakPad.cpp

@@ -19,7 +19,7 @@
 #include "BreakPad.h"
 
 #include "config.h"
-#include "utils/logger.h"
+#include "utils/Logger.h"
 
 #include <QCoreApplication>
 #include <QString>

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"

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;

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;
 

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
 {

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;
 

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;
 

src/libtomahawk/Artist.h

@@ -30,7 +30,7 @@
 
 #include "Typedefs.h"
 #include "DllMacro.h"
-#include "infosystem/infosystem.h"
+#include "infosystem/InfoSystem.h"
 
 namespace Tomahawk
 {

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;
 

src/libtomahawk/AtticaManager.cpp

@@ -31,7 +31,7 @@
 #include <QDir>
 #include <QTimer>
 
-#include "utils/logger.h"
+#include "utils/Logger.h"
 #include "accounts/ResolverAccount.h"
 #include "accounts/AccountManager.h"
 

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 )
 

src/libtomahawk/Collection.cpp

@@ -24,7 +24,7 @@
 
 #include "Source.h"
 
-#include "utils/logger.h"
+#include "utils/Logger.h"
 #include <PlaylistUpdaterInterface.h>
 
 using namespace Tomahawk;

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;
 

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
 
 

src/libtomahawk/DropJob.h

@@ -22,7 +22,7 @@
 
 #include "Query.h"
 
-#include "infosystem/infosystem.h"
+#include "infosystem/InfoSystem.h"
 #include "utils/xspfloader.h"
 
 #include <QObject>

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"

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 <echonest/Catalog.h>
 

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

src/libtomahawk/ExternalResolverGui.cpp

@@ -26,7 +26,7 @@
 #include <QtGui/QIcon>
 #include <QtGui/QWidget>
 #include <QUiLoader>
-#include "utils/logger.h"
+#include "utils/Logger.h"
 
 Tomahawk::ExternalResolverGui::ExternalResolverGui(const QString& filePath)
     : Tomahawk::ExternalResolver(filePath)

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"

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 <QtGui/QAction>
 #include "SourceList.h"
-#include "database/databasecommand_socialaction.h"
+#include "database/DatabaseCommand_SocialAction.h"
 #include "SourcePlaylistInterface.h"
 
 using namespace Tomahawk;

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"
 

src/libtomahawk/Playlist.cpp

@@ -24,11 +24,11 @@
 #include <QtXml/QDomElement>
 
 #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;

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;

src/libtomahawk/PlaylistInterface.h

@@ -24,7 +24,7 @@
 
 #include "Typedefs.h"
 #include "DllMacro.h"
-#include "utils/logger.h"
+#include "utils/Logger.h"
 
 namespace Tomahawk
 {

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;
 

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;
 

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;
 

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 <QCoreApplication>
 
-#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;
 

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;
 

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;
 

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;

src/libtomahawk/ViewManager.cpp

@@ -22,9 +22,9 @@
 #include <QVBoxLayout>
 #include <QMetaMethod>
 
-#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
 

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"
 

src/libtomahawk/ViewPage.cpp

@@ -18,7 +18,7 @@
 
 #include "ViewPage.h"
 
-#include "utils/logger.h"
+#include "utils/Logger.h"
 
 using namespace Tomahawk;
 

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;
 

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"
 

src/libtomahawk/audio/AudioEngine.cpp

@@ -17,7 +17,7 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#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;

src/libtomahawk/audio/AudioEngine.h

@@ -27,7 +27,7 @@
 #include <phonon/AudioOutput>
 #include <phonon/BackendCapabilities>
 
-#include "libtomahawk/infosystem/infosystem.h"
+#include "libtomahawk/infosystem/InfoSystem.h"
 
 #include "Result.h"
 #include "Typedefs.h"

src/libtomahawk/context/ContextPage.cpp

@@ -21,7 +21,7 @@
 #include <QGraphicsLinearLayout>
 
 #include "PlaylistInterface.h"
-#include "utils/stylehelper.h"
+#include "utils/StyleHelper.h"
 
 using namespace Tomahawk;
 

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

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;

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;

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

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;
 

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 )

src/libtomahawk/database/DatabaseCommandLoggable.cpp

@@ -18,4 +18,4 @@
 
 #include "DatabaseCommandLoggable.h"
 
-#include "utils/logger.h"
+#include "utils/Logger.h"

src/libtomahawk/database/DatabaseCommand_AddClientAuth.cpp

@@ -16,11 +16,11 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#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,

src/libtomahawk/database/DatabaseCommand_AddFiles.cpp

@@ -16,7 +16,7 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "databasecommand_addfiles.h"
+#include "DatabaseCommand_AddFiles.h"
 
 #include <QSqlQuery>
 
@@ -29,7 +29,7 @@
 #include "network/Servent.h"
 #include "SourceList.h"
 
-#include "utils/logger.h"
+#include "utils/Logger.h"
 
 using namespace Tomahawk;
 

src/libtomahawk/database/DatabaseCommand_AddSource.cpp

@@ -16,12 +16,12 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "databasecommand_addsource.h"
+#include "DatabaseCommand_AddSource.h"
 
 #include <QSqlQuery>
 
 #include "DatabaseImpl.h"
-#include "utils/logger.h"
+#include "utils/Logger.h"
 
 
 DatabaseCommand_addSource::DatabaseCommand_addSource( const QString& username, const QString& fname, QObject* parent )

src/libtomahawk/database/DatabaseCommand_AllAlbums.cpp

@@ -16,7 +16,7 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "databasecommand_allalbums.h"
+#include "DatabaseCommand_AllAlbums.h"
 
 #include <QSqlQuery>
 
@@ -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 )

src/libtomahawk/database/DatabaseCommand_AllArtists.cpp

@@ -16,7 +16,7 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "databasecommand_allartists.h"
+#include "DatabaseCommand_AllArtists.h"
 
 #include <QSqlQuery>
 
@@ -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 )

src/libtomahawk/database/DatabaseCommand_AllTracks.cpp

@@ -17,7 +17,7 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "databasecommand_alltracks.h"
+#include "DatabaseCommand_AllTracks.h"
 
 #include <QSqlQuery>
 
@@ -25,7 +25,7 @@
 #include "Artist.h"
 #include "Album.h"
 #include "SourceList.h"
-#include "utils/logger.h"
+#include "utils/Logger.h"
 
 
 void

src/libtomahawk/database/DatabaseCommand_ClientAuthValid.cpp

@@ -16,11 +16,11 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#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 )