alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* loadEngine -> loadDataEngine

Browse Source 
* ws clean up
* add to the apidox a bit
* add a ctor

svn path=/trunk/KDE/kdelibs/; revision=1150391
This commit is contained in:
Aaron J. Seigo 2010-07-15 21:11:20 +00:00
parent e00a7b2422
commit fd71ff404b
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dataenginemanager.cpp
View File

@ -117,7 +117,7 @@ Plasma::DataEngine *DataEngineManager::loadEngine(const QString &name)
// Ask the application's plugin loader, if present
if (PluginLoader::pluginLoader()) {
engine = PluginLoader::pluginLoader()->loadEngine(name);
engine = PluginLoader::pluginLoader()->loadDataEngine(name);
if (engine) {
return engine;
}

13
pluginloader.cpp
View File

@ -23,15 +23,16 @@
namespace Plasma {
class PluginLoaderPrivate
{
// Placeholder for BC
};
static PluginLoader* s_pluginLoader = 0;
PluginLoader::PluginLoader()
: d(0)
{
}
PluginLoader::~PluginLoader()
{
//delete d;
}
void PluginLoader::setPluginLoader(PluginLoader* loader)
@ -52,7 +53,7 @@ Applet* PluginLoader::loadApplet(const QString &name, uint appletId, const QVari
{ Q_UNUSED(name) Q_UNUSED(appletId) Q_UNUSED(args) return 0;
}
DataEngine* PluginLoader::loadEngine(const QString &name)
DataEngine* PluginLoader::loadDataEngine(const QString &name)
{ Q_UNUSED(name) return 0;
}

20
pluginloader.h
View File

@ -32,7 +32,9 @@ class PluginLoaderPrivate;
/**
* This is an abstract base class which defines an interface to which Plasma's
* Applet Loading logic can communicate with a parent application.
* Applet Loading logic can communicate with a parent application. The plugin loader
* must be set before any plugins are loaded, otherwise (for safety reasons), the
* default PluginLoader implementation will be used.
*
* @author Ryan Rix <ry@n.rix.si>
* @since 4.6
@ -40,8 +42,10 @@ class PluginLoaderPrivate;
class PLASMA_EXPORT PluginLoader
{
public:
PluginLoader();
virtual ~PluginLoader();
/**
* Load an external applet and supply it to Plasma.
*
@ -53,15 +57,15 @@ public:
**/
virtual Applet* loadApplet(const QString &name, uint appletId = 0,
const QVariantList &args = QVariantList());
/**
* Load an external DataEngine and supply it to Plasma.
*
* @param name the name of the engine
* @return the data engine that was loaded, or the NullEngine on failure.
**/
virtual DataEngine* loadEngine(const QString &name);
virtual DataEngine* loadDataEngine(const QString &name);
/**
* Load an external Service and supply it to Plasma.
*
@ -72,7 +76,7 @@ public:
* @return a Service object, unlike Plasma::Service::loadService, this can return null.
**/
virtual Service* loadService(const QString &name, const QVariantList &args, QObject *parent = 0);
/**
* Set the plugin loader which will be queried for all loads.
*
@ -80,14 +84,14 @@ public:
* by the application
**/
static void setPluginLoader(PluginLoader* loader);
/**
* Return the active plugin loader
**/
static PluginLoader* pluginLoader();
private:
PluginLoaderPrivate* d;
PluginLoaderPrivate * const d;
};
}