[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [plasma-mediacenter] /: Changed MediaSources to DataSources
From: Aditya Dev Sharma <aditya.sharma15696 () gmail ! com>
Date: 2015-11-03 13:44:59
Message-ID: E1ZtbtT-0008ON-Mh () scm ! kde ! org
[Download RAW message or body]
Git commit 0f8e6bec7d8a805e94798a441491426505e97140 by Aditya Dev Sharma.
Committed on 03/11/2015 at 13:43.
Pushed by adityadevsharma into branch 'master'.
Changed MediaSources to DataSources
M +1 -1 CMakeLists.txt
R +0 -0 datasources/CMakeLists.txt [from: mediasources/CMakeLists.txt - 100% \
similarity] R +1 -1 datasources/baloosearch/CMakeLists.txt [from: \
mediasources/baloosearch/CMakeLists.txt - 094% similarity] R +0 -0 \
datasources/baloosearch/audiosearchresulthandler.cpp [from: \
mediasources/baloosearch/audiosearchresulthandler.cpp - 100% similarity] R +0 -0 \
datasources/baloosearch/audiosearchresulthandler.h [from: \
mediasources/baloosearch/audiosearchresulthandler.h - 100% similarity] R +1 -1 \
datasources/baloosearch/baloosearch.desktop [from: \
mediasources/baloosearch/baloosearch.desktop - 098% similarity] R +2 -2 \
datasources/baloosearch/baloosearchmediasource.cpp [from: \
mediasources/baloosearch/baloosearchmediasource.cpp - 097% similarity] R +2 -2 \
datasources/baloosearch/baloosearchmediasource.h [from: \
mediasources/baloosearch/baloosearchmediasource.h - 094% similarity] R +0 -0 \
datasources/baloosearch/imagesearchresulthandler.cpp [from: \
mediasources/baloosearch/imagesearchresulthandler.cpp - 100% similarity] R +0 -0 \
datasources/baloosearch/imagesearchresulthandler.h [from: \
mediasources/baloosearch/imagesearchresulthandler.h - 100% similarity] R +0 -0 \
datasources/baloosearch/searchresulthandler.cpp [from: \
mediasources/baloosearch/searchresulthandler.cpp - 100% similarity] R +0 -0 \
datasources/baloosearch/searchresulthandler.h [from: \
mediasources/baloosearch/searchresulthandler.h - 100% similarity] R +0 -0 \
datasources/baloosearch/videosearchresulthandler.cpp [from: \
mediasources/baloosearch/videosearchresulthandler.cpp - 100% similarity] R +0 -0 \
datasources/baloosearch/videosearchresulthandler.h [from: \
mediasources/baloosearch/videosearchresulthandler.h - 100% similarity] R +1 -1 \
datasources/filesystemsearch/CMakeLists.txt [from: \
mediasources/filesystemsearch/CMakeLists.txt - 091% similarity] R +1 -1 \
datasources/filesystemsearch/filesystemsearch.desktop [from: \
mediasources/filesystemsearch/filesystemsearch.desktop - 098% similarity] R +2 -2 \
datasources/filesystemsearch/filesystemsearchmediasource.cpp [from: \
mediasources/filesystemsearch/filesystemsearchmediasource.cpp - 096% similarity] R \
+2 -2 datasources/filesystemsearch/filesystemsearchmediasource.h [from: \
mediasources/filesystemsearch/filesystemsearchmediasource.h - 097% similarity] M +3 \
-3 libs/mediacenter/CMakeLists.txt R +6 -6 \
libs/mediacenter/abstractdatasource.cpp [from: \
libs/mediacenter/abstractmediasource.cpp - 085% similarity] R +8 -8 \
libs/mediacenter/abstractdatasource.h [from: libs/mediacenter/abstractmediasource.h - \
081% similarity] A +3 -0 \
libs/mediacenter/data/servicetypes/pmc_datasource.desktop D +0 -3 \
libs/mediacenter/data/servicetypes/pmc_mediasource.desktop R +13 -13 \
libs/mediacenter/datasourcesloader.cpp [from: libs/mediacenter/mediasourcesloader.cpp \
- 076% similarity] R +6 -6 libs/mediacenter/datasourcesloader.h [from: \
libs/mediacenter/mediasourcesloader.h - 087% similarity] M +1 -1 \
libs/mediacenter/plugin/mediacenterplugin.cpp M +2 -2 \
libs/mediacenter/plugin/qmlaccess.cpp M +1 -1 \
libs/mediacenter/plugin/qmlaccess.h M +2 -1 tests/CMakeLists.txt
A +12 -0 tests/datasourceloadertest/CMakeLists.txt
R +3 -3 tests/datasourceloadertest/datasourceloadertest.cpp [from: \
tests/mediasourceloadertest/mediasourceloadertest.cpp - 089% similarity] D +0 -12 \
tests/mediasourceloadertest/CMakeLists.txt
http://commits.kde.org/plasma-mediacenter/0f8e6bec7d8a805e94798a441491426505e97140
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1d7a4b..5223ae8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,7 +74,7 @@ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE_ENABLE_EXCEPTIONS}")
set(CMAKE_AUTOMOC ON)
add_subdirectory(browsingbackends)
-add_subdirectory(mediasources)
+add_subdirectory(datasources)
#add_subdirectory(onlineservices)
add_subdirectory(mediaelements)
add_subdirectory(components)
diff --git a/mediasources/CMakeLists.txt b/datasources/CMakeLists.txt
similarity index 100%
rename from mediasources/CMakeLists.txt
rename to datasources/CMakeLists.txt
diff --git a/mediasources/baloosearch/CMakeLists.txt \
b/datasources/baloosearch/CMakeLists.txt similarity index 94%
rename from mediasources/baloosearch/CMakeLists.txt
rename to datasources/baloosearch/CMakeLists.txt
index 7bb831e..87c83b7 100644
--- a/mediasources/baloosearch/CMakeLists.txt
+++ b/datasources/baloosearch/CMakeLists.txt
@@ -23,4 +23,4 @@ target_link_libraries(pmc_baloosearch
kcoreaddons_desktop_to_json(pmc_baloosearch baloosearch.desktop)
-install(TARGETS pmc_baloosearch DESTINATION \
${PLUGIN_INSTALL_DIR}/plasma/mediacenter/mediasources) +install(TARGETS \
pmc_baloosearch DESTINATION \
${PLUGIN_INSTALL_DIR}/plasma/mediacenter/datasources)
diff --git a/mediasources/baloosearch/audiosearchresulthandler.cpp \
b/datasources/baloosearch/audiosearchresulthandler.cpp similarity index 100%
rename from mediasources/baloosearch/audiosearchresulthandler.cpp
rename to datasources/baloosearch/audiosearchresulthandler.cpp
diff --git a/mediasources/baloosearch/audiosearchresulthandler.h \
b/datasources/baloosearch/audiosearchresulthandler.h similarity index 100%
rename from mediasources/baloosearch/audiosearchresulthandler.h
rename to datasources/baloosearch/audiosearchresulthandler.h
diff --git a/mediasources/baloosearch/baloosearch.desktop \
b/datasources/baloosearch/baloosearch.desktop similarity index 98%
rename from mediasources/baloosearch/baloosearch.desktop
rename to datasources/baloosearch/baloosearch.desktop
index 74b32da..23bc78c 100644
--- a/mediasources/baloosearch/baloosearch.desktop
+++ b/datasources/baloosearch/baloosearch.desktop
@@ -74,7 +74,7 @@ Comment[uk]=Отримати дані із засобу \
стільничного Comment[x-test]=xxGet media from Baloo Searchxx
Comment[zh_TW]=從 Baloo 搜尋取得媒體
-X-KDE-ServiceTypes=Plasma/MediaCenter/MediaSource
+X-KDE-ServiceTypes=Plasma/MediaCenter/DataSource
X-KDE-PluginInfo-Name=baloosearch
X-KDE-PluginInfo-Author=Sinny Kumari
diff --git a/mediasources/baloosearch/baloosearchmediasource.cpp \
b/datasources/baloosearch/baloosearchmediasource.cpp similarity index 97%
rename from mediasources/baloosearch/baloosearchmediasource.cpp
rename to datasources/baloosearch/baloosearchmediasource.cpp
index 9cd59b0..bc4a6bf 100644
--- a/mediasources/baloosearch/baloosearchmediasource.cpp
+++ b/datasources/baloosearch/baloosearchmediasource.cpp
@@ -35,10 +35,10 @@
#include <QDBusConnection>
#include <QMimeDatabase>
-MEDIACENTER_EXPORT_MEDIASOURCE(BalooSearchMediaSource, "baloosearch.json")
+MEDIACENTER_EXPORT_DATASOURCE(BalooSearchMediaSource, "baloosearch.json")
BalooSearchMediaSource::BalooSearchMediaSource(QObject* parent, const QVariantList& \
args)
- : AbstractMediaSource(parent, args)
+ : AbstractDataSource(parent, args)
{
m_allowedMimes << "audio" << "image" << "video";
diff --git a/mediasources/baloosearch/baloosearchmediasource.h \
b/datasources/baloosearch/baloosearchmediasource.h similarity index 94%
rename from mediasources/baloosearch/baloosearchmediasource.h
rename to datasources/baloosearch/baloosearchmediasource.h
index e083e06..f7843ac 100644
--- a/mediasources/baloosearch/baloosearchmediasource.h
+++ b/datasources/baloosearch/baloosearchmediasource.h
@@ -18,11 +18,11 @@
#ifndef BALOOSEARCHMEDIASOURCE_H
#define BALOOSEARCHMEDIASOURCE_H
-#include <mediacenter/abstractmediasource.h>
+#include <mediacenter/abstractdatasource.h>
class SearchResultHandler;
-class BalooSearchMediaSource : public MediaCenter::AbstractMediaSource
+class BalooSearchMediaSource : public MediaCenter::AbstractDataSource
{
Q_OBJECT
public:
diff --git a/mediasources/baloosearch/imagesearchresulthandler.cpp \
b/datasources/baloosearch/imagesearchresulthandler.cpp similarity index 100%
rename from mediasources/baloosearch/imagesearchresulthandler.cpp
rename to datasources/baloosearch/imagesearchresulthandler.cpp
diff --git a/mediasources/baloosearch/imagesearchresulthandler.h \
b/datasources/baloosearch/imagesearchresulthandler.h similarity index 100%
rename from mediasources/baloosearch/imagesearchresulthandler.h
rename to datasources/baloosearch/imagesearchresulthandler.h
diff --git a/mediasources/baloosearch/searchresulthandler.cpp \
b/datasources/baloosearch/searchresulthandler.cpp similarity index 100%
rename from mediasources/baloosearch/searchresulthandler.cpp
rename to datasources/baloosearch/searchresulthandler.cpp
diff --git a/mediasources/baloosearch/searchresulthandler.h \
b/datasources/baloosearch/searchresulthandler.h similarity index 100%
rename from mediasources/baloosearch/searchresulthandler.h
rename to datasources/baloosearch/searchresulthandler.h
diff --git a/mediasources/baloosearch/videosearchresulthandler.cpp \
b/datasources/baloosearch/videosearchresulthandler.cpp similarity index 100%
rename from mediasources/baloosearch/videosearchresulthandler.cpp
rename to datasources/baloosearch/videosearchresulthandler.cpp
diff --git a/mediasources/baloosearch/videosearchresulthandler.h \
b/datasources/baloosearch/videosearchresulthandler.h similarity index 100%
rename from mediasources/baloosearch/videosearchresulthandler.h
rename to datasources/baloosearch/videosearchresulthandler.h
diff --git a/mediasources/filesystemsearch/CMakeLists.txt \
b/datasources/filesystemsearch/CMakeLists.txt similarity index 91%
rename from mediasources/filesystemsearch/CMakeLists.txt
rename to datasources/filesystemsearch/CMakeLists.txt
index 6b5f4bc..8ec2e8e 100644
--- a/mediasources/filesystemsearch/CMakeLists.txt
+++ b/datasources/filesystemsearch/CMakeLists.txt
@@ -11,4 +11,4 @@ target_link_libraries(pmc_filesystemsearch
kcoreaddons_desktop_to_json(pmc_filesystemsearch filesystemsearch.desktop)
-install(TARGETS pmc_filesystemsearch DESTINATION \
${PLUGIN_INSTALL_DIR}/plasma/mediacenter/mediasources) +install(TARGETS \
pmc_filesystemsearch DESTINATION \
${PLUGIN_INSTALL_DIR}/plasma/mediacenter/datasources)
diff --git a/mediasources/filesystemsearch/filesystemsearch.desktop \
b/datasources/filesystemsearch/filesystemsearch.desktop similarity index 98%
rename from mediasources/filesystemsearch/filesystemsearch.desktop
rename to datasources/filesystemsearch/filesystemsearch.desktop
index 3687bfb..b1cd188 100644
--- a/mediasources/filesystemsearch/filesystemsearch.desktop
+++ b/datasources/filesystemsearch/filesystemsearch.desktop
@@ -73,7 +73,7 @@ Comment[uk]=Отримати мультимедійні дані з \
локаль Comment[x-test]=xxGet media from your local filesxx
Comment[zh_TW]=從您的本地端檔案取得媒體
-X-KDE-ServiceTypes=Plasma/MediaCenter/MediaSource
+X-KDE-ServiceTypes=Plasma/MediaCenter/DataSource
X-KDE-PluginInfo-Name=filsystemsearch
X-KDE-PluginInfo-Author=Shantanu Tushar
diff --git a/mediasources/filesystemsearch/filesystemsearchmediasource.cpp \
b/datasources/filesystemsearch/filesystemsearchmediasource.cpp similarity index 96%
rename from mediasources/filesystemsearch/filesystemsearchmediasource.cpp
rename to datasources/filesystemsearch/filesystemsearchmediasource.cpp
index 489dbe9..4dd62fe 100644
--- a/mediasources/filesystemsearch/filesystemsearchmediasource.cpp
+++ b/datasources/filesystemsearch/filesystemsearchmediasource.cpp
@@ -27,10 +27,10 @@
#include <QMimeType>
#include <QMimeDatabase>
-MEDIACENTER_EXPORT_MEDIASOURCE(FilesystemSearchMediaSource, "filesystemsearch.json")
+MEDIACENTER_EXPORT_DATASOURCE(FilesystemSearchMediaSource, "filesystemsearch.json")
FilesystemSearchMediaSource::FilesystemSearchMediaSource(QObject* parent, const \
QVariantList& args)
- : AbstractMediaSource(parent, args),
+ : AbstractDataSource(parent, args),
m_quit(false)
{
m_allowedMimes << "audio" << "image" << "video";
diff --git a/mediasources/filesystemsearch/filesystemsearchmediasource.h \
b/datasources/filesystemsearch/filesystemsearchmediasource.h similarity index 97%
rename from mediasources/filesystemsearch/filesystemsearchmediasource.h
rename to datasources/filesystemsearch/filesystemsearchmediasource.h
index 88740b8..3018220 100644
--- a/mediasources/filesystemsearch/filesystemsearchmediasource.h
+++ b/datasources/filesystemsearch/filesystemsearchmediasource.h
@@ -18,7 +18,7 @@
#ifndef FILESYSTEMSEARCHMEDIASOURCE_H
#define FILESYSTEMSEARCHMEDIASOURCE_H
-#include <mediacenter/abstractmediasource.h>
+#include <mediacenter/abstractdatasource.h>
#include <QMutex>
@@ -32,7 +32,7 @@ class QDir;
* when none of Baloo or Nepomuk are installed. As such this MediaSource does
* not attempt 100% correctness and is not configurable at all.
*/
-class FilesystemSearchMediaSource : public MediaCenter::AbstractMediaSource
+class FilesystemSearchMediaSource : public MediaCenter::AbstractDataSource
{
public:
explicit FilesystemSearchMediaSource(QObject* parent = 0, const QVariantList& = \
QVariantList());
diff --git a/libs/mediacenter/CMakeLists.txt b/libs/mediacenter/CMakeLists.txt
index caf8ce8..5a13449 100644
--- a/libs/mediacenter/CMakeLists.txt
+++ b/libs/mediacenter/CMakeLists.txt
@@ -30,8 +30,8 @@ set (plasmamediacenter_SRCS
pmcalbum.cpp
pmcartist.cpp
filtermediamodel.cpp
- abstractmediasource.cpp
- mediasourcesloader.cpp
+ abstractdatasource.cpp
+ datasourcesloader.cpp
singletonfactory.cpp
mediavalidator.cpp
settings.cpp
@@ -90,6 +90,6 @@ set_target_properties(plasmamediacenter PROPERTIES VERSION \
${PROJECT_VERSION} SO install(TARGETS plasmamediacenter \
${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
install(FILES data/servicetypes/pmc_browsingbackend.desktop DESTINATION \
${SERVICETYPES_INSTALL_DIR})
-install(FILES data/servicetypes/pmc_mediasource.desktop DESTINATION \
${SERVICETYPES_INSTALL_DIR}) +install(FILES data/servicetypes/pmc_datasource.desktop \
DESTINATION ${SERVICETYPES_INSTALL_DIR})
add_subdirectory(plugin)
diff --git a/libs/mediacenter/abstractmediasource.cpp \
b/libs/mediacenter/abstractdatasource.cpp similarity index 85%
rename from libs/mediacenter/abstractmediasource.cpp
rename to libs/mediacenter/abstractdatasource.cpp
index 075bc40..8abb41e 100644
--- a/libs/mediacenter/abstractmediasource.cpp
+++ b/libs/mediacenter/abstractdatasource.cpp
@@ -17,35 +17,35 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. *
***********************************************************************************/
-#include "abstractmediasource.h"
+#include "abstractdatasource.h"
#include <QDebug>
using namespace MediaCenter;
-class AbstractMediaSource::Private
+class AbstractDataSource::Private
{
public:
Private() : mediaLibrary(0) {}
MediaLibrary* mediaLibrary;
};
-AbstractMediaSource::AbstractMediaSource(QObject* parent, const QVariantList&)
+AbstractDataSource::AbstractDataSource(QObject* parent, const QVariantList&)
: QThread(parent), d(new Private)
{
moveToThread(this);
}
-AbstractMediaSource::~AbstractMediaSource()
+AbstractDataSource::~AbstractDataSource()
{
}
-void AbstractMediaSource::setMediaLibrary(MediaLibrary* mediaLibrary)
+void AbstractDataSource::setMediaLibrary(MediaLibrary* mediaLibrary)
{
d->mediaLibrary = mediaLibrary;
}
-MediaLibrary* AbstractMediaSource::mediaLibrary() const
+MediaLibrary* AbstractDataSource::mediaLibrary() const
{
return d->mediaLibrary;
}
diff --git a/libs/mediacenter/abstractmediasource.h \
b/libs/mediacenter/abstractdatasource.h similarity index 81%
rename from libs/mediacenter/abstractmediasource.h
rename to libs/mediacenter/abstractdatasource.h
index c2f3796..dde872e 100644
--- a/libs/mediacenter/abstractmediasource.h
+++ b/libs/mediacenter/abstractdatasource.h
@@ -17,8 +17,8 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. *
***********************************************************************************/
-#ifndef ABSTRACTMEDIASOURCE_H
-#define ABSTRACTMEDIASOURCE_H
+#ifndef ABSTRACTDATASOURCE_H
+#define ABSTRACTDATASOURCE_H
#include <QtCore/QThread>
#include <KPluginInfo>
@@ -28,12 +28,12 @@
class MediaLibrary;
namespace MediaCenter {
-class MEDIACENTER_EXPORT AbstractMediaSource : public QThread
+class MEDIACENTER_EXPORT AbstractDataSource : public QThread
{
Q_OBJECT
public:
- explicit AbstractMediaSource(QObject* parent = 0, const QVariantList& = \
QVariantList());
- ~AbstractMediaSource();
+ explicit AbstractDataSource(QObject* parent = 0, const QVariantList& = \
QVariantList()); + ~AbstractDataSource();
void setMediaLibrary(MediaLibrary *mediaLibrary);
@@ -46,7 +46,7 @@ private:
};
}
-#define MEDIACENTER_EXPORT_MEDIASOURCE(classname, jsonfile) \
- K_PLUGIN_FACTORY_WITH_JSON( MediaSourceFactory, jsonfile, registerPlugin< \
classname >(); ) +#define MEDIACENTER_EXPORT_DATASOURCE(classname, jsonfile) \
+ K_PLUGIN_FACTORY_WITH_JSON( DataSourceFactory, jsonfile, registerPlugin< \
classname >(); )
-#endif // ABSTRACTMEDIASOURCE_H
+#endif // ABSTRACTDATASOURCE_H
diff --git a/libs/mediacenter/data/servicetypes/pmc_datasource.desktop \
b/libs/mediacenter/data/servicetypes/pmc_datasource.desktop new file mode 100644
index 0000000..24cf245
--- /dev/null
+++ b/libs/mediacenter/data/servicetypes/pmc_datasource.desktop
@@ -0,0 +1,3 @@
+[Desktop Entry]
+Type=ServiceType
+X-KDE-ServiceType=Plasma/MediaCenter/DataSource
diff --git a/libs/mediacenter/data/servicetypes/pmc_mediasource.desktop \
b/libs/mediacenter/data/servicetypes/pmc_mediasource.desktop deleted file mode 100644
index c5ed06e..0000000
--- a/libs/mediacenter/data/servicetypes/pmc_mediasource.desktop
+++ /dev/null
@@ -1,3 +0,0 @@
-[Desktop Entry]
-Type=ServiceType
-X-KDE-ServiceType=Plasma/MediaCenter/MediaSource
diff --git a/libs/mediacenter/mediasourcesloader.cpp \
b/libs/mediacenter/datasourcesloader.cpp similarity index 76%
rename from libs/mediacenter/mediasourcesloader.cpp
rename to libs/mediacenter/datasourcesloader.cpp
index ebf7403..77c376d 100644
--- a/libs/mediacenter/mediasourcesloader.cpp
+++ b/libs/mediacenter/datasourcesloader.cpp
@@ -17,9 +17,9 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. *
***********************************************************************************/
-#include "mediasourcesloader.h"
+#include "datasourcesloader.h"
#include "medialibrary.h"
-#include "abstractmediasource.h"
+#include "abstractdatasource.h"
#include "singletonfactory.h"
@@ -28,16 +28,16 @@
#include <QDebug>
#include <QApplication>
-MediaSourcesLoader::MediaSourcesLoader(QObject* parent): QObject(parent)
+DataSourcesLoader::DataSourcesLoader(QObject* parent): QObject(parent)
{
}
-void MediaSourcesLoader::load()
+void DataSourcesLoader::load()
{
- KPluginInfo::List pluginInfo = \
KPluginTrader::self()->query("plasma/mediacenter/mediasources"); + \
KPluginInfo::List pluginInfo = \
KPluginTrader::self()->query("plasma/mediacenter/datasources"); if \
(pluginInfo.isEmpty()) {
- qWarning() << "no available media sources";
+ qWarning() << "no available data sources";
}
Q_FOREACH (const KPluginInfo &info, pluginInfo) {
@@ -47,14 +47,14 @@ void MediaSourcesLoader::load()
const QVariantList args = QVariantList() << \
loader.metaData().toVariantMap(); if(factory)
{
- MediaCenter::AbstractMediaSource *mediaSource = \
factory->create<MediaCenter::AbstractMediaSource>(0, args);
- if (mediaSource) {
- mediaSource->setMediaLibrary(SingletonFactory::instanceFor<MediaLibrary>());
- mediaSource->start();
- connect(QApplication::instance(), SIGNAL(destroyed(QObject*)), \
mediaSource, SLOT(quit()));
- qDebug() << "created instance for media source" << info.name();
+ MediaCenter::AbstractDataSource *dataSource = \
factory->create<MediaCenter::AbstractDataSource>(0, args); + if \
(dataSource) { + \
dataSource->setMediaLibrary(SingletonFactory::instanceFor<MediaLibrary>()); + \
dataSource->start(); + connect(QApplication::instance(), \
SIGNAL(destroyed(QObject*)), dataSource, SLOT(quit())); + qDebug() << \
"created instance for data source" << info.name(); } else {
- qDebug() << "Could not create a instance for the media source " << \
info.name(); + qDebug() << "Could not create a instance for the data \
source " << info.name(); }
}
diff --git a/libs/mediacenter/mediasourcesloader.h \
b/libs/mediacenter/datasourcesloader.h similarity index 87%
rename from libs/mediacenter/mediasourcesloader.h
rename to libs/mediacenter/datasourcesloader.h
index c24b0d1..b0f7937 100644
--- a/libs/mediacenter/mediasourcesloader.h
+++ b/libs/mediacenter/datasourcesloader.h
@@ -17,25 +17,25 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. *
***********************************************************************************/
-#ifndef MEDIASOURCESLOADER_H
-#define MEDIASOURCESLOADER_H
+#ifndef DATASOURCESLOADER_H
+#define DATASOURCESLOADER_H
#include <QtCore/QObject>
#include "mediacenter_export.h"
namespace MediaCenter {
-class AbstractMediaSource;
+class AbstractDataSource;
}
-class MEDIACENTER_EXPORT MediaSourcesLoader : public QObject
+class MEDIACENTER_EXPORT DataSourcesLoader : public QObject
{
Q_OBJECT
public:
- explicit MediaSourcesLoader(QObject* parent = 0);
+ explicit DataSourcesLoader(QObject* parent = 0);
public Q_SLOTS:
void load();
};
-#endif // MEDIASOURCESLOADER_H
+#endif // DATASOURCESLOADER_H
diff --git a/libs/mediacenter/plugin/mediacenterplugin.cpp \
b/libs/mediacenter/plugin/mediacenterplugin.cpp index ba091d6..07d3ae0 100644
--- a/libs/mediacenter/plugin/mediacenterplugin.cpp
+++ b/libs/mediacenter/plugin/mediacenterplugin.cpp
@@ -25,7 +25,7 @@
#include "mediacenter/multipleplaylistmodel.h"
#include "mediacenter/objectpair.h"
#include "mediacenter/settings.h"
-#include "mediacenter/mediasourcesloader.h"
+#include "mediacenter/datasourcesloader.h"
#include "mediacenter/abstractbrowsingbackend.h"
#include "mediacenter/medialibrary.h"
#include "mediacenter/runtimedata.h"
diff --git a/libs/mediacenter/plugin/qmlaccess.cpp \
b/libs/mediacenter/plugin/qmlaccess.cpp index da3810e..c0a7071 100644
--- a/libs/mediacenter/plugin/qmlaccess.cpp
+++ b/libs/mediacenter/plugin/qmlaccess.cpp
@@ -28,8 +28,8 @@ QMLAccess::QMLAccess(QObject *parent) : QObject(parent)
{
SingletonFactory::instanceFor<MediaLibrary>()->start();
- MediaSourcesLoader mediasourceLoader;
- mediasourceLoader.load();
+ DataSourcesLoader datasourceLoader;
+ datasourceLoader.load();
m_playlistModel = new PlaylistModel(this);
diff --git a/libs/mediacenter/plugin/qmlaccess.h \
b/libs/mediacenter/plugin/qmlaccess.h index 67d0826..6c8aeab 100644
--- a/libs/mediacenter/plugin/qmlaccess.h
+++ b/libs/mediacenter/plugin/qmlaccess.h
@@ -25,7 +25,7 @@
#include "mediacenter/backendsmodel.h"
#include "mediacenter/abstractbrowsingbackend.h"
#include "mediacenter/singletonfactory.h"
-#include "mediacenter/mediasourcesloader.h"
+#include "mediacenter/datasourcesloader.h"
#include "mediacenter/mpris2/mediaplayer2player.h"
class QMLAccess : public QObject
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index bce9618..e2caa9d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,2 +1,3 @@
-add_subdirectory(mediasourceloadertest)
+add_subdirectory(datasourceloadertest)
+
#add_subdirectory(fakemediasource)
diff --git a/tests/datasourceloadertest/CMakeLists.txt \
b/tests/datasourceloadertest/CMakeLists.txt new file mode 100644
index 0000000..0888328
--- /dev/null
+++ b/tests/datasourceloadertest/CMakeLists.txt
@@ -0,0 +1,12 @@
+set (pmc_SRCS
+ application.cpp
+ )
+
+set(datasourcesloadertest_SRCS
+ datasourceloadertest.cpp
+)
+
+add_executable(datasourcesloadertest ${datasourcesloadertest_SRCS})
+target_link_libraries(datasourcesloadertest
+ plasmamediacenter
+)
diff --git a/tests/mediasourceloadertest/mediasourceloadertest.cpp \
b/tests/datasourceloadertest/datasourceloadertest.cpp similarity index 89%
rename from tests/mediasourceloadertest/mediasourceloadertest.cpp
rename to tests/datasourceloadertest/datasourceloadertest.cpp
index 3ae99f4..315ca40 100644
--- a/tests/mediasourceloadertest/mediasourceloadertest.cpp
+++ b/tests/datasourceloadertest/datasourceloadertest.cpp
@@ -19,12 +19,12 @@
*/
#include <QCoreApplication>
-#include "mediacenter/mediasourcesloader.h"
+#include "mediacenter/datasourcesloader.h"
int main(int argc, char *argv[])
{
QCoreApplication app(argc, argv);
- MediaSourcesLoader mediasourcesloader;
- mediasourcesloader.load();
+ DataSourcesLoader datasourcesloader;
+ datasourcesloader.load();
return app.exec();
}
diff --git a/tests/mediasourceloadertest/CMakeLists.txt \
b/tests/mediasourceloadertest/CMakeLists.txt deleted file mode 100644
index d73986a..0000000
--- a/tests/mediasourceloadertest/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-set (pmc_SRCS
- application.cpp
- )
-
-set(mediasourcesloadertest_SRCS
- mediasourceloadertest.cpp
-)
-
-add_executable(mediasourcesloadertest ${mediasourcesloadertest_SRCS})
-target_link_libraries(mediasourcesloadertest
- plasmamediacenter
-)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic