diff --git a/src/AudioControls.cpp b/src/AudioControls.cpp index 5625804cb..85ffccd81 100644 --- a/src/AudioControls.cpp +++ b/src/AudioControls.cpp @@ -25,8 +25,8 @@ #include #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" diff --git a/src/MusicScanner.cpp b/src/MusicScanner.cpp index 105d6db88..9ed17a09b 100644 --- a/src/MusicScanner.cpp +++ b/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" diff --git a/src/MusicScanner.h b/src/MusicScanner.h index ca9b48c31..b819f36f2 100644 --- a/src/MusicScanner.h +++ b/src/MusicScanner.h @@ -21,7 +21,7 @@ #define MUSICSCANNER_H #include "TomahawkSettings.h" -#include "database/databasecommand.h" +#include "database/DatabaseCommand.h" /* taglib */ #include @@ -36,7 +36,7 @@ #include #include #include -#include +#include // descend dir tree comparing dir mtimes to last known mtime // emit signal for any dir with new content, so we can scan it. diff --git a/src/ScanManager.cpp b/src/ScanManager.cpp index fb2b0e479..018134254 100644 --- a/src/ScanManager.cpp +++ b/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" diff --git a/src/SearchBox.ui b/src/SearchBox.ui index 10b0f8783..95e9a248d 100644 --- a/src/SearchBox.ui +++ b/src/SearchBox.ui @@ -36,7 +36,7 @@ SearchLineEdit QLineEdit -
libtomahawk/playlist/topbar/searchlineedit.h
+
libtomahawk/playlist/topbar/SearchLineEdit.h
 diff --git a/src/SettingsDialog.cpp b/src/SettingsDialog.cpp index 35ee91f1a..2fa5d609a 100644 --- a/src/SettingsDialog.cpp +++ b/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" diff --git a/src/TomahawkApp.cpp b/src/TomahawkApp.cpp index 9b915675e..22d4a3b4f 100644 --- a/src/TomahawkApp.cpp +++ b/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" diff --git a/src/TomahawkWindow.cpp b/src/TomahawkWindow.cpp index 93ed6165a..a127deddd 100644 --- a/src/TomahawkWindow.cpp +++ b/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" diff --git a/src/accounts/twitter/TwitterConfigWidget.cpp b/src/accounts/twitter/TwitterConfigWidget.cpp index befa89277..0321dbac1 100644 --- a/src/accounts/twitter/TwitterConfigWidget.cpp +++ b/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 diff --git a/src/accounts/twitter/sip/TwitterSip.cpp b/src/accounts/twitter/sip/TwitterSip.cpp index 905a09513..a54e1f319 100644 --- a/src/accounts/twitter/sip/TwitterSip.cpp +++ b/src/accounts/twitter/sip/TwitterSip.cpp @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include "utils/logger.h" diff --git a/src/accounts/zeroconf/TomahawkZeroconf.h b/src/accounts/zeroconf/TomahawkZeroconf.h index b154ebcf3..d52c2ec88 100644 --- a/src/accounts/zeroconf/TomahawkZeroconf.h +++ b/src/accounts/zeroconf/TomahawkZeroconf.h @@ -28,7 +28,7 @@ #include #include -#include "database/database.h" +#include "database/Database.h" #include "network/Servent.h" #include "accounts/AccountDllMacro.h" diff --git a/src/libtomahawk/Album.cpp b/src/libtomahawk/Album.cpp index b0c6844ff..2b99ed5cb 100644 --- a/src/libtomahawk/Album.cpp +++ b/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" diff --git a/src/libtomahawk/AlbumPlaylistInterface.cpp b/src/libtomahawk/AlbumPlaylistInterface.cpp index 576bacd4a..4521723d4 100644 --- a/src/libtomahawk/AlbumPlaylistInterface.cpp +++ b/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" diff --git a/src/libtomahawk/Artist.cpp b/src/libtomahawk/Artist.cpp index b701e5848..227380b80 100644 --- a/src/libtomahawk/Artist.cpp +++ b/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" diff --git a/src/libtomahawk/ArtistPlaylistInterface.cpp b/src/libtomahawk/ArtistPlaylistInterface.cpp index 1c388404d..56bf3ec35 100644 --- a/src/libtomahawk/ArtistPlaylistInterface.cpp +++ b/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" diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt index 28f4905c5..5611b1c07 100644 --- a/src/libtomahawk/CMakeLists.txt +++ b/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 ) diff --git a/src/libtomahawk/ContextMenu.cpp b/src/libtomahawk/ContextMenu.cpp index 9ae67efb3..ab46994a0 100644 --- a/src/libtomahawk/ContextMenu.cpp +++ b/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" diff --git a/src/libtomahawk/EchonestCatalogSynchronizer.cpp b/src/libtomahawk/EchonestCatalogSynchronizer.cpp index 03d9ee26d..4170b3e26 100644 --- a/src/libtomahawk/EchonestCatalogSynchronizer.cpp +++ b/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" diff --git a/src/libtomahawk/GlobalActionManager.cpp b/src/libtomahawk/GlobalActionManager.cpp index 8149f4de4..9800a1ef3 100644 --- a/src/libtomahawk/GlobalActionManager.cpp +++ b/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 #include diff --git a/src/libtomahawk/LatchManager.cpp b/src/libtomahawk/LatchManager.cpp index 812c6e475..04d1ef75c 100644 --- a/src/libtomahawk/LatchManager.cpp +++ b/src/libtomahawk/LatchManager.cpp @@ -21,7 +21,7 @@ #include "ActionCollection.h" #include "audio/audioengine.h" -#include "database/database.h" +#include "database/Database.h" #include #include "SourceList.h" diff --git a/src/libtomahawk/Pipeline.cpp b/src/libtomahawk/Pipeline.cpp index 00af7e940..46fe5e6c7 100644 --- a/src/libtomahawk/Pipeline.cpp +++ b/src/libtomahawk/Pipeline.cpp @@ -21,7 +21,7 @@ #include #include "FuncTimeout.h" -#include "database/database.h" +#include "database/Database.h" #include "ExternalResolver.h" #include "resolvers/scriptresolver.h" #include "resolvers/qtscriptresolver.h" diff --git a/src/libtomahawk/Playlist.cpp b/src/libtomahawk/Playlist.cpp index ac19d2c5b..8dbc0cee8 100644 --- a/src/libtomahawk/Playlist.cpp +++ b/src/libtomahawk/Playlist.cpp @@ -23,7 +23,7 @@ #include #include -#include "database/database.h" +#include "database/Database.h" #include "database/databasecommand_loadplaylistentries.h" #include "database/databasecommand_setplaylistrevision.h" #include "database/databasecommand_createplaylist.h" diff --git a/src/libtomahawk/Query.cpp b/src/libtomahawk/Query.cpp index e7ccec251..ee825b7ea 100644 --- a/src/libtomahawk/Query.cpp +++ b/src/libtomahawk/Query.cpp @@ -21,7 +21,7 @@ #include -#include "database/database.h" +#include "database/Database.h" #include "database/DatabaseImpl.h" #include "database/databasecommand_logplayback.h" #include "database/databasecommand_playbackhistory.h" diff --git a/src/libtomahawk/Result.cpp b/src/libtomahawk/Result.cpp index 6ff57feb2..420e9eb23 100644 --- a/src/libtomahawk/Result.cpp +++ b/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" diff --git a/src/libtomahawk/Source.cpp b/src/libtomahawk/Source.cpp index 91f1d48eb..a5a5a21b9 100644 --- a/src/libtomahawk/Source.cpp +++ b/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 diff --git a/src/libtomahawk/SourceList.cpp b/src/libtomahawk/SourceList.cpp index 5427643c1..ba65336c8 100644 --- a/src/libtomahawk/SourceList.cpp +++ b/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" diff --git a/src/libtomahawk/TomahawkSettings.cpp b/src/libtomahawk/TomahawkSettings.cpp index 1afacbe3f..67cd49372 100644 --- a/src/libtomahawk/TomahawkSettings.cpp +++ b/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; diff --git a/src/libtomahawk/ViewManager.cpp b/src/libtomahawk/ViewManager.cpp index e6ca483f3..717ceed1a 100644 --- a/src/libtomahawk/ViewManager.cpp +++ b/src/libtomahawk/ViewManager.cpp @@ -25,23 +25,23 @@ #include "audio/audioengine.h" #include "context/ContextWidget.h" #include "infobar/infobar.h" -#include "topbar/topbar.h" +#include "topbar/TopBar.h" -#include "treemodel.h" -#include "collectionflatmodel.h" -#include "collectionview.h" -#include "playlistmodel.h" -#include "playlistview.h" -#include "trackproxymodel.h" -#include "trackmodel.h" -#include "artistview.h" -#include "albumview.h" -#include "albumproxymodel.h" -#include "albummodel.h" +#include "TreeModel.h" +#include "CollectionFlatModel.h" +#include "CollectionView.h" +#include "PlaylistModel.h" +#include "PlaylistView.h" +#include "TrackProxyModel.h" +#include "TrackModel.h" +#include "ArtistView.h" +#include "AlbumView.h" +#include "AlbumProxyModel.h" +#include "AlbumModel.h" #include "SourceList.h" #include "TomahawkSettings.h" -#include "customplaylistview.h" +#include "CustomPlaylistView.h" #include "PlaylistLargeItemDelegate.h" #include "RecentlyPlayedModel.h" #include "dynamic/widgets/DynamicWidget.h" diff --git a/src/libtomahawk/ViewManager.h b/src/libtomahawk/ViewManager.h index 3d3816f9f..7755406d7 100644 --- a/src/libtomahawk/ViewManager.h +++ b/src/libtomahawk/ViewManager.h @@ -27,7 +27,7 @@ #include "Artist.h" #include "Collection.h" #include "PlaylistInterface.h" -#include "playlist/queueview.h" +#include "playlist/QueueView.h" #include "ViewPage.h" #include "widgets/welcomewidget.h" #include "widgets/whatshotwidget.h" diff --git a/src/libtomahawk/audio/audioengine.cpp b/src/libtomahawk/audio/audioengine.cpp index fb57f4fd3..3b6c7c063 100644 --- a/src/libtomahawk/audio/audioengine.cpp +++ b/src/libtomahawk/audio/audioengine.cpp @@ -28,7 +28,7 @@ #include "PlaylistInterface.h" #include "SourcePlaylistInterface.h" #include "TomahawkSettings.h" -#include "database/database.h" +#include "database/Database.h" #include "database/databasecommand_logplayback.h" #include "network/Servent.h" #include "utils/qnr_iodevicestream.h" diff --git a/src/libtomahawk/context/ContextWidget.cpp b/src/libtomahawk/context/ContextWidget.cpp index e09d02b67..b0b346529 100644 --- a/src/libtomahawk/context/ContextWidget.cpp +++ b/src/libtomahawk/context/ContextWidget.cpp @@ -29,8 +29,8 @@ #include "context/pages/TopTracksContext.h" #include "context/pages/WikipediaContext.h" -#include "playlist/artistview.h" -#include "playlist/treemodel.h" +#include "playlist/ArtistView.h" +#include "playlist/TreeModel.h" #include "utils/stylehelper.h" #include "utils/tomahawkutilsgui.h" diff --git a/src/libtomahawk/context/pages/RelatedArtistsContext.cpp b/src/libtomahawk/context/pages/RelatedArtistsContext.cpp index 612eb5e8f..628d47eb0 100644 --- a/src/libtomahawk/context/pages/RelatedArtistsContext.cpp +++ b/src/libtomahawk/context/pages/RelatedArtistsContext.cpp @@ -21,8 +21,8 @@ #include -#include "playlist/artistview.h" -#include "playlist/treemodel.h" +#include "playlist/ArtistView.h" +#include "playlist/TreeModel.h" using namespace Tomahawk; diff --git a/src/libtomahawk/context/pages/TopTracksContext.cpp b/src/libtomahawk/context/pages/TopTracksContext.cpp index 930b59eee..12b8366a8 100644 --- a/src/libtomahawk/context/pages/TopTracksContext.cpp +++ b/src/libtomahawk/context/pages/TopTracksContext.cpp @@ -19,9 +19,9 @@ #include "TopTracksContext.h" -#include "playlist/playlistmodel.h" -#include "playlist/playlistview.h" -#include "playlist/trackheader.h" +#include "playlist/PlaylistModel.h" +#include "playlist/PlaylistView.h" +#include "playlist/TrackHeader.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/database.cpp b/src/libtomahawk/database/Database.cpp similarity index 97% rename from src/libtomahawk/database/database.cpp rename to src/libtomahawk/database/Database.cpp index 9e2e0ba4f..1c146543c 100644 --- a/src/libtomahawk/database/database.cpp +++ b/src/libtomahawk/database/Database.cpp @@ -17,11 +17,11 @@ * along with Tomahawk. If not, see . */ -#include "database.h" +#include "Database.h" -#include "databasecommand.h" +#include "DatabaseCommand.h" #include "DatabaseImpl.h" -#include "databaseworker.h" +#include "DatabaseWorker.h" #include "utils/logger.h" #define DEFAULT_WORKER_THREADS 4 diff --git a/src/libtomahawk/database/database.h b/src/libtomahawk/database/Database.h similarity index 98% rename from src/libtomahawk/database/database.h rename to src/libtomahawk/database/Database.h index 07d2a4f85..b265bd39c 100644 --- a/src/libtomahawk/database/database.h +++ b/src/libtomahawk/database/Database.h @@ -25,7 +25,7 @@ #include "Artist.h" #include "Album.h" -#include "databasecommand.h" +#include "DatabaseCommand.h" #include "DllMacro.h" diff --git a/src/libtomahawk/database/databasecollection.cpp b/src/libtomahawk/database/DatabaseCollection.cpp similarity index 98% rename from src/libtomahawk/database/databasecollection.cpp rename to src/libtomahawk/database/DatabaseCollection.cpp index 801897a69..f6968059e 100644 --- a/src/libtomahawk/database/databasecollection.cpp +++ b/src/libtomahawk/database/DatabaseCollection.cpp @@ -16,9 +16,9 @@ * along with Tomahawk. If not, see . */ -#include "databasecollection.h" +#include "DatabaseCollection.h" -#include "database/database.h" +#include "database/Database.h" #include "databasecommand_alltracks.h" #include "databasecommand_addfiles.h" #include "databasecommand_deletefiles.h" diff --git a/src/libtomahawk/database/databasecollection.h b/src/libtomahawk/database/DatabaseCollection.h similarity index 100% rename from src/libtomahawk/database/databasecollection.h rename to src/libtomahawk/database/DatabaseCollection.h diff --git a/src/libtomahawk/database/databasecommand.cpp b/src/libtomahawk/database/DatabaseCommand.cpp similarity index 99% rename from src/libtomahawk/database/databasecommand.cpp rename to src/libtomahawk/database/DatabaseCommand.cpp index 83b0e4b57..2cb716bb6 100644 --- a/src/libtomahawk/database/databasecommand.cpp +++ b/src/libtomahawk/database/DatabaseCommand.cpp @@ -16,7 +16,7 @@ * along with Tomahawk. If not, see . */ -#include "databasecommand.h" +#include "DatabaseCommand.h" #include "databasecommand_addfiles.h" #include "databasecommand_createplaylist.h" diff --git a/src/libtomahawk/database/databasecommand.h b/src/libtomahawk/database/DatabaseCommand.h similarity index 99% rename from src/libtomahawk/database/databasecommand.h rename to src/libtomahawk/database/DatabaseCommand.h index 12f211506..9c5f02c23 100644 --- a/src/libtomahawk/database/databasecommand.h +++ b/src/libtomahawk/database/DatabaseCommand.h @@ -27,7 +27,7 @@ #include #include "Typedefs.h" -#include "database/op.h" +#include "database/Op.h" #include "DllMacro.h" diff --git a/src/libtomahawk/database/databasecommandloggable.cpp b/src/libtomahawk/database/DatabaseCommandLoggable.cpp similarity index 95% rename from src/libtomahawk/database/databasecommandloggable.cpp rename to src/libtomahawk/database/DatabaseCommandLoggable.cpp index c665f0c89..bb2074ee1 100644 --- a/src/libtomahawk/database/databasecommandloggable.cpp +++ b/src/libtomahawk/database/DatabaseCommandLoggable.cpp @@ -16,6 +16,6 @@ * along with Tomahawk. If not, see . */ -#include "databasecommandloggable.h" +#include "DatabaseCommandLoggable.h" #include "utils/logger.h" diff --git a/src/libtomahawk/database/databasecommandloggable.h b/src/libtomahawk/database/DatabaseCommandLoggable.h similarity index 97% rename from src/libtomahawk/database/databasecommandloggable.h rename to src/libtomahawk/database/DatabaseCommandLoggable.h index 2684e4bad..1fcb60872 100644 --- a/src/libtomahawk/database/databasecommandloggable.h +++ b/src/libtomahawk/database/DatabaseCommandLoggable.h @@ -19,7 +19,7 @@ #ifndef DATABASECOMMANDLOGGABLE_H #define DATABASECOMMANDLOGGABLE_H -#include "database/databasecommand.h" +#include "database/DatabaseCommand.h" #include "DllMacro.h" /// A Database Command that will be added to the oplog and sent over the network diff --git a/src/libtomahawk/database/DatabaseImpl.cpp b/src/libtomahawk/database/DatabaseImpl.cpp index 5e1eb2557..b8462527e 100644 --- a/src/libtomahawk/database/DatabaseImpl.cpp +++ b/src/libtomahawk/database/DatabaseImpl.cpp @@ -26,7 +26,7 @@ #include #include -#include "database/database.h" +#include "database/Database.h" #include "databasecommand_updatesearchindex.h" #include "SourceList.h" #include "Result.h" @@ -35,11 +35,11 @@ #include "utils/tomahawkutils.h" #include "utils/logger.h" -/* !!!! You need to manually generate schema.sql.h when the schema changes: +/* !!!! You need to manually generate Schema.sql.h when the schema changes: cd src/libtomahawk/database - ./gen_schema.h.sh ./schema.sql tomahawk > schema.sql.h + ./gen_schema.h.sh ./Schema.sql tomahawk > Schema.sql.h */ -#include "schema.sql.h" +#include "Schema.sql.h" #define CURRENT_SCHEMA_VERSION 28 diff --git a/src/libtomahawk/database/DatabaseImpl.h b/src/libtomahawk/database/DatabaseImpl.h index f10c3f760..f734f171f 100644 --- a/src/libtomahawk/database/DatabaseImpl.h +++ b/src/libtomahawk/database/DatabaseImpl.h @@ -31,8 +31,8 @@ #include #include -#include "tomahawksqlquery.h" -#include "fuzzyindex.h" +#include "TomahawkSqlQuery.h" +#include "FuzzyIndex.h" #include "Typedefs.h" class Database; diff --git a/src/libtomahawk/database/databaseresolver.cpp b/src/libtomahawk/database/DatabaseResolver.cpp similarity index 97% rename from src/libtomahawk/database/databaseresolver.cpp rename to src/libtomahawk/database/DatabaseResolver.cpp index 8131e02fd..81c509124 100644 --- a/src/libtomahawk/database/databaseresolver.cpp +++ b/src/libtomahawk/database/DatabaseResolver.cpp @@ -16,11 +16,11 @@ * along with Tomahawk. If not, see . */ -#include "databaseresolver.h" +#include "DatabaseResolver.h" #include "Pipeline.h" #include "network/Servent.h" -#include "database/database.h" +#include "database/Database.h" #include "database/databasecommand_resolve.h" #include "utils/logger.h" diff --git a/src/libtomahawk/database/databaseresolver.h b/src/libtomahawk/database/DatabaseResolver.h similarity index 100% rename from src/libtomahawk/database/databaseresolver.h rename to src/libtomahawk/database/DatabaseResolver.h diff --git a/src/libtomahawk/database/databaseworker.cpp b/src/libtomahawk/database/DatabaseWorker.cpp similarity index 98% rename from src/libtomahawk/database/databaseworker.cpp rename to src/libtomahawk/database/DatabaseWorker.cpp index 7979706df..e1d485a70 100644 --- a/src/libtomahawk/database/databaseworker.cpp +++ b/src/libtomahawk/database/DatabaseWorker.cpp @@ -17,17 +17,17 @@ * along with Tomahawk. If not, see . */ -#include "databaseworker.h" +#include "DatabaseWorker.h" #include #include #include #include "Source.h" -#include "database.h" +#include "Database.h" #include "DatabaseImpl.h" -#include "databasecommandloggable.h" -#include "tomahawksqlquery.h" +#include "DatabaseCommandLoggable.h" +#include "TomahawkSqlQuery.h" #include "utils/logger.h" #ifndef QT_NO_DEBUG diff --git a/src/libtomahawk/database/databaseworker.h b/src/libtomahawk/database/DatabaseWorker.h similarity index 98% rename from src/libtomahawk/database/databaseworker.h rename to src/libtomahawk/database/DatabaseWorker.h index 44029bac1..458d4d427 100644 --- a/src/libtomahawk/database/databaseworker.h +++ b/src/libtomahawk/database/DatabaseWorker.h @@ -29,7 +29,7 @@ #include #include -#include "databasecommand.h" +#include "DatabaseCommand.h" class Database; class DatabaseCommandLoggable; diff --git a/src/libtomahawk/database/fuzzyindex.cpp b/src/libtomahawk/database/FuzzyIndex.cpp similarity index 99% rename from src/libtomahawk/database/fuzzyindex.cpp rename to src/libtomahawk/database/FuzzyIndex.cpp index 5e4565a72..4f33f7f36 100644 --- a/src/libtomahawk/database/fuzzyindex.cpp +++ b/src/libtomahawk/database/FuzzyIndex.cpp @@ -16,7 +16,7 @@ * along with Tomahawk. If not, see . */ -#include "fuzzyindex.h" +#include "FuzzyIndex.h" #include #include diff --git a/src/libtomahawk/database/fuzzyindex.h b/src/libtomahawk/database/FuzzyIndex.h similarity index 100% rename from src/libtomahawk/database/fuzzyindex.h rename to src/libtomahawk/database/FuzzyIndex.h diff --git a/src/libtomahawk/database/LocalCollection.h b/src/libtomahawk/database/LocalCollection.h index f26300935..80e212a1d 100644 --- a/src/libtomahawk/database/LocalCollection.h +++ b/src/libtomahawk/database/LocalCollection.h @@ -20,7 +20,7 @@ #ifndef LOCALCOLLECTION_H #define LOCALCOLLECTION_H -#include "databasecollection.h" +#include "DatabaseCollection.h" #include "DllMacro.h" #include "Playlist.h" diff --git a/src/libtomahawk/database/op.h b/src/libtomahawk/database/Op.h similarity index 100% rename from src/libtomahawk/database/op.h rename to src/libtomahawk/database/Op.h diff --git a/src/libtomahawk/database/schema.sql b/src/libtomahawk/database/Schema.sql similarity index 100% rename from src/libtomahawk/database/schema.sql rename to src/libtomahawk/database/Schema.sql diff --git a/src/libtomahawk/database/schema.sql.h b/src/libtomahawk/database/Schema.sql.h similarity index 99% rename from src/libtomahawk/database/schema.sql.h rename to src/libtomahawk/database/Schema.sql.h index 4b66ab105..42af50880 100644 --- a/src/libtomahawk/database/schema.sql.h +++ b/src/libtomahawk/database/Schema.sql.h @@ -1,5 +1,5 @@ /* - This file was automatically generated from ./schema.sql on Fri Nov 18 14:00:37 CET 2011. + This file was automatically generated from ./Schema.sql on Fri Nov 18 14:00:37 CET 2011. */ static const char * tomahawk_schema_sql = diff --git a/src/libtomahawk/database/tomahawksqlquery.h b/src/libtomahawk/database/TomahawkSqlQuery.h similarity index 100% rename from src/libtomahawk/database/tomahawksqlquery.h rename to src/libtomahawk/database/TomahawkSqlQuery.h diff --git a/src/libtomahawk/database/databasecommand_addclientauth.cpp b/src/libtomahawk/database/databasecommand_addclientauth.cpp index a3410cacf..4874313b8 100644 --- a/src/libtomahawk/database/databasecommand_addclientauth.cpp +++ b/src/libtomahawk/database/databasecommand_addclientauth.cpp @@ -19,7 +19,7 @@ #include "databasecommand_addclientauth.h" #include "DatabaseImpl.h" -#include "tomahawksqlquery.h" +#include "TomahawkSqlQuery.h" #include "utils/logger.h" diff --git a/src/libtomahawk/database/databasecommand_addclientauth.h b/src/libtomahawk/database/databasecommand_addclientauth.h index 5467b10e0..659af18ee 100644 --- a/src/libtomahawk/database/databasecommand_addclientauth.h +++ b/src/libtomahawk/database/databasecommand_addclientauth.h @@ -19,7 +19,7 @@ #ifndef DATABASECOMMAND_ADDCLIENTAUTH_H #define DATABASECOMMAND_ADDCLIENTAUTH_H -#include "databasecommand.h" +#include "DatabaseCommand.h" #include "DllMacro.h" #include diff --git a/src/libtomahawk/database/databasecommand_addfiles.cpp b/src/libtomahawk/database/databasecommand_addfiles.cpp index 0fa6e07f2..a9eebbdff 100644 --- a/src/libtomahawk/database/databasecommand_addfiles.cpp +++ b/src/libtomahawk/database/databasecommand_addfiles.cpp @@ -23,7 +23,7 @@ #include "Artist.h" #include "Album.h" #include "Collection.h" -#include "database/database.h" +#include "database/Database.h" #include "DatabaseImpl.h" #include "network/DbSyncConnection.h" #include "network/Servent.h" diff --git a/src/libtomahawk/database/databasecommand_addfiles.h b/src/libtomahawk/database/databasecommand_addfiles.h index b471767ee..294c8e73e 100644 --- a/src/libtomahawk/database/databasecommand_addfiles.h +++ b/src/libtomahawk/database/databasecommand_addfiles.h @@ -22,7 +22,7 @@ #include #include -#include "database/databasecommandloggable.h" +#include "database/DatabaseCommandLoggable.h" #include "Typedefs.h" #include "Query.h" diff --git a/src/libtomahawk/database/databasecommand_addsource.h b/src/libtomahawk/database/databasecommand_addsource.h index e291e9814..fce75bafd 100644 --- a/src/libtomahawk/database/databasecommand_addsource.h +++ b/src/libtomahawk/database/databasecommand_addsource.h @@ -22,7 +22,7 @@ #include #include -#include "databasecommand.h" +#include "DatabaseCommand.h" #include "DllMacro.h" diff --git a/src/libtomahawk/database/databasecommand_allalbums.h b/src/libtomahawk/database/databasecommand_allalbums.h index a7e074c22..55a16f79f 100644 --- a/src/libtomahawk/database/databasecommand_allalbums.h +++ b/src/libtomahawk/database/databasecommand_allalbums.h @@ -26,7 +26,7 @@ #include "Artist.h" #include "Collection.h" #include "Typedefs.h" -#include "databasecommand.h" +#include "DatabaseCommand.h" #include "DllMacro.h" diff --git a/src/libtomahawk/database/databasecommand_allartists.h b/src/libtomahawk/database/databasecommand_allartists.h index 45180e36e..9f5ecc1ae 100644 --- a/src/libtomahawk/database/databasecommand_allartists.h +++ b/src/libtomahawk/database/databasecommand_allartists.h @@ -25,7 +25,7 @@ #include "Artist.h" #include "Collection.h" #include "Typedefs.h" -#include "databasecommand.h" +#include "DatabaseCommand.h" #include "DllMacro.h" diff --git a/src/libtomahawk/database/databasecommand_alltracks.h b/src/libtomahawk/database/databasecommand_alltracks.h index 57d0e119b..4aa8ee056 100644 --- a/src/libtomahawk/database/databasecommand_alltracks.h +++ b/src/libtomahawk/database/databasecommand_alltracks.h @@ -22,7 +22,7 @@ #include #include -#include "databasecommand.h" +#include "DatabaseCommand.h" #include "Collection.h" #include "Typedefs.h" #include "Query.h" diff --git a/src/libtomahawk/database/databasecommand_clientauthvalid.cpp b/src/libtomahawk/database/databasecommand_clientauthvalid.cpp index c8cd8ce98..5660b4c83 100644 --- a/src/libtomahawk/database/databasecommand_clientauthvalid.cpp +++ b/src/libtomahawk/database/databasecommand_clientauthvalid.cpp @@ -19,7 +19,7 @@ #include "databasecommand_clientauthvalid.h" #include "DatabaseImpl.h" -#include "tomahawksqlquery.h" +#include "TomahawkSqlQuery.h" #include "utils/logger.h" diff --git a/src/libtomahawk/database/databasecommand_clientauthvalid.h b/src/libtomahawk/database/databasecommand_clientauthvalid.h index 382918e80..ff94f6f51 100644 --- a/src/libtomahawk/database/databasecommand_clientauthvalid.h +++ b/src/libtomahawk/database/databasecommand_clientauthvalid.h @@ -19,7 +19,7 @@ #ifndef DATABASECOMMAND_CLIENTAUTHVALID_H #define DATABASECOMMAND_CLIENTAUTHVALID_H -#include "databasecommand.h" +#include "DatabaseCommand.h" #include "DllMacro.h" #include diff --git a/src/libtomahawk/database/databasecommand_collectionattributes.h b/src/libtomahawk/database/databasecommand_collectionattributes.h index a6012112f..0d02ea0d0 100644 --- a/src/libtomahawk/database/databasecommand_collectionattributes.h +++ b/src/libtomahawk/database/databasecommand_collectionattributes.h @@ -20,7 +20,7 @@ #define DATABASECOMMAND_COLLECTIONATTRIBUTES_H #include "Typedefs.h" -#include "databasecommand.h" +#include "DatabaseCommand.h" #include "databasecommand_setcollectionattributes.h" #include diff --git a/src/libtomahawk/database/databasecommand_collectionstats.h b/src/libtomahawk/database/databasecommand_collectionstats.h index ea2394038..0e87e6c77 100644 --- a/src/libtomahawk/database/databasecommand_collectionstats.h +++ b/src/libtomahawk/database/databasecommand_collectionstats.h @@ -21,7 +21,7 @@ #include -#include "databasecommand.h" +#include "DatabaseCommand.h" #include "Typedefs.h" #include "DllMacro.h" diff --git a/src/libtomahawk/database/databasecommand_createdynamicplaylist.cpp b/src/libtomahawk/database/databasecommand_createdynamicplaylist.cpp index d8a0bbeac..76828030e 100644 --- a/src/libtomahawk/database/databasecommand_createdynamicplaylist.cpp +++ b/src/libtomahawk/database/databasecommand_createdynamicplaylist.cpp @@ -22,7 +22,7 @@ #include #include "DatabaseImpl.h" -#include "tomahawksqlquery.h" +#include "TomahawkSqlQuery.h" #include "dynamic/DynamicPlaylist.h" #include "dynamic/DynamicControl.h" #include "dynamic/GeneratorInterface.h" diff --git a/src/libtomahawk/database/databasecommand_createplaylist.cpp b/src/libtomahawk/database/databasecommand_createplaylist.cpp index 56b11d5b3..7b87c1a81 100644 --- a/src/libtomahawk/database/databasecommand_createplaylist.cpp +++ b/src/libtomahawk/database/databasecommand_createplaylist.cpp @@ -22,7 +22,7 @@ #include "Source.h" #include "DatabaseImpl.h" -#include "tomahawksqlquery.h" +#include "TomahawkSqlQuery.h" #include "network/Servent.h" #include "utils/logger.h" diff --git a/src/libtomahawk/database/databasecommand_createplaylist.h b/src/libtomahawk/database/databasecommand_createplaylist.h index ee3c0bab2..f5df58d5a 100644 --- a/src/libtomahawk/database/databasecommand_createplaylist.h +++ b/src/libtomahawk/database/databasecommand_createplaylist.h @@ -20,7 +20,7 @@ #define DATABASECOMMAND_CREATEPLAYLIST_H #include "Typedefs.h" -#include "databasecommandloggable.h" +#include "DatabaseCommandLoggable.h" #include "qjson/qobjecthelper.h" #include "DllMacro.h" diff --git a/src/libtomahawk/database/databasecommand_deletefiles.cpp b/src/libtomahawk/database/databasecommand_deletefiles.cpp index 702bfd23b..442fbff58 100644 --- a/src/libtomahawk/database/databasecommand_deletefiles.cpp +++ b/src/libtomahawk/database/databasecommand_deletefiles.cpp @@ -25,7 +25,7 @@ #include "Album.h" #include "Collection.h" #include "Source.h" -#include "database/database.h" +#include "database/Database.h" #include "database/DatabaseImpl.h" #include "network/Servent.h" #include "utils/logger.h" diff --git a/src/libtomahawk/database/databasecommand_deletefiles.h b/src/libtomahawk/database/databasecommand_deletefiles.h index d9be3442f..0bc51f84a 100644 --- a/src/libtomahawk/database/databasecommand_deletefiles.h +++ b/src/libtomahawk/database/databasecommand_deletefiles.h @@ -24,7 +24,7 @@ #include #include -#include "database/databasecommandloggable.h" +#include "database/DatabaseCommandLoggable.h" #include "Typedefs.h" #include "DllMacro.h" diff --git a/src/libtomahawk/database/databasecommand_deleteplaylist.h b/src/libtomahawk/database/databasecommand_deleteplaylist.h index 610357cf2..abbcfe1a9 100644 --- a/src/libtomahawk/database/databasecommand_deleteplaylist.h +++ b/src/libtomahawk/database/databasecommand_deleteplaylist.h @@ -20,7 +20,7 @@ #define DATABASECOMMAND_DELETEPLAYLIST_H #include "DatabaseImpl.h" -#include "databasecommandloggable.h" +#include "DatabaseCommandLoggable.h" #include "Source.h" #include "Typedefs.h" diff --git a/src/libtomahawk/database/databasecommand_dirmtimes.h b/src/libtomahawk/database/databasecommand_dirmtimes.h index 7e519e920..641bb0a47 100644 --- a/src/libtomahawk/database/databasecommand_dirmtimes.h +++ b/src/libtomahawk/database/databasecommand_dirmtimes.h @@ -25,7 +25,7 @@ #include #include -#include "databasecommand.h" +#include "DatabaseCommand.h" #include "DllMacro.h" diff --git a/src/libtomahawk/database/databasecommand_filemtimes.h b/src/libtomahawk/database/databasecommand_filemtimes.h index 249f57f4d..b7efae755 100644 --- a/src/libtomahawk/database/databasecommand_filemtimes.h +++ b/src/libtomahawk/database/databasecommand_filemtimes.h @@ -25,7 +25,7 @@ #include #include -#include "databasecommand.h" +#include "DatabaseCommand.h" #include "DllMacro.h" diff --git a/src/libtomahawk/database/databasecommand_genericselect.h b/src/libtomahawk/database/databasecommand_genericselect.h index 3c6114a81..e3562b9d6 100644 --- a/src/libtomahawk/database/databasecommand_genericselect.h +++ b/src/libtomahawk/database/databasecommand_genericselect.h @@ -21,7 +21,7 @@ #include -#include "databasecommand.h" +#include "DatabaseCommand.h" #include "Typedefs.h" #include diff --git a/src/libtomahawk/database/databasecommand_importplaylist.h b/src/libtomahawk/database/databasecommand_importplaylist.h index 431e23793..7580031f7 100644 --- a/src/libtomahawk/database/databasecommand_importplaylist.h +++ b/src/libtomahawk/database/databasecommand_importplaylist.h @@ -22,7 +22,7 @@ #include #include -#include "databasecommand.h" +#include "DatabaseCommand.h" #include "DllMacro.h" diff --git a/src/libtomahawk/database/databasecommand_loadallautoplaylists.h b/src/libtomahawk/database/databasecommand_loadallautoplaylists.h index 96169938e..badaabb3a 100644 --- a/src/libtomahawk/database/databasecommand_loadallautoplaylists.h +++ b/src/libtomahawk/database/databasecommand_loadallautoplaylists.h @@ -22,7 +22,7 @@ #include #include -#include "databasecommand.h" +#include "DatabaseCommand.h" #include "Typedefs.h" #include "databasecommand_loadallplaylists.h" diff --git a/src/libtomahawk/database/databasecommand_loadallplaylists.h b/src/libtomahawk/database/databasecommand_loadallplaylists.h index 40053b501..b6d32850a 100644 --- a/src/libtomahawk/database/databasecommand_loadallplaylists.h +++ b/src/libtomahawk/database/databasecommand_loadallplaylists.h @@ -24,7 +24,7 @@ #include #include "Typedefs.h" -#include "databasecommand.h" +#include "DatabaseCommand.h" #include "DllMacro.h" diff --git a/src/libtomahawk/database/databasecommand_loadallsortedplaylists.h b/src/libtomahawk/database/databasecommand_loadallsortedplaylists.h index 330d022bf..5d61f3210 100644 --- a/src/libtomahawk/database/databasecommand_loadallsortedplaylists.h +++ b/src/libtomahawk/database/databasecommand_loadallsortedplaylists.h @@ -19,7 +19,7 @@ #ifndef DATABASECOMMAND_LOADALLSORTEDPLAYLISTS_H #define DATABASECOMMAND_LOADALLSORTEDPLAYLISTS_H -#include "databasecommand.h" +#include "DatabaseCommand.h" #include "databasecommand_loadallplaylists.h" /** diff --git a/src/libtomahawk/database/databasecommand_loadallsources.h b/src/libtomahawk/database/databasecommand_loadallsources.h index e0ee8f9ab..227e16956 100644 --- a/src/libtomahawk/database/databasecommand_loadallsources.h +++ b/src/libtomahawk/database/databasecommand_loadallsources.h @@ -22,7 +22,7 @@ #include #include -#include "databasecommand.h" +#include "DatabaseCommand.h" #include "Typedefs.h" #include "DllMacro.h" diff --git a/src/libtomahawk/database/databasecommand_loadallstations.h b/src/libtomahawk/database/databasecommand_loadallstations.h index e7f46b15a..31fcc1745 100644 --- a/src/libtomahawk/database/databasecommand_loadallstations.h +++ b/src/libtomahawk/database/databasecommand_loadallstations.h @@ -22,7 +22,7 @@ #include #include -#include "databasecommand.h" +#include "DatabaseCommand.h" #include "Typedefs.h" #include "databasecommand_loadallplaylists.h" diff --git a/src/libtomahawk/database/databasecommand_loaddynamicplaylist.h b/src/libtomahawk/database/databasecommand_loaddynamicplaylist.h index 103ce7981..c41b123e2 100644 --- a/src/libtomahawk/database/databasecommand_loaddynamicplaylist.h +++ b/src/libtomahawk/database/databasecommand_loaddynamicplaylist.h @@ -22,7 +22,7 @@ #include #include -#include "databasecommand.h" +#include "DatabaseCommand.h" #include "Typedefs.h" namespace Tomahawk diff --git a/src/libtomahawk/database/databasecommand_loaddynamicplaylistentries.cpp b/src/libtomahawk/database/databasecommand_loaddynamicplaylistentries.cpp index 66fcbc861..4bd0f1919 100644 --- a/src/libtomahawk/database/databasecommand_loaddynamicplaylistentries.cpp +++ b/src/libtomahawk/database/databasecommand_loaddynamicplaylistentries.cpp @@ -22,7 +22,7 @@ #include #include "DatabaseImpl.h" -#include "tomahawksqlquery.h" +#include "TomahawkSqlQuery.h" #include "dynamic/DynamicControl.h" #include "dynamic/GeneratorInterface.h" #include "dynamic/GeneratorFactory.h" diff --git a/src/libtomahawk/database/databasecommand_loaddynamicplaylistentries.h b/src/libtomahawk/database/databasecommand_loaddynamicplaylistentries.h index f056cee92..41241b3ea 100644 --- a/src/libtomahawk/database/databasecommand_loaddynamicplaylistentries.h +++ b/src/libtomahawk/database/databasecommand_loaddynamicplaylistentries.h @@ -23,7 +23,7 @@ #include #include "Typedefs.h" -#include "databasecommand.h" +#include "DatabaseCommand.h" #include "databasecommand_loadplaylistentries.h" #include "Playlist.h" diff --git a/src/libtomahawk/database/databasecommand_loadfiles.h b/src/libtomahawk/database/databasecommand_loadfiles.h index 79f354565..5a278bb11 100644 --- a/src/libtomahawk/database/databasecommand_loadfiles.h +++ b/src/libtomahawk/database/databasecommand_loadfiles.h @@ -24,7 +24,7 @@ #include #include -#include "databasecommand.h" +#include "DatabaseCommand.h" #include "Result.h" #include "DllMacro.h" diff --git a/src/libtomahawk/database/databasecommand_loadops.cpp b/src/libtomahawk/database/databasecommand_loadops.cpp index 4afc102c5..ae0f029f4 100644 --- a/src/libtomahawk/database/databasecommand_loadops.cpp +++ b/src/libtomahawk/database/databasecommand_loadops.cpp @@ -19,7 +19,7 @@ #include "databasecommand_loadops.h" #include "DatabaseImpl.h" -#include "tomahawksqlquery.h" +#include "TomahawkSqlQuery.h" #include "Source.h" #include "utils/logger.h" diff --git a/src/libtomahawk/database/databasecommand_loadops.h b/src/libtomahawk/database/databasecommand_loadops.h index b18f1d864..16dc6d5d9 100644 --- a/src/libtomahawk/database/databasecommand_loadops.h +++ b/src/libtomahawk/database/databasecommand_loadops.h @@ -21,8 +21,8 @@ #define DATABASECOMMAND_LOADOPS_H #include "Typedefs.h" -#include "databasecommand.h" -#include "op.h" +#include "DatabaseCommand.h" +#include "Op.h" #include "DllMacro.h" diff --git a/src/libtomahawk/database/databasecommand_loadplaylistentries.h b/src/libtomahawk/database/databasecommand_loadplaylistentries.h index 2d4d904e6..eed131fe0 100644 --- a/src/libtomahawk/database/databasecommand_loadplaylistentries.h +++ b/src/libtomahawk/database/databasecommand_loadplaylistentries.h @@ -23,7 +23,7 @@ #include #include -#include "databasecommand.h" +#include "DatabaseCommand.h" #include "Playlist.h" #include "DllMacro.h" diff --git a/src/libtomahawk/database/databasecommand_loadsocialactions.cpp b/src/libtomahawk/database/databasecommand_loadsocialactions.cpp index 18a663a52..d57b1870b 100644 --- a/src/libtomahawk/database/databasecommand_loadsocialactions.cpp +++ b/src/libtomahawk/database/databasecommand_loadsocialactions.cpp @@ -20,7 +20,7 @@ #include -#include "database/database.h" +#include "database/Database.h" #include "DatabaseImpl.h" #include "network/Servent.h" #include "Result.h" diff --git a/src/libtomahawk/database/databasecommand_loadsocialactions.h b/src/libtomahawk/database/databasecommand_loadsocialactions.h index caf8aaa1a..8656823b3 100644 --- a/src/libtomahawk/database/databasecommand_loadsocialactions.h +++ b/src/libtomahawk/database/databasecommand_loadsocialactions.h @@ -21,7 +21,7 @@ #include #include -#include "database/databasecommand.h" +#include "database/DatabaseCommand.h" #include "SourceList.h" #include "Typedefs.h" diff --git a/src/libtomahawk/database/databasecommand_logplayback.cpp b/src/libtomahawk/database/databasecommand_logplayback.cpp index cac3a303a..3d3a07dbb 100644 --- a/src/libtomahawk/database/databasecommand_logplayback.cpp +++ b/src/libtomahawk/database/databasecommand_logplayback.cpp @@ -22,7 +22,7 @@ #include #include "Collection.h" -#include "database/database.h" +#include "database/Database.h" #include "DatabaseImpl.h" #include "network/Servent.h" #include "utils/logger.h" diff --git a/src/libtomahawk/database/databasecommand_logplayback.h b/src/libtomahawk/database/databasecommand_logplayback.h index 58cc38e5a..384a07579 100644 --- a/src/libtomahawk/database/databasecommand_logplayback.h +++ b/src/libtomahawk/database/databasecommand_logplayback.h @@ -22,7 +22,7 @@ #include #include -#include "database/databasecommandloggable.h" +#include "database/DatabaseCommandLoggable.h" #include "SourceList.h" #include "Typedefs.h" #include "Artist.h" diff --git a/src/libtomahawk/database/databasecommand_modifyplaylist.h b/src/libtomahawk/database/databasecommand_modifyplaylist.h index eeb564d5c..7dad06bac 100644 --- a/src/libtomahawk/database/databasecommand_modifyplaylist.h +++ b/src/libtomahawk/database/databasecommand_modifyplaylist.h @@ -23,7 +23,7 @@ #include #include "Typedefs.h" -#include "databasecommand.h" +#include "DatabaseCommand.h" #include "DllMacro.h" diff --git a/src/libtomahawk/database/databasecommand_playbackhistory.h b/src/libtomahawk/database/databasecommand_playbackhistory.h index c2f116ee9..f97b8b6f6 100644 --- a/src/libtomahawk/database/databasecommand_playbackhistory.h +++ b/src/libtomahawk/database/databasecommand_playbackhistory.h @@ -22,7 +22,7 @@ #include #include -#include "databasecommand.h" +#include "DatabaseCommand.h" #include "Typedefs.h" #include "DllMacro.h" diff --git a/src/libtomahawk/database/databasecommand_renameplaylist.h b/src/libtomahawk/database/databasecommand_renameplaylist.h index a3ec1d8b0..d7f1d7086 100644 --- a/src/libtomahawk/database/databasecommand_renameplaylist.h +++ b/src/libtomahawk/database/databasecommand_renameplaylist.h @@ -20,7 +20,7 @@ #define DATABASECOMMAND_RENAMEPLAYLIST_H #include "Typedefs.h" -#include "databasecommandloggable.h" +#include "DatabaseCommandLoggable.h" #include "DllMacro.h" diff --git a/src/libtomahawk/database/databasecommand_resolve.h b/src/libtomahawk/database/databasecommand_resolve.h index b3b7eae44..5b85ad5f4 100644 --- a/src/libtomahawk/database/databasecommand_resolve.h +++ b/src/libtomahawk/database/databasecommand_resolve.h @@ -19,7 +19,7 @@ #ifndef DATABASECOMMAND_RESOLVE_H #define DATABASECOMMAND_RESOLVE_H -#include "databasecommand.h" +#include "DatabaseCommand.h" #include "DatabaseImpl.h" #include "Result.h" #include "Artist.h" diff --git a/src/libtomahawk/database/databasecommand_setcollectionattributes.h b/src/libtomahawk/database/databasecommand_setcollectionattributes.h index f3d57f281..b1986f468 100644 --- a/src/libtomahawk/database/databasecommand_setcollectionattributes.h +++ b/src/libtomahawk/database/databasecommand_setcollectionattributes.h @@ -20,7 +20,7 @@ #define DATABASECOMMAND_SETCOLLECTIONATTRIBUTES #include "Typedefs.h" -#include "databasecommandloggable.h" +#include "DatabaseCommandLoggable.h" #include class DatabaseCommand_SetCollectionAttributes : public DatabaseCommandLoggable diff --git a/src/libtomahawk/database/databasecommand_setdynamicplaylistrevision.cpp b/src/libtomahawk/database/databasecommand_setdynamicplaylistrevision.cpp index 1d15a78d2..16529f22b 100644 --- a/src/libtomahawk/database/databasecommand_setdynamicplaylistrevision.cpp +++ b/src/libtomahawk/database/databasecommand_setdynamicplaylistrevision.cpp @@ -22,7 +22,7 @@ #include "Source.h" #include "DatabaseImpl.h" -#include "tomahawksqlquery.h" +#include "TomahawkSqlQuery.h" #include "dynamic/DynamicPlaylist.h" #include "dynamic/DynamicControl.h" #include "network/Servent.h" diff --git a/src/libtomahawk/database/databasecommand_setplaylistrevision.cpp b/src/libtomahawk/database/databasecommand_setplaylistrevision.cpp index a4b2dfd0c..3ebe5921d 100644 --- a/src/libtomahawk/database/databasecommand_setplaylistrevision.cpp +++ b/src/libtomahawk/database/databasecommand_setplaylistrevision.cpp @@ -22,7 +22,7 @@ #include "Source.h" #include "DatabaseImpl.h" -#include "tomahawksqlquery.h" +#include "TomahawkSqlQuery.h" #include "network/Servent.h" #include "utils/logger.h" diff --git a/src/libtomahawk/database/databasecommand_setplaylistrevision.h b/src/libtomahawk/database/databasecommand_setplaylistrevision.h index d3fbbbf7f..027bf03d8 100644 --- a/src/libtomahawk/database/databasecommand_setplaylistrevision.h +++ b/src/libtomahawk/database/databasecommand_setplaylistrevision.h @@ -19,7 +19,7 @@ #ifndef DATABASECOMMAND_SETPLAYLISTREVISION_H #define DATABASECOMMAND_SETPLAYLISTREVISION_H -#include "databasecommandloggable.h" +#include "DatabaseCommandLoggable.h" #include "Playlist.h" #include "qjson/qobjecthelper.h" diff --git a/src/libtomahawk/database/databasecommand_settrackattributes.cpp b/src/libtomahawk/database/databasecommand_settrackattributes.cpp index 5c07973b5..88f47e0ee 100644 --- a/src/libtomahawk/database/databasecommand_settrackattributes.cpp +++ b/src/libtomahawk/database/databasecommand_settrackattributes.cpp @@ -17,7 +17,7 @@ */ #include "databasecommand_settrackattributes.h" -#include "tomahawksqlquery.h" +#include "TomahawkSqlQuery.h" #include "DatabaseImpl.h" using namespace Tomahawk; diff --git a/src/libtomahawk/database/databasecommand_settrackattributes.h b/src/libtomahawk/database/databasecommand_settrackattributes.h index e639da496..921da0ece 100644 --- a/src/libtomahawk/database/databasecommand_settrackattributes.h +++ b/src/libtomahawk/database/databasecommand_settrackattributes.h @@ -20,7 +20,7 @@ #define DATABASECOMMAND_SETTRACKATTRIBUTES #include "Typedefs.h" -#include "databasecommandloggable.h" +#include "DatabaseCommandLoggable.h" #include diff --git a/src/libtomahawk/database/databasecommand_socialaction.cpp b/src/libtomahawk/database/databasecommand_socialaction.cpp index 6b50c62b0..858c7a57a 100644 --- a/src/libtomahawk/database/databasecommand_socialaction.cpp +++ b/src/libtomahawk/database/databasecommand_socialaction.cpp @@ -20,7 +20,7 @@ #include -#include "database/database.h" +#include "database/Database.h" #include "DatabaseImpl.h" #include "network/Servent.h" #include "utils/logger.h" diff --git a/src/libtomahawk/database/databasecommand_socialaction.h b/src/libtomahawk/database/databasecommand_socialaction.h index 1ae0478eb..08447e511 100644 --- a/src/libtomahawk/database/databasecommand_socialaction.h +++ b/src/libtomahawk/database/databasecommand_socialaction.h @@ -20,7 +20,7 @@ #define DATABASECOMMAND_SOCIALACTION_H #include -#include "database/databasecommandloggable.h" +#include "database/DatabaseCommandLoggable.h" #include "SourceList.h" #include "Typedefs.h" diff --git a/src/libtomahawk/database/databasecommand_sourceoffline.cpp b/src/libtomahawk/database/databasecommand_sourceoffline.cpp index 8d7d5e844..22eb14617 100644 --- a/src/libtomahawk/database/databasecommand_sourceoffline.cpp +++ b/src/libtomahawk/database/databasecommand_sourceoffline.cpp @@ -19,7 +19,7 @@ #include "databasecommand_sourceoffline.h" #include "DatabaseImpl.h" -#include "tomahawksqlquery.h" +#include "TomahawkSqlQuery.h" #include "utils/logger.h" diff --git a/src/libtomahawk/database/databasecommand_sourceoffline.h b/src/libtomahawk/database/databasecommand_sourceoffline.h index 8d3c2eb1c..c955fa725 100644 --- a/src/libtomahawk/database/databasecommand_sourceoffline.h +++ b/src/libtomahawk/database/databasecommand_sourceoffline.h @@ -19,7 +19,7 @@ #ifndef DATABASECOMMAND_SOURCEOFFLINE_H #define DATABASECOMMAND_SOURCEOFFLINE_H -#include "databasecommand.h" +#include "DatabaseCommand.h" #include "DllMacro.h" class DLLEXPORT DatabaseCommand_SourceOffline : public DatabaseCommand diff --git a/src/libtomahawk/database/databasecommand_trackattributes.h b/src/libtomahawk/database/databasecommand_trackattributes.h index 12a7cdb1b..2259fbad8 100644 --- a/src/libtomahawk/database/databasecommand_trackattributes.h +++ b/src/libtomahawk/database/databasecommand_trackattributes.h @@ -20,7 +20,7 @@ #define DATABASECOMMAND_TRACKATTRIBUTES_H #include "Typedefs.h" -#include "databasecommand.h" +#include "DatabaseCommand.h" #include "databasecommand_collectionattributes.h" #include "databasecommand_settrackattributes.h" #include diff --git a/src/libtomahawk/database/databasecommand_updatesearchindex.cpp b/src/libtomahawk/database/databasecommand_updatesearchindex.cpp index 9eb173f1b..e7428ae0c 100644 --- a/src/libtomahawk/database/databasecommand_updatesearchindex.cpp +++ b/src/libtomahawk/database/databasecommand_updatesearchindex.cpp @@ -19,7 +19,7 @@ #include "databasecommand_updatesearchindex.h" #include "DatabaseImpl.h" -#include "tomahawksqlquery.h" +#include "TomahawkSqlQuery.h" #include "utils/logger.h" #include "jobview/IndexingJobItem.h" #include "jobview/JobStatusView.h" diff --git a/src/libtomahawk/database/databasecommand_updatesearchindex.h b/src/libtomahawk/database/databasecommand_updatesearchindex.h index fc3c5522a..6353aeffb 100644 --- a/src/libtomahawk/database/databasecommand_updatesearchindex.h +++ b/src/libtomahawk/database/databasecommand_updatesearchindex.h @@ -19,7 +19,7 @@ #ifndef DATABASECOMMAND_UPDATESEARCHINDEX_H #define DATABASECOMMAND_UPDATESEARCHINDEX_H -#include "databasecommand.h" +#include "DatabaseCommand.h" #include "DllMacro.h" class IndexingJobItem; diff --git a/src/libtomahawk/database/gen_schema.h.sh b/src/libtomahawk/database/gen_schema.h.sh index 424ee18c0..c6318f5a9 100755 --- a/src/libtomahawk/database/gen_schema.h.sh +++ b/src/libtomahawk/database/gen_schema.h.sh @@ -1,7 +1,7 @@ #!/bin/bash -# !!!! You need to manually generate schema.sql.h when the schema changes: -# ./gen_schema.h.sh ./schema.sql tomahawk > schema.sql.h +# !!!! You need to manually generate Schema.sql.h when the schema changes: +# ./gen_schema.h.sh ./Schema.sql tomahawk > Schema.sql.h schema=$1 name=$2 @@ -27,6 +27,6 @@ const char * get_${name}_sql() EOF else - echo "Usage: $0 " + echo "Usage: $0 " exit 1 fi diff --git a/src/libtomahawk/network/ControlConnection.cpp b/src/libtomahawk/network/ControlConnection.cpp index c63088470..bda505862 100644 --- a/src/libtomahawk/network/ControlConnection.cpp +++ b/src/libtomahawk/network/ControlConnection.cpp @@ -20,7 +20,7 @@ #include "ControlConnection.h" #include "StreamConnection.h" -#include "database/database.h" +#include "database/Database.h" #include "database/databasecommand_collectionstats.h" #include "DbSyncConnection.h" #include "SourceList.h" diff --git a/src/libtomahawk/network/DbSyncConnection.cpp b/src/libtomahawk/network/DbSyncConnection.cpp index a7ae6f8e8..c94d28be5 100644 --- a/src/libtomahawk/network/DbSyncConnection.cpp +++ b/src/libtomahawk/network/DbSyncConnection.cpp @@ -31,8 +31,8 @@ #include "DbSyncConnection.h" -#include "database/database.h" -#include "database/databasecommand.h" +#include "database/Database.h" +#include "database/DatabaseCommand.h" #include "database/databasecommand_collectionstats.h" #include "database/databasecommand_loadops.h" #include "RemoteCollection.h" diff --git a/src/libtomahawk/network/DbSyncConnection.h b/src/libtomahawk/network/DbSyncConnection.h index d3c2867d4..67f4ac709 100644 --- a/src/libtomahawk/network/DbSyncConnection.h +++ b/src/libtomahawk/network/DbSyncConnection.h @@ -25,7 +25,7 @@ #include #include "network/Connection.h" -#include "database/op.h" +#include "database/Op.h" #include "Typedefs.h" class DatabaseCommand; diff --git a/src/libtomahawk/network/RemoteCollection.h b/src/libtomahawk/network/RemoteCollection.h index 445f74b3f..8b75c9c93 100644 --- a/src/libtomahawk/network/RemoteCollection.h +++ b/src/libtomahawk/network/RemoteCollection.h @@ -22,7 +22,7 @@ #include "Typedefs.h" #include "network/ControlConnection.h" -#include "database/databasecollection.h" +#include "database/DatabaseCollection.h" class RemoteCollection : public DatabaseCollection { diff --git a/src/libtomahawk/network/Servent.cpp b/src/libtomahawk/network/Servent.cpp index 39bf3ea82..53fd42edc 100644 --- a/src/libtomahawk/network/Servent.cpp +++ b/src/libtomahawk/network/Servent.cpp @@ -33,7 +33,7 @@ #include "BufferIoDevice.h" #include "Connection.h" #include "ControlConnection.h" -#include "database/database.h" +#include "database/Database.h" #include "StreamConnection.h" #include "SourceList.h" diff --git a/src/libtomahawk/network/StreamConnection.cpp b/src/libtomahawk/network/StreamConnection.cpp index 603a5a71e..6552a5481 100644 --- a/src/libtomahawk/network/StreamConnection.cpp +++ b/src/libtomahawk/network/StreamConnection.cpp @@ -27,7 +27,7 @@ #include "network/ControlConnection.h" #include "network/Servent.h" #include "database/databasecommand_loadfiles.h" -#include "database/database.h" +#include "database/Database.h" #include "SourceList.h" #include "utils/logger.h" diff --git a/src/libtomahawk/playlist/albumitem.cpp b/src/libtomahawk/playlist/AlbumItem.cpp similarity index 99% rename from src/libtomahawk/playlist/albumitem.cpp rename to src/libtomahawk/playlist/AlbumItem.cpp index b59c1e013..873c3c1b4 100644 --- a/src/libtomahawk/playlist/albumitem.cpp +++ b/src/libtomahawk/playlist/AlbumItem.cpp @@ -16,7 +16,7 @@ * along with Tomahawk. If not, see . */ -#include "albumitem.h" +#include "AlbumItem.h" #include "utils/tomahawkutils.h" #include "utils/logger.h" diff --git a/src/libtomahawk/playlist/albumitem.h b/src/libtomahawk/playlist/AlbumItem.h similarity index 100% rename from src/libtomahawk/playlist/albumitem.h rename to src/libtomahawk/playlist/AlbumItem.h diff --git a/src/libtomahawk/playlist/albumitemdelegate.cpp b/src/libtomahawk/playlist/AlbumItemDelegate.cpp similarity index 98% rename from src/libtomahawk/playlist/albumitemdelegate.cpp rename to src/libtomahawk/playlist/AlbumItemDelegate.cpp index 4e0c17f46..92e9ae7c5 100644 --- a/src/libtomahawk/playlist/albumitemdelegate.cpp +++ b/src/libtomahawk/playlist/AlbumItemDelegate.cpp @@ -17,7 +17,7 @@ * along with Tomahawk. If not, see . */ -#include "albumitemdelegate.h" +#include "AlbumItemDelegate.h" #include #include @@ -32,9 +32,9 @@ #include "utils/PixmapDelegateFader.h" #include -#include "playlist/albumitem.h" -#include "playlist/albumproxymodel.h" -#include "albumview.h" +#include "playlist/AlbumItem.h" +#include "playlist/AlbumProxyModel.h" +#include "AlbumView.h" #include #include diff --git a/src/libtomahawk/playlist/albumitemdelegate.h b/src/libtomahawk/playlist/AlbumItemDelegate.h similarity index 100% rename from src/libtomahawk/playlist/albumitemdelegate.h rename to src/libtomahawk/playlist/AlbumItemDelegate.h diff --git a/src/libtomahawk/playlist/albummodel.cpp b/src/libtomahawk/playlist/AlbumModel.cpp similarity index 99% rename from src/libtomahawk/playlist/albummodel.cpp rename to src/libtomahawk/playlist/AlbumModel.cpp index c6759a149..e6f15e9e1 100644 --- a/src/libtomahawk/playlist/albummodel.cpp +++ b/src/libtomahawk/playlist/AlbumModel.cpp @@ -17,17 +17,17 @@ * along with Tomahawk. If not, see . */ -#include "albummodel.h" +#include "AlbumModel.h" #include #include #include #include "Artist.h" -#include "albumitem.h" +#include "AlbumItem.h" #include "Source.h" #include "SourceList.h" -#include "database/database.h" +#include "database/Database.h" #include "utils/tomahawkutils.h" #include "utils/logger.h" diff --git a/src/libtomahawk/playlist/albummodel.h b/src/libtomahawk/playlist/AlbumModel.h similarity index 100% rename from src/libtomahawk/playlist/albummodel.h rename to src/libtomahawk/playlist/AlbumModel.h diff --git a/src/libtomahawk/playlist/albumproxymodel.cpp b/src/libtomahawk/playlist/AlbumProxyModel.cpp similarity index 97% rename from src/libtomahawk/playlist/albumproxymodel.cpp rename to src/libtomahawk/playlist/AlbumProxyModel.cpp index 6ae8ec493..8e0a2fd38 100644 --- a/src/libtomahawk/playlist/albumproxymodel.cpp +++ b/src/libtomahawk/playlist/AlbumProxyModel.cpp @@ -17,13 +17,13 @@ * along with Tomahawk. If not, see . */ -#include "albumproxymodel.h" +#include "AlbumProxyModel.h" #include -#include "albumproxymodelplaylistinterface.h" +#include "AlbumProxyModelPlaylistInterface.h" #include "Artist.h" -#include "albumitem.h" +#include "AlbumItem.h" #include "Query.h" #include "utils/logger.h" diff --git a/src/libtomahawk/playlist/albumproxymodel.h b/src/libtomahawk/playlist/AlbumProxyModel.h similarity index 98% rename from src/libtomahawk/playlist/albumproxymodel.h rename to src/libtomahawk/playlist/AlbumProxyModel.h index ff9074d93..c0973caaa 100644 --- a/src/libtomahawk/playlist/albumproxymodel.h +++ b/src/libtomahawk/playlist/AlbumProxyModel.h @@ -23,7 +23,7 @@ #include #include "PlaylistInterface.h" -#include "playlist/albummodel.h" +#include "playlist/AlbumModel.h" #include "DllMacro.h" diff --git a/src/libtomahawk/playlist/albumproxymodelplaylistinterface.cpp b/src/libtomahawk/playlist/AlbumProxyModelPlaylistInterface.cpp similarity index 96% rename from src/libtomahawk/playlist/albumproxymodelplaylistinterface.cpp rename to src/libtomahawk/playlist/AlbumProxyModelPlaylistInterface.cpp index 589540ba9..c820d57fe 100644 --- a/src/libtomahawk/playlist/albumproxymodelplaylistinterface.cpp +++ b/src/libtomahawk/playlist/AlbumProxyModelPlaylistInterface.cpp @@ -17,11 +17,11 @@ * along with Tomahawk. If not, see . */ -#include "albumproxymodelplaylistinterface.h" +#include "AlbumProxyModelPlaylistInterface.h" -#include "albumproxymodel.h" +#include "AlbumProxyModel.h" #include "Artist.h" -#include "albumitem.h" +#include "AlbumItem.h" #include "Query.h" #include "utils/logger.h" diff --git a/src/libtomahawk/playlist/albumproxymodelplaylistinterface.h b/src/libtomahawk/playlist/AlbumProxyModelPlaylistInterface.h similarity index 98% rename from src/libtomahawk/playlist/albumproxymodelplaylistinterface.h rename to src/libtomahawk/playlist/AlbumProxyModelPlaylistInterface.h index b0049703f..9cf5e9179 100644 --- a/src/libtomahawk/playlist/albumproxymodelplaylistinterface.h +++ b/src/libtomahawk/playlist/AlbumProxyModelPlaylistInterface.h @@ -21,7 +21,7 @@ #define ALBUMPROXYMODELPLAYLISTINTERFACE_H #include "PlaylistInterface.h" -#include "playlist/albummodel.h" +#include "playlist/AlbumModel.h" #include "DllMacro.h" diff --git a/src/libtomahawk/playlist/albumview.cpp b/src/libtomahawk/playlist/AlbumView.cpp similarity index 98% rename from src/libtomahawk/playlist/albumview.cpp rename to src/libtomahawk/playlist/AlbumView.cpp index 45e8ee890..85fc23b8b 100644 --- a/src/libtomahawk/playlist/albumview.cpp +++ b/src/libtomahawk/playlist/AlbumView.cpp @@ -17,7 +17,7 @@ * along with Tomahawk. If not, see . */ -#include "albumview.h" +#include "AlbumView.h" #include #include @@ -29,9 +29,9 @@ #include "context/ContextWidget.h" #include "TomahawkSettings.h" #include "Artist.h" -#include "albumitem.h" -#include "albumitemdelegate.h" -#include "albummodel.h" +#include "AlbumItem.h" +#include "AlbumItemDelegate.h" +#include "AlbumModel.h" #include "ViewManager.h" #include "utils/logger.h" #include "dynamic/widgets/LoadingSpinner.h" diff --git a/src/libtomahawk/playlist/albumview.h b/src/libtomahawk/playlist/AlbumView.h similarity index 97% rename from src/libtomahawk/playlist/albumview.h rename to src/libtomahawk/playlist/AlbumView.h index 83db6c122..6e5cd73f9 100644 --- a/src/libtomahawk/playlist/albumview.h +++ b/src/libtomahawk/playlist/AlbumView.h @@ -25,8 +25,8 @@ #include #include "ViewPage.h" -#include "albumproxymodel.h" -#include "widgets/overlaywidget.h" +#include "AlbumProxyModel.h" +#include "widgets/OverlayWidget.h" #include "DllMacro.h" class AlbumModel; diff --git a/src/libtomahawk/playlist/artistview.cpp b/src/libtomahawk/playlist/ArtistView.cpp similarity index 98% rename from src/libtomahawk/playlist/artistview.cpp rename to src/libtomahawk/playlist/ArtistView.cpp index 680efbc7a..fbafd9bfa 100644 --- a/src/libtomahawk/playlist/artistview.cpp +++ b/src/libtomahawk/playlist/ArtistView.cpp @@ -17,7 +17,7 @@ * along with Tomahawk. If not, see . */ -#include "artistview.h" +#include "ArtistView.h" #include #include @@ -27,13 +27,13 @@ #include "audio/audioengine.h" #include "context/ContextWidget.h" #include "dynamic/widgets/LoadingSpinner.h" -#include "widgets/overlaywidget.h" +#include "widgets/OverlayWidget.h" #include "ContextMenu.h" #include "TomahawkSettings.h" -#include "treeheader.h" -#include "treeitemdelegate.h" -#include "treemodel.h" +#include "TreeHeader.h" +#include "TreeItemDelegate.h" +#include "TreeModel.h" #include "ViewManager.h" #include "utils/logger.h" diff --git a/src/libtomahawk/playlist/artistview.h b/src/libtomahawk/playlist/ArtistView.h similarity index 99% rename from src/libtomahawk/playlist/artistview.h rename to src/libtomahawk/playlist/ArtistView.h index 7d171a0cf..1926acd4e 100644 --- a/src/libtomahawk/playlist/artistview.h +++ b/src/libtomahawk/playlist/ArtistView.h @@ -24,7 +24,7 @@ #include #include -#include "treeproxymodel.h" +#include "TreeProxyModel.h" #include "ViewPage.h" #include "PlaylistInterface.h" diff --git a/src/libtomahawk/playlist/collectionflatmodel.cpp b/src/libtomahawk/playlist/CollectionFlatModel.cpp similarity index 98% rename from src/libtomahawk/playlist/collectionflatmodel.cpp rename to src/libtomahawk/playlist/CollectionFlatModel.cpp index 5f8a83ae1..170be4a8e 100644 --- a/src/libtomahawk/playlist/collectionflatmodel.cpp +++ b/src/libtomahawk/playlist/CollectionFlatModel.cpp @@ -16,9 +16,9 @@ * along with Tomahawk. If not, see . */ -#include "collectionflatmodel.h" +#include "CollectionFlatModel.h" -#include "database/database.h" +#include "database/Database.h" #include "SourceList.h" #include "utils/logger.h" diff --git a/src/libtomahawk/playlist/collectionflatmodel.h b/src/libtomahawk/playlist/CollectionFlatModel.h similarity index 99% rename from src/libtomahawk/playlist/collectionflatmodel.h rename to src/libtomahawk/playlist/CollectionFlatModel.h index e76075c35..dcc72c52a 100644 --- a/src/libtomahawk/playlist/collectionflatmodel.h +++ b/src/libtomahawk/playlist/CollectionFlatModel.h @@ -25,7 +25,7 @@ #include #include "Typedefs.h" -#include "trackmodel.h" +#include "TrackModel.h" #include "Query.h" #include "Source.h" #include "PlaylistInterface.h" diff --git a/src/libtomahawk/playlist/collectionproxymodel.cpp b/src/libtomahawk/playlist/CollectionProxyModel.cpp similarity index 94% rename from src/libtomahawk/playlist/collectionproxymodel.cpp rename to src/libtomahawk/playlist/CollectionProxyModel.cpp index 3942a1ffb..44c0cbe6d 100644 --- a/src/libtomahawk/playlist/collectionproxymodel.cpp +++ b/src/libtomahawk/playlist/CollectionProxyModel.cpp @@ -17,9 +17,9 @@ * along with Tomahawk. If not, see . */ -#include "collectionproxymodel.h" +#include "CollectionProxyModel.h" -#include "collectionproxymodelplaylistinterface.h" +#include "CollectionProxyModelPlaylistInterface.h" #include diff --git a/src/libtomahawk/playlist/collectionproxymodel.h b/src/libtomahawk/playlist/CollectionProxyModel.h similarity index 94% rename from src/libtomahawk/playlist/collectionproxymodel.h rename to src/libtomahawk/playlist/CollectionProxyModel.h index b507bcca9..ab2d06dc3 100644 --- a/src/libtomahawk/playlist/collectionproxymodel.h +++ b/src/libtomahawk/playlist/CollectionProxyModel.h @@ -20,8 +20,8 @@ #ifndef COLLECTIONPROXYMODEL_H #define COLLECTIONPROXYMODEL_H -#include "trackproxymodel.h" -#include "trackproxymodelplaylistinterface.h" +#include "TrackProxyModel.h" +#include "TrackProxyModelPlaylistInterface.h" #include "DllMacro.h" diff --git a/src/libtomahawk/playlist/collectionproxymodelplaylistinterface.cpp b/src/libtomahawk/playlist/CollectionProxyModelPlaylistInterface.cpp similarity index 93% rename from src/libtomahawk/playlist/collectionproxymodelplaylistinterface.cpp rename to src/libtomahawk/playlist/CollectionProxyModelPlaylistInterface.cpp index 912a52c4e..675faa0d2 100644 --- a/src/libtomahawk/playlist/collectionproxymodelplaylistinterface.cpp +++ b/src/libtomahawk/playlist/CollectionProxyModelPlaylistInterface.cpp @@ -17,9 +17,9 @@ * along with Tomahawk. If not, see . */ -#include "collectionproxymodelplaylistinterface.h" +#include "CollectionProxyModelPlaylistInterface.h" -#include "collectionproxymodel.h" +#include "CollectionProxyModel.h" #include "Album.h" #include "Query.h" #include "utils/logger.h" diff --git a/src/libtomahawk/playlist/collectionproxymodelplaylistinterface.h b/src/libtomahawk/playlist/CollectionProxyModelPlaylistInterface.h similarity index 95% rename from src/libtomahawk/playlist/collectionproxymodelplaylistinterface.h rename to src/libtomahawk/playlist/CollectionProxyModelPlaylistInterface.h index f952535e6..1cf5ac727 100644 --- a/src/libtomahawk/playlist/collectionproxymodelplaylistinterface.h +++ b/src/libtomahawk/playlist/CollectionProxyModelPlaylistInterface.h @@ -20,8 +20,8 @@ #ifndef COLLECTIONPROXYMODELPLAYLISTINTERFACE_H #define COLLECTIONPROXYMODELPLAYLISTINTERFACE_H -#include "trackproxymodel.h" -#include "trackproxymodelplaylistinterface.h" +#include "TrackProxyModel.h" +#include "TrackProxyModelPlaylistInterface.h" #include "DllMacro.h" diff --git a/src/libtomahawk/playlist/collectionview.cpp b/src/libtomahawk/playlist/CollectionView.cpp similarity index 95% rename from src/libtomahawk/playlist/collectionview.cpp rename to src/libtomahawk/playlist/CollectionView.cpp index a393b8693..0a466e75d 100644 --- a/src/libtomahawk/playlist/collectionview.cpp +++ b/src/libtomahawk/playlist/CollectionView.cpp @@ -17,14 +17,14 @@ * along with Tomahawk. If not, see . */ -#include "collectionview.h" +#include "CollectionView.h" #include #include -#include "collectionproxymodel.h" -#include "trackmodel.h" -#include "widgets/overlaywidget.h" +#include "CollectionProxyModel.h" +#include "TrackModel.h" +#include "widgets/OverlayWidget.h" #include "utils/logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/collectionview.h b/src/libtomahawk/playlist/CollectionView.h similarity index 97% rename from src/libtomahawk/playlist/collectionview.h rename to src/libtomahawk/playlist/CollectionView.h index 3d16c66d7..6f80df54a 100644 --- a/src/libtomahawk/playlist/collectionview.h +++ b/src/libtomahawk/playlist/CollectionView.h @@ -20,8 +20,8 @@ #ifndef COLLECTIONVIEW_H #define COLLECTIONVIEW_H -#include "trackproxymodel.h" -#include "trackview.h" +#include "TrackProxyModel.h" +#include "TrackView.h" #include "ViewPage.h" #include "DllMacro.h" diff --git a/src/libtomahawk/playlist/customplaylistview.cpp b/src/libtomahawk/playlist/CustomPlaylistView.cpp similarity index 98% rename from src/libtomahawk/playlist/customplaylistview.cpp rename to src/libtomahawk/playlist/CustomPlaylistView.cpp index 2068805c5..0715f73c0 100644 --- a/src/libtomahawk/playlist/customplaylistview.cpp +++ b/src/libtomahawk/playlist/CustomPlaylistView.cpp @@ -17,10 +17,10 @@ */ -#include "customplaylistview.h" +#include "CustomPlaylistView.h" #include "database/databasecommand_genericselect.h" -#include "database/database.h" +#include "database/Database.h" #include "utils/tomahawkutils.h" #include "SourceList.h" #include "audio/audioengine.h" diff --git a/src/libtomahawk/playlist/customplaylistview.h b/src/libtomahawk/playlist/CustomPlaylistView.h similarity index 98% rename from src/libtomahawk/playlist/customplaylistview.h rename to src/libtomahawk/playlist/CustomPlaylistView.h index 40bd642db..17f7c1921 100644 --- a/src/libtomahawk/playlist/customplaylistview.h +++ b/src/libtomahawk/playlist/CustomPlaylistView.h @@ -20,7 +20,7 @@ #ifndef CUSTOMPLAYLISTVIEW_H #define CUSTOMPLAYLISTVIEW_H -#include "playlistview.h" +#include "PlaylistView.h" #include "DllMacro.h" diff --git a/src/libtomahawk/playlist/PlaylistChartItemDelegate.cpp b/src/libtomahawk/playlist/PlaylistChartItemDelegate.cpp index 0d06c6feb..b0238b7c4 100644 --- a/src/libtomahawk/playlist/PlaylistChartItemDelegate.cpp +++ b/src/libtomahawk/playlist/PlaylistChartItemDelegate.cpp @@ -27,12 +27,12 @@ #include "Source.h" #include "SourceList.h" -#include "playlistview.h" -#include "trackmodel.h" -#include "trackmodelitem.h" -#include "trackproxymodel.h" -#include "trackview.h" -#include "trackheader.h" +#include "PlaylistView.h" +#include "TrackModel.h" +#include "TrackModelItem.h" +#include "TrackProxyModel.h" +#include "TrackView.h" +#include "TrackHeader.h" #include "utils/tomahawkutilsgui.h" #include "utils/logger.h" diff --git a/src/libtomahawk/playlist/playlistitemdelegate.cpp b/src/libtomahawk/playlist/PlaylistItemDelegate.cpp similarity index 98% rename from src/libtomahawk/playlist/playlistitemdelegate.cpp rename to src/libtomahawk/playlist/PlaylistItemDelegate.cpp index 2f69913ee..2452dd80a 100644 --- a/src/libtomahawk/playlist/playlistitemdelegate.cpp +++ b/src/libtomahawk/playlist/PlaylistItemDelegate.cpp @@ -17,7 +17,7 @@ * along with Tomahawk. If not, see . */ -#include "playlistitemdelegate.h" +#include "PlaylistItemDelegate.h" #include #include @@ -28,11 +28,11 @@ #include "Source.h" #include "SourceList.h" -#include "trackmodel.h" -#include "trackmodelitem.h" -#include "trackproxymodel.h" -#include "trackview.h" -#include "trackheader.h" +#include "TrackModel.h" +#include "TrackModelItem.h" +#include "TrackProxyModel.h" +#include "TrackView.h" +#include "TrackHeader.h" #include "utils/tomahawkutilsgui.h" #include "utils/logger.h" diff --git a/src/libtomahawk/playlist/playlistitemdelegate.h b/src/libtomahawk/playlist/PlaylistItemDelegate.h similarity index 100% rename from src/libtomahawk/playlist/playlistitemdelegate.h rename to src/libtomahawk/playlist/PlaylistItemDelegate.h diff --git a/src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp b/src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp index 315c499f0..6f4b9edf7 100644 --- a/src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp +++ b/src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp @@ -28,12 +28,12 @@ #include "Source.h" #include "SourceList.h" -#include "playlistview.h" -#include "trackmodel.h" -#include "trackmodelitem.h" -#include "trackproxymodel.h" -#include "trackview.h" -#include "trackheader.h" +#include "PlaylistView.h" +#include "TrackModel.h" +#include "TrackModelItem.h" +#include "TrackProxyModel.h" +#include "TrackView.h" +#include "TrackHeader.h" #include "utils/tomahawkutilsgui.h" #include "utils/logger.h" diff --git a/src/libtomahawk/playlist/playlistmodel.cpp b/src/libtomahawk/playlist/PlaylistModel.cpp similarity index 99% rename from src/libtomahawk/playlist/playlistmodel.cpp rename to src/libtomahawk/playlist/PlaylistModel.cpp index 9e61f5ae5..34f755097 100644 --- a/src/libtomahawk/playlist/playlistmodel.cpp +++ b/src/libtomahawk/playlist/PlaylistModel.cpp @@ -17,7 +17,7 @@ * along with Tomahawk. If not, see . */ -#include "playlistmodel.h" +#include "PlaylistModel.h" #include #include @@ -27,7 +27,7 @@ #include "Pipeline.h" #include "Source.h" #include "SourceList.h" -#include "database/database.h" +#include "database/Database.h" #include "database/databasecommand_playbackhistory.h" #include "dynamic/GeneratorInterface.h" #include "DropJob.h" diff --git a/src/libtomahawk/playlist/playlistmodel.h b/src/libtomahawk/playlist/PlaylistModel.h similarity index 99% rename from src/libtomahawk/playlist/playlistmodel.h rename to src/libtomahawk/playlist/PlaylistModel.h index 1cce48e5e..2e5b0a79b 100644 --- a/src/libtomahawk/playlist/playlistmodel.h +++ b/src/libtomahawk/playlist/PlaylistModel.h @@ -23,7 +23,7 @@ #include #include "Typedefs.h" -#include "trackmodel.h" +#include "TrackModel.h" #include "Playlist.h" #include "Query.h" #include "PlaylistInterface.h" diff --git a/src/libtomahawk/playlist/playlistproxymodel.cpp b/src/libtomahawk/playlist/PlaylistProxyModel.cpp similarity index 94% rename from src/libtomahawk/playlist/playlistproxymodel.cpp rename to src/libtomahawk/playlist/PlaylistProxyModel.cpp index 6a68f82d7..df8eead27 100644 --- a/src/libtomahawk/playlist/playlistproxymodel.cpp +++ b/src/libtomahawk/playlist/PlaylistProxyModel.cpp @@ -17,9 +17,9 @@ * along with Tomahawk. If not, see . */ -#include "playlistproxymodel.h" +#include "PlaylistProxyModel.h" -#include "playlistproxymodelplaylistinterface.h" +#include "PlaylistProxyModelPlaylistInterface.h" #include "utils/logger.h" diff --git a/src/libtomahawk/playlist/playlistproxymodel.h b/src/libtomahawk/playlist/PlaylistProxyModel.h similarity index 97% rename from src/libtomahawk/playlist/playlistproxymodel.h rename to src/libtomahawk/playlist/PlaylistProxyModel.h index c2a9e9f87..ec8ce154f 100644 --- a/src/libtomahawk/playlist/playlistproxymodel.h +++ b/src/libtomahawk/playlist/PlaylistProxyModel.h @@ -20,7 +20,7 @@ #ifndef PLAYLISTPROXYMODEL_H #define PLAYLISTPROXYMODEL_H -#include "trackproxymodel.h" +#include "TrackProxyModel.h" #include "DllMacro.h" diff --git a/src/libtomahawk/playlist/playlistproxymodelplaylistinterface.cpp b/src/libtomahawk/playlist/PlaylistProxyModelPlaylistInterface.cpp similarity index 93% rename from src/libtomahawk/playlist/playlistproxymodelplaylistinterface.cpp rename to src/libtomahawk/playlist/PlaylistProxyModelPlaylistInterface.cpp index ae042e958..377014228 100644 --- a/src/libtomahawk/playlist/playlistproxymodelplaylistinterface.cpp +++ b/src/libtomahawk/playlist/PlaylistProxyModelPlaylistInterface.cpp @@ -17,9 +17,9 @@ * along with Tomahawk. If not, see . */ -#include "playlistproxymodelplaylistinterface.h" +#include "PlaylistProxyModelPlaylistInterface.h" -#include "playlistproxymodel.h" +#include "PlaylistProxyModel.h" #include "utils/logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/playlistproxymodelplaylistinterface.h b/src/libtomahawk/playlist/PlaylistProxyModelPlaylistInterface.h similarity index 96% rename from src/libtomahawk/playlist/playlistproxymodelplaylistinterface.h rename to src/libtomahawk/playlist/PlaylistProxyModelPlaylistInterface.h index f0a06ad3c..133e6f5e1 100644 --- a/src/libtomahawk/playlist/playlistproxymodelplaylistinterface.h +++ b/src/libtomahawk/playlist/PlaylistProxyModelPlaylistInterface.h @@ -20,7 +20,7 @@ #ifndef PLAYLISTPROXYMODELPLAYLISTINTERFACE_H #define PLAYLISTPROXYMODELPLAYLISTINTERFACE_H -#include "trackproxymodelplaylistinterface.h" +#include "TrackProxyModelPlaylistInterface.h" #include "DllMacro.h" diff --git a/src/libtomahawk/playlist/playlistview.cpp b/src/libtomahawk/playlist/PlaylistView.cpp similarity index 97% rename from src/libtomahawk/playlist/playlistview.cpp rename to src/libtomahawk/playlist/PlaylistView.cpp index fe4656b0b..6b0b5d8c2 100644 --- a/src/libtomahawk/playlist/playlistview.cpp +++ b/src/libtomahawk/playlist/PlaylistView.cpp @@ -17,13 +17,13 @@ * along with Tomahawk. If not, see . */ -#include "playlistview.h" +#include "PlaylistView.h" #include #include -#include "playlist/playlistproxymodel.h" -#include "widgets/overlaywidget.h" +#include "playlist/PlaylistProxyModel.h" +#include "widgets/OverlayWidget.h" #include "ViewManager.h" #include "utils/logger.h" #include "PlaylistUpdaterInterface.h" diff --git a/src/libtomahawk/playlist/playlistview.h b/src/libtomahawk/playlist/PlaylistView.h similarity index 96% rename from src/libtomahawk/playlist/playlistview.h rename to src/libtomahawk/playlist/PlaylistView.h index b3db28c82..0a2f3cc06 100644 --- a/src/libtomahawk/playlist/playlistview.h +++ b/src/libtomahawk/playlist/PlaylistView.h @@ -20,9 +20,9 @@ #ifndef PLAYLISTVIEW_H #define PLAYLISTVIEW_H -#include "playlist/trackproxymodel.h" -#include "playlist/playlistmodel.h" -#include "trackview.h" +#include "playlist/TrackProxyModel.h" +#include "playlist/PlaylistModel.h" +#include "TrackView.h" #include "ViewPage.h" #include "DllMacro.h" diff --git a/src/libtomahawk/playlist/queueproxymodel.cpp b/src/libtomahawk/playlist/QueueProxyModel.cpp similarity index 94% rename from src/libtomahawk/playlist/queueproxymodel.cpp rename to src/libtomahawk/playlist/QueueProxyModel.cpp index 7248457fd..8a7640fba 100644 --- a/src/libtomahawk/playlist/queueproxymodel.cpp +++ b/src/libtomahawk/playlist/QueueProxyModel.cpp @@ -17,10 +17,10 @@ * along with Tomahawk. If not, see . */ -#include "queueproxymodel.h" +#include "QueueProxyModel.h" -#include "queueproxymodelplaylistinterface.h" -#include "playlist/trackview.h" +#include "QueueProxyModelPlaylistInterface.h" +#include "playlist/TrackView.h" #include "ViewManager.h" #include "utils/logger.h" diff --git a/src/libtomahawk/playlist/queueproxymodel.h b/src/libtomahawk/playlist/QueueProxyModel.h similarity index 97% rename from src/libtomahawk/playlist/queueproxymodel.h rename to src/libtomahawk/playlist/QueueProxyModel.h index ac3f3fec9..8156d8df3 100644 --- a/src/libtomahawk/playlist/queueproxymodel.h +++ b/src/libtomahawk/playlist/QueueProxyModel.h @@ -20,7 +20,7 @@ #ifndef QUEUEPROXYMODEL_H #define QUEUEPROXYMODEL_H -#include "playlistproxymodel.h" +#include "PlaylistProxyModel.h" #include "DllMacro.h" diff --git a/src/libtomahawk/playlist/queueproxymodelplaylistinterface.cpp b/src/libtomahawk/playlist/QueueProxyModelPlaylistInterface.cpp similarity index 95% rename from src/libtomahawk/playlist/queueproxymodelplaylistinterface.cpp rename to src/libtomahawk/playlist/QueueProxyModelPlaylistInterface.cpp index 6f71b8c19..e80bc1ed0 100644 --- a/src/libtomahawk/playlist/queueproxymodelplaylistinterface.cpp +++ b/src/libtomahawk/playlist/QueueProxyModelPlaylistInterface.cpp @@ -17,9 +17,9 @@ * along with Tomahawk. If not, see . */ -#include "queueproxymodelplaylistinterface.h" +#include "QueueProxyModelPlaylistInterface.h" -#include "queueproxymodel.h" +#include "QueueProxyModel.h" #include "utils/logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/queueproxymodelplaylistinterface.h b/src/libtomahawk/playlist/QueueProxyModelPlaylistInterface.h similarity index 96% rename from src/libtomahawk/playlist/queueproxymodelplaylistinterface.h rename to src/libtomahawk/playlist/QueueProxyModelPlaylistInterface.h index 8a74b41d8..12540f2ff 100644 --- a/src/libtomahawk/playlist/queueproxymodelplaylistinterface.h +++ b/src/libtomahawk/playlist/QueueProxyModelPlaylistInterface.h @@ -20,7 +20,7 @@ #ifndef QUEUEPROXYMODELPLAYLISTINTERFACE_H #define QUEUEPROXYMODELPLAYLISTINTERFACE_H -#include "playlistproxymodelplaylistinterface.h" +#include "PlaylistProxyModelPlaylistInterface.h" #include "Result.h" #include "DllMacro.h" diff --git a/src/libtomahawk/playlist/queueview.cpp b/src/libtomahawk/playlist/QueueView.cpp similarity index 96% rename from src/libtomahawk/playlist/queueview.cpp rename to src/libtomahawk/playlist/QueueView.cpp index 6a9984a27..4b8656ccf 100644 --- a/src/libtomahawk/playlist/queueview.cpp +++ b/src/libtomahawk/playlist/QueueView.cpp @@ -16,16 +16,16 @@ * along with Tomahawk. If not, see . */ -#include "queueview.h" -#include "ui_queueview.h" +#include "QueueView.h" +#include "ui_QueueView.h" #include #include "widgets/HeaderLabel.h" -#include "playlist/queueproxymodel.h" -#include "widgets/overlaywidget.h" +#include "playlist/QueueProxyModel.h" +#include "widgets/OverlayWidget.h" #include "utils/logger.h" -#include "playlistview.h" +#include "PlaylistView.h" #include "utils/tomahawkutilsgui.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/queueview.h b/src/libtomahawk/playlist/QueueView.h similarity index 100% rename from src/libtomahawk/playlist/queueview.h rename to src/libtomahawk/playlist/QueueView.h diff --git a/src/libtomahawk/playlist/queueview.ui b/src/libtomahawk/playlist/QueueView.ui similarity index 97% rename from src/libtomahawk/playlist/queueview.ui rename to src/libtomahawk/playlist/QueueView.ui index e22d6c881..e9e318b12 100644 --- a/src/libtomahawk/playlist/queueview.ui +++ b/src/libtomahawk/playlist/QueueView.ui @@ -76,7 +76,7 @@ PlaylistView QTreeView -
playlist/playlistview.h
+
playlist/PlaylistView.h
 diff --git a/src/libtomahawk/playlist/RecentlyAddedModel.cpp b/src/libtomahawk/playlist/RecentlyAddedModel.cpp index 208adfd93..c5cc75153 100644 --- a/src/libtomahawk/playlist/RecentlyAddedModel.cpp +++ b/src/libtomahawk/playlist/RecentlyAddedModel.cpp @@ -23,7 +23,7 @@ #include "Source.h" #include "SourceList.h" -#include "database/database.h" +#include "database/Database.h" #include "database/databasecommand_alltracks.h" #include "utils/tomahawkutils.h" #include "utils/logger.h" diff --git a/src/libtomahawk/playlist/RecentlyAddedModel.h b/src/libtomahawk/playlist/RecentlyAddedModel.h index e702fc82b..d47032039 100644 --- a/src/libtomahawk/playlist/RecentlyAddedModel.h +++ b/src/libtomahawk/playlist/RecentlyAddedModel.h @@ -23,7 +23,7 @@ #include #include "Typedefs.h" -#include "trackmodel.h" +#include "TrackModel.h" #include "DllMacro.h" diff --git a/src/libtomahawk/playlist/RecentlyPlayedModel.cpp b/src/libtomahawk/playlist/RecentlyPlayedModel.cpp index a8f00063d..1f877af53 100644 --- a/src/libtomahawk/playlist/RecentlyPlayedModel.cpp +++ b/src/libtomahawk/playlist/RecentlyPlayedModel.cpp @@ -23,7 +23,7 @@ #include "Source.h" #include "SourceList.h" -#include "database/database.h" +#include "database/Database.h" #include "database/databasecommand_playbackhistory.h" #include "utils/tomahawkutils.h" #include "utils/logger.h" diff --git a/src/libtomahawk/playlist/RecentlyPlayedModel.h b/src/libtomahawk/playlist/RecentlyPlayedModel.h index f8b49731c..78573ee95 100644 --- a/src/libtomahawk/playlist/RecentlyPlayedModel.h +++ b/src/libtomahawk/playlist/RecentlyPlayedModel.h @@ -23,7 +23,7 @@ #include #include "Typedefs.h" -#include "playlistmodel.h" +#include "PlaylistModel.h" #include "DllMacro.h" diff --git a/src/libtomahawk/playlist/trackheader.cpp b/src/libtomahawk/playlist/TrackHeader.cpp similarity index 95% rename from src/libtomahawk/playlist/trackheader.cpp rename to src/libtomahawk/playlist/TrackHeader.cpp index aa30c0ca2..562cf80fe 100644 --- a/src/libtomahawk/playlist/trackheader.cpp +++ b/src/libtomahawk/playlist/TrackHeader.cpp @@ -17,9 +17,9 @@ * along with Tomahawk. If not, see . */ -#include "trackheader.h" +#include "TrackHeader.h" -#include "playlist/trackview.h" +#include "playlist/TrackView.h" #include "utils/logger.h" diff --git a/src/libtomahawk/playlist/trackheader.h b/src/libtomahawk/playlist/TrackHeader.h similarity index 100% rename from src/libtomahawk/playlist/trackheader.h rename to src/libtomahawk/playlist/TrackHeader.h diff --git a/src/libtomahawk/playlist/trackmodel.cpp b/src/libtomahawk/playlist/TrackModel.cpp similarity index 99% rename from src/libtomahawk/playlist/trackmodel.cpp rename to src/libtomahawk/playlist/TrackModel.cpp index 2478e790e..5d958f250 100644 --- a/src/libtomahawk/playlist/trackmodel.cpp +++ b/src/libtomahawk/playlist/TrackModel.cpp @@ -18,7 +18,7 @@ * along with Tomahawk. If not, see . */ -#include "trackmodel.h" +#include "TrackModel.h" #include #include diff --git a/src/libtomahawk/playlist/trackmodel.h b/src/libtomahawk/playlist/TrackModel.h similarity index 99% rename from src/libtomahawk/playlist/trackmodel.h rename to src/libtomahawk/playlist/TrackModel.h index 1009a3aff..cf85f9d50 100644 --- a/src/libtomahawk/playlist/trackmodel.h +++ b/src/libtomahawk/playlist/TrackModel.h @@ -24,7 +24,7 @@ #include #include "PlaylistInterface.h" -#include "trackmodelitem.h" +#include "TrackModelItem.h" #include "Typedefs.h" #include "DllMacro.h" diff --git a/src/libtomahawk/playlist/trackmodelitem.cpp b/src/libtomahawk/playlist/TrackModelItem.cpp similarity index 99% rename from src/libtomahawk/playlist/trackmodelitem.cpp rename to src/libtomahawk/playlist/TrackModelItem.cpp index cb71b7a21..a037f3145 100644 --- a/src/libtomahawk/playlist/trackmodelitem.cpp +++ b/src/libtomahawk/playlist/TrackModelItem.cpp @@ -17,7 +17,7 @@ * along with Tomahawk. If not, see . */ -#include "trackmodelitem.h" +#include "TrackModelItem.h" #include "Playlist.h" #include "Query.h" diff --git a/src/libtomahawk/playlist/trackmodelitem.h b/src/libtomahawk/playlist/TrackModelItem.h similarity index 100% rename from src/libtomahawk/playlist/trackmodelitem.h rename to src/libtomahawk/playlist/TrackModelItem.h diff --git a/src/libtomahawk/playlist/trackproxymodel.cpp b/src/libtomahawk/playlist/TrackProxyModel.cpp similarity index 99% rename from src/libtomahawk/playlist/trackproxymodel.cpp rename to src/libtomahawk/playlist/TrackProxyModel.cpp index f3125a5c2..eff052a32 100644 --- a/src/libtomahawk/playlist/trackproxymodel.cpp +++ b/src/libtomahawk/playlist/TrackProxyModel.cpp @@ -17,11 +17,11 @@ * along with Tomahawk. If not, see . */ -#include "trackproxymodel.h" +#include "TrackProxyModel.h" #include -#include "trackproxymodelplaylistinterface.h" +#include "TrackProxyModelPlaylistInterface.h" #include "Artist.h" #include "Album.h" #include "Query.h" diff --git a/src/libtomahawk/playlist/trackproxymodel.h b/src/libtomahawk/playlist/TrackProxyModel.h similarity index 98% rename from src/libtomahawk/playlist/trackproxymodel.h rename to src/libtomahawk/playlist/TrackProxyModel.h index 073c85efc..64ec60db8 100644 --- a/src/libtomahawk/playlist/trackproxymodel.h +++ b/src/libtomahawk/playlist/TrackProxyModel.h @@ -23,7 +23,7 @@ #include #include "PlaylistInterface.h" -#include "playlist/trackmodel.h" +#include "playlist/TrackModel.h" #include "DllMacro.h" diff --git a/src/libtomahawk/playlist/trackproxymodelplaylistinterface.cpp b/src/libtomahawk/playlist/TrackProxyModelPlaylistInterface.cpp similarity index 98% rename from src/libtomahawk/playlist/trackproxymodelplaylistinterface.cpp rename to src/libtomahawk/playlist/TrackProxyModelPlaylistInterface.cpp index 53e9638d1..cd36b068c 100644 --- a/src/libtomahawk/playlist/trackproxymodelplaylistinterface.cpp +++ b/src/libtomahawk/playlist/TrackProxyModelPlaylistInterface.cpp @@ -17,9 +17,9 @@ * along with Tomahawk. If not, see . */ -#include "trackproxymodelplaylistinterface.h" +#include "TrackProxyModelPlaylistInterface.h" -#include "trackproxymodel.h" +#include "TrackProxyModel.h" #include "Artist.h" #include "Album.h" #include "Query.h" diff --git a/src/libtomahawk/playlist/trackproxymodelplaylistinterface.h b/src/libtomahawk/playlist/TrackProxyModelPlaylistInterface.h similarity index 98% rename from src/libtomahawk/playlist/trackproxymodelplaylistinterface.h rename to src/libtomahawk/playlist/TrackProxyModelPlaylistInterface.h index 36dca300a..b899ea983 100644 --- a/src/libtomahawk/playlist/trackproxymodelplaylistinterface.h +++ b/src/libtomahawk/playlist/TrackProxyModelPlaylistInterface.h @@ -23,7 +23,7 @@ #include #include "PlaylistInterface.h" -#include "playlist/trackmodel.h" +#include "playlist/TrackModel.h" #include "DllMacro.h" diff --git a/src/libtomahawk/playlist/trackview.cpp b/src/libtomahawk/playlist/TrackView.cpp similarity index 99% rename from src/libtomahawk/playlist/trackview.cpp rename to src/libtomahawk/playlist/TrackView.cpp index 3734a88ef..0ac609aa8 100644 --- a/src/libtomahawk/playlist/trackview.cpp +++ b/src/libtomahawk/playlist/TrackView.cpp @@ -17,19 +17,19 @@ * along with Tomahawk. If not, see . */ -#include "trackview.h" +#include "TrackView.h" #include #include #include -#include "trackheader.h" +#include "TrackHeader.h" #include "ViewManager.h" -#include "trackmodel.h" -#include "trackproxymodel.h" +#include "TrackModel.h" +#include "TrackProxyModel.h" #include "audio/audioengine.h" #include "context/ContextWidget.h" -#include "widgets/overlaywidget.h" +#include "widgets/OverlayWidget.h" #include "dynamic/widgets/LoadingSpinner.h" #include "utils/tomahawkutils.h" #include "utils/logger.h" diff --git a/src/libtomahawk/playlist/trackview.h b/src/libtomahawk/playlist/TrackView.h similarity index 99% rename from src/libtomahawk/playlist/trackview.h rename to src/libtomahawk/playlist/TrackView.h index 73b90c190..7a69e5053 100644 --- a/src/libtomahawk/playlist/trackview.h +++ b/src/libtomahawk/playlist/TrackView.h @@ -25,7 +25,7 @@ #include #include "ContextMenu.h" -#include "playlistitemdelegate.h" +#include "PlaylistItemDelegate.h" #include "DllMacro.h" diff --git a/src/libtomahawk/playlist/treeheader.cpp b/src/libtomahawk/playlist/TreeHeader.cpp similarity index 95% rename from src/libtomahawk/playlist/treeheader.cpp rename to src/libtomahawk/playlist/TreeHeader.cpp index d46ee3aa4..1d00dfe97 100644 --- a/src/libtomahawk/playlist/treeheader.cpp +++ b/src/libtomahawk/playlist/TreeHeader.cpp @@ -16,9 +16,9 @@ * along with Tomahawk. If not, see . */ -#include "treeheader.h" +#include "TreeHeader.h" -#include "playlist/artistview.h" +#include "playlist/ArtistView.h" #include "utils/logger.h" diff --git a/src/libtomahawk/playlist/treeheader.h b/src/libtomahawk/playlist/TreeHeader.h similarity index 100% rename from src/libtomahawk/playlist/treeheader.h rename to src/libtomahawk/playlist/TreeHeader.h diff --git a/src/libtomahawk/playlist/treeitemdelegate.cpp b/src/libtomahawk/playlist/TreeItemDelegate.cpp similarity index 98% rename from src/libtomahawk/playlist/treeitemdelegate.cpp rename to src/libtomahawk/playlist/TreeItemDelegate.cpp index 0b6e5ccaf..c12e49d6f 100644 --- a/src/libtomahawk/playlist/treeitemdelegate.cpp +++ b/src/libtomahawk/playlist/TreeItemDelegate.cpp @@ -17,7 +17,7 @@ * along with Tomahawk. If not, see . */ -#include "treeitemdelegate.h" +#include "TreeItemDelegate.h" #include #include @@ -32,9 +32,9 @@ #include "utils/closure.h" #include "utils/PixmapDelegateFader.h" -#include "treemodelitem.h" -#include "treeproxymodel.h" -#include "artistview.h" +#include "TreeModelItem.h" +#include "TreeProxyModel.h" +#include "ArtistView.h" TreeItemDelegate::TreeItemDelegate( ArtistView* parent, TreeProxyModel* proxy ) diff --git a/src/libtomahawk/playlist/treeitemdelegate.h b/src/libtomahawk/playlist/TreeItemDelegate.h similarity index 100% rename from src/libtomahawk/playlist/treeitemdelegate.h rename to src/libtomahawk/playlist/TreeItemDelegate.h diff --git a/src/libtomahawk/playlist/treemodel.cpp b/src/libtomahawk/playlist/TreeModel.cpp similarity index 99% rename from src/libtomahawk/playlist/treemodel.cpp rename to src/libtomahawk/playlist/TreeModel.cpp index 4d7cfd4f3..61482abea 100644 --- a/src/libtomahawk/playlist/treemodel.cpp +++ b/src/libtomahawk/playlist/TreeModel.cpp @@ -18,7 +18,7 @@ * along with Tomahawk. If not, see . */ -#include "treemodel.h" +#include "TreeModel.h" #include @@ -28,7 +28,7 @@ #include "audio/audioengine.h" #include "database/databasecommand_allalbums.h" #include "database/databasecommand_alltracks.h" -#include "database/database.h" +#include "database/Database.h" #include "utils/tomahawkutils.h" #include "utils/logger.h" diff --git a/src/libtomahawk/playlist/treemodel.h b/src/libtomahawk/playlist/TreeModel.h similarity index 99% rename from src/libtomahawk/playlist/treemodel.h rename to src/libtomahawk/playlist/TreeModel.h index 6b04f3edc..f500ca5a8 100644 --- a/src/libtomahawk/playlist/treemodel.h +++ b/src/libtomahawk/playlist/TreeModel.h @@ -30,7 +30,7 @@ #include "PlaylistInterface.h" #include "database/databasecommand_allartists.h" -#include "treemodelitem.h" +#include "TreeModelItem.h" #include "infosystem/infosystem.h" #include "DllMacro.h" diff --git a/src/libtomahawk/playlist/treemodelitem.cpp b/src/libtomahawk/playlist/TreeModelItem.cpp similarity index 99% rename from src/libtomahawk/playlist/treemodelitem.cpp rename to src/libtomahawk/playlist/TreeModelItem.cpp index 407aaa58b..0aa01c42e 100644 --- a/src/libtomahawk/playlist/treemodelitem.cpp +++ b/src/libtomahawk/playlist/TreeModelItem.cpp @@ -16,7 +16,7 @@ * along with Tomahawk. If not, see . */ -#include "treemodelitem.h" +#include "TreeModelItem.h" #include "utils/tomahawkutils.h" #include "utils/logger.h" diff --git a/src/libtomahawk/playlist/treemodelitem.h b/src/libtomahawk/playlist/TreeModelItem.h similarity index 100% rename from src/libtomahawk/playlist/treemodelitem.h rename to src/libtomahawk/playlist/TreeModelItem.h diff --git a/src/libtomahawk/playlist/treeproxymodel.cpp b/src/libtomahawk/playlist/TreeProxyModel.cpp similarity index 99% rename from src/libtomahawk/playlist/treeproxymodel.cpp rename to src/libtomahawk/playlist/TreeProxyModel.cpp index 10e9705a9..3a74d27c8 100644 --- a/src/libtomahawk/playlist/treeproxymodel.cpp +++ b/src/libtomahawk/playlist/TreeProxyModel.cpp @@ -17,14 +17,14 @@ * along with Tomahawk. If not, see . */ -#include "treeproxymodel.h" +#include "TreeProxyModel.h" #include -#include "treeproxymodelplaylistinterface.h" +#include "TreeProxyModelPlaylistInterface.h" #include "Source.h" #include "Query.h" -#include "database/database.h" +#include "database/Database.h" #include "database/DatabaseImpl.h" #include "database/databasecommand_allalbums.h" #include "utils/logger.h" diff --git a/src/libtomahawk/playlist/treeproxymodel.h b/src/libtomahawk/playlist/TreeProxyModel.h similarity index 99% rename from src/libtomahawk/playlist/treeproxymodel.h rename to src/libtomahawk/playlist/TreeProxyModel.h index df31524e6..e02fc6cc6 100644 --- a/src/libtomahawk/playlist/treeproxymodel.h +++ b/src/libtomahawk/playlist/TreeProxyModel.h @@ -23,7 +23,7 @@ #include #include "PlaylistInterface.h" -#include "treemodel.h" +#include "TreeModel.h" #include "DllMacro.h" diff --git a/src/libtomahawk/playlist/treeproxymodelplaylistinterface.cpp b/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.cpp similarity index 97% rename from src/libtomahawk/playlist/treeproxymodelplaylistinterface.cpp rename to src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.cpp index dcf1529a7..a6cd7108e 100644 --- a/src/libtomahawk/playlist/treeproxymodelplaylistinterface.cpp +++ b/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.cpp @@ -17,13 +17,13 @@ * along with Tomahawk. If not, see . */ -#include "treeproxymodelplaylistinterface.h" +#include "TreeProxyModelPlaylistInterface.h" -#include "treeproxymodel.h" +#include "TreeProxyModel.h" #include "Source.h" #include "Query.h" -#include "database/database.h" +#include "database/Database.h" #include "database/DatabaseImpl.h" #include "database/databasecommand_allalbums.h" #include "utils/logger.h" diff --git a/src/libtomahawk/playlist/treeproxymodelplaylistinterface.h b/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.h similarity index 99% rename from src/libtomahawk/playlist/treeproxymodelplaylistinterface.h rename to src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.h index 79a76b3f4..ae6abf293 100644 --- a/src/libtomahawk/playlist/treeproxymodelplaylistinterface.h +++ b/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.h @@ -21,7 +21,7 @@ #define TREEPROXYMODELPLAYLISTINTERFACE_H #include "PlaylistInterface.h" -#include "treemodel.h" +#include "TreeModel.h" #include "DllMacro.h" diff --git a/src/libtomahawk/playlist/dynamic/DynamicModel.h b/src/libtomahawk/playlist/dynamic/DynamicModel.h index 09f154543..304059e57 100644 --- a/src/libtomahawk/playlist/dynamic/DynamicModel.h +++ b/src/libtomahawk/playlist/dynamic/DynamicModel.h @@ -20,7 +20,7 @@ #ifndef DYNAMIC_MODEL_H #define DYNAMIC_MODEL_H -#include "playlistmodel.h" +#include "PlaylistModel.h" #include "Query.h" namespace Tomahawk diff --git a/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp b/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp index bd2115888..eff8a7808 100644 --- a/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp +++ b/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp @@ -21,8 +21,8 @@ #include "SourceList.h" #include "GeneratorFactory.h" -#include "database/database.h" -#include "database/databasecommand.h" +#include "database/Database.h" +#include "database/DatabaseCommand.h" #include "database/databasecommand_createdynamicplaylist.h" #include "database/databasecommand_setdynamicplaylistrevision.h" #include "database/databasecommand_loaddynamicplaylistentries.h" diff --git a/src/libtomahawk/playlist/dynamic/DynamicView.cpp b/src/libtomahawk/playlist/dynamic/DynamicView.cpp index 7fa3da238..927f32927 100644 --- a/src/libtomahawk/playlist/dynamic/DynamicView.cpp +++ b/src/libtomahawk/playlist/dynamic/DynamicView.cpp @@ -25,11 +25,11 @@ #include #include -#include "playlistmodel.h" -#include "trackproxymodel.h" -#include "trackheader.h" +#include "PlaylistModel.h" +#include "TrackProxyModel.h" +#include "TrackHeader.h" #include "DynamicModel.h" -#include "widgets/overlaywidget.h" +#include "widgets/OverlayWidget.h" #include "utils/logger.h" using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/dynamic/DynamicView.h b/src/libtomahawk/playlist/dynamic/DynamicView.h index 3d70feeb3..d8236f311 100644 --- a/src/libtomahawk/playlist/dynamic/DynamicView.h +++ b/src/libtomahawk/playlist/dynamic/DynamicView.h @@ -20,7 +20,7 @@ #ifndef DYNAMIC_VIEW_H #define DYNAMIC_VIEW_H -#include "playlist/playlistview.h" +#include "playlist/PlaylistView.h" #include #include #include diff --git a/src/libtomahawk/playlist/dynamic/database/DatabaseGenerator.cpp b/src/libtomahawk/playlist/dynamic/database/DatabaseGenerator.cpp index 0baf8f0be..a0b8857b1 100644 --- a/src/libtomahawk/playlist/dynamic/database/DatabaseGenerator.cpp +++ b/src/libtomahawk/playlist/dynamic/database/DatabaseGenerator.cpp @@ -21,7 +21,7 @@ #include "DatabaseControl.h" #include "utils/logger.h" #include -#include +#include using namespace Tomahawk; diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp index 12a5167ed..78d259eec 100644 --- a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp +++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp @@ -23,7 +23,7 @@ #include "utils/tomahawkutils.h" #include "TomahawkSettings.h" #include "database/databasecommand_collectionattributes.h" -#include "database/database.h" +#include "database/Database.h" #include "utils/logger.h" #include "SourceList.h" #include diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp index e564596ae..adf571599 100644 --- a/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp +++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp @@ -29,7 +29,7 @@ #include "DynamicControlList.h" #include "dynamic/DynamicModel.h" -#include "trackproxymodel.h" +#include "TrackProxyModel.h" #include "dynamic/GeneratorInterface.h" #include "dynamic/GeneratorFactory.h" #include "Pipeline.h" diff --git a/src/libtomahawk/playlist/topbar/clearbutton.cpp b/src/libtomahawk/playlist/topbar/ClearButton.cpp similarity index 99% rename from src/libtomahawk/playlist/topbar/clearbutton.cpp rename to src/libtomahawk/playlist/topbar/ClearButton.cpp index a0a5e99d9..f0cc3b543 100644 --- a/src/libtomahawk/playlist/topbar/clearbutton.cpp +++ b/src/libtomahawk/playlist/topbar/ClearButton.cpp @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ -#include "clearbutton.h" +#include "ClearButton.h" #include diff --git a/src/libtomahawk/playlist/topbar/clearbutton.h b/src/libtomahawk/playlist/topbar/ClearButton.h similarity index 100% rename from src/libtomahawk/playlist/topbar/clearbutton.h rename to src/libtomahawk/playlist/topbar/ClearButton.h diff --git a/src/libtomahawk/playlist/topbar/lineedit.cpp b/src/libtomahawk/playlist/topbar/LineEdit.cpp similarity index 99% rename from src/libtomahawk/playlist/topbar/lineedit.cpp rename to src/libtomahawk/playlist/topbar/LineEdit.cpp index 4df64a56c..01eb3ab26 100644 --- a/src/libtomahawk/playlist/topbar/lineedit.cpp +++ b/src/libtomahawk/playlist/topbar/LineEdit.cpp @@ -26,8 +26,8 @@ * SUCH DAMAGE. */ -#include "lineedit.h" -#include "lineedit_p.h" +#include "LineEdit.h" +#include "LineEdit_p.h" #include #include diff --git a/src/libtomahawk/playlist/topbar/lineedit.h b/src/libtomahawk/playlist/topbar/LineEdit.h similarity index 100% rename from src/libtomahawk/playlist/topbar/lineedit.h rename to src/libtomahawk/playlist/topbar/LineEdit.h diff --git a/src/libtomahawk/playlist/topbar/lineedit_p.h b/src/libtomahawk/playlist/topbar/LineEdit_p.h similarity index 100% rename from src/libtomahawk/playlist/topbar/lineedit_p.h rename to src/libtomahawk/playlist/topbar/LineEdit_p.h diff --git a/src/libtomahawk/playlist/topbar/searchbutton.cpp b/src/libtomahawk/playlist/topbar/SearchButton.cpp similarity index 99% rename from src/libtomahawk/playlist/topbar/searchbutton.cpp rename to src/libtomahawk/playlist/topbar/SearchButton.cpp index 779c75911..95196c7bc 100644 --- a/src/libtomahawk/playlist/topbar/searchbutton.cpp +++ b/src/libtomahawk/playlist/topbar/SearchButton.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301 USA */ -#include "searchbutton.h" +#include "SearchButton.h" #include #include diff --git a/src/libtomahawk/playlist/topbar/searchbutton.h b/src/libtomahawk/playlist/topbar/SearchButton.h similarity index 100% rename from src/libtomahawk/playlist/topbar/searchbutton.h rename to src/libtomahawk/playlist/topbar/SearchButton.h diff --git a/src/libtomahawk/playlist/topbar/searchlineedit.cpp b/src/libtomahawk/playlist/topbar/SearchLineEdit.cpp similarity index 96% rename from src/libtomahawk/playlist/topbar/searchlineedit.cpp rename to src/libtomahawk/playlist/topbar/SearchLineEdit.cpp index 72bb02f2e..5b9372523 100644 --- a/src/libtomahawk/playlist/topbar/searchlineedit.cpp +++ b/src/libtomahawk/playlist/topbar/SearchLineEdit.cpp @@ -26,10 +26,10 @@ * SUCH DAMAGE. */ -#include "searchlineedit.h" +#include "SearchLineEdit.h" -#include "clearbutton.h" -#include "searchbutton.h" +#include "ClearButton.h" +#include "SearchButton.h" SearchLineEdit::SearchLineEdit(QWidget *parent) : LineEdit(parent) diff --git a/src/libtomahawk/playlist/topbar/searchlineedit.h b/src/libtomahawk/playlist/topbar/SearchLineEdit.h similarity index 98% rename from src/libtomahawk/playlist/topbar/searchlineedit.h rename to src/libtomahawk/playlist/topbar/SearchLineEdit.h index ee18a415d..c5d3be908 100644 --- a/src/libtomahawk/playlist/topbar/searchlineedit.h +++ b/src/libtomahawk/playlist/topbar/SearchLineEdit.h @@ -29,7 +29,7 @@ #ifndef SEARCHLINEEDIT_H #define SEARCHLINEEDIT_H -#include "lineedit.h" +#include "LineEdit.h" class ClearButton; class SearchButton; diff --git a/src/libtomahawk/playlist/topbar/topbar.cpp b/src/libtomahawk/playlist/topbar/TopBar.cpp similarity index 99% rename from src/libtomahawk/playlist/topbar/topbar.cpp rename to src/libtomahawk/playlist/topbar/TopBar.cpp index 43b624140..1e068c1b1 100644 --- a/src/libtomahawk/playlist/topbar/topbar.cpp +++ b/src/libtomahawk/playlist/topbar/TopBar.cpp @@ -17,10 +17,10 @@ * along with Tomahawk. If not, see . */ -#include "topbar.h" -#include "ui_topbar.h" +#include "TopBar.h" +#include "ui_TopBar.h" -#include "searchbutton.h" +#include "SearchButton.h" #include #include diff --git a/src/libtomahawk/playlist/topbar/topbar.h b/src/libtomahawk/playlist/topbar/TopBar.h similarity index 100% rename from src/libtomahawk/playlist/topbar/topbar.h rename to src/libtomahawk/playlist/topbar/TopBar.h diff --git a/src/libtomahawk/playlist/topbar/topbar.ui b/src/libtomahawk/playlist/topbar/TopBar.ui similarity index 99% rename from src/libtomahawk/playlist/topbar/topbar.ui rename to src/libtomahawk/playlist/topbar/TopBar.ui index c5d123892..12b7b97d2 100644 --- a/src/libtomahawk/playlist/topbar/topbar.ui +++ b/src/libtomahawk/playlist/topbar/TopBar.ui @@ -316,7 +316,7 @@ SearchLineEdit QLineEdit -
playlist/topbar/searchlineedit.h
+
playlist/topbar/SearchLineEdit.h
 diff --git a/src/libtomahawk/sip/SipHandler.cpp b/src/libtomahawk/sip/SipHandler.cpp index fd7b381e1..a0aa98cd7 100644 --- a/src/libtomahawk/sip/SipHandler.cpp +++ b/src/libtomahawk/sip/SipHandler.cpp @@ -31,7 +31,7 @@ #include "FuncTimeout.h" -#include "database/database.h" +#include "database/Database.h" #include "network/ControlConnection.h" #include "network/Servent.h" #include "SourceList.h" diff --git a/src/libtomahawk/thirdparty/Qocoa/qsearchfield.cpp b/src/libtomahawk/thirdparty/Qocoa/qsearchfield.cpp index ffd45acef..c33659c04 100644 --- a/src/libtomahawk/thirdparty/Qocoa/qsearchfield.cpp +++ b/src/libtomahawk/thirdparty/Qocoa/qsearchfield.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include #include -#include "playlist/topbar/searchlineedit.h" +#include "playlist/topbar/SearchLineEdit.h" #include "utils/tomahawkutilsgui.h" class DLLEXPORT QSearchFieldPrivate diff --git a/src/libtomahawk/utils/tomahawkutilsgui.cpp b/src/libtomahawk/utils/tomahawkutilsgui.cpp index f8c404df3..b89ac3628 100644 --- a/src/libtomahawk/utils/tomahawkutilsgui.cpp +++ b/src/libtomahawk/utils/tomahawkutilsgui.cpp @@ -23,7 +23,7 @@ #include "Query.h" #include "Result.h" #include "logger.h" -#include "trackmodelitem.h" +#include "TrackModelItem.h" #include #include diff --git a/src/libtomahawk/widgets/overlaywidget.cpp b/src/libtomahawk/widgets/OverlayWidget.cpp similarity index 99% rename from src/libtomahawk/widgets/overlaywidget.cpp rename to src/libtomahawk/widgets/OverlayWidget.cpp index 97173dd1b..aba3b3eaa 100644 --- a/src/libtomahawk/widgets/overlaywidget.cpp +++ b/src/libtomahawk/widgets/OverlayWidget.cpp @@ -17,7 +17,7 @@ * along with Tomahawk. If not, see . */ -#include "overlaywidget.h" +#include "OverlayWidget.h" #include #include diff --git a/src/libtomahawk/widgets/overlaywidget.h b/src/libtomahawk/widgets/OverlayWidget.h similarity index 100% rename from src/libtomahawk/widgets/overlaywidget.h rename to src/libtomahawk/widgets/OverlayWidget.h diff --git a/src/libtomahawk/widgets/RecentPlaylistsModel.cpp b/src/libtomahawk/widgets/RecentPlaylistsModel.cpp index 6e06b4805..09a9d665f 100644 --- a/src/libtomahawk/widgets/RecentPlaylistsModel.cpp +++ b/src/libtomahawk/widgets/RecentPlaylistsModel.cpp @@ -24,7 +24,7 @@ #include "SourceList.h" #include "utils/logger.h" #include "dynamic/DynamicPlaylist.h" -#include "database/database.h" +#include "database/Database.h" #include "database/databasecommand_loadallsortedplaylists.h" #include "RecentlyPlayedPlaylistsModel.h" #include diff --git a/src/libtomahawk/widgets/SocialPlaylistWidget.cpp b/src/libtomahawk/widgets/SocialPlaylistWidget.cpp index bfa147405..2cdeaf57d 100644 --- a/src/libtomahawk/widgets/SocialPlaylistWidget.cpp +++ b/src/libtomahawk/widgets/SocialPlaylistWidget.cpp @@ -21,13 +21,13 @@ #include "ui_SocialPlaylistWidget.h" #include "database/databasecommand_loaddynamicplaylist.h" -#include "database/database.h" +#include "database/Database.h" #include "SourceList.h" #include "dynamic/GeneratorInterface.h" #include "dynamic/database/DatabaseGenerator.h" #include "utils/logger.h" #include "database/databasecommand_genericselect.h" -#include "widgets/overlaywidget.h" +#include "widgets/OverlayWidget.h" using namespace Tomahawk; diff --git a/src/libtomahawk/widgets/SocialPlaylistWidget.ui b/src/libtomahawk/widgets/SocialPlaylistWidget.ui index 7943a6369..83fa005ff 100644 --- a/src/libtomahawk/widgets/SocialPlaylistWidget.ui +++ b/src/libtomahawk/widgets/SocialPlaylistWidget.ui @@ -84,7 +84,7 @@ PlaylistView QTreeView -
playlist/playlistview.h
+
playlist/PlaylistView.h
 HeaderLabel @@ -94,7 +94,7 @@ AlbumView QListView -
playlist/albumview.h
+
playlist/AlbumView.h
 PlaylistWidget diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp index cd82835dc..41762003f 100644 --- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp @@ -23,9 +23,9 @@ #include "audio/audioengine.h" #include "ViewManager.h" -#include "database/database.h" -#include "playlist/treemodel.h" -#include "playlist/albummodel.h" +#include "database/Database.h" +#include "playlist/TreeModel.h" +#include "playlist/AlbumModel.h" #include "database/databasecommand_alltracks.h" #include "database/databasecommand_allalbums.h" @@ -34,7 +34,7 @@ #include "utils/logger.h" #include "widgets/OverlayButton.h" -#include "widgets/overlaywidget.h" +#include "widgets/OverlayWidget.h" using namespace Tomahawk; diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui index c9fd466ae..9ad34c135 100644 --- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui +++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui @@ -50,12 +50,12 @@ ArtistView QTreeView -
artistview.h
+
ArtistView.h
 AlbumView QListView -
playlist/albumview.h
+
playlist/AlbumView.h
 diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp index d369fd065..141922d1a 100644 --- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp @@ -22,10 +22,10 @@ #include "ui_ArtistInfoWidget.h" #include "audio/audioengine.h" -#include "playlist/trackheader.h" -#include "playlist/treemodel.h" -#include "playlist/playlistmodel.h" -#include "playlist/treeproxymodel.h" +#include "playlist/TrackHeader.h" +#include "playlist/TreeModel.h" +#include "playlist/PlaylistModel.h" +#include "playlist/TreeProxyModel.h" #include "database/databasecommand_alltracks.h" #include "database/databasecommand_allalbums.h" @@ -35,7 +35,7 @@ #include "utils/logger.h" #include "widgets/OverlayButton.h" -#include "widgets/overlaywidget.h" +#include "widgets/OverlayWidget.h" #include "Pipeline.h" diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui index 670acc2b8..b951a3558 100644 --- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui +++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui @@ -94,7 +94,7 @@ PlaylistView QTreeView -
playlist/playlistview.h
+
playlist/PlaylistView.h
 HeaderLabel @@ -114,7 +114,7 @@ ArtistView QTreeView -
artistview.h
+
ArtistView.h
 diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget_p.h b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget_p.h index b93dd0891..d697b56e0 100644 --- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget_p.h +++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget_p.h @@ -23,7 +23,7 @@ #include "ArtistInfoWidget.h" #include "ui_ArtistInfoWidget.h" #include "PlaylistInterface.h" -#include "treeproxymodel.h" +#include "TreeProxyModel.h" #include "Result.h" #include diff --git a/src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp b/src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp index 62443b854..00a41b927 100644 --- a/src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp @@ -22,18 +22,18 @@ #include "Source.h" #include "ViewManager.h" -#include "playlist/albummodel.h" -#include "playlist/collectionflatmodel.h" +#include "playlist/AlbumModel.h" +#include "playlist/CollectionFlatModel.h" #include "playlist/RecentlyAddedModel.h" #include "playlist/RecentlyPlayedModel.h" -#include "database/database.h" +#include "database/Database.h" #include "database/databasecommand_allalbums.h" #include "utils/tomahawkutils.h" #include "utils/logger.h" -#include "widgets/overlaywidget.h" +#include "widgets/OverlayWidget.h" SourceInfoWidget::SourceInfoWidget( const Tomahawk::source_ptr& source, QWidget* parent ) diff --git a/src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui b/src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui index 191a5a9af..e11eeaa15 100644 --- a/src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui +++ b/src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui @@ -109,17 +109,17 @@ AlbumView QListView -
playlist/albumview.h
+
playlist/AlbumView.h
 PlaylistView QTreeView -
playlist/playlistview.h
+
playlist/PlaylistView.h
 CollectionView QTreeView -
playlist/collectionview.h
+
playlist/CollectionView.h
 diff --git a/src/libtomahawk/widgets/newplaylistwidget.cpp b/src/libtomahawk/widgets/newplaylistwidget.cpp index 610ac9a05..973de8e27 100644 --- a/src/libtomahawk/widgets/newplaylistwidget.cpp +++ b/src/libtomahawk/widgets/newplaylistwidget.cpp @@ -24,8 +24,8 @@ #include "SourceList.h" #include "ViewManager.h" -#include "playlist/playlistmodel.h" -#include "widgets/overlaywidget.h" +#include "playlist/PlaylistModel.h" +#include "widgets/OverlayWidget.h" #include "utils/xspfloader.h" #include "utils/tomahawkutils.h" diff --git a/src/libtomahawk/widgets/newplaylistwidget.ui b/src/libtomahawk/widgets/newplaylistwidget.ui index 74a6d7956..a5560f0ca 100644 --- a/src/libtomahawk/widgets/newplaylistwidget.ui +++ b/src/libtomahawk/widgets/newplaylistwidget.ui @@ -77,7 +77,7 @@ PlaylistView QTreeView -
playlist/playlistview.h
+
playlist/PlaylistView.h
 diff --git a/src/libtomahawk/widgets/newreleaseswidget.cpp b/src/libtomahawk/widgets/newreleaseswidget.cpp index d71cf82e7..50b319650 100644 --- a/src/libtomahawk/widgets/newreleaseswidget.cpp +++ b/src/libtomahawk/widgets/newreleaseswidget.cpp @@ -35,10 +35,10 @@ #include "audio/audioengine.h" #include "dynamic/GeneratorInterface.h" -#include "playlist/playlistmodel.h" -#include "playlist/treeproxymodel.h" +#include "playlist/PlaylistModel.h" +#include "playlist/TreeProxyModel.h" #include "playlist/PlaylistChartItemDelegate.h" -#include "widgets/overlaywidget.h" +#include "widgets/OverlayWidget.h" #include "utils/tomahawkutils.h" #include "utils/logger.h" #include "Pipeline.h" diff --git a/src/libtomahawk/widgets/newreleaseswidget.ui b/src/libtomahawk/widgets/newreleaseswidget.ui index d6122d622..1dc057717 100644 --- a/src/libtomahawk/widgets/newreleaseswidget.ui +++ b/src/libtomahawk/widgets/newreleaseswidget.ui @@ -31,7 +31,7 @@ AlbumView QListView -
playlist/albumview.h
+
playlist/AlbumView.h
 Tomahawk::Breadcrumb diff --git a/src/libtomahawk/widgets/searchwidget.cpp b/src/libtomahawk/widgets/searchwidget.cpp index faea55767..0dfe5bb8b 100644 --- a/src/libtomahawk/widgets/searchwidget.cpp +++ b/src/libtomahawk/widgets/searchwidget.cpp @@ -26,9 +26,9 @@ #include "SourceList.h" #include "ViewManager.h" #include "dynamic/widgets/LoadingSpinner.h" -#include "playlist/albummodel.h" -#include "playlist/playlistmodel.h" -#include "widgets/overlaywidget.h" +#include "playlist/AlbumModel.h" +#include "playlist/PlaylistModel.h" +#include "widgets/OverlayWidget.h" #include "utils/tomahawkutils.h" #include "utils/logger.h" diff --git a/src/libtomahawk/widgets/searchwidget.ui b/src/libtomahawk/widgets/searchwidget.ui index a8f94ab34..d1f81af0c 100644 --- a/src/libtomahawk/widgets/searchwidget.ui +++ b/src/libtomahawk/widgets/searchwidget.ui @@ -41,12 +41,12 @@ PlaylistView QTreeView -
playlist/playlistview.h
+
playlist/PlaylistView.h
 AlbumView QListView -
playlist/albumview.h
+
playlist/AlbumView.h
 diff --git a/src/libtomahawk/widgets/welcomewidget.cpp b/src/libtomahawk/widgets/welcomewidget.cpp index 22cfb1289..b699d9f0e 100644 --- a/src/libtomahawk/widgets/welcomewidget.cpp +++ b/src/libtomahawk/widgets/welcomewidget.cpp @@ -29,9 +29,9 @@ #include "RecentPlaylistsModel.h" #include "audio/audioengine.h" -#include "playlist/albummodel.h" +#include "playlist/AlbumModel.h" #include "playlist/RecentlyPlayedModel.h" -#include "widgets/overlaywidget.h" +#include "widgets/OverlayWidget.h" #include "utils/tomahawkutils.h" #include "utils/logger.h" #include "dynamic/GeneratorInterface.h" diff --git a/src/libtomahawk/widgets/welcomewidget.ui b/src/libtomahawk/widgets/welcomewidget.ui index 142c2a120..964a28743 100644 --- a/src/libtomahawk/widgets/welcomewidget.ui +++ b/src/libtomahawk/widgets/welcomewidget.ui @@ -96,12 +96,12 @@ AlbumView QListView -
playlist/albumview.h
+
playlist/AlbumView.h
 PlaylistView QTreeView -
playlist/playlistview.h
+
playlist/PlaylistView.h
 PlaylistWidget diff --git a/src/libtomahawk/widgets/whatshotwidget.cpp b/src/libtomahawk/widgets/whatshotwidget.cpp index 35128ea83..98c73cd9f 100644 --- a/src/libtomahawk/widgets/whatshotwidget.cpp +++ b/src/libtomahawk/widgets/whatshotwidget.cpp @@ -34,10 +34,10 @@ #include "audio/audioengine.h" #include "dynamic/GeneratorInterface.h" -#include "playlist/playlistmodel.h" -#include "playlist/treeproxymodel.h" +#include "playlist/PlaylistModel.h" +#include "playlist/TreeProxyModel.h" #include "playlist/PlaylistChartItemDelegate.h" -#include "widgets/overlaywidget.h" +#include "widgets/OverlayWidget.h" #include "utils/tomahawkutils.h" #include "utils/logger.h" #include "Pipeline.h" diff --git a/src/libtomahawk/widgets/whatshotwidget.ui b/src/libtomahawk/widgets/whatshotwidget.ui index d62df772d..95e51f4d3 100644 --- a/src/libtomahawk/widgets/whatshotwidget.ui +++ b/src/libtomahawk/widgets/whatshotwidget.ui @@ -66,17 +66,17 @@ AlbumView QListView -
playlist/albumview.h
+
playlist/AlbumView.h
 ArtistView QTreeView -
artistview.h
+
ArtistView.h
 PlaylistView QTreeView -
playlist/playlistview.h
+
playlist/PlaylistView.h
 Tomahawk::Breadcrumb diff --git a/src/libtomahawk/widgets/whatshotwidget_p.h b/src/libtomahawk/widgets/whatshotwidget_p.h index 38dd6e952..35a64cb4c 100644 --- a/src/libtomahawk/widgets/whatshotwidget_p.h +++ b/src/libtomahawk/widgets/whatshotwidget_p.h @@ -23,8 +23,8 @@ #include "whatshotwidget.h" #include "PlaylistInterface.h" #include "ui_whatshotwidget.h" -#include "treeproxymodel.h" -#include "playlistview.h" +#include "TreeProxyModel.h" +#include "PlaylistView.h" #include "Result.h" #include diff --git a/src/sourcetree/items/historyitem.cpp b/src/sourcetree/items/historyitem.cpp index 47baa5251..d441199d0 100644 --- a/src/sourcetree/items/historyitem.cpp +++ b/src/sourcetree/items/historyitem.cpp @@ -23,7 +23,7 @@ #include "genericpageitems.h" #include "utils/tomahawkutilsgui.h" #include "utils/logger.h" -#include "playlist/customplaylistview.h" +#include "playlist/CustomPlaylistView.h" #include "temporarypageitem.h" #include "SourceList.h" diff --git a/src/sourcetree/items/playlistitems.cpp b/src/sourcetree/items/playlistitems.cpp index c5c552758..2c142f3cf 100644 --- a/src/sourcetree/items/playlistitems.cpp +++ b/src/sourcetree/items/playlistitems.cpp @@ -25,7 +25,7 @@ #include "Query.h" #include "ViewManager.h" #include "playlist/dynamic/GeneratorInterface.h" -#include "playlist/playlistview.h" +#include "playlist/PlaylistView.h" #include "categoryitems.h" #include "sourceitem.h" #include "utils/tomahawkutils.h" diff --git a/src/sourcetree/items/sourceitem.cpp b/src/sourcetree/items/sourceitem.cpp index fbb628c2f..322cf0a10 100644 --- a/src/sourcetree/items/sourceitem.cpp +++ b/src/sourcetree/items/sourceitem.cpp @@ -27,9 +27,9 @@ #include "utils/tomahawkutilsgui.h" #include "utils/logger.h" #include "widgets/SocialPlaylistWidget.h" -#include "playlist/customplaylistview.h" -#include "playlist/collectionview.h" -#include "playlist/playlistview.h" +#include "playlist/CustomPlaylistView.h" +#include "playlist/CollectionView.h" +#include "playlist/PlaylistView.h" #include "playlist/RecentlyAddedModel.h" #include "playlist/RecentlyPlayedModel.h" #include "playlist/PlaylistLargeItemDelegate.h" diff --git a/src/sourcetree/sourcesmodel.cpp b/src/sourcetree/sourcesmodel.cpp index ebfaf8926..5e17cbbbb 100644 --- a/src/sourcetree/sourcesmodel.cpp +++ b/src/sourcetree/sourcesmodel.cpp @@ -40,8 +40,8 @@ #include "GlobalActionManager.h" #include "DropJob.h" #include "items/playlistitems.h" -#include "playlist/artistview.h" -#include "playlist/playlistview.h" +#include "playlist/ArtistView.h" +#include "playlist/PlaylistView.h" #include "playlist/dynamic/widgets/DynamicWidget.h" using namespace Tomahawk; diff --git a/src/sourcetree/sourcetreeview.cpp b/src/sourcetree/sourcetreeview.cpp index d3ed0e6ea..0dbf8c01c 100644 --- a/src/sourcetree/sourcetreeview.cpp +++ b/src/sourcetree/sourcetreeview.cpp @@ -46,7 +46,7 @@ #include "items/genericpageitems.h" #include "items/temporarypageitem.h" #include "database/databasecommand_socialaction.h" -#include "database/database.h" +#include "database/Database.h" #include "LatchManager.h" using namespace Tomahawk; diff --git a/src/web/api_v1.cpp b/src/web/api_v1.cpp index 88a60018a..5547ffae7 100644 --- a/src/web/api_v1.cpp +++ b/src/web/api_v1.cpp @@ -25,7 +25,7 @@ #include "utils/logger.h" #include "utils/tomahawkutils.h" -#include "database/database.h" +#include "database/Database.h" #include "database/databasecommand_addclientauth.h" #include "database/databasecommand_clientauthvalid.h" #include "network/Servent.h"