AND WE'RE DONE! CAMELCASE FTW!!1!1!

src/AccountDelegate.cpp

@@ -25,7 +25,7 @@
 #include "accounts/AccountModel.h"
 #include "accounts/Account.h"
 
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
 #define CHILD_ACCOUNT_HEIGHT 24

src/AccountFactoryWrapper.cpp

@@ -20,7 +20,7 @@
 
 #include "accounts/Account.h"
 #include "accounts/AccountManager.h"
-#include "guihelpers.h"
+#include "GuiHelpers.h"
 #include "AccountFactoryWrapperDelegate.h"
 #include "DelegateConfigWrapper.h"
 #include "ui_AccountFactoryWrapper.h"

src/AccountFactoryWrapperDelegate.cpp

@@ -19,7 +19,7 @@
 #include "AccountFactoryWrapperDelegate.h"
 #include "accounts/Account.h"
 #include "AccountFactoryWrapper.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 
 #include <QApplication>
 #include <QPainter>

src/AudioControls.cpp

@@ -28,7 +28,7 @@
 #include "playlist/PlaylistView.h"
 #include "database/Database.h"
 #include "widgets/ImageButton.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 #include "Album.h"
 #include "DropJob.h"

src/CMakeLists.txt

@@ -37,7 +37,7 @@ ENDIF()
 #ENDFOREACH( moddir )
 
 SET( tomahawkSources ${tomahawkSources}
-     web/api_v1.cpp
+     web/Api_v1.cpp
 
      MusicScanner.cpp
      ShortcutHandler.cpp
@@ -54,21 +54,21 @@ IF(LIBLASTFM_FOUND)
 ENDIF(LIBLASTFM_FOUND)
 
 SET( tomahawkSourcesGui ${tomahawkSourcesGui}
-     sourcetree/sourcesmodel.cpp
+     sourcetree/SourcesModel.cpp
-     sourcetree/sourcesproxymodel.cpp
+     sourcetree/SourcesProxyModel.cpp
-     sourcetree/sourcetreeview.cpp
+     sourcetree/SourceTreeView.cpp
-     sourcetree/sourcedelegate.cpp
+     sourcetree/SourceDelegate.cpp
-     sourcetree/animationhelper.cpp
+     sourcetree/AnimationHelper.cpp
-     sourcetree/items/sourcetreeitem.cpp
+     sourcetree/items/SourceTreeItem.cpp
-     sourcetree/items/sourceitem.cpp
+     sourcetree/items/SourceItem.cpp
-     sourcetree/items/playlistitems.cpp
+     sourcetree/items/PlaylistItems.cpp
-     sourcetree/items/categoryitems.cpp
+     sourcetree/items/CategoryItems.cpp
-     sourcetree/items/genericpageitems.cpp
+     sourcetree/items/GenericPageItems.cpp
-     sourcetree/items/temporarypageitem.cpp
+     sourcetree/items/TemporaryPageItem.cpp
-     sourcetree/items/groupitem.cpp
+     sourcetree/items/GroupItem.cpp
-     sourcetree/items/historyitem.cpp
+     sourcetree/items/HistoryItem.cpp
 
-     utils/guihelpers.cpp
+     utils/GuiHelpers.cpp
 
      accounts/lastfm/LastFmAccount.cpp
      accounts/lastfm/LastFmConfig.cpp
@@ -151,12 +151,12 @@ ENDIF( UNIX )
 IF( APPLE )
     INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/thirdparty/SPMediaKeyTap )
 
-    SET( tomahawkSources ${tomahawkSources} mac/tomahawkapp_mac.mm mac/macshortcuthandler.cpp )
+    SET( tomahawkSources ${tomahawkSources} mac/TomahawkApp_Mac.mm mac/MacShortcutHandler.cpp )
 ENDIF( APPLE )
 
 IF(GLOOX_FOUND)
   INCLUDE_DIRECTORIES( ${GLOOX_INCLUDE_DIR} )
-  SET( tomahawkSources ${tomahawkSources} xmppbot/xmppbot.cpp )
+  SET( tomahawkSources ${tomahawkSources} xmppbot/XmppBot.cpp )
 ENDIF(GLOOX_FOUND)
 
 ADD_SUBDIRECTORY( accounts )

src/MusicScanner.cpp

@@ -21,7 +21,7 @@
 
 #include <QtCore/QCoreApplication>
 
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "TomahawkSettings.h"
 #include "SourceList.h"
 #include "database/Database.h"

src/ScanManager.cpp

@@ -25,7 +25,7 @@
 
 #include "MusicScanner.h"
 #include "TomahawkSettings.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "libtomahawk/SourceList.h"
 
 #include "database/Database.h"

src/SettingsDialog.cpp

@@ -37,8 +37,8 @@
 #include "Pipeline.h"
 #include "Resolver.h"
 #include "ExternalResolverGui.h"
-#include "utils/tomahawkutilsgui.h"
+#include "utils/TomahawkUtilsGui.h"
-#include "guihelpers.h"
+#include "GuiHelpers.h"
 #include "ScanManager.h"
 #include "SettingsListDelegate.h"
 #include "AccountDelegate.h"

src/TomahawkApp.cpp

@@ -46,7 +46,7 @@
 #include "playlist/dynamic/database/DatabaseGenerator.h"
 #include "playlist/XspfUpdater.h"
 #include "network/Servent.h"
-#include "web/api_v1.h"
+#include "web/Api_v1.h"
 #include "SourceList.h"
 #include "ShortcutHandler.h"
 #include "ScanManager.h"
@@ -59,14 +59,14 @@
 #include "EchonestCatalogSynchronizer.h"
 
 #include "audio/AudioEngine.h"
-#include "utils/xspfloader.h"
+#include "utils/XspfLoader.h"
 #include "utils/JspfLoader.h"
 #include "utils/Logger.h"
-#include "utils/tomahawkutilsgui.h"
+#include "utils/TomahawkUtilsGui.h"
 #include "accounts/lastfm/LastFmAccount.h"
 #include "accounts/spotify/SpotifyAccount.h"
 #include "accounts/spotify/SpotifyPlaylistUpdater.h"
-#include "utils/tomahawkcache.h"
+#include "utils/TomahawkCache.h"
 
 #include "config.h"
 
@@ -85,11 +85,11 @@
 
 // should go to a plugin actually
 #ifdef GLOOX_FOUND
-    #include "xmppbot/xmppbot.h"
+    #include "xmppbot/XmppBot.h"
 #endif
 
 #ifdef Q_WS_MAC
-#include "mac/macshortcuthandler.h"
+#include "mac/MacShortcutHandler.h"
 
 #include <sys/resource.h>
 #include <sys/sysctl.h>

src/TomahawkApp.h

@@ -35,9 +35,9 @@
 #include "QxtHttpServerConnector"
 #include "QxtHttpSessionManager"
 
-#include "mac/tomahawkapp_mac.h" // for PlatforInterface
+#include "mac/TomahawkApp_Mac.h" // for PlatforInterface
 #include "Typedefs.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h"
 
 class AudioEngine;

src/TomahawkWindow.cpp

@@ -40,7 +40,7 @@
 #include "Artist.h"
 #include "ViewManager.h"
 #include "accounts/AccountManager.h"
-#include "sourcetree/sourcetreeview.h"
+#include "sourcetree/SourceTreeView.h"
 #include "network/Servent.h"
 #include "utils/ProxyStyle.h"
 #include "widgets/AnimatedSplitter.h"

src/TomahawkWindow.h

@@ -29,7 +29,7 @@
 
 #include "Result.h"
 #include "audio/AudioEngine.h"
-#include "utils/xspfloader.h"
+#include "utils/XspfLoader.h"
 
 namespace Tomahawk {
 namespace Accounts {

src/accounts/lastfm/LastFmAccount.cpp

@@ -21,7 +21,7 @@
 
 #include "infosystem/InfoSystem.h"
 #include "LastFmPlugin.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "resolvers/QtScriptResolver.h"
 #include "AtticaManager.h"
 #include "Pipeline.h"

src/accounts/lastfm/LastFmConfig.cpp

@@ -19,7 +19,7 @@
 #include "LastFmConfig.h"
 
 #include "LastFmAccount.h"
-#include <utils/tomahawkutils.h>
+#include <utils/TomahawkUtils.h>
 #include "ui_LastFmConfig.h"
 #include "lastfm/ws.h"
 #include "lastfm/XmlQuery"

src/accounts/lastfm/LastFmPlugin.cpp

@@ -26,7 +26,7 @@
 #include "Album.h"
 #include "Typedefs.h"
 #include "audio/AudioEngine.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 #include "accounts/lastfm/LastFmAccount.h"
 

src/accounts/spotify/SpotifyAccount.cpp

@@ -24,7 +24,7 @@
 #include "SpotifyAccountConfig.h"
 #include "SpotifyPlaylistUpdater.h"
 #include "resolvers/ScriptResolver.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "ActionCollection.h"
 
 #ifndef ENABLE_HEADLESS

src/accounts/spotify/SpotifyAccount.h

@@ -23,7 +23,7 @@
 #include "accounts/ResolverAccount.h"
 #include "SourceList.h"
 #include "Playlist.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/SmartPointerList.h"
 
 class QAction;

src/accounts/spotify/SpotifyPlaylistUpdater.cpp

@@ -20,7 +20,7 @@
 
 #include "accounts/AccountManager.h"
 #include "SpotifyAccount.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 
 #include <QMessageBox>
 

src/accounts/twitter/TomahawkOAuthTwitter.h

@@ -21,7 +21,7 @@
 #define TOMAHAWKOAUTHTWITTERACCOUNT
 
 #include "accounts/AccountDllMacro.h"
-#include <utils/tomahawkutils.h>
+#include <utils/TomahawkUtils.h>
 
 #include <QTweetLib/qtweetlib_global.h>
 #include <QTweetLib/oauthtwitter.h>

src/accounts/twitter/TwitterConfigWidget.cpp

@@ -22,7 +22,7 @@
 #include "ui_TwitterConfigWidget.h"
 
 #include "TomahawkSettings.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "database/Database.h"
 
 #include "TomahawkOAuthTwitter.h"

src/accounts/twitter/sip/TwitterSip.cpp

@@ -33,7 +33,7 @@
 #include <QTweetLib/qtweetstatus.h>
 #include <QTweetLib/qtweetusershow.h>
 
-#include <utils/tomahawkutils.h>
+#include <utils/TomahawkUtils.h>
 #include <TomahawkSettings.h>
 #include <database/Database.h>
 #include <network/Servent.h>

src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp

@@ -22,7 +22,7 @@
 #include "XmppConfigWidget.h"
 #include "ui_XmppConfigWidget.h"
 
-#include "utils/tomahawkutilsgui.h"
+#include "utils/TomahawkUtilsGui.h"
 
 #include <QtPlugin>
 #include <QInputDialog>

src/accounts/xmpp/sip/AvatarManager.cpp

@@ -19,7 +19,7 @@
 
 #include "AvatarManager.h"
 
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 
 #include <jreen/vcard.h>
 #include <jreen/vcardupdate.h>

src/accounts/xmpp/sip/XmppSip.cpp

@@ -45,7 +45,7 @@
 #include <QtCore/QDateTime>
 #include <QtCore/QTimer>
 
-#include <utils/tomahawkutils.h>
+#include <utils/TomahawkUtils.h>
 #include <utils/Logger.h>
 #include <accounts/AccountManager.h>
 
@@ -55,7 +55,7 @@
     #include <QtGui/QMessageBox>
 #endif
 
-#include <utils/tomahawkutilsgui.h>
+#include <utils/TomahawkUtilsGui.h>
 #include "utils/Logger.h"
 #include "XmppInfoPlugin.h"
 

src/breakpad/CrashReporter/CrashReporter.cpp

@@ -25,7 +25,7 @@
 #include <QDateTime>
 #include <QHttp>
 
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 
 #define LOGFILE TomahawkUtils::appLogDir().filePath( "Tomahawk.log" ).toLocal8Bit()
 #define RESPATH ":/data/"

src/libtomahawk/ActionCollection.cpp

@@ -21,7 +21,7 @@
 #include "ActionCollection.h"
 #include "TomahawkSettings.h"
 #include "audio/AudioEngine.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 
 ActionCollection* ActionCollection::s_instance = 0;
 ActionCollection* ActionCollection::instance()

src/libtomahawk/AtticaManager.cpp

@@ -18,7 +18,7 @@
 
 #include "AtticaManager.h"
 
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "TomahawkSettingsGui.h"
 #include "Pipeline.h"
 

src/libtomahawk/CMakeLists.txt

@@ -108,8 +108,8 @@ set( libGuiSources
     resolvers/ScriptResolver.cpp
     resolvers/QtScriptResolver.cpp
 
-    utils/widgetdragfilter.cpp
+    utils/WidgetDragFilter.cpp
-    utils/xspfgenerator.cpp
+    utils/XspfGenerator.cpp
     utils/JspfLoader.cpp
     utils/SpotifyParser.cpp
     utils/M3uLoader.cpp
@@ -119,7 +119,7 @@ set( libGuiSources
     utils/StyleHelper.cpp
     utils/DropJobNotifier.cpp
     utils/ProxyStyle.cpp
-    utils/tomahawkutilsgui.cpp
+    utils/TomahawkUtilsGui.cpp
     utils/Closure.cpp
     utils/PixmapDelegateFader.cpp
     utils/SmartPointerList.h
@@ -289,11 +289,11 @@ set( libSources
     taghandlers/mp4tag.cpp
     taghandlers/oggtag.cpp
 
-    utils/tomahawkutils.cpp
+    utils/TomahawkUtils.cpp
     utils/Logger.cpp
     utils/Qnr_IoDeviceStream.cpp
-    utils/xspfloader.cpp
+    utils/XspfLoader.cpp
-    utils/tomahawkcache.cpp
+    utils/TomahawkCache.cpp
 
     thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.cpp
     thirdparty/kdsingleapplicationguard/kdsharedmemorylocker.cpp
@@ -390,10 +390,10 @@ IF( APPLE )
     SET( libSources ${libSources}
       infosystem/infoplugins/mac/Adium.mm
       infosystem/infoplugins/mac/AdiumPlugin.cpp
-      utils/tomahawkutils_mac.mm
+      utils/TomahawkUtils_Mac.mm
       thirdparty/Qocoa/qsearchfield_mac.mm )
 
-    SET_SOURCE_FILES_PROPERTIES(utils/tomahawkutils_mac.mm PROPERTIES COMPILE_FLAGS "-fvisibility=default")
+    SET_SOURCE_FILES_PROPERTIES(utils/TomahawkUtils_Mac.mm PROPERTIES COMPILE_FLAGS "-fvisibility=default")
 
     SET( OS_SPECIFIC_LINK_LIBRARIES
         ${OS_SPECIFIC_LINK_LIBRARIES}

src/libtomahawk/DropJob.cpp

@@ -30,10 +30,10 @@
 #include "utils/M3uLoader.h"
 #include "utils/ShortenedLinkParser.h"
 #include "utils/Logger.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "GlobalActionManager.h"
 #include "infosystem/InfoSystem.h"
-#include "utils/xspfloader.h"
+#include "utils/XspfLoader.h"
 #include "jobview/JobStatusView.h"
 #include "jobview/JobStatusModel.h"
 #include "jobview/ErrorStatusMessage.h"

src/libtomahawk/DropJob.h

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

src/libtomahawk/GlobalActionManager.cpp

@@ -31,10 +31,10 @@
 
 #include "echonest/Playlist.h"
 
-#include "utils/xspfloader.h"
+#include "utils/XspfLoader.h"
-#include "utils/xspfgenerator.h"
+#include "utils/XspfGenerator.h"
 #include "utils/Logger.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 
 #include "utils/JspfLoader.h"
 #include "utils/SpotifyParser.h"

src/libtomahawk/Source.cpp

@@ -33,7 +33,7 @@
 #include <QCoreApplication>
 
 #include "utils/Logger.h"
-#include "utils/tomahawkutilsgui.h"
+#include "utils/TomahawkUtilsGui.h"
 #include "database/DatabaseCommand_SocialAction.h"
 
 using namespace Tomahawk;

src/libtomahawk/TomahawkSettings.cpp

@@ -26,7 +26,7 @@
 #include "PlaylistInterface.h"
 
 #include "utils/Logger.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 
 #include "database/DatabaseCommand_UpdateSearchIndex.h"
 #include "database/Database.h"

src/libtomahawk/ViewPage.h

@@ -24,7 +24,7 @@
 #include "PlaylistInterface.h"
 #include "Artist.h"
 #include "Album.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 
 #include <QtGui/QPixmap>
 

src/libtomahawk/context/ContextPage.h

@@ -25,7 +25,7 @@
 #include <QStyleOptionGraphicsItem>
 
 #include "Typedefs.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 
 #include "DllMacro.h"
 #include <signal.h>

src/libtomahawk/context/ContextWidget.cpp

@@ -33,7 +33,7 @@
 #include "playlist/TreeModel.h"
 
 #include "utils/StyleHelper.h"
-#include "utils/tomahawkutilsgui.h"
+#include "utils/TomahawkUtilsGui.h"
 
 #define ANIMATION_TIME 450
 #define SLIDE_TIME 350

src/libtomahawk/database/DatabaseCommand_AllAlbums.cpp

@@ -23,7 +23,7 @@
 #include "Artist.h"
 #include "DatabaseImpl.h"
 #include "Source.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
 

src/libtomahawk/database/DatabaseCommand_AllArtists.cpp

@@ -23,7 +23,7 @@
 #include "Artist.h"
 #include "DatabaseImpl.h"
 #include "Source.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
 DatabaseCommand_AllArtists::DatabaseCommand_AllArtists( const Tomahawk::collection_ptr &collection, QObject *parent )

src/libtomahawk/database/DatabaseCommand_DeleteFiles.cpp

@@ -29,7 +29,7 @@
 #include "database/DatabaseImpl.h"
 #include "network/Servent.h"
 #include "utils/Logger.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 
 using namespace Tomahawk;
 

src/libtomahawk/database/DatabaseImpl.cpp

@@ -32,7 +32,7 @@
 #include "Result.h"
 #include "Artist.h"
 #include "Album.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
 /* !!!! You need to manually generate Schema.sql.h when the schema changes:

src/libtomahawk/database/FuzzyIndex.cpp

@@ -25,7 +25,7 @@
 #include <CLucene/queryParser/MultiFieldQueryParser.h>
 
 #include "DatabaseImpl.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
 using namespace lucene::analysis;

src/libtomahawk/infobar/InfoBar.cpp

@@ -24,7 +24,7 @@
 
 #include "ViewManager.h"
 #include "thirdparty/Qocoa/qsearchfield.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 #include <QCheckBox>
 #include <QPaintEvent>

src/libtomahawk/infosystem/InfoSystem.cpp

@@ -24,7 +24,7 @@
 #include "TomahawkSettings.h"
 #include "InfoSystemCache.h"
 #include "InfoSystemWorker.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
 namespace Tomahawk

src/libtomahawk/infosystem/InfoSystem.h

@@ -33,7 +33,7 @@
 #include <QtCore/QStringList>
 
 #include "DllMacro.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 
 class QNetworkAccessManager;
 

src/libtomahawk/infosystem/InfoSystemWorker.cpp

@@ -33,7 +33,7 @@
 #include "infoplugins/generic/musicbrainzPlugin.h"
 #include "infoplugins/generic/hypemPlugin.h"
 #include "GlobalActionManager.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
 #ifdef Q_WS_MAC

src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin.cpp

@@ -31,9 +31,9 @@
 #include "Typedefs.h"
 #include "audio/AudioEngine.h"
 #include "TomahawkSettings.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
-#include "utils/tomahawkcache.h"
+#include "utils/TomahawkCache.h"
 
 #define CHART_URL "http://charts.tomahawk-player.org/"
 //#define CHART_URL "http://localhost:8080/"

src/libtomahawk/infosystem/infoplugins/generic/EchonestPlugin.cpp

@@ -21,7 +21,7 @@
 #include <echonest/Artist.h>
 #include <echonest/ArtistTypes.h>
 
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
 #include <QNetworkConfiguration>

src/libtomahawk/infosystem/infoplugins/generic/MusixMatchPlugin.cpp

@@ -22,7 +22,7 @@
 #include <QNetworkReply>
 #include <QDomDocument>
 
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
 using namespace Tomahawk::InfoSystem;

src/libtomahawk/infosystem/infoplugins/generic/NewReleasesPlugin.cpp

@@ -10,9 +10,9 @@
 #include "Typedefs.h"
 #include "audio/AudioEngine.h"
 #include "TomahawkSettings.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
-#include "utils/tomahawkcache.h"
+#include "utils/TomahawkCache.h"
 
 #include <qjson/parser.h>
 #include <qjson/serializer.h>

src/libtomahawk/infosystem/infoplugins/generic/hypemPlugin.cpp

@@ -28,7 +28,7 @@
 #include "Album.h"
 #include "Typedefs.h"
 #include "TomahawkSettings.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
 #define HYPEM_URL "http://hypem.com/playlist/"

src/libtomahawk/infosystem/infoplugins/generic/musicbrainzPlugin.cpp

@@ -22,7 +22,7 @@
 #include <QNetworkReply>
 #include <QDomDocument>
 
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
 using namespace Tomahawk::InfoSystem;

src/libtomahawk/infosystem/infoplugins/generic/spotifyPlugin.cpp

@@ -29,7 +29,7 @@
 #include "Typedefs.h"
 #include "audio/AudioEngine.h"
 #include "TomahawkSettings.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 #include "ChartsPlugin_Data_p.h"
 

src/libtomahawk/infosystem/infoplugins/unix/FdoNotifyPlugin.cpp

@@ -38,7 +38,7 @@
  */
 
 #include "FdoNotifyPlugin.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "ImageConverter.h"
 
 #include <QtDBus/QDBusConnection>

src/libtomahawk/infosystem/infoplugins/unix/MprisPlugin.cpp

@@ -29,7 +29,7 @@
 #include "TomahawkSettings.h"
 #include "GlobalActionManager.h"
 #include "utils/Logger.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 
 #include "MprisPlugin.h"
 #include "MprisPluginRootAdaptor.h"

src/libtomahawk/jobview/AclJobItem.cpp

@@ -19,7 +19,7 @@
 
 #include "AclJobItem.h"
 
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 
 #include <QPixmap>
 #include <QListView>

src/libtomahawk/jobview/ErrorStatusMessage.cpp

@@ -18,7 +18,7 @@
 
 #include "ErrorStatusMessage.h"
 
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 
 #include <QTimer>
 

src/libtomahawk/jobview/IndexingJobItem.cpp

@@ -18,7 +18,7 @@
 
 #include "IndexingJobItem.h"
 
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 
 #include <QPixmap>
 

src/libtomahawk/jobview/LatchedStatusItem.cpp

@@ -22,7 +22,7 @@
 #include "SourceList.h"
 #include "JobStatusView.h"
 #include "JobStatusModel.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 
 LatchedStatusItem::LatchedStatusItem( const Tomahawk::source_ptr& from, const Tomahawk::source_ptr& to, LatchedStatusManager* parent )
     : JobStatusItem()

src/libtomahawk/jobview/PipelineStatusItem.cpp

@@ -20,7 +20,7 @@
 
 #include "PipelineStatusItem.h"
 
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "Pipeline.h"
 #include "TomahawkApp.h"
 #include "JobStatusModel.h"

src/libtomahawk/jobview/TransferStatusItem.cpp

@@ -22,7 +22,7 @@
 #include "JobStatusModel.h"
 #include "network/StreamConnection.h"
 #include "network/Servent.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "Result.h"
 #include "Source.h"
 #include "Artist.h"

src/libtomahawk/network/Servent.cpp

@@ -39,7 +39,7 @@
 
 #include "PortFwdThread.h"
 #include "TomahawkSettings.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
 using namespace Tomahawk;

src/libtomahawk/playlist/AlbumItem.cpp

@@ -18,7 +18,7 @@
 
 #include "AlbumItem.h"
 
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
 using namespace Tomahawk;

src/libtomahawk/playlist/AlbumItemDelegate.cpp

@@ -27,7 +27,7 @@
 #include "Query.h"
 #include "Result.h"
 
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 #include "utils/PixmapDelegateFader.h"
 #include <utils/Closure.h>

src/libtomahawk/playlist/AlbumModel.cpp

@@ -28,7 +28,7 @@
 #include "Source.h"
 #include "SourceList.h"
 #include "database/Database.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
 using namespace Tomahawk;

src/libtomahawk/playlist/CustomPlaylistView.cpp

@@ -21,7 +21,7 @@
 
 #include "database/DatabaseCommand_GenericSelect.h"
 #include "database/Database.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "SourceList.h"
 #include "audio/AudioEngine.h"
 

src/libtomahawk/playlist/PlaylistChartItemDelegate.cpp

@@ -34,7 +34,7 @@
 #include "TrackView.h"
 #include "TrackHeader.h"
 
-#include "utils/tomahawkutilsgui.h"
+#include "utils/TomahawkUtilsGui.h"
 #include "utils/Logger.h"
 #include <utils/PixmapDelegateFader.h>
 #include <utils/Closure.h>

src/libtomahawk/playlist/PlaylistItemDelegate.cpp

@@ -34,7 +34,7 @@
 #include "TrackView.h"
 #include "TrackHeader.h"
 
-#include "utils/tomahawkutilsgui.h"
+#include "utils/TomahawkUtilsGui.h"
 #include "utils/Logger.h"
 
 using namespace Tomahawk;

src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp

@@ -35,7 +35,7 @@
 #include "TrackView.h"
 #include "TrackHeader.h"
 
-#include "utils/tomahawkutilsgui.h"
+#include "utils/TomahawkUtilsGui.h"
 #include "utils/Logger.h"
 #include <utils/PixmapDelegateFader.h>
 #include <utils/Closure.h>

src/libtomahawk/playlist/PlaylistModel.cpp

@@ -31,7 +31,7 @@
 #include "database/DatabaseCommand_PlaybackHistory.h"
 #include "dynamic/GeneratorInterface.h"
 #include "DropJob.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
 using namespace Tomahawk;

src/libtomahawk/playlist/QueueView.cpp

@@ -26,7 +26,7 @@
 #include "widgets/OverlayWidget.h"
 #include "utils/Logger.h"
 #include "PlaylistView.h"
-#include "utils/tomahawkutilsgui.h"
+#include "utils/TomahawkUtilsGui.h"
 
 using namespace Tomahawk;
 

src/libtomahawk/playlist/RecentlyAddedModel.cpp

@@ -25,7 +25,7 @@
 #include "SourceList.h"
 #include "database/Database.h"
 #include "database/DatabaseCommand_AllTracks.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
 #define LATEST_TRACK_ITEMS 250

src/libtomahawk/playlist/RecentlyPlayedModel.cpp

@@ -25,7 +25,7 @@
 #include "SourceList.h"
 #include "database/Database.h"
 #include "database/DatabaseCommand_PlaybackHistory.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
 #define HISTORY_TRACK_ITEMS 25

src/libtomahawk/playlist/TrackModel.cpp

@@ -25,7 +25,7 @@
 #include <QTreeView>
 
 #include "audio/AudioEngine.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 
 #include "Artist.h"
 #include "Album.h"

src/libtomahawk/playlist/TrackModelItem.cpp

@@ -21,7 +21,7 @@
 
 #include "Playlist.h"
 #include "Query.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
 using namespace Tomahawk;

src/libtomahawk/playlist/TrackView.cpp

@@ -31,7 +31,7 @@
 #include "context/ContextWidget.h"
 #include "widgets/OverlayWidget.h"
 #include "dynamic/widgets/LoadingSpinner.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 #include "utils/Closure.h"
 #include "DropJob.h"

src/libtomahawk/playlist/TreeItemDelegate.cpp

@@ -27,7 +27,7 @@
 #include "Query.h"
 #include "Result.h"
 
-#include "utils/tomahawkutilsgui.h"
+#include "utils/TomahawkUtilsGui.h"
 #include "utils/Logger.h"
 #include "utils/Closure.h"
 #include "utils/PixmapDelegateFader.h"

src/libtomahawk/playlist/TreeModel.cpp

@@ -29,7 +29,7 @@
 #include "database/DatabaseCommand_AllAlbums.h"
 #include "database/DatabaseCommand_AllTracks.h"
 #include "database/Database.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
 using namespace Tomahawk;

src/libtomahawk/playlist/TreeModelItem.cpp

@@ -18,7 +18,7 @@
 
 #include "TreeModelItem.h"
 
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 #include "Artist.h"
 #include "Album.h"

src/libtomahawk/playlist/XspfUpdater.cpp

@@ -19,10 +19,10 @@
 #include "XspfUpdater.h"
 
 #include "Playlist.h"
-#include "utils/xspfloader.h"
+#include "utils/XspfLoader.h"
 #include "TomahawkSettings.h"
 #include "Pipeline.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 
 #include <QTimer>
 

src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp

@@ -20,7 +20,7 @@
 #include "dynamic/echonest/EchonestControl.h"
 #include "dynamic/echonest/EchonestSteerer.h"
 #include "Query.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "TomahawkSettings.h"
 #include "database/DatabaseCommand_CollectionAttributes.h"
 #include "database/Database.h"

src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp

@@ -30,7 +30,7 @@
 #include "echonest/Playlist.h"
 #include "dynamic/widgets/DynamicWidget.h"
 
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
 using namespace Tomahawk;

src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.cpp

@@ -23,7 +23,7 @@
 #include "DynamicControlWrapper.h"
 #include "dynamic/GeneratorInterface.h"
 #include "dynamic/DynamicControl.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "widgets/ElidedLabel.h"
 
 #include <QtGui/QLabel>

src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp

@@ -29,7 +29,7 @@
 
 #include "DynamicControlWrapper.h"
 #include "dynamic/GeneratorInterface.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
 using namespace Tomahawk;

src/libtomahawk/playlist/dynamic/widgets/DynamicControlWrapper.cpp

@@ -27,7 +27,7 @@
 #include <QStackedLayout>
 
 #include "dynamic/DynamicControl.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
 using namespace Tomahawk;

src/libtomahawk/playlist/dynamic/widgets/LoadingSpinner.cpp

@@ -25,7 +25,7 @@
 #include <QMovie>
 #include <QLabel>
 
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
 #define ANIM_LENGTH 300

src/libtomahawk/playlist/topbar/TopBar.cpp

@@ -26,7 +26,7 @@
 #include <QRadioButton>
 #include <QFile>
 
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
 #define MAXDUDES 3

src/libtomahawk/resolvers/QtScriptResolver.cpp

@@ -27,7 +27,7 @@
 
 #include "network/Servent.h"
 
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
 

src/libtomahawk/resolvers/QtScriptResolver.h

@@ -22,7 +22,7 @@
 
 #include "ExternalResolverGui.h"
 #include "Query.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "config.h"
 
 #include <QtCore/QDir>

src/libtomahawk/resolvers/ScriptResolver.cpp

@@ -28,7 +28,7 @@
 #include "Pipeline.h"
 #include "SourceList.h"
 
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
 #ifdef Q_OS_WIN

src/libtomahawk/thirdparty/Qocoa/qsearchfield.cpp

@@ -27,7 +27,7 @@ THE SOFTWARE.
 #include <QVBoxLayout>
 
 #include "playlist/topbar/SearchLineEdit.h"
-#include "utils/tomahawkutilsgui.h"
+#include "utils/TomahawkUtilsGui.h"
 
 class DLLEXPORT QSearchFieldPrivate
 {

src/libtomahawk/utils/DropJobNotifier.cpp

@@ -21,7 +21,7 @@
 #include "DropJobNotifier.h"
 
 #include "utils/Logger.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "Query.h"
 #include "SourceList.h"
 #include "jobview/JobStatusView.h"

src/libtomahawk/utils/GroovesharkParser.cpp

@@ -21,7 +21,7 @@
 #include "GroovesharkParser.h"
 
 #include "utils/Logger.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "Query.h"
 #include "SourceList.h"
 #include "DropJob.h"

src/libtomahawk/utils/ItunesParser.cpp

@@ -20,7 +20,7 @@
 
 #include "ItunesParser.h"
 #include "utils/Logger.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "Query.h"
 #include "SourceList.h"
 #include "jobview/JobStatusView.h"

src/libtomahawk/utils/JspfLoader.cpp

@@ -26,7 +26,7 @@
 
 #include <qjson/parser.h>
 
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
 #include "SourceList.h"

src/libtomahawk/utils/Logger.cpp

@@ -28,7 +28,7 @@
 #include <QTime>
 #include <QVariant>
 
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 
 #define LOGFILE TomahawkUtils::appLogDir().filePath( "Tomahawk.log" ).toLocal8Bit()
 #define LOGFILE_SIZE 1024 * 256

src/libtomahawk/utils/M3uLoader.cpp

@@ -19,7 +19,7 @@
 
 #include "M3uLoader.h"
 #include "utils/Logger.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "Query.h"
 #include "SourceList.h"
 

src/libtomahawk/utils/PixmapDelegateFader.cpp

@@ -18,7 +18,7 @@
  */
 
 #include "PixmapDelegateFader.h"
-#include "tomahawkutilsgui.h"
+#include "TomahawkUtilsGui.h"
 
 #include <QPainter>
 #include <QBuffer>

src/libtomahawk/utils/RdioParser.cpp

@@ -21,7 +21,7 @@
 
 #include "ShortenedLinkParser.h"
 #include "config.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 #include "DropJob.h"
 #include "jobview/JobStatusView.h"

src/libtomahawk/utils/ShortenedLinkParser.cpp

@@ -20,7 +20,7 @@
 #include "ShortenedLinkParser.h"
 
 #include "utils/Logger.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "DropJobNotifier.h"
 #include "Query.h"
 #include "jobview/ErrorStatusMessage.h"

src/libtomahawk/utils/SpotifyParser.cpp

@@ -20,7 +20,7 @@
 #include "SpotifyParser.h"
 
 #include "utils/Logger.h"
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "Query.h"
 #include "SourceList.h"
 #include "DropJob.h"