extragear/multimedia/amarok/src
Seb Ruiz
ruiz at kde.org
Sun Sep 2 09:34:13 CEST 2007
SVN commit 707553 by seb:
This converts some files to our new CamelCase.{cpp,h} naming scheme. Sorry, I didn't intend on this being such a freaking huge commit but I got carried away and the repercussions were bigger than I first took into account. If i cause any conflicts or headaches, feel free to send me an abusive email.
CCMAIL: amarok-devel at kde.org
M +1 -1 AmarokMimeData.h
M +5 -5 CMakeLists.txt
M +1 -1 amarokcore/amarokdbushandler.cpp
M +1 -1 app.cpp
A collection/BlockingQuery.cpp collection/blockingquery.cpp#707536 [License: GPL (v2+)]
A collection/BlockingQuery.h collection/blockingquery.h#707536 [License: GPL (v2+)]
A collection/Collection.cpp collection/collection.cpp#707536 [License: GPL (v2+)]
A collection/Collection.h collection/collection.h#707536 [License: GPL (v2+)]
M +1 -2 collection/CollectionLocation.cpp
A collection/CollectionManager.cpp collection/collectionmanager.cpp#707536 [License: GPL (v2+)]
A collection/CollectionManager.h collection/collectionmanager.h#707536 [License: GPL (v2+)]
A collection/MetaQueryBuilder.cpp collection/metaquerybuilder.cpp#707536 [License: GPL (v2+)]
A collection/MetaQueryBuilder.h collection/metaquerybuilder.h#707536 [License: GPL (v2+)]
A collection/QueryMaker.cpp collection/querymaker.cpp#707536 [License: GPL (v2+)]
A collection/QueryMaker.h collection/querymaker.h#707536 [License: GPL (v2+)]
D collection/blockingquery.cpp
D collection/blockingquery.h
D collection/collection.cpp
D collection/collection.h
D collection/collectionmanager.cpp
D collection/collectionmanager.h
M +1 -1 collection/daap/daapcollection.h
D collection/metaquerybuilder.cpp
D collection/metaquerybuilder.h
D collection/querymaker.cpp
D collection/querymaker.h
M +1 -1 collection/sqlcollection/sqlcollection.h
M +1 -1 collection/sqlcollection/sqlmeta.cpp
M +1 -1 collection/sqlcollection/sqlquerybuilder.h
M +1 -1 collection/support/memoryquerymaker.h
M +1 -1 collection/support/memoryquerymakerfilters_p.h
M +3 -3 collectionbrowser/CollectionTreeItemModelBase.cpp
M +1 -1 collectionbrowser/collectiontreeitem.h
M +3 -3 collectionbrowser/collectiontreeitemmodel.cpp
M +3 -3 collectionbrowser/singlecollectiontreeitemmodel.cpp
M +1 -1 collectiondb.cpp
M +1 -1 enginecontroller.cpp
M +1 -1 filebrowser.cpp
M +1 -1 meta/PlaylistFileSupport.cpp
M +2 -2 meta/meta.cpp
M +1 -1 meta/proxy/MetaProxy.cpp
M +1 -1 meta/proxy/MetaProxy_p.h
M +4 -4 playlist/PlaylistModel.cpp
M +1 -1 podcasts/PodcastCollection.h
M +1 -1 servicebrowser/jamendo/jamendodatabasehandler.cpp
M +1 -1 servicebrowser/magnatunestore/magnatunedatabasehandler.cpp
M +1 -1 servicebrowser/scriptableservice/ScriptableServiceCollection.h
M +1 -1 servicebrowser/servicecollection.h
M +1 -1 servicebrowser/servicesqlcollection.cpp
M +1 -1 servicebrowser/servicesqlcollection.h
M +1 -1 servicebrowser/servicesqlquerymaker.h
--- trunk/extragear/multimedia/amarok/src/AmarokMimeData.h #707552:707553
@@ -21,7 +21,7 @@
#include "amarok_export.h"
#include "meta/meta.h"
-#include "collection/querymaker.h"
+#include "collection/QueryMaker.h"
#include <QList>
#include <QMimeData>
--- trunk/extragear/multimedia/amarok/src/CMakeLists.txt #707552:707553
@@ -269,12 +269,12 @@
# COLLECTION
#####################################################################
set(collection_SRCS
- collection/blockingquery.cpp
- collection/collection.cpp
- collection/collectionmanager.cpp
+ collection/BlockingQuery.cpp
+ collection/Collection.cpp
+ collection/CollectionManager.cpp
collection/CollectionLocation.cpp
- collection/metaquerybuilder.cpp
- collection/querymaker.cpp
+ collection/MetaQueryBuilder.cpp
+ collection/QueryMaker.cpp
collection/support/memoryquerymaker.cpp
)
--- trunk/extragear/multimedia/amarok/src/amarokcore/amarokdbushandler.cpp #707552:707553
@@ -26,7 +26,7 @@
#include "app.h" //transferCliArgs
#include "debug.h"
#include "collectiondb.h"
-#include "collection/collectionmanager.h"
+#include "collection/CollectionManager.h"
#include "collection/SqlStorage.h"
#include "context/LyricsManager.h"
#include "enginebase.h"
--- trunk/extragear/multimedia/amarok/src/app.cpp #707552:707553
@@ -21,7 +21,7 @@
#include "amarokdbushandler.h"
#include "atomicstring.h"
#include "collectiondb.h"
-#include "collectionmanager.h"
+#include "CollectionManager.h"
#include "ConfigDialog.h"
#include "context/ContextView.h"
//#include "dbsetup.h" //firstRunWizard()
--- trunk/extragear/multimedia/amarok/src/collection/CollectionLocation.cpp #707552:707553
@@ -17,9 +17,8 @@
*/
#include "CollectionLocation.h"
+#include "Collection.h"
-#include "collection.h"
-
CollectionLocation::CollectionLocation()
:QObject()
{
--- trunk/extragear/multimedia/amarok/src/collection/daap/daapcollection.h #707552:707553
@@ -21,7 +21,7 @@
#ifndef DAAPCOLLECTION_H
#define DAAPCOLLECTION_H
-#include "collection.h"
+#include "Collection.h"
#include "memorycollection.h"
#include "reader.h"
--- trunk/extragear/multimedia/amarok/src/collection/sqlcollection/sqlcollection.h #707552:707553
@@ -19,7 +19,7 @@
#define AMAROK_COLLECTION_SQLCOLLECTION_H
#include "amarok_export.h"
-#include "collection.h"
+#include "Collection.h"
#include "sqlregistry.h"
#include "SqlStorage.h"
--- trunk/extragear/multimedia/amarok/src/collection/sqlcollection/sqlmeta.cpp #707552:707553
@@ -19,7 +19,7 @@
#include "sqlmeta.h"
#include "amarok.h"
-#include "blockingquery.h"
+#include "BlockingQuery.h"
#include "sqlregistry.h"
#include "sqlcollection.h"
--- trunk/extragear/multimedia/amarok/src/collection/sqlcollection/sqlquerybuilder.h #707552:707553
@@ -18,7 +18,7 @@
#ifndef AMAROK_COLLECTION_SQLQUERYBUILDER_H
#define AMAROK_COLLECTION_SQLQUERYBUILDER_H
-#include "querymaker.h"
+#include "QueryMaker.h"
#include "amarok_export.h"
#include "threadmanager.h"
--- trunk/extragear/multimedia/amarok/src/collection/support/memoryquerymaker.h #707552:707553
@@ -20,7 +20,7 @@
#define MEMORYQUERYMAKER_H
#include "memorycollection.h"
-#include "querymaker.h"
+#include "QueryMaker.h"
namespace ThreadWeaver
{
--- trunk/extragear/multimedia/amarok/src/collection/support/memoryquerymakerfilters_p.h #707552:707553
@@ -21,7 +21,7 @@
#include "debug.h"
#include "meta/meta.h"
-#include "collection/querymaker.h"
+#include "collection/QueryMaker.h"
#include <QList>
#include <QString>
--- trunk/extragear/multimedia/amarok/src/collectionbrowser/CollectionTreeItemModelBase.cpp #707552:707553
@@ -16,12 +16,12 @@
#include "amarok.h"
#include "AmarokMimeData.h"
-#include "collection.h"
-#include "collectionmanager.h"
+#include "Collection.h"
+#include "CollectionManager.h"
#include "collectiontreeitem.h"
#include "debug.h"
#include "expression.h"
-#include "querymaker.h"
+#include "QueryMaker.h"
#include <KIcon>
#include <KIconLoader>
--- trunk/extragear/multimedia/amarok/src/collectionbrowser/collectiontreeitem.h #707552:707553
@@ -12,7 +12,7 @@
#include "meta.h"
//#include "sqlmeta.h"
#include "querybuilder.h"
-#include "collection.h"
+#include "Collection.h"
#include <QList>
--- trunk/extragear/multimedia/amarok/src/collectionbrowser/collectiontreeitemmodel.cpp #707552:707553
@@ -15,9 +15,9 @@
//#include "collection/sqlregistry.h"
#include "debug.h"
#include "amarok.h"
-#include "collection.h"
-#include "collectionmanager.h"
-#include "querymaker.h"
+#include "Collection.h"
+#include "CollectionManager.h"
+#include "QueryMaker.h"
#include <KLocale>
#include <KIcon>
--- trunk/extragear/multimedia/amarok/src/collectionbrowser/singlecollectiontreeitemmodel.cpp #707552:707553
@@ -15,9 +15,9 @@
//#include "collection/sqlregistry.h"
#include "debug.h"
#include "amarok.h"
-#include "collection.h"
-#include "collectionmanager.h"
-#include "querymaker.h"
+#include "Collection.h"
+#include "CollectionManager.h"
+#include "QueryMaker.h"
#include <KLocale>
#include <KIcon>
--- trunk/extragear/multimedia/amarok/src/collectiondb.cpp #707552:707553
@@ -47,7 +47,7 @@
#include "threadmanager.h"
//queries moved to sqlcollection, CollectionDB is still being used by legacy stuff
-#include "collection/collectionmanager.h"
+#include "collection/CollectionManager.h"
#include "SqlStorage.h"
#include <QBuffer>
--- trunk/extragear/multimedia/amarok/src/enginecontroller.cpp #707552:707553
@@ -17,7 +17,7 @@
#include "amarok.h"
#include "amarokconfig.h"
-#include "collection/collectionmanager.h"
+#include "collection/CollectionManager.h"
#include "debug.h"
#include "enginebase.h"
#include "lastfm.h"
--- trunk/extragear/multimedia/amarok/src/filebrowser.cpp #707552:707553
@@ -26,7 +26,7 @@
#include "amarok.h"
#include "browserToolBar.h"
#include "collectiondb.h"
-#include "collection/collectionmanager.h"
+#include "collection/CollectionManager.h"
#include "enginecontroller.h"
#include "k3bexporter.h"
#include "kbookmarkhandler.h"
--- trunk/extragear/multimedia/amarok/src/meta/PlaylistFileSupport.cpp #707552:707553
@@ -8,7 +8,7 @@
#include "PlaylistFileSupport.h"
-#include "collection/collectionmanager.h"
+#include "collection/CollectionManager.h"
#include "statusbar.h"
#include "xspfplaylist.h"
--- trunk/extragear/multimedia/amarok/src/meta/meta.cpp #707552:707553
@@ -21,8 +21,8 @@
#include "amarok.h"
#include "amarokconfig.h"
-#include "collection.h"
-#include "querymaker.h"
+#include "Collection.h"
+#include "QueryMaker.h"
#include <QDir>
#include <QImage>
--- trunk/extragear/multimedia/amarok/src/meta/proxy/MetaProxy.cpp #707552:707553
@@ -22,7 +22,7 @@
#include "debug.h"
-#include "collectionmanager.h"
+#include "CollectionManager.h"
#include <QObject>
#include <QPointer>
--- trunk/extragear/multimedia/amarok/src/meta/proxy/MetaProxy_p.h #707552:707553
@@ -23,7 +23,7 @@
#include "amarok.h"
#include "amarokconfig.h"
-#include "collection.h"
+#include "Collection.h"
#include "lastfm.h"
#include "meta.h"
--- trunk/extragear/multimedia/amarok/src/playlist/PlaylistModel.cpp #707552:707553
@@ -18,10 +18,10 @@
#include "TheInstances.h"
#include "UndoCommands.h"
-#include "collection/blockingquery.h"
-#include "collection/collection.h"
-#include "collection/collectionmanager.h"
-#include "collection/querymaker.h"
+#include "collection/BlockingQuery.h"
+#include "collection/Collection.h"
+#include "collection/CollectionManager.h"
+#include "collection/QueryMaker.h"
#include "meta/lastfm/LastFmMeta.h"
#include <QAction>
--- trunk/extragear/multimedia/amarok/src/podcasts/PodcastCollection.h #707552:707553
@@ -19,7 +19,7 @@
#ifndef PODCASTCOLLECTION_H
#define PODCASTCOLLECTION_H
-#include <collection.h>
+#include "Collection.h"
#include "support/memorycollection.h"
#include "PodcastMeta.h"
#include "playlistmanager/PlaylistManager.h"
--- trunk/extragear/multimedia/amarok/src/servicebrowser/jamendo/jamendodatabasehandler.cpp #707552:707553
@@ -19,7 +19,7 @@
#include "jamendodatabasehandler.h"
-#include "collectionmanager.h"
+#include "CollectionManager.h"
#include "debug.h"
#include "SqlStorage.h"
--- trunk/extragear/multimedia/amarok/src/servicebrowser/magnatunestore/magnatunedatabasehandler.cpp #707552:707553
@@ -20,7 +20,7 @@
#include "magnatunedatabasehandler.h"
-#include "collectionmanager.h"
+#include "CollectionManager.h"
#include "debug.h"
#include "SqlStorage.h"
--- trunk/extragear/multimedia/amarok/src/servicebrowser/scriptableservice/ScriptableServiceCollection.h #707552:707553
@@ -20,7 +20,7 @@
#ifndef SCRIPTABLESERVICECOLLECTION_H
#define SCRIPTABLESERVICECOLLECTION_H
-#include "collection.h"
+#include "Collection.h"
#include "support/memorycollection.h"
/**
--- trunk/extragear/multimedia/amarok/src/servicebrowser/servicecollection.h #707552:707553
@@ -20,7 +20,7 @@
#ifndef SERVICECOLLECTION_H
#define SERVICECOLLECTION_H
-#include "collection.h"
+#include "Collection.h"
#include "support/memorycollection.h"
#include "jamendo/jamendodatabasehandler.h"
--- trunk/extragear/multimedia/amarok/src/servicebrowser/servicesqlcollection.cpp #707552:707553
@@ -19,7 +19,7 @@
#include "servicesqlcollection.h"
-#include "collectionmanager.h"
+#include "CollectionManager.h"
#include "servicesqlquerymaker.h"
#include "SqlStorage.h"
--- trunk/extragear/multimedia/amarok/src/servicebrowser/servicesqlcollection.h #707552:707553
@@ -19,7 +19,7 @@
#ifndef AMAROK_SERVICESQLCOLLECTION_H
#define AMAROK_SERVICESQLCOLLECTION_H
-#include "collection.h"
+#include "Collection.h"
#include "servicemetabase.h"
#include "ServiceSqlRegistry.h"
--- trunk/extragear/multimedia/amarok/src/servicebrowser/servicesqlquerymaker.h #707552:707553
@@ -22,7 +22,7 @@
#include "servicemetabase.h"
#include "ServiceSqlRegistry.h"
-#include "querymaker.h"
+#include "QueryMaker.h"
#include "threadmanager.h"
More information about the Amarok-devel
mailing list