Rename to uppercase

2025-07-31 03:10:12 +02:00 · 2010-12-10 16:38:26 -05:00
parent f4be2b5067
commit d4e95e05d4
26 changed files with 124 additions and 43 deletions
--- 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
 {
--- 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
--- a/src/collection.cpp
+++ b/src/collection.cpp
@@ -4,7 +4,7 @@
 #include <QGenericArgument>

 #include "tomahawk/playlist.h"
-#include "dynamic/dynamicplaylist.h"
+#include "dynamic/DynamicPlaylist.h"

 using namespace Tomahawk;

--- a/src/database/databasecommand_createdynamicplaylist.cpp
+++ b/src/database/databasecommand_createdynamicplaylist.cpp
@@ -4,9 +4,9 @@
 #include <QSqlDriver>

 #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;

--- 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
--- a/src/database/databasecommand_loadalldynamicplaylists.cpp
+++ b/src/database/databasecommand_loadalldynamicplaylists.cpp
@@ -17,7 +17,7 @@

 #include <QSqlQuery>

-#include "dynamic/dynamicplaylist.h"
+#include "dynamic/DynamicPlaylist.h"
 #include "databaseimpl.h"

 using namespace Tomahawk;
--- 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;

--- 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
 {
--- a/src/database/databasecommand_setdynamicplaylistrevision.cpp
+++ b/src/database/databasecommand_setdynamicplaylistrevision.cpp
@@ -3,8 +3,8 @@
 #include <QSqlQuery>

 #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, 
--- 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 <generatorinterface.h>
+#include "dynamic/GeneratorInterface.h"

 using namespace Tomahawk;

--- a/src/dynamic/DynamicControl.cpp
+++ b/src/dynamic/DynamicControl.cpp
@@ -14,7 +14,7 @@
 * this program.  If not, see <http://www.gnu.org/licenses/>.                           *
 ****************************************************************************************/

-#include "dynamiccontrol.h"
+#include "DynamicControl.h"

 Tomahawk::DynamicControl::DynamicControl()
 {
--- a/src/dynamic/DynamicControl.h
+++ b/src/dynamic/DynamicControl.h
--- a/src/dynamic/DynamicPlaylist.cpp
+++ b/src/dynamic/DynamicPlaylist.cpp
@@ -14,10 +14,10 @@
 * this program.  If not, see <http://www.gnu.org/licenses/>.                           *
 ****************************************************************************************/

-#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"
--- 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;
--- a/src/dynamic/DynamicPlaylistModel.cpp
+++ b/src/dynamic/DynamicPlaylistModel.cpp
@@ -0,0 +1,35 @@
+/****************************************************************************************
+ * Copyright (c) 2010 Leo Franchi <lfranchi@kde.org>                                    *
+ *                                                                                      *
+ * 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 <http://www.gnu.org/licenses/>.                           *
+ ****************************************************************************************/
+
+#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)
+{
+
+}
--- a/src/dynamic/DynamicPlaylistModel.h
+++ b/src/dynamic/DynamicPlaylistModel.h
@@ -0,0 +1,39 @@
+/****************************************************************************************
+ * Copyright (c) 2010 Leo Franchi <lfranchi@kde.org>                                    *
+ *                                                                                      *
+ * 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 <http://www.gnu.org/licenses/>.                           *
+ ****************************************************************************************/
+#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
--- 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;

--- a/src/dynamic/GeneratorFactory.h
+++ b/src/dynamic/GeneratorFactory.h
@@ -4,7 +4,7 @@
 #include <QHash>
 #include <QString>

-#include "dynamic/generatorinterface.h"
+#include "dynamic/GeneratorInterface.h"

 namespace Tomahawk {
    
--- a/src/dynamic/GeneratorInterface.cpp
+++ b/src/dynamic/GeneratorInterface.cpp
@@ -14,7 +14,7 @@
 * this program.  If not, see <http://www.gnu.org/licenses/>.                           *
 ****************************************************************************************/

-#include "dynamic/generatorinterface.h"
+#include "dynamic/GeneratorInterface.h"

 // lame
 Tomahawk::GeneratorInterface::GeneratorInterface()
--- a/src/dynamic/GeneratorInterface.h
+++ b/src/dynamic/GeneratorInterface.h
@@ -20,7 +20,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QSharedPointer>

-#include "dynamic/dynamiccontrol.h"
+#include "dynamic/DynamicControl.h"
 #include <tomahawk/typedefs.h>

 namespace Tomahawk {
--- a/src/dynamic/echonest/EchonestControl.cpp
+++ b/src/dynamic/echonest/EchonestControl.cpp
@@ -14,7 +14,7 @@
 * this program.  If not, see <http://www.gnu.org/licenses/>.                           *
 ****************************************************************************************/

-#include "echonest/echonestcontrol.h"
+#include "echonest/EchonestControl.h"

 #include <echonest/Playlist.h>

--- a/src/dynamic/echonest/EchonestControl.h
+++ b/src/dynamic/echonest/EchonestControl.h
@@ -19,7 +19,7 @@

 #include <echonest/Playlist.h>

-#include "dynamic/dynamiccontrol.h"
+#include "dynamic/DynamicControl.h"

 namespace Tomahawk
 {
--- a/src/dynamic/echonest/EchonestGenerator.cpp
+++ b/src/dynamic/echonest/EchonestGenerator.cpp
@@ -14,8 +14,8 @@
 * this program.  If not, see <http://www.gnu.org/licenses/>.                           *
 ****************************************************************************************/

-#include "echonest/echonestgenerator.h"
-#include "echonest/echonestcontrol.h"
+#include "echonest/EchonestGenerator.h"
+#include "echonest/EchonestControl.h"
 #include "tomahawk/query.h"

 using namespace Tomahawk;
--- a/src/dynamic/echonest/EchonestGenerator.h
+++ b/src/dynamic/echonest/EchonestGenerator.h
@@ -19,8 +19,8 @@

 #include <echonest/Playlist.h>

-#include "dynamic/generatorinterface.h"
-#include "dynamic/generatorfactory.h"
+#include "dynamic/GeneratorInterface.h"
+#include "dynamic/GeneratorFactory.h"


 namespace Tomahawk 
--- 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
 {
--- 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"