From d4e95e05d479ce24613023308e1ce909930a9861 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Fri, 10 Dec 2010 16:38:26 -0500 Subject: [PATCH] Rename to uppercase --- include/tomahawk/collection.h | 2 +- src/CMakeLists.txt | 31 +++++++++------ src/collection.cpp | 2 +- .../databasecommand_createdynamicplaylist.cpp | 6 +-- .../databasecommand_createdynamicplaylist.h | 2 +- ...atabasecommand_loadalldynamicplaylists.cpp | 2 +- .../databasecommand_loaddynamicplaylist.cpp | 4 +- .../databasecommand_loaddynamicplaylist.h | 2 +- ...basecommand_setdynamicplaylistrevision.cpp | 4 +- ...tabasecommand_setdynamicplaylistrevision.h | 2 +- ...{dynamiccontrol.cpp => DynamicControl.cpp} | 2 +- .../{dynamiccontrol.h => DynamicControl.h} | 0 ...ynamicplaylist.cpp => DynamicPlaylist.cpp} | 4 +- .../{dynamicplaylist.h => DynamicPlaylist.h} | 2 +- src/dynamic/DynamicPlaylistModel.cpp | 35 +++++++++++++++++ src/dynamic/DynamicPlaylistModel.h | 39 +++++++++++++++++++ ...eratorfactory.cpp => GeneratorFactory.cpp} | 4 +- ...{generatorfactory.h => GeneratorFactory.h} | 2 +- ...orinterface.cpp => GeneratorInterface.cpp} | 2 +- ...eratorinterface.h => GeneratorInterface.h} | 2 +- ...chonestcontrol.cpp => EchonestControl.cpp} | 2 +- .../{echonestcontrol.h => EchonestControl.h} | 2 +- ...estgenerator.cpp => EchonestGenerator.cpp} | 4 +- ...chonestgenerator.h => EchonestGenerator.h} | 4 +- src/sourcetree/sourcetreeitem.h | 2 +- src/tomahawkapp.cpp | 4 +- 26 files changed, 124 insertions(+), 43 deletions(-) rename src/dynamic/{dynamiccontrol.cpp => DynamicControl.cpp} (98%) rename src/dynamic/{dynamiccontrol.h => DynamicControl.h} (100%) rename src/dynamic/{dynamicplaylist.cpp => DynamicPlaylist.cpp} (99%) rename src/dynamic/{dynamicplaylist.h => DynamicPlaylist.h} (99%) create mode 100644 src/dynamic/DynamicPlaylistModel.cpp create mode 100644 src/dynamic/DynamicPlaylistModel.h rename src/dynamic/{generatorfactory.cpp => GeneratorFactory.cpp} (89%) rename src/dynamic/{generatorfactory.h => GeneratorFactory.h} (94%) rename src/dynamic/{generatorinterface.cpp => GeneratorInterface.cpp} (97%) rename src/dynamic/{generatorinterface.h => GeneratorInterface.h} (99%) rename src/dynamic/echonest/{echonestcontrol.cpp => EchonestControl.cpp} (98%) rename src/dynamic/echonest/{echonestcontrol.h => EchonestControl.h} (98%) rename src/dynamic/echonest/{echonestgenerator.cpp => EchonestGenerator.cpp} (97%) rename src/dynamic/echonest/{echonestgenerator.h => EchonestGenerator.h} (96%) diff --git a/include/tomahawk/collection.h b/include/tomahawk/collection.h index 0d947fc9f..f8944083b 100644 --- a/include/tomahawk/collection.h +++ b/include/tomahawk/collection.h @@ -18,7 +18,7 @@ #include "tomahawk/source.h" #include "tomahawk/typedefs.h" #include "typedefs.h" -#include "dynamic/dynamicplaylist.h" +#include "dynamic/DynamicPlaylist.h" namespace Tomahawk { diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bf231e9fd..d65b6c50b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -97,12 +97,12 @@ SET( tomahawkSources ${tomahawkSources} database/databasecommand_deletedynamicplaylist.cpp database/databasecollection.cpp - dynamic/dynamicplaylist.cpp - dynamic/dynamiccontrol.cpp - dynamic/generatorfactory.cpp - dynamic/generatorinterface.cpp - dynamic/echonest/echonestgenerator.cpp - dynamic/echonest/echonestcontrol.cpp + dynamic/DynamicPlaylist.cpp + dynamic/DynamicControl.cpp + dynamic/GeneratorFactory.cpp + dynamic/GeneratorInterface.cpp + dynamic/echonest/EchonestGenerator.cpp + dynamic/echonest/EchonestControl.cpp scrobbler.cpp xmppbot/xmppbot.cpp @@ -150,6 +150,9 @@ SET( tomahawkSourcesGui ${tomahawkSourcesGui} sourcetree/sourcetreeitemwidget.cpp sourcetree/sourcetreeview.cpp + dynamic/widgets/DynamicWidget.cpp + dynamic/DynamicPlaylistModel.cpp + topbar/topbar.cpp topbar/clearbutton.cpp topbar/searchlineedit.cpp @@ -158,6 +161,7 @@ SET( tomahawkSourcesGui ${tomahawkSourcesGui} infowidgets/sourceinfowidget.cpp + transferview.cpp tomahawkwindow.cpp tomahawktrayicon.cpp @@ -240,12 +244,12 @@ SET( tomahawkHeaders ${tomahawkHeaders} network/filetransferconnection.h network/dbsyncconnection.h - dynamic/dynamicplaylist.h - dynamic/dynamiccontrol.h - dynamic/generatorfactory.h - dynamic/generatorinterface.h - dynamic/echonest/echonestgenerator.h - dynamic/echonest/echonestcontrol.h + dynamic/DynamicPlaylist.h + dynamic/DynamicControl.h + dynamic/GeneratorFactory.h + dynamic/GeneratorInterface.h + dynamic/echonest/EchonestGenerator.h + dynamic/echonest/EchonestControl.h musicscanner.h scriptresolver.h @@ -303,6 +307,9 @@ SET( tomahawkHeadersGui ${tomahawkHeadersGui} infowidgets/sourceinfowidget.h + dynamic/widgets/DynamicWidget.cpp + dynamic/DynamicPlaylistModel.h + transferview.h tomahawkwindow.h tomahawktrayicon.h diff --git a/src/collection.cpp b/src/collection.cpp index 63674c51c..257325b97 100644 --- a/src/collection.cpp +++ b/src/collection.cpp @@ -4,7 +4,7 @@ #include #include "tomahawk/playlist.h" -#include "dynamic/dynamicplaylist.h" +#include "dynamic/DynamicPlaylist.h" using namespace Tomahawk; diff --git a/src/database/databasecommand_createdynamicplaylist.cpp b/src/database/databasecommand_createdynamicplaylist.cpp index d1a4fb601..cc3120470 100644 --- a/src/database/databasecommand_createdynamicplaylist.cpp +++ b/src/database/databasecommand_createdynamicplaylist.cpp @@ -4,9 +4,9 @@ #include #include "tomahawk/tomahawkapp.h" -#include "dynamic/dynamicplaylist.h" -#include "dynamic/dynamiccontrol.h" -#include "dynamic/generatorinterface.h" +#include "dynamic/DynamicPlaylist.h" +#include "dynamic/DynamicControl.h" +#include "dynamic/GeneratorInterface.h" using namespace Tomahawk; diff --git a/src/database/databasecommand_createdynamicplaylist.h b/src/database/databasecommand_createdynamicplaylist.h index a1c5668dd..aab3673d3 100644 --- a/src/database/databasecommand_createdynamicplaylist.h +++ b/src/database/databasecommand_createdynamicplaylist.h @@ -3,7 +3,7 @@ #include "databaseimpl.h" #include "databasecommand_createplaylist.h" -#include "dynamic/dynamicplaylist.h" +#include "dynamic/DynamicPlaylist.h" #include "tomahawk/typedefs.h" class DatabaseCommand_CreateDynamicPlaylist : public DatabaseCommand_CreatePlaylist diff --git a/src/database/databasecommand_loadalldynamicplaylists.cpp b/src/database/databasecommand_loadalldynamicplaylists.cpp index b980f672f..21b690462 100644 --- a/src/database/databasecommand_loadalldynamicplaylists.cpp +++ b/src/database/databasecommand_loadalldynamicplaylists.cpp @@ -17,7 +17,7 @@ #include -#include "dynamic/dynamicplaylist.h" +#include "dynamic/DynamicPlaylist.h" #include "databaseimpl.h" using namespace Tomahawk; diff --git a/src/database/databasecommand_loaddynamicplaylist.cpp b/src/database/databasecommand_loaddynamicplaylist.cpp index c3756a6f9..125801ceb 100644 --- a/src/database/databasecommand_loaddynamicplaylist.cpp +++ b/src/database/databasecommand_loaddynamicplaylist.cpp @@ -5,8 +5,8 @@ #include "databaseimpl.h" #include "tomahawksqlquery.h" -#include "dynamic/dynamiccontrol.h" -#include "dynamic/generatorinterface.h" +#include "dynamic/DynamicControl.h" +#include "dynamic/GeneratorInterface.h" using namespace Tomahawk; diff --git a/src/database/databasecommand_loaddynamicplaylist.h b/src/database/databasecommand_loaddynamicplaylist.h index 2dbbb44c3..fe80e469f 100644 --- a/src/database/databasecommand_loaddynamicplaylist.h +++ b/src/database/databasecommand_loaddynamicplaylist.h @@ -8,7 +8,7 @@ #include "databasecommand.h" #include "databasecommand_loadplaylistentries.h" #include "tomahawk/playlist.h" -#include "dynamic/dynamiccontrol.h" +#include "dynamic/DynamicControl.h" class DatabaseCommand_LoadDynamicPlaylist : public DatabaseCommand_LoadPlaylistEntries { diff --git a/src/database/databasecommand_setdynamicplaylistrevision.cpp b/src/database/databasecommand_setdynamicplaylistrevision.cpp index b1889fba8..773bf7dd1 100644 --- a/src/database/databasecommand_setdynamicplaylistrevision.cpp +++ b/src/database/databasecommand_setdynamicplaylistrevision.cpp @@ -3,8 +3,8 @@ #include #include "tomahawksqlquery.h" -#include "dynamic/dynamicplaylist.h" -#include "dynamic/dynamiccontrol.h" +#include "dynamic/DynamicPlaylist.h" +#include "dynamic/DynamicControl.h" #include "tomahawk/tomahawkapp.h" DatabaseCommand_SetDynamicPlaylistRevision::DatabaseCommand_SetDynamicPlaylistRevision(const Tomahawk::source_ptr& s, diff --git a/src/database/databasecommand_setdynamicplaylistrevision.h b/src/database/databasecommand_setdynamicplaylistrevision.h index 52799d4a4..cbb03880f 100644 --- a/src/database/databasecommand_setdynamicplaylistrevision.h +++ b/src/database/databasecommand_setdynamicplaylistrevision.h @@ -5,7 +5,7 @@ #include "databaseimpl.h" #include "tomahawk/collection.h" #include "tomahawk/playlist.h" -#include +#include "dynamic/GeneratorInterface.h" using namespace Tomahawk; diff --git a/src/dynamic/dynamiccontrol.cpp b/src/dynamic/DynamicControl.cpp similarity index 98% rename from src/dynamic/dynamiccontrol.cpp rename to src/dynamic/DynamicControl.cpp index 5e5dd6bac..0a0dc5f4b 100644 --- a/src/dynamic/dynamiccontrol.cpp +++ b/src/dynamic/DynamicControl.cpp @@ -14,7 +14,7 @@ * this program. If not, see . * ****************************************************************************************/ -#include "dynamiccontrol.h" +#include "DynamicControl.h" Tomahawk::DynamicControl::DynamicControl() { diff --git a/src/dynamic/dynamiccontrol.h b/src/dynamic/DynamicControl.h similarity index 100% rename from src/dynamic/dynamiccontrol.h rename to src/dynamic/DynamicControl.h diff --git a/src/dynamic/dynamicplaylist.cpp b/src/dynamic/DynamicPlaylist.cpp similarity index 99% rename from src/dynamic/dynamicplaylist.cpp rename to src/dynamic/DynamicPlaylist.cpp index 69965ef7b..d168d6b4f 100644 --- a/src/dynamic/dynamicplaylist.cpp +++ b/src/dynamic/DynamicPlaylist.cpp @@ -14,10 +14,10 @@ * this program. If not, see . * ****************************************************************************************/ -#include "dynamicplaylist.h" +#include "DynamicPlaylist.h" #include "tomahawk/tomahawkapp.h" -#include "generatorfactory.h" +#include "GeneratorFactory.h" #include "database.h" #include "databasecommand.h" #include "databasecommand_createdynamicplaylist.h" diff --git a/src/dynamic/dynamicplaylist.h b/src/dynamic/DynamicPlaylist.h similarity index 99% rename from src/dynamic/dynamicplaylist.h rename to src/dynamic/DynamicPlaylist.h index 1e2a0545d..59e3ee850 100644 --- a/src/dynamic/dynamicplaylist.h +++ b/src/dynamic/DynamicPlaylist.h @@ -23,7 +23,7 @@ #include "tomahawk/playlist.h" #include "tomahawk/typedefs.h" -#include "dynamic/dynamiccontrol.h" +#include "dynamic/DynamicControl.h" class DatabaseCommand_LoadAllDynamicPlaylists; class DatabaseCommand_SetDynamicPlaylistRevision; diff --git a/src/dynamic/DynamicPlaylistModel.cpp b/src/dynamic/DynamicPlaylistModel.cpp new file mode 100644 index 000000000..de185b758 --- /dev/null +++ b/src/dynamic/DynamicPlaylistModel.cpp @@ -0,0 +1,35 @@ +/**************************************************************************************** + * Copyright (c) 2010 Leo Franchi * + * * + * This program is free software; you can redistribute it and/or modify it under * + * the terms of the GNU General Public License as published by the Free Software * + * Foundation; either version 2 of the License, or (at your option) any later * + * version. * + * * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY * + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A * + * PARTICULAR PURPOSE. See the GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along with * + * this program. If not, see . * + ****************************************************************************************/ + +#include "DynamicPlaylistModel.h" +#include "audio/audioengine.h" +#include "dynamic/DynamicPlaylist.h" + +DynamicPlaylistModel::DynamicPlaylistModel(QObject* parent) + : PlaylistModel(parent) +{ + +} + +DynamicPlaylistModel::~DynamicPlaylistModel() +{ + +} + +void DynamicPlaylistModel::loadPlaylist(const Tomahawk::dynplaylist_ptr& playlist) +{ + +} diff --git a/src/dynamic/DynamicPlaylistModel.h b/src/dynamic/DynamicPlaylistModel.h new file mode 100644 index 000000000..940a6707c --- /dev/null +++ b/src/dynamic/DynamicPlaylistModel.h @@ -0,0 +1,39 @@ +/**************************************************************************************** + * Copyright (c) 2010 Leo Franchi * + * * + * This program is free software; you can redistribute it and/or modify it under * + * the terms of the GNU General Public License as published by the Free Software * + * Foundation; either version 2 of the License, or (at your option) any later * + * version. * + * * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY * + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A * + * PARTICULAR PURPOSE. See the GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along with * + * this program. If not, see . * + ****************************************************************************************/ +#ifndef DYNAMIC_PLAYLIST_MODEL_H +#define DYNAMIC_PLAYLIST_MODEL_H + +#include "tomahawk/typedefs.h" +#include "playlist/playlistmodel.h" + +/** + * Simple model that extends PlaylistModel with support for adding/removing tracks from top and bottom. + */ +class DynamicPlaylistModel : public PlaylistModel +{ +Q_OBJECT +public: + explicit DynamicPlaylistModel( QObject* parent = 0 ); + ~DynamicPlaylistModel(); + + void loadPlaylist( const Tomahawk::dynplaylist_ptr& playlist ); + +private: + Tomahawk::dynplaylist_ptr m_playlist; +}; + + +#endif diff --git a/src/dynamic/generatorfactory.cpp b/src/dynamic/GeneratorFactory.cpp similarity index 89% rename from src/dynamic/generatorfactory.cpp rename to src/dynamic/GeneratorFactory.cpp index 87ec45897..0d18f2fcd 100644 --- a/src/dynamic/generatorfactory.cpp +++ b/src/dynamic/GeneratorFactory.cpp @@ -1,5 +1,5 @@ -#include "dynamic/generatorfactory.h" -#include "dynamic/generatorinterface.h" +#include "dynamic/GeneratorFactory.h" +#include "dynamic/GeneratorInterface.h" using namespace Tomahawk; diff --git a/src/dynamic/generatorfactory.h b/src/dynamic/GeneratorFactory.h similarity index 94% rename from src/dynamic/generatorfactory.h rename to src/dynamic/GeneratorFactory.h index c38fe912b..58604f159 100644 --- a/src/dynamic/generatorfactory.h +++ b/src/dynamic/GeneratorFactory.h @@ -4,7 +4,7 @@ #include #include -#include "dynamic/generatorinterface.h" +#include "dynamic/GeneratorInterface.h" namespace Tomahawk { diff --git a/src/dynamic/generatorinterface.cpp b/src/dynamic/GeneratorInterface.cpp similarity index 97% rename from src/dynamic/generatorinterface.cpp rename to src/dynamic/GeneratorInterface.cpp index 01f7f2c1b..0c234128b 100644 --- a/src/dynamic/generatorinterface.cpp +++ b/src/dynamic/GeneratorInterface.cpp @@ -14,7 +14,7 @@ * this program. If not, see . * ****************************************************************************************/ -#include "dynamic/generatorinterface.h" +#include "dynamic/GeneratorInterface.h" // lame Tomahawk::GeneratorInterface::GeneratorInterface() diff --git a/src/dynamic/generatorinterface.h b/src/dynamic/GeneratorInterface.h similarity index 99% rename from src/dynamic/generatorinterface.h rename to src/dynamic/GeneratorInterface.h index c564adc6d..3493f659c 100644 --- a/src/dynamic/generatorinterface.h +++ b/src/dynamic/GeneratorInterface.h @@ -20,7 +20,7 @@ #include #include -#include "dynamic/dynamiccontrol.h" +#include "dynamic/DynamicControl.h" #include namespace Tomahawk { diff --git a/src/dynamic/echonest/echonestcontrol.cpp b/src/dynamic/echonest/EchonestControl.cpp similarity index 98% rename from src/dynamic/echonest/echonestcontrol.cpp rename to src/dynamic/echonest/EchonestControl.cpp index 073b78733..91f2544c6 100644 --- a/src/dynamic/echonest/echonestcontrol.cpp +++ b/src/dynamic/echonest/EchonestControl.cpp @@ -14,7 +14,7 @@ * this program. If not, see . * ****************************************************************************************/ -#include "echonest/echonestcontrol.h" +#include "echonest/EchonestControl.h" #include diff --git a/src/dynamic/echonest/echonestcontrol.h b/src/dynamic/echonest/EchonestControl.h similarity index 98% rename from src/dynamic/echonest/echonestcontrol.h rename to src/dynamic/echonest/EchonestControl.h index 8e400c4ac..3a1a9eee7 100644 --- a/src/dynamic/echonest/echonestcontrol.h +++ b/src/dynamic/echonest/EchonestControl.h @@ -19,7 +19,7 @@ #include -#include "dynamic/dynamiccontrol.h" +#include "dynamic/DynamicControl.h" namespace Tomahawk { diff --git a/src/dynamic/echonest/echonestgenerator.cpp b/src/dynamic/echonest/EchonestGenerator.cpp similarity index 97% rename from src/dynamic/echonest/echonestgenerator.cpp rename to src/dynamic/echonest/EchonestGenerator.cpp index 73dc4914f..1e5fe8596 100644 --- a/src/dynamic/echonest/echonestgenerator.cpp +++ b/src/dynamic/echonest/EchonestGenerator.cpp @@ -14,8 +14,8 @@ * this program. If not, see . * ****************************************************************************************/ -#include "echonest/echonestgenerator.h" -#include "echonest/echonestcontrol.h" +#include "echonest/EchonestGenerator.h" +#include "echonest/EchonestControl.h" #include "tomahawk/query.h" using namespace Tomahawk; diff --git a/src/dynamic/echonest/echonestgenerator.h b/src/dynamic/echonest/EchonestGenerator.h similarity index 96% rename from src/dynamic/echonest/echonestgenerator.h rename to src/dynamic/echonest/EchonestGenerator.h index 5d010755b..eaf496251 100644 --- a/src/dynamic/echonest/echonestgenerator.h +++ b/src/dynamic/echonest/EchonestGenerator.h @@ -19,8 +19,8 @@ #include -#include "dynamic/generatorinterface.h" -#include "dynamic/generatorfactory.h" +#include "dynamic/GeneratorInterface.h" +#include "dynamic/GeneratorFactory.h" namespace Tomahawk diff --git a/src/sourcetree/sourcetreeitem.h b/src/sourcetree/sourcetreeitem.h index 9b88a52e7..434ae4bce 100644 --- a/src/sourcetree/sourcetreeitem.h +++ b/src/sourcetree/sourcetreeitem.h @@ -6,7 +6,7 @@ #include "tomahawk/typedefs.h" #include "sourcetreeitemwidget.h" -#include "dynamic/dynamicplaylist.h" +#include "dynamic/DynamicPlaylist.h" class SourceTreeItem : public QObject { diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp index b8dd10232..8273c628a 100644 --- a/src/tomahawkapp.cpp +++ b/src/tomahawkapp.cpp @@ -15,8 +15,8 @@ #include "database/databasecommand_collectionstats.h" #include "database/databaseresolver.h" #include "sip/SipHandler.h" -#include "dynamic/generatorfactory.h" -#include "dynamic/echonest/echonestgenerator.h" +#include "dynamic/GeneratorFactory.h" +#include "dynamic/echonest/EchonestGenerator.h" #include "utils/tomahawkutils.h" #include "xmppbot/xmppbot.h" #include "web/api_v1.h"