CamelCase round 3: ~100 more down.

src/AudioControls.cpp

@@ -25,8 +25,8 @@
 #include <QtGui/QMouseEvent>
 
 #include "audio/audioengine.h"
-#include "playlist/playlistview.h"
-#include "database/database.h"
+#include "playlist/PlaylistView.h"
+#include "database/Database.h"
 #include "widgets/imagebutton.h"
 #include "utils/tomahawkutils.h"
 #include "utils/logger.h"

src/MusicScanner.cpp

@@ -24,7 +24,7 @@
 #include "utils/tomahawkutils.h"
 #include "TomahawkSettings.h"
 #include "SourceList.h"
-#include "database/database.h"
+#include "database/Database.h"
 #include "database/databasecommand_dirmtimes.h"
 #include "database/databasecommand_filemtimes.h"
 #include "database/databasecommand_collectionstats.h"

src/MusicScanner.h

@@ -21,7 +21,7 @@
 #define MUSICSCANNER_H
 
 #include "TomahawkSettings.h"
-#include "database/databasecommand.h"
+#include "database/DatabaseCommand.h"
 
 /* taglib */
 #include <taglib/fileref.h>
@@ -36,7 +36,7 @@
 #include <QtCore/QMutex>
 #include <QtCore/QMutexLocker>
 #include <QtCore/QWeakPointer>
-#include <database/database.h>
+#include <database/Database.h>
 
 // descend dir tree comparing dir mtimes to last known mtime
 // emit signal for any dir with new content, so we can scan it.

src/ScanManager.cpp

@@ -28,7 +28,7 @@
 #include "utils/tomahawkutils.h"
 #include "libtomahawk/SourceList.h"
 
-#include "database/database.h"
+#include "database/Database.h"
 #include "database/databasecommand_filemtimes.h"
 #include "database/databasecommand_deletefiles.h"
 

src/SearchBox.ui

@@ -36,7 +36,7 @@
   <customwidget>
    <class>SearchLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>libtomahawk/playlist/topbar/searchlineedit.h</header>
+   <header>libtomahawk/playlist/topbar/SearchLineEdit.h</header>
   </customwidget>
  </customwidgets>
  <resources/>

src/SettingsDialog.cpp

@@ -42,7 +42,7 @@
 #include "ScanManager.h"
 #include "SettingsListDelegate.h"
 #include "AccountDelegate.h"
-#include "database/database.h"
+#include "database/Database.h"
 #include "network/Servent.h"
 #include "playlist/dynamic/widgets/LoadingSpinner.h"
 #include "accounts/AccountModel.h"

src/TomahawkApp.cpp

@@ -37,10 +37,10 @@
 #include "accounts/AccountManager.h"
 #include "accounts/spotify/SpotifyAccount.h"
 #include "accounts/lastfm/LastFmAccount.h"
-#include "database/database.h"
-#include "database/databasecollection.h"
+#include "database/Database.h"
+#include "database/DatabaseCollection.h"
 #include "database/databasecommand_collectionstats.h"
-#include "database/databaseresolver.h"
+#include "database/DatabaseResolver.h"
 #include "playlist/dynamic/GeneratorFactory.h"
 #include "playlist/dynamic/echonest/EchonestGenerator.h"
 #include "playlist/dynamic/database/DatabaseGenerator.h"

src/TomahawkWindow.cpp

@@ -49,9 +49,9 @@
 #include "widgets/playlisttypeselectordlg.h"
 #include "thirdparty/Qocoa/qsearchfield.h"
 #include "playlist/dynamic/GeneratorInterface.h"
-#include "playlist/playlistmodel.h"
-#include "playlist/playlistview.h"
-#include "playlist/queueview.h"
+#include "playlist/PlaylistModel.h"
+#include "playlist/PlaylistView.h"
+#include "playlist/QueueView.h"
 
 #include "AudioControls.h"
 #include "SettingsDialog.h"

src/accounts/twitter/TwitterConfigWidget.cpp

@@ -23,7 +23,7 @@
 
 #include "TomahawkSettings.h"
 #include "utils/tomahawkutils.h"
-#include "database/database.h"
+#include "database/Database.h"
 
 #include "TomahawkOAuthTwitter.h"
 #include <QTweetLib/qtweetaccountverifycredentials.h>

src/accounts/twitter/sip/TwitterSip.cpp

@@ -35,7 +35,7 @@
 
 #include <utils/tomahawkutils.h>
 #include <TomahawkSettings.h>
-#include <database/database.h>
+#include <database/Database.h>
 #include <network/Servent.h>
 
 #include "utils/logger.h"

src/accounts/zeroconf/TomahawkZeroconf.h

@@ -28,7 +28,7 @@
 #include <QUdpSocket>
 #include <QTimer>
 
-#include "database/database.h"
+#include "database/Database.h"
 #include "network/Servent.h"
 #include "accounts/AccountDllMacro.h"
 

src/libtomahawk/Album.cpp

@@ -21,7 +21,7 @@
 
 #include "Artist.h"
 #include "AlbumPlaylistInterface.h"
-#include "database/database.h"
+#include "database/Database.h"
 #include "database/DatabaseImpl.h"
 #include "Query.h"
 

src/libtomahawk/AlbumPlaylistInterface.cpp

@@ -20,7 +20,7 @@
 #include "AlbumPlaylistInterface.h"
 
 #include "Artist.h"
-#include "database/database.h"
+#include "database/Database.h"
 #include "database/DatabaseImpl.h"
 #include "database/databasecommand_alltracks.h"
 #include "Query.h"

src/libtomahawk/Artist.cpp

@@ -21,7 +21,7 @@
 
 #include "ArtistPlaylistInterface.h"
 #include "Collection.h"
-#include "database/database.h"
+#include "database/Database.h"
 #include "database/DatabaseImpl.h"
 #include "Query.h"
 

src/libtomahawk/ArtistPlaylistInterface.cpp

@@ -22,7 +22,7 @@
 #include "Artist.h"
 #include "Collection.h"
 #include "Query.h"
-#include "database/database.h"
+#include "database/Database.h"
 #include "database/databasecommand_alltracks.h"
 
 #include "utils/logger.h"

src/libtomahawk/CMakeLists.txt

@@ -45,38 +45,38 @@ set( libGuiSources
 
     infobar/infobar.cpp
 
-    playlist/treemodel.cpp
-    playlist/treeproxymodel.cpp
-    playlist/treeproxymodelplaylistinterface.cpp
-    playlist/treeheader.cpp
-    playlist/treeitemdelegate.cpp
-    playlist/collectionproxymodel.cpp
-    playlist/collectionproxymodelplaylistinterface.cpp
-    playlist/collectionflatmodel.cpp
-    playlist/collectionview.cpp
-    playlist/playlistmodel.cpp
-    playlist/playlistproxymodel.cpp
-    playlist/playlistproxymodelplaylistinterface.cpp
-    playlist/playlistview.cpp
-    playlist/playlistitemdelegate.cpp
-    playlist/queueproxymodel.cpp
-    playlist/queueproxymodelplaylistinterface.cpp
-    playlist/queueview.cpp
-    playlist/trackmodel.cpp
-    playlist/trackmodelitem.cpp
-    playlist/trackproxymodel.cpp
-    playlist/trackproxymodelplaylistinterface.cpp
-    playlist/trackview.cpp
-    playlist/trackheader.cpp
-    playlist/treemodelitem.cpp
-    playlist/albumitem.cpp
-    playlist/albummodel.cpp
-    playlist/albumproxymodel.cpp
-    playlist/albumproxymodelplaylistinterface.cpp
-    playlist/albumitemdelegate.cpp
-    playlist/albumview.cpp
-    playlist/artistview.cpp
-    playlist/customplaylistview.cpp
+    playlist/TreeModel.cpp
+    playlist/TreeProxyModel.cpp
+    playlist/TreeProxyModelPlaylistInterface.cpp
+    playlist/TreeHeader.cpp
+    playlist/TreeItemDelegate.cpp
+    playlist/CollectionProxyModel.cpp
+    playlist/CollectionProxyModelPlaylistInterface.cpp
+    playlist/CollectionFlatModel.cpp
+    playlist/CollectionView.cpp
+    playlist/PlaylistModel.cpp
+    playlist/PlaylistProxyModel.cpp
+    playlist/PlaylistProxyModelPlaylistInterface.cpp
+    playlist/PlaylistView.cpp
+    playlist/PlaylistItemDelegate.cpp
+    playlist/QueueProxyModel.cpp
+    playlist/QueueProxyModelPlaylistInterface.cpp
+    playlist/QueueView.cpp
+    playlist/TrackModel.cpp
+    playlist/TrackModelItem.cpp
+    playlist/TrackProxyModel.cpp
+    playlist/TrackProxyModelPlaylistInterface.cpp
+    playlist/TrackView.cpp
+    playlist/TrackHeader.cpp
+    playlist/TreeModelItem.cpp
+    playlist/AlbumItem.cpp
+    playlist/AlbumModel.cpp
+    playlist/AlbumProxyModel.cpp
+    playlist/AlbumProxyModelPlaylistInterface.cpp
+    playlist/AlbumItemDelegate.cpp
+    playlist/AlbumView.cpp
+    playlist/ArtistView.cpp
+    playlist/CustomPlaylistView.cpp
     playlist/ViewHeader.cpp
     playlist/RecentlyAddedModel.cpp
     playlist/RecentlyPlayedModel.cpp
@@ -98,11 +98,11 @@ set( libGuiSources
     playlist/dynamic/widgets/DynamicSetupWidget.cpp
     playlist/dynamic/widgets/LoadingSpinner.cpp
 
-    playlist/topbar/topbar.cpp
-    playlist/topbar/clearbutton.cpp
-    playlist/topbar/searchlineedit.cpp
-    playlist/topbar/lineedit.cpp
-    playlist/topbar/searchbutton.cpp
+    playlist/topbar/TopBar.cpp
+    playlist/topbar/ClearButton.cpp
+    playlist/topbar/SearchLineEdit.cpp
+    playlist/topbar/LineEdit.cpp
+    playlist/topbar/SearchButton.cpp
 
     ExternalResolverGui.cpp
     resolvers/scriptresolver.cpp
@@ -141,7 +141,7 @@ set( libGuiSources
     widgets/RecentlyPlayedPlaylistsModel.cpp
     widgets/RecentPlaylistsModel.cpp
     widgets/OverlayButton.cpp
-    widgets/overlaywidget.cpp
+    widgets/OverlayWidget.cpp
     widgets/HeaderLabel.cpp
     widgets/HeaderWidget.cpp
     widgets/combobox.cpp
@@ -196,15 +196,15 @@ set( libSources
     audio/audioengine.cpp
 
 
-    database/database.cpp
-    database/fuzzyindex.cpp
-    database/databasecollection.cpp
+    database/Database.cpp
+    database/FuzzyIndex.cpp
+    database/DatabaseCollection.cpp
     database/LocalCollection.cpp
-    database/databaseworker.cpp
+    database/DatabaseWorker.cpp
     database/DatabaseImpl.cpp
-    database/databaseresolver.cpp
-    database/databasecommand.cpp
-    database/databasecommandloggable.cpp
+    database/DatabaseResolver.cpp
+    database/DatabaseCommand.cpp
+    database/DatabaseCommandLoggable.cpp
     database/databasecommand_resolve.cpp
     database/databasecommand_allartists.cpp
     database/databasecommand_allalbums.cpp
@@ -246,7 +246,7 @@ set( libSources
     database/databasecommand_collectionattributes.cpp
     database/databasecommand_trackattributes.cpp
     database/databasecommand_settrackattributes.cpp
-    database/database.cpp
+    database/Database.cpp
 
     infosystem/infosystem.cpp
     infosystem/infosystemcache.cpp
@@ -312,8 +312,8 @@ set( libUI ${libUI}
     widgets/infowidgets/sourceinfowidget.ui
     widgets/infowidgets/ArtistInfoWidget.ui
     widgets/infowidgets/AlbumInfoWidget.ui
-    playlist/topbar/topbar.ui
-    playlist/queueview.ui
+    playlist/topbar/TopBar.ui
+    playlist/QueueView.ui
     context/ContextWidget.ui
     infobar/infobar.ui
 )

src/libtomahawk/ContextMenu.cpp

@@ -20,7 +20,7 @@
 #include "ContextMenu.h"
 
 #include "GlobalActionManager.h"
-#include "playlistview.h"
+#include "PlaylistView.h"
 #include "ViewManager.h"
 #include "Query.h"
 #include "Source.h"

src/libtomahawk/EchonestCatalogSynchronizer.cpp

@@ -19,7 +19,7 @@
 #include "EchonestCatalogSynchronizer.h"
 
 #include "Collection.h"
-#include "database/database.h"
+#include "database/Database.h"
 #include "database/databasecommand_genericselect.h"
 #include "database/databasecommand_setcollectionattributes.h"
 #include "database/databasecommand_loadfiles.h"

src/libtomahawk/GlobalActionManager.cpp

@@ -43,8 +43,8 @@
 
 #include "widgets/searchwidget.h"
 #include "ViewManager.h"
-#include "playlist/topbar/topbar.h"
-#include "playlist/playlistview.h"
+#include "playlist/topbar/TopBar.h"
+#include "playlist/PlaylistView.h"
 
 #include <QtGui/QApplication>
 #include <QtGui/QClipboard>

src/libtomahawk/LatchManager.cpp

@@ -21,7 +21,7 @@
 
 #include "ActionCollection.h"
 #include "audio/audioengine.h"
-#include "database/database.h"
+#include "database/Database.h"
 
 #include <QtGui/QAction>
 #include "SourceList.h"

src/libtomahawk/Pipeline.cpp

@@ -21,7 +21,7 @@
 #include <QMutexLocker>
 
 #include "FuncTimeout.h"
-#include "database/database.h"
+#include "database/Database.h"
 #include "ExternalResolver.h"
 #include "resolvers/scriptresolver.h"
 #include "resolvers/qtscriptresolver.h"

src/libtomahawk/Playlist.cpp

@@ -23,7 +23,7 @@
 #include <QtXml/QDomDocument>
 #include <QtXml/QDomElement>
 
-#include "database/database.h"
+#include "database/Database.h"
 #include "database/databasecommand_loadplaylistentries.h"
 #include "database/databasecommand_setplaylistrevision.h"
 #include "database/databasecommand_createplaylist.h"

src/libtomahawk/Query.cpp

@@ -21,7 +21,7 @@
 
 #include <QtAlgorithms>
 
-#include "database/database.h"
+#include "database/Database.h"
 #include "database/DatabaseImpl.h"
 #include "database/databasecommand_logplayback.h"
 #include "database/databasecommand_playbackhistory.h"

src/libtomahawk/Result.cpp

@@ -21,7 +21,7 @@
 #include "Album.h"
 #include "Collection.h"
 #include "Source.h"
-#include "database/database.h"
+#include "database/Database.h"
 #include "database/databasecommand_resolve.h"
 #include "database/databasecommand_alltracks.h"
 #include "database/databasecommand_addfiles.h"

src/libtomahawk/Source.cpp

@@ -28,7 +28,7 @@
 #include "database/databasecommand_collectionstats.h"
 #include "database/databasecommand_sourceoffline.h"
 #include "database/databasecommand_updatesearchindex.h"
-#include "database/database.h"
+#include "database/Database.h"
 
 #include <QCoreApplication>
 

src/libtomahawk/SourceList.cpp

@@ -18,7 +18,7 @@
 
 #include "SourceList.h"
 
-#include "database/database.h"
+#include "database/Database.h"
 #include "database/databasecommand_loadallsources.h"
 #include "network/RemoteCollection.h"
 #include "network/ControlConnection.h"

src/libtomahawk/TomahawkSettings.cpp

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