CamelCase Round 2...FIGHT

src/AudioControls.cpp

@@ -30,11 +30,11 @@
 #include "widgets/imagebutton.h"
 #include "utils/tomahawkutils.h"
 #include "utils/logger.h"
-#include "album.h"
-#include "dropjob.h"
+#include "Album.h"
+#include "DropJob.h"
 #include "SocialWidget.h"
-#include "globalactionmanager.h"
-#include "viewmanager.h"
+#include "GlobalActionManager.h"
+#include "ViewManager.h"
 
 using namespace Tomahawk;
 

src/AudioControls.h

@@ -24,9 +24,9 @@
 #include <QtCore/QTimer>
 #include <QtCore/QTimeLine>
 
-#include "result.h"
-#include "playlistinterface.h"
-#include "query.h"
+#include "Result.h"
+#include "PlaylistInterface.h"
+#include "Query.h"
 
 class QDropEvent;
 class QDragEnterEvent;

src/CMakeLists.txt

@@ -72,7 +72,7 @@ SET( tomahawkSourcesGui ${tomahawkSourcesGui}
 
      accounts/lastfm/LastFmAccount.cpp
      accounts/lastfm/LastFmConfig.cpp
-     accounts/lastfm/lastfmplugin.cpp
+     accounts/lastfm/LastFmPlugin.cpp
 
      accounts/spotify/SpotifyAccount.cpp
      accounts/spotify/SpotifyAccountConfig.cpp

src/ConfigDelegateBase.h

@@ -19,7 +19,7 @@
 #ifndef CONFIGDELEGATEBASE_H
 #define CONFIGDELEGATEBASE_H
 
-#include "dllmacro.h"
+#include "DllMacro.h"
 
 #include <QStyledItemDelegate>
 

src/DiagnosticsDialog.cpp

@@ -23,8 +23,8 @@
 #include "config.h"
 
 #include <sip/SipHandler.h>
-#include <network/servent.h>
-#include <sourcelist.h>
+#include <network/Servent.h>
+#include <SourceList.h>
 
 #include <QTextEdit>
 #include <QDialogButtonBox>

src/LoadXSPFDialog.cpp

@@ -17,7 +17,7 @@
  */
 
 #include "LoadXSPFDialog.h"
-#include "tomahawksettings.h"
+#include "TomahawkSettings.h"
 
 #include "ui_LoadXSPFDialog.h"
 #include <QFileDialog>

src/MusicScanner.cpp

@@ -22,8 +22,8 @@
 #include <QtCore/QCoreApplication>
 
 #include "utils/tomahawkutils.h"
-#include "tomahawksettings.h"
-#include "sourcelist.h"
+#include "TomahawkSettings.h"
+#include "SourceList.h"
 #include "database/database.h"
 #include "database/databasecommand_dirmtimes.h"
 #include "database/databasecommand_filemtimes.h"

src/MusicScanner.h

@@ -20,7 +20,7 @@
 #ifndef MUSICSCANNER_H
 #define MUSICSCANNER_H
 
-#include "tomahawksettings.h"
+#include "TomahawkSettings.h"
 #include "database/databasecommand.h"
 
 /* taglib */

src/PipelineStatusView.cpp

@@ -22,7 +22,7 @@
 #include <QHeaderView>
 #include <QVBoxLayout>
 
-#include "libtomahawk/pipeline.h"
+#include "libtomahawk/Pipeline.h"
 
 #include "utils/logger.h"
 

src/PipelineStatusView.h

@@ -22,9 +22,9 @@
 
 #include <QTreeWidget>
 
-#include "typedefs.h"
+#include "Typedefs.h"
 #include "widgets/animatedsplitter.h"
-#include "query.h"
+#include "Query.h"
 
 class StreamConnection;
 

src/ScanManager.cpp

@@ -24,9 +24,9 @@
 #include <QtCore/QTimer>
 
 #include "MusicScanner.h"
-#include "tomahawksettings.h"
+#include "TomahawkSettings.h"
 #include "utils/tomahawkutils.h"
-#include "libtomahawk/sourcelist.h"
+#include "libtomahawk/SourceList.h"
 
 #include "database/database.h"
 #include "database/databasecommand_filemtimes.h"

src/ScanManager.h

@@ -20,7 +20,7 @@
 #ifndef SCANMANAGER_H
 #define SCANMANAGER_H
 
-#include "typedefs.h"
+#include "Typedefs.h"
 
 #include <QtCore/QHash>
 #include <QtCore/QMap>

src/Scrobbler.cpp

@@ -23,11 +23,11 @@
 #include <QSettings>
 #include <QCryptographicHash>
 
-#include "artist.h"
-#include "album.h"
-#include "typedefs.h"
+#include "Artist.h"
+#include "Album.h"
+#include "Typedefs.h"
 #include "audio/audioengine.h"
-#include "tomahawksettings.h"
+#include "TomahawkSettings.h"
 #include "infosystem/infosystem.h"
 
 #include "utils/logger.h"

src/Scrobbler.h

@@ -21,7 +21,7 @@
 #define TOMAHAWK_SCROBBLER_H
 
 #include "lastfm/ScrobblePoint"
-#include "result.h"
+#include "Result.h"
 #include "infosystem/infosystem.h"
 
 #include <QObject>

src/SettingsDialog.cpp

@@ -31,10 +31,10 @@
 
 #include "AtticaManager.h"
 #include "TomahawkApp.h"
-#include "tomahawksettings.h"
+#include "TomahawkSettings.h"
 #include "DelegateConfigWrapper.h"
 #include "MusicScanner.h"
-#include "pipeline.h"
+#include "Pipeline.h"
 #include "Resolver.h"
 #include "ExternalResolverGui.h"
 #include "utils/tomahawkutilsgui.h"
@@ -43,7 +43,7 @@
 #include "SettingsListDelegate.h"
 #include "AccountDelegate.h"
 #include "database/database.h"
-#include "network/servent.h"
+#include "network/Servent.h"
 #include "playlist/dynamic/widgets/LoadingSpinner.h"
 #include "accounts/AccountModel.h"
 #include "accounts/Account.h"

src/SocialWidget.cpp

@@ -23,7 +23,7 @@
 #include <QDialog>
 #include <QPropertyAnimation>
 
-#include "globalactionmanager.h"
+#include "GlobalActionManager.h"
 #include "utils/logger.h"
 
 #define CORNER_ROUNDNESS 8.0

src/SocialWidget.h

@@ -23,7 +23,7 @@
 #include <QAbstractItemView>
 #include <QTimer>
 
-#include "query.h"
+#include "Query.h"
 
 namespace Ui
 {

src/TomahawkApp.cpp

@@ -30,9 +30,9 @@
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
 
-#include "artist.h"
-#include "album.h"
-#include "collection.h"
+#include "Artist.h"
+#include "Album.h"
+#include "Collection.h"
 #include "infosystem/infosystem.h"
 #include "accounts/AccountManager.h"
 #include "accounts/spotify/SpotifyAccount.h"
@@ -45,17 +45,17 @@
 #include "playlist/dynamic/echonest/EchonestGenerator.h"
 #include "playlist/dynamic/database/DatabaseGenerator.h"
 #include "playlist/XspfUpdater.h"
-#include "network/servent.h"
+#include "network/Servent.h"
 #include "web/api_v1.h"
-#include "sourcelist.h"
+#include "SourceList.h"
 #include "ShortcutHandler.h"
 #include "ScanManager.h"
-#include "tomahawksettings.h"
-#include "globalactionmanager.h"
-#include "database/localcollection.h"
+#include "TomahawkSettings.h"
+#include "GlobalActionManager.h"
+#include "database/LocalCollection.h"
 #include "MusicScanner.h"
-#include "pipeline.h"
-#include "dropjob.h"
+#include "Pipeline.h"
+#include "DropJob.h"
 #include "EchonestCatalogSynchronizer.h"
 
 #include "audio/audioengine.h"
@@ -77,7 +77,7 @@
     #include "AtticaManager.h"
     #include "TomahawkWindow.h"
     #include "SettingsDialog.h"
-    #include "actioncollection.h"
+    #include "ActionCollection.h"
     #include <QtGui/QMessageBox>
     #include "widgets/HeaderLabel.h"
     #include <TomahawkSettingsGui.h>

src/TomahawkApp.h

@@ -36,7 +36,7 @@
 #include "QxtHttpSessionManager"
 
 #include "mac/tomahawkapp_mac.h" // for PlatforInterface
-#include "typedefs.h"
+#include "Typedefs.h"
 #include "utils/tomahawkutils.h"
 #include "thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h"
 

src/TomahawkTrayIcon.cpp

@@ -21,14 +21,14 @@
 
 #include <QtGui/QWheelEvent>
 
-#include "artist.h"
+#include "Artist.h"
 
 #include "audio/audioengine.h"
 #include "TomahawkApp.h"
 #include "TomahawkWindow.h"
 
 #include "utils/logger.h"
-#include <actioncollection.h>
+#include <ActionCollection.h>
 
 
 TomahawkTrayIcon::TomahawkTrayIcon( QObject* parent )

src/TomahawkTrayIcon.h

@@ -24,7 +24,7 @@
 #include <QtCore/QTimer>
 #include <QtGui/QMenu>
 
-#include "result.h"
+#include "Result.h"
 
 class TomahawkTrayIcon : public QSystemTrayIcon
 {

src/TomahawkWindow.cpp

@@ -35,13 +35,13 @@
 #include <QTimer>
 #include <QToolBar>
 
-#include "playlist.h"
-#include "query.h"
-#include "artist.h"
-#include "viewmanager.h"
+#include "Playlist.h"
+#include "Query.h"
+#include "Artist.h"
+#include "ViewManager.h"
 #include "accounts/AccountManager.h"
 #include "sourcetree/sourcetreeview.h"
-#include "network/servent.h"
+#include "network/Servent.h"
 #include "utils/proxystyle.h"
 #include "widgets/animatedsplitter.h"
 #include "widgets/newplaylistwidget.h"
@@ -56,8 +56,8 @@
 #include "AudioControls.h"
 #include "SettingsDialog.h"
 #include "DiagnosticsDialog.h"
-#include "tomahawksettings.h"
-#include "sourcelist.h"
+#include "TomahawkSettings.h"
+#include "SourceList.h"
 #include "jobview/JobStatusView.h"
 #include "jobview/JobStatusModel.h"
 #include "jobview/ErrorStatusMessage.h"
@@ -72,7 +72,7 @@
 #include "utils/logger.h"
 #include "jobview/JobStatusModel.h"
 #include "LoadXSPFDialog.h"
-#include <actioncollection.h>
+#include <ActionCollection.h>
 
 using namespace Tomahawk;
 using namespace Accounts;

src/TomahawkWindow.h

@@ -27,7 +27,7 @@
 #include <QString>
 #include <QStackedWidget>
 
-#include "result.h"
+#include "Result.h"
 #include "audio/audioengine.h"
 #include "utils/xspfloader.h"
 

src/accounts/lastfm/LastFmAccount.cpp

@@ -20,11 +20,11 @@
 #include "LastFmConfig.h"
 
 #include "infosystem/infosystem.h"
-#include "lastfmplugin.h"
+#include "LastFmPlugin.h"
 #include "utils/tomahawkutils.h"
 #include "resolvers/qtscriptresolver.h"
 #include "AtticaManager.h"
-#include "pipeline.h"
+#include "Pipeline.h"
 #include "accounts/AccountManager.h"
 
 using namespace Tomahawk;

src/accounts/lastfm/LastFmPlugin.cpp

@@ -16,15 +16,15 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "lastfmplugin.h"
+#include "LastFmPlugin.h"
 
 #include <QDir>
 #include <QSettings>
 #include <QNetworkConfiguration>
 #include <QDomElement>
 
-#include "album.h"
-#include "typedefs.h"
+#include "Album.h"
+#include "Typedefs.h"
 #include "audio/audioengine.h"
 #include "utils/tomahawkutils.h"
 #include "utils/logger.h"

src/accounts/spotify/SpotifyAccount.cpp

@@ -18,14 +18,14 @@
  */
 
 #include "SpotifyAccount.h"
-#include "playlist.h"
+#include "Playlist.h"
 #include "playlist/PlaylistUpdaterInterface.h"
-#include "sourcelist.h"
+#include "SourceList.h"
 #include "SpotifyAccountConfig.h"
 #include "SpotifyPlaylistUpdater.h"
 #include "resolvers/scriptresolver.h"
 #include "utils/tomahawkutils.h"
-#include "actioncollection.h"
+#include "ActionCollection.h"
 
 #ifndef ENABLE_HEADLESS
 #include "jobview/JobStatusView.h"

src/accounts/spotify/SpotifyAccount.h

@@ -21,8 +21,8 @@
 #define SpotifyAccount_H
 
 #include "accounts/ResolverAccount.h"
-#include "sourcelist.h"
-#include "playlist.h"
+#include "SourceList.h"
+#include "Playlist.h"
 #include "utils/tomahawkutils.h"
 #include "utils/SmartPointerList.h"
 

src/accounts/spotify/SpotifyPlaylistUpdater.cpp

@@ -87,7 +87,7 @@ SpotifyPlaylistUpdater::init()
     connect( playlist().data(), SIGNAL( tracksRemoved( QList<Tomahawk::query_ptr> ) ), this, SLOT( tomahawkTracksRemoved( QList<Tomahawk::query_ptr> ) ) );
     connect( playlist().data(), SIGNAL( tracksMoved( QList<Tomahawk::plentry_ptr>, int ) ), this, SLOT( tomahawkTracksMoved( QList<Tomahawk::plentry_ptr>, int ) ) );
     connect( playlist().data(), SIGNAL( renamed( QString, QString ) ), this, SLOT( tomahawkPlaylistRenamed( QString, QString ) ) );
-    connect( playlist().data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( playlistRevisionLoaded() ), Qt::QueuedConnection ); // Queued so that in playlist.cpp:443 we let the playlist clear its own queue first
+    connect( playlist().data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( playlistRevisionLoaded() ), Qt::QueuedConnection ); // Queued so that in Playlist.cpp:443 we let the playlist clear its own queue first
     // TODO reorders in a playlist
 }
 

src/accounts/twitter/CMakeLists.txt

@@ -7,23 +7,23 @@ add_definitions( -DQT_SHARED )
 add_definitions( -DACCOUNTDLLEXPORT_PRO )
 
 set( twitterAccountSources
-    twitteraccount.cpp
-    twitterinfoplugin.cpp
-    twitterconfigwidget.cpp
-    tomahawkoauthtwitter.cpp
-    sip/twittersip.cpp
+    TwitterAccount.cpp
+    TwitterInfoPlugin.cpp
+    TwitterConfigWidget.cpp
+    TomahawkOAuthTwitter.cpp
+    sip/TwitterSip.cpp
 )
 
 set( twitterAccountHeaders
-    twitteraccount.h
-    twitterinfoplugin.h
-    twitterconfigwidget.h
-    tomahawkoauthtwitter.h
-    sip/twittersip.h
+    TwitterAccount.h
+    TwitterInfoPlugin.h
+    TwitterConfigWidget.h
+    TomahawkOAuthTwitter.h
+    sip/TwitterSip.h
 )
 
 set( twitterAccountUI
-    twitterconfigwidget.ui
+    TwitterConfigWidget.ui
 )
 
 include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ..

src/accounts/twitter/TomahawkOAuthTwitter.cpp

@@ -18,7 +18,7 @@
 
 
 
-#include "tomahawkoauthtwitter.h"
+#include "TomahawkOAuthTwitter.h"
 
 #include <QtGui/QInputDialog>
 

src/accounts/twitter/TwitterAccount.cpp

@@ -18,9 +18,9 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "twitteraccount.h"
-#include "twitterconfigwidget.h"
-#include "accounts/twitter/tomahawkoauthtwitter.h"
+#include "TwitterAccount.h"
+#include "TwitterConfigWidget.h"
+#include "accounts/twitter/TomahawkOAuthTwitter.h"
 #include "libtomahawk/infosystem/infosystem.h"
 
 #include "sip/SipPlugin.h"

src/accounts/twitter/TwitterAccount.h

@@ -21,11 +21,11 @@
 #ifndef TWITTERACCOUNT_H
 #define TWITTERACCOUNT_H
 
-#include "twitterconfigwidget.h"
-#include "tomahawkoauthtwitter.h"
+#include "TwitterConfigWidget.h"
+#include "TomahawkOAuthTwitter.h"
 
-#include "sip/twittersip.h"
-#include "twitterinfoplugin.h"
+#include "sip/TwitterSip.h"
+#include "TwitterInfoPlugin.h"
 #include "accounts/AccountDllMacro.h"
 #include "accounts/Account.h"
 

src/accounts/twitter/TwitterConfigWidget.cpp

@@ -17,15 +17,15 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "twitterconfigwidget.h"
-#include "twitteraccount.h"
-#include "ui_twitterconfigwidget.h"
+#include "TwitterConfigWidget.h"
+#include "TwitterAccount.h"
+#include "ui_TwitterConfigWidget.h"
 
-#include "tomahawksettings.h"
+#include "TomahawkSettings.h"
 #include "utils/tomahawkutils.h"
 #include "database/database.h"
 
-#include "tomahawkoauthtwitter.h"
+#include "TomahawkOAuthTwitter.h"
 #include <QTweetLib/qtweetaccountverifycredentials.h>
 #include <QTweetLib/qtweetstatusupdate.h>
 #include <QTweetLib/qtweetdirectmessagenew.h>

src/accounts/twitter/TwitterInfoPlugin.cpp

@@ -18,14 +18,14 @@
  */
 
 
-#include "twitterinfoplugin.h"
+#include "TwitterInfoPlugin.h"
 
-#include "accounts/twitter/twitteraccount.h"
+#include "accounts/twitter/TwitterAccount.h"
 
 #include <QTweetLib/qtweetaccountverifycredentials.h>
 #include <QTweetLib/qtweetstatusupdate.h>
 
-#include "globalactionmanager.h"
+#include "GlobalActionManager.h"
 #include "utils/logger.h"
 
 namespace Tomahawk

src/accounts/twitter/TwitterInfoPlugin.h

@@ -21,7 +21,7 @@
 #define TWITTERINFOPLUGIN_H
 
 #include "infosystem/infosystem.h"
-#include "accounts/twitter/tomahawkoauthtwitter.h"
+#include "accounts/twitter/TomahawkOAuthTwitter.h"
 
 #include <QTweetLib/qtweetuser.h>
 #include <QTweetLib/qtweetstatus.h>

src/accounts/twitter/sip/TwitterSip.cpp

@@ -18,7 +18,7 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "twittersip.h"
+#include "TwitterSip.h"
 
 #include <QtPlugin>
 #include <QDateTime>
@@ -34,13 +34,13 @@
 #include <QTweetLib/qtweetusershow.h>
 
 #include <utils/tomahawkutils.h>
-#include <tomahawksettings.h>
+#include <TomahawkSettings.h>
 #include <database/database.h>
-#include <network/servent.h>
+#include <network/Servent.h>
 
 #include "utils/logger.h"
-#include "accounts/twitter/tomahawkoauthtwitter.h"
-#include <accounts/twitter/twitteraccount.h>
+#include "accounts/twitter/TomahawkOAuthTwitter.h"
+#include <accounts/twitter/TwitterAccount.h>
 
 static QString s_gotTomahawkRegex = QString( "^(@[a-zA-Z0-9]+ )?(Got Tomahawk\\?) (\\{[a-fA-F0-9\\-]+\\}) (.*)$" );
 

src/accounts/twitter/sip/TwitterSip.h

@@ -37,7 +37,7 @@
 #include "accounts/AccountDllMacro.h"
 #include "sip/SipPlugin.h"
 #include "accounts/Account.h"
-#include "accounts/twitter/tomahawkoauthtwitter.h"
+#include "accounts/twitter/TomahawkOAuthTwitter.h"
 
 class ACCOUNTDLLEXPORT TwitterSipPlugin : public SipPlugin
 {

src/accounts/xmpp/CMakeLists.txt

@@ -12,8 +12,8 @@ set( xmppAccountSources
     sip/XmppSip.cpp
     sip/TomahawkXmppMessage.cpp
     sip/TomahawkXmppMessageFactory.cpp
-    sip/avatarmanager.cpp
-    sip/xmlconsole.cpp
+    sip/AvatarManager.cpp
+    sip/XmlConsole.cpp
     XmppInfoPlugin.cpp
 )
 
@@ -21,14 +21,14 @@ set( xmppAccountHeaders
     XmppAccount.h
     XmppConfigWidget.h
     sip/XmppSip.h
-    sip/avatarmanager.h
-    sip/xmlconsole.h
+    sip/AvatarManager.h
+    sip/XmlConsole.h
     XmppInfoPlugin.h
 )
 
 set( xmppAccountUI
     XmppConfigWidget.ui
-    sip/xmlconsole.ui
+    sip/XmlConsole.ui
 )
 
 include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ..

src/accounts/xmpp/XmppInfoPlugin.cpp

@@ -20,7 +20,7 @@
 
 #include "XmppInfoPlugin.h"
 
-#include "globalactionmanager.h"
+#include "GlobalActionManager.h"
 #include "sip/XmppSip.h"
 #include "utils/logger.h"
 

src/accounts/xmpp/googlewrapper/CMakeLists.txt

@@ -5,10 +5,10 @@ set( googleHeaders
     ../XmppAccount.h
     ../XmppConfigWidget.h
     ../sip/XmppSip.h
-    ../sip/avatarmanager.h
-    ../sip/xmlconsole.h
+    ../sip/AvatarManager.h
+    ../sip/XmlConsole.h
     ../XmppInfoPlugin.h
-    googlewrapper.h )
+    GoogleWrapper.h )
 
 set( googleSources
     ../XmppAccount.cpp
@@ -16,11 +16,11 @@ set( googleSources
     ../sip/XmppSip.cpp
     ../sip/TomahawkXmppMessage.cpp
     ../sip/TomahawkXmppMessageFactory.cpp
-    ../sip/avatarmanager.cpp
-    ../sip/xmlconsole.cpp
+    ../sip/AvatarManager.cpp
+    ../sip/XmlConsole.cpp
     ../XmppInfoPlugin.cpp
 
-    googlewrapper.cpp )
+    GoogleWrapper.cpp )
 
 add_definitions(-DGOOGLE_WRAPPER)
 

src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp

@@ -18,7 +18,7 @@
 */
 
 
-#include "googlewrapper.h"
+#include "GoogleWrapper.h"
 #include "XmppConfigWidget.h"
 #include "ui_XmppConfigWidget.h"
 

src/accounts/xmpp/sip/AvatarManager.cpp

@@ -17,7 +17,7 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "avatarmanager.h"
+#include "AvatarManager.h"
 
 #include "utils/tomahawkutils.h"
 

src/accounts/xmpp/sip/TomahawkXmppMessage.cpp

@@ -17,7 +17,7 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "tomahawkxmppmessage.h"
+#include "TomahawkXmppMessage.h"
 
 #include "utils/logger.h"
 

src/accounts/xmpp/sip/TomahawkXmppMessageFactory.cpp

@@ -17,7 +17,7 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "tomahawkxmppmessagefactory.h"
+#include "TomahawkXmppMessageFactory.h"
 
 #include <QStringList>
 #include <QXmlStreamWriter>

src/accounts/xmpp/sip/TomahawkXmppMessageFactory.h

@@ -20,7 +20,7 @@
 #ifndef ENTITYTIMEFACTORY_P_H
 #define ENTITYTIMEFACTORY_P_H
 
-#include "tomahawkxmppmessage.h"
+#include "TomahawkXmppMessage.h"
 
 #include <jreen/stanzaextension.h>
 

src/accounts/xmpp/sip/XmlConsole.cpp

@@ -18,8 +18,8 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "xmlconsole.h"
-#include "ui_xmlconsole.h"
+#include "XmlConsole.h"
+#include "ui_XmlConsole.h"
 
 #include <QMenu>
 #include <QActionGroup>

src/accounts/xmpp/sip/XmppSip.cpp

@@ -23,8 +23,8 @@
 
 #include "config.h"
 
-#include "tomahawkxmppmessage.h"
-#include "tomahawkxmppmessagefactory.h"
+#include "TomahawkXmppMessage.h"
+#include "TomahawkXmppMessageFactory.h"
 
 #include <jreen/jid.h>
 #include <jreen/capabilities.h>

src/accounts/xmpp/sip/XmppSip.h

@@ -24,10 +24,10 @@
 
 #include "sip/SipPlugin.h"
 
-#include "avatarmanager.h"
+#include "AvatarManager.h"
 
 #ifndef ENABLE_HEADLESS
-    #include "xmlconsole.h"
+    #include "XmlConsole.h"
 #endif
 
 #include <jreen/client.h>

src/accounts/zeroconf/CMakeLists.txt

@@ -7,21 +7,21 @@ add_definitions( -DQT_SHARED )
 add_definitions( -DACCOUNTDLLEXPORT_PRO )
 
 set( zeroconfSources
-        zeroconf.cpp
-        zeroconfaccount.cpp
+        Zeroconf.cpp
+        ZeroconfAccount.cpp
 )
 
 set( zeroconfHeaders
-	zeroconf.h
-	tomahawkzeroconf.h
-	zeroconfaccount.h
+	Zeroconf.h
+	TomahawkZeroconf.h
+	ZeroconfAccount.h
 )
 
 include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ..
    ${QT_INCLUDE_DIR}
 )
 
-qt4_wrap_ui( UI_SRCS configwidget.ui )
+qt4_wrap_ui( UI_SRCS ConfigWidget.ui )
 qt4_add_resources( RC_SRCS "resources.qrc" )
 qt4_wrap_cpp( zeroconfMoc ${zeroconfHeaders} )
 add_library( tomahawk_account_zeroconf SHARED ${zeroconfSources} ${zeroconfMoc} ${RC_SRCS} ${UI_SRCS} )

src/accounts/zeroconf/TomahawkZeroconf.h

@@ -29,7 +29,7 @@
 #include <QTimer>
 
 #include "database/database.h"
-#include "network/servent.h"
+#include "network/Servent.h"
 #include "accounts/AccountDllMacro.h"
 
 class Node : public QObject

src/accounts/zeroconf/Zeroconf.cpp

@@ -17,15 +17,15 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "zeroconf.h"
+#include "Zeroconf.h"
 
 #include <QtPlugin>
 
 #include <QtCore/QTimer>
 
-#include "tomahawksettings.h"
+#include "TomahawkSettings.h"
 #include "utils/logger.h"
-#include "zeroconfaccount.h"
+#include "ZeroconfAccount.h"
 
 using namespace Tomahawk;
 using namespace Accounts;

src/accounts/zeroconf/Zeroconf.h

@@ -22,7 +22,7 @@
 
 #include "sip/SipPlugin.h"
 #include "accounts/Account.h"
-#include "tomahawkzeroconf.h"
+#include "TomahawkZeroconf.h"
 
 #include "../AccountDllMacro.h"
 

src/accounts/zeroconf/ZeroconfAccount.cpp

@@ -16,10 +16,10 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "zeroconfaccount.h"
+#include "ZeroconfAccount.h"
 
 #include "sip/SipPlugin.h"
-#include "zeroconf.h"
+#include "Zeroconf.h"
 
 #include <QtCore/QtPlugin>
 

src/libtomahawk/AclRegistry.cpp

@@ -17,12 +17,12 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "aclregistry.h"
+#include "AclRegistry.h"
 
 #include <QThread>
 #include <QVariant>
 
-#include "tomahawksettings.h"
+#include "TomahawkSettings.h"
 #include "TomahawkApp.h"
 
 #include "utils/logger.h"

src/libtomahawk/AclRegistry.h

@@ -28,7 +28,7 @@
 #include <QVariant>
 
 #include "HeadlessCheck.h"
-#include "dllmacro.h"
+#include "DllMacro.h"
 
 class DLLEXPORT ACLRegistry : public QObject
 {

src/libtomahawk/ActionCollection.cpp

@@ -18,8 +18,8 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "actioncollection.h"
-#include "tomahawksettings.h"
+#include "ActionCollection.h"
+#include "TomahawkSettings.h"
 #include "audio/audioengine.h"
 #include "utils/tomahawkutils.h"
 

src/libtomahawk/ActionCollection.h

@@ -21,7 +21,7 @@
 #ifndef TOMAHAWKACTIONCOLLECTION_H
 #define TOMAHAWKACTIONCOLLECTION_H
 
-#include "dllmacro.h"
+#include "DllMacro.h"
 
 #include <QtGui/QAction>
 

src/libtomahawk/Album.cpp

@@ -17,13 +17,13 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "album.h"
+#include "Album.h"
 
-#include "artist.h"
-#include "albumplaylistinterface.h"
+#include "Artist.h"
+#include "AlbumPlaylistInterface.h"
 #include "database/database.h"
-#include "database/databaseimpl.h"
-#include "query.h"
+#include "database/DatabaseImpl.h"
+#include "Query.h"
 
 #include "utils/logger.h"
 

src/libtomahawk/Album.h

@@ -28,9 +28,9 @@
     #include <QtGui/QPixmap>
 #endif
 
-#include "typedefs.h"
-#include "playlistinterface.h"
-#include "dllmacro.h"
+#include "Typedefs.h"
+#include "PlaylistInterface.h"
+#include "DllMacro.h"
 #include "infosystem/infosystem.h"
 
 namespace Tomahawk

src/libtomahawk/AlbumPlaylistInterface.cpp

@@ -17,13 +17,13 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "albumplaylistinterface.h"
+#include "AlbumPlaylistInterface.h"
 
-#include "artist.h"
+#include "Artist.h"
 #include "database/database.h"
-#include "database/databaseimpl.h"
+#include "database/DatabaseImpl.h"
 #include "database/databasecommand_alltracks.h"
-#include "query.h"
+#include "Query.h"
 
 #include "utils/logger.h"
 

src/libtomahawk/AlbumPlaylistInterface.h

@@ -23,10 +23,10 @@
 #include <QtCore/QObject>
 #include <QtCore/QSharedPointer>
 
-#include "album.h"
-#include "typedefs.h"
-#include "playlistinterface.h"
-#include "dllmacro.h"
+#include "Album.h"
+#include "Typedefs.h"
+#include "PlaylistInterface.h"
+#include "DllMacro.h"
 
 namespace Tomahawk
 {

src/libtomahawk/Artist.cpp

@@ -17,13 +17,13 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "artist.h"
+#include "Artist.h"
 
-#include "artistplaylistinterface.h"
-#include "collection.h"
+#include "ArtistPlaylistInterface.h"
+#include "Collection.h"
 #include "database/database.h"
-#include "database/databaseimpl.h"
-#include "query.h"
+#include "database/DatabaseImpl.h"
+#include "Query.h"
 
 #include "utils/logger.h"
 

src/libtomahawk/Artist.h

@@ -28,8 +28,8 @@
     #include <QtGui/QPixmap>
 #endif
 
-#include "typedefs.h"
-#include "dllmacro.h"
+#include "Typedefs.h"
+#include "DllMacro.h"
 #include "infosystem/infosystem.h"
 
 namespace Tomahawk

src/libtomahawk/ArtistPlaylistInterface.cpp

@@ -17,11 +17,11 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "artistplaylistinterface.h"
+#include "ArtistPlaylistInterface.h"
 
-#include "artist.h"
-#include "collection.h"
-#include "query.h"
+#include "Artist.h"
+#include "Collection.h"
+#include "Query.h"
 #include "database/database.h"
 #include "database/databasecommand_alltracks.h"
 

src/libtomahawk/ArtistPlaylistInterface.h

@@ -23,10 +23,10 @@
 #include <QtCore/QObject>
 #include <QtCore/QSharedPointer>
 
-#include "artist.h"
-#include "typedefs.h"
-#include "playlistinterface.h"
-#include "dllmacro.h"
+#include "Artist.h"
+#include "Typedefs.h"
+#include "PlaylistInterface.h"
+#include "DllMacro.h"
 
 namespace Tomahawk
 {

src/libtomahawk/AtticaManager.cpp

@@ -20,7 +20,7 @@
 
 #include "utils/tomahawkutils.h"
 #include "TomahawkSettingsGui.h"
-#include "pipeline.h"
+#include "Pipeline.h"
 
 #include <attica/downloaditem.h>
 #include <quazip.h>

src/libtomahawk/AtticaManager.h

@@ -25,7 +25,7 @@
 #include <QHash>
 #include <QPixmap>
 
-#include "dllmacro.h"
+#include "DllMacro.h"
 #include "accounts/Account.h"
 
 #include <attica/provider.h>

src/libtomahawk/CMakeLists.txt

@@ -15,13 +15,13 @@ add_definitions( -DQT_SHAREDPOINTER_TRACK_POINTERS )
 
 
 set( libGuiSources
-    actioncollection.cpp
+    ActionCollection.cpp
 
-    contextmenu.cpp
-    dropjob.cpp
-    globalactionmanager.cpp
-    viewpage.cpp
-    viewmanager.cpp
+    ContextMenu.cpp
+    DropJob.cpp
+    GlobalActionManager.cpp
+    ViewPage.cpp
+    ViewManager.cpp
     LatchManager.cpp
     TomahawkSettingsGui.cpp
 
@@ -161,26 +161,26 @@ IF(QCA2_FOUND)
 ENDIF(QCA2_FOUND)
 
 set( libSources
-    tomahawksettings.cpp
-    sourcelist.cpp
-    pipeline.cpp
+    TomahawkSettings.cpp
+    SourceList.cpp
+    Pipeline.cpp
 
-    aclregistry.cpp
-    artist.cpp
-    artistplaylistinterface.cpp
-    album.cpp
-    albumplaylistinterface.cpp
-    collection.cpp
-    functimeout.cpp
-    playlist.cpp
-    playlistplaylistinterface.cpp
+    AclRegistry.cpp
+    Artist.cpp
+    ArtistPlaylistInterface.cpp
+    Album.cpp
+    AlbumPlaylistInterface.cpp
+    Collection.cpp
+    FuncTimeout.cpp
+    Playlist.cpp
+    PlaylistPlaylistInterface.cpp
     Resolver.cpp
     ExternalResolver.cpp
-    query.cpp
-    result.cpp
+    Query.cpp
+    Result.cpp
     Source.cpp
-    sourceplaylistinterface.cpp
-    playlistinterface.cpp
+    SourcePlaylistInterface.cpp
+    PlaylistInterface.cpp
 
     EchonestCatalogSynchronizer.cpp
 
@@ -191,7 +191,7 @@ set( libSources
     accounts/ResolverAccount.cpp
     sip/SipPlugin.cpp
     sip/SipHandler.cpp
-    sip/sipinfo.cpp
+    sip/SipInfo.cpp
 
     audio/audioengine.cpp
 
@@ -199,9 +199,9 @@ set( libSources
     database/database.cpp
     database/fuzzyindex.cpp
     database/databasecollection.cpp
-    database/localcollection.cpp
+    database/LocalCollection.cpp
     database/databaseworker.cpp
-    database/databaseimpl.cpp
+    database/DatabaseImpl.cpp
     database/databaseresolver.cpp
     database/databasecommand.cpp
     database/databasecommandloggable.cpp
@@ -261,15 +261,15 @@ set( libSources
     infosystem/infoplugins/generic/musicbrainzPlugin.cpp
     infosystem/infoplugins/generic/RoviPlugin.cpp
 
-    network/bufferiodevice.cpp
-    network/msgprocessor.cpp
-    network/streamconnection.cpp
-    network/dbsyncconnection.cpp
-    network/remotecollection.cpp
-    network/portfwdthread.cpp
-    network/servent.cpp
-    network/connection.cpp
-    network/controlconnection.cpp
+    network/BufferIoDevice.cpp
+    network/MsgProcessor.cpp
+    network/StreamConnection.cpp
+    network/DbSyncConnection.cpp
+    network/RemoteCollection.cpp
+    network/PortFwdThread.cpp
+    network/Servent.cpp
+    network/Connection.cpp
+    network/ControlConnection.cpp
 
     playlist/PlaylistUpdaterInterface.cpp
     playlist/dynamic/DynamicPlaylist.cpp

src/libtomahawk/Collection.cpp

@@ -17,7 +17,7 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "collection.h"
+#include "Collection.h"
 
 #include <QMetaObject>
 #include <QGenericArgument>

src/libtomahawk/Collection.h

@@ -31,12 +31,12 @@
 #include <QList>
 #include <QSharedPointer>
 
-#include "typedefs.h"
-#include "functimeout.h"
-#include "playlist.h"
+#include "Typedefs.h"
+#include "FuncTimeout.h"
+#include "Playlist.h"
 #include "playlist/dynamic/DynamicPlaylist.h"
 
-#include "dllmacro.h"
+#include "DllMacro.h"
 
 namespace Tomahawk
 {

src/libtomahawk/ContextMenu.cpp

@@ -17,15 +17,15 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "contextmenu.h"
+#include "ContextMenu.h"
 
-#include "globalactionmanager.h"
+#include "GlobalActionManager.h"
 #include "playlistview.h"
-#include "viewmanager.h"
-#include "query.h"
+#include "ViewManager.h"
+#include "Query.h"
 #include "Source.h"
-#include "artist.h"
-#include "album.h"
+#include "Artist.h"
+#include "Album.h"
 #include "utils/logger.h"
 
 using namespace Tomahawk;

src/libtomahawk/ContextMenu.h

@@ -23,8 +23,8 @@
 #include <QtCore/QSignalMapper>
 #include <QtGui/QMenu>
 
-#include "typedefs.h"
-#include "dllmacro.h"
+#include "Typedefs.h"
+#include "DllMacro.h"
 
 namespace Tomahawk
 {

src/libtomahawk/DropJob.cpp

@@ -18,10 +18,10 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "dropjob.h"
+#include "DropJob.h"
 
-#include "artist.h"
-#include "album.h"
+#include "Artist.h"
+#include "Album.h"
 #include "Source.h"
 
 #include "utils/spotifyparser.h"
@@ -31,13 +31,13 @@
 #include "utils/shortenedlinkparser.h"
 #include "utils/logger.h"
 #include "utils/tomahawkutils.h"
-#include "globalactionmanager.h"
+#include "GlobalActionManager.h"
 #include "infosystem/infosystem.h"
 #include "utils/xspfloader.h"
 #include "jobview/JobStatusView.h"
 #include "jobview/JobStatusModel.h"
 #include "jobview/ErrorStatusMessage.h"
-#include "pipeline.h"
+#include "Pipeline.h"
 
 #ifdef QCA2_FOUND
 #include "utils/groovesharkparser.h"

src/libtomahawk/DropJob.h

@@ -20,7 +20,7 @@
 #ifndef DROPJOB_H
 #define DROPJOB_H
 
-#include "query.h"
+#include "Query.h"
 
 #include "infosystem/infosystem.h"
 #include "utils/xspfloader.h"

src/libtomahawk/EchonestCatalogSynchronizer.cpp

@@ -18,14 +18,14 @@
 
 #include "EchonestCatalogSynchronizer.h"
 
-#include "collection.h"
+#include "Collection.h"
 #include "database/database.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"
+#include "TomahawkSettings.h"
+#include "SourceList.h"
+#include "Query.h"
 
 #include <echonest/CatalogUpdateEntry.h>
 #include <echonest/Config.h>

src/libtomahawk/EchonestCatalogSynchronizer.h

@@ -19,8 +19,8 @@
 #ifndef ECHONESTCATALOGSYNCHRONIZER_H
 #define ECHONESTCATALOGSYNCHRONIZER_H
 
-#include "dllmacro.h"
-#include "query.h"
+#include "DllMacro.h"
+#include "Query.h"
 #include "database/databasecommand_trackattributes.h"
 
 #include <echonest/Catalog.h>

src/libtomahawk/ExternalResolver.h

@@ -21,8 +21,8 @@
 #define EXTERNALRESOLVER_H
 
 
-#include "query.h"
-#include "dllmacro.h"
+#include "Query.h"
+#include "DllMacro.h"
 #include "Resolver.h"
 
 #include <boost/function.hpp>

src/libtomahawk/ExternalResolverGui.h

@@ -20,7 +20,7 @@
 #define EXTERNALRESOLVERGUI_H
 
 #include "ExternalResolver.h"
-#include "dllmacro.h"
+#include "DllMacro.h"
 
 class QWidget;
 

src/libtomahawk/FuncTimeout.cpp

@@ -17,7 +17,7 @@
  */
 
 
-#include "functimeout.h"
+#include "FuncTimeout.h"
 
 #include <QTimer>
 

src/libtomahawk/FuncTimeout.h

@@ -25,7 +25,7 @@
 #include "boost/function.hpp"
 #include "boost/bind.hpp"
 
-#include "dllmacro.h"
+#include "DllMacro.h"
 
 /*
     I want to do:

src/libtomahawk/GlobalActionManager.cpp

@@ -18,15 +18,15 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "globalactionmanager.h"
+#include "GlobalActionManager.h"
 
-#include "artist.h"
-#include "album.h"
-#include "sourcelist.h"
-#include "pipeline.h"
-#include "tomahawksettings.h"
+#include "Artist.h"
+#include "Album.h"
+#include "SourceList.h"
+#include "Pipeline.h"
+#include "TomahawkSettings.h"
 #include "audio/audioengine.h"
-#include "database/localcollection.h"
+#include "database/LocalCollection.h"
 #include "playlist/dynamic/GeneratorInterface.h"
 
 #include "echonest/Playlist.h"
@@ -42,7 +42,7 @@
 #include "utils/rdioparser.h"
 
 #include "widgets/searchwidget.h"
-#include "viewmanager.h"
+#include "ViewManager.h"
 #include "playlist/topbar/topbar.h"
 #include "playlist/playlistview.h"
 

src/libtomahawk/GlobalActionManager.h

@@ -20,10 +20,10 @@
 #ifndef GLOBALACTIONMANAGER_H
 #define GLOBALACTIONMANAGER_H
 
-#include "query.h"
-#include "playlist.h"
+#include "Query.h"
+#include "Playlist.h"
 #include "playlist/dynamic/DynamicPlaylist.h"
-#include "dllmacro.h"
+#include "DllMacro.h"
 
 #include <QNetworkAccessManager>
 #include <QNetworkReply>

src/libtomahawk/LatchManager.cpp

@@ -19,14 +19,14 @@
 
 #include "LatchManager.h"
 
-#include "actioncollection.h"
+#include "ActionCollection.h"
 #include "audio/audioengine.h"
 #include "database/database.h"
 
 #include <QtGui/QAction>
-#include "sourcelist.h"
+#include "SourceList.h"
 #include "database/databasecommand_socialaction.h"
-#include "sourceplaylistinterface.h"
+#include "SourcePlaylistInterface.h"
 
 using namespace Tomahawk;
 

src/libtomahawk/LatchManager.h

@@ -20,7 +20,7 @@
 #ifndef LATCHMANAGER_H
 #define LATCHMANAGER_H
 
-#include "dllmacro.h"
+#include "DllMacro.h"
 #include "Source.h"
 
 #include <QtCore/QObject>

src/libtomahawk/Pipeline.cpp

@@ -16,11 +16,11 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "pipeline.h"
+#include "Pipeline.h"
 
 #include <QMutexLocker>
 
-#include "functimeout.h"
+#include "FuncTimeout.h"
 #include "database/database.h"
 #include "ExternalResolver.h"
 #include "resolvers/scriptresolver.h"

src/libtomahawk/Pipeline.h

@@ -19,8 +19,8 @@
 #ifndef PIPELINE_H
 #define PIPELINE_H
 
-#include "typedefs.h"
-#include "query.h"
+#include "Typedefs.h"
+#include "Query.h"
 
 #include <QObject>
 #include <QList>
@@ -30,7 +30,7 @@
 
 #include <boost/function.hpp>
 
-#include "dllmacro.h"
+#include "DllMacro.h"
 
 namespace Tomahawk
 {

src/libtomahawk/Playlist.cpp

@@ -18,7 +18,7 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "playlist.h"
+#include "Playlist.h"
 
 #include <QtXml/QDomDocument>
 #include <QtXml/QDomElement>
@@ -30,11 +30,11 @@
 #include "database/databasecommand_deleteplaylist.h"
 #include "database/databasecommand_renameplaylist.h"
 
-#include "tomahawksettings.h"
-#include "pipeline.h"
+#include "TomahawkSettings.h"
+#include "Pipeline.h"
 #include "Source.h"
-#include "sourcelist.h"
-#include "playlistplaylistinterface.h"
+#include "SourceList.h"
+#include "PlaylistPlaylistInterface.h"
 
 #include "utils/logger.h"
 #include "PlaylistUpdaterInterface.h"

src/libtomahawk/Playlist.h

@@ -27,13 +27,13 @@
 #include <QSharedPointer>
 #include <QQueue>
 
-#include "typedefs.h"
-#include "result.h"
-#include "playlistinterface.h"
+#include "Typedefs.h"
+#include "Result.h"
+#include "PlaylistInterface.h"
 #include "playlist/PlaylistUpdaterInterface.h"
-#include "query.h"
+#include "Query.h"
 
-#include "dllmacro.h"
+#include "DllMacro.h"
 
 class DatabaseCommand_LoadAllPlaylists;
 class DatabaseCommand_LoadAllSortedPlaylists;