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

* get rid of Interface hack now that DataEngineManager is in libplasma

Browse Source 
* provide a singleton accessor to DataEngineManager
* port code to API changes

svn path=/trunk/KDE/kdebase/workspace/plasma/lib/; revision=668668
This commit is contained in:
Aaron J. Seigo 2007-05-27 07:59:17 +00:00
parent 4090084e34
commit 1835680cf3
4 changed files with 45 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dataengine.cpp
View File

@ -49,7 +49,7 @@ class DataEngine::Private
<< ": could not find DataSource " << sourceName
<< ", creating" << endl;
DataSource* s = new DataSource(engine);
s->setName(sourceName);
s->setObjectName(sourceName);
sources.insert(sourceName, s);
emit engine->newDataSource(sourceName);
return s;
@ -128,14 +128,14 @@ void DataEngine::setData(const QString& source, const QString& key, const QVaria
void DataEngine::addSource(DataSource* source)
{
DataSource::Dict::const_iterator it = d->sources.find(source->name());
DataSource::Dict::const_iterator it = d->sources.find(source->objectName());
if (it != d->sources.constEnd()) {
kDebug() << "source named \"" << source->name() << "\" already exists." << endl;
kDebug() << "source named \"" << source->objectName() << "\" already exists." << endl;
return;
}
d->sources.insert(source->name(), source);
emit newDataSource(source->name());
d->sources.insert(source->objectName(), source);
emit newDataSource(source->objectName());
}
/*

41
dataenginemanager.h
View File

@ -25,17 +25,56 @@
namespace Plasma
{
/**
* @brief DataEngine loader and life time manager
*
* Plasma::DataEngineManager provides facilities for listing, loading and
* according to reference count unloading of DataEngines.
**/
class PLASMA_EXPORT DataEngineManager
{
public:
/**
* Singleton pattern accessor.
*/
static DataEngineManager* self();
/**
* Default constructor. Usually the singleton method self() is the
* preferred access mechanism.
*/
DataEngineManager();
~DataEngineManager();
/**
* Returns a data engine object if one is loaded and available.
* Otherwise, returns 0.
*
* @param name the name of the engine
*/
Plasma::DataEngine* dataEngine(const QString& name) const;
/**
* Loads a data engine and increases the reference count on it.
* This should be called once per object (or set of objects) using the
* DataEngine. Afterwards, dataEngine should be used or the return
* value cached. Call unloadDataEngine when finished with the engine.
*
* @param name the name of the engine
* @return the data engine that was loaded, or 0 on failure.
*/
Plasma::DataEngine* loadDataEngine(const QString& name);
/**
* Decreases the reference count on the engine. If the count reaches
* zero, then the engine is deleted to save resources.
*/
void unloadDataEngine(const QString& name);
QStringList knownEngines() const;
/**
* Returns a listing of all known engines by name
*/
static QStringList knownEngines();
private:
DataEngine::Dict m_engines;

41
interface.cpp
View File

@ -1,41 +0,0 @@
/*
* Copyright (C) 2006 Aaron Seigo <aseigo@kde.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License version 2 as
* published by the Free Software Foundation
*
* 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 Library General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "interface.h"
#include <kdebug.h>
Plasma::Interface* Plasma::Interface::m_interface;
namespace Plasma
{
Interface *Interface::self()
{
return m_interface;
}
Interface::Interface()
{
}
Interface::~Interface()
{
}
}

50
interface.h
View File

@ -1,50 +0,0 @@
/*
* Copyright (C) 2006 Aaron Seigo <aseigo@kde.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License version 2 as
* published by the Free Software Foundation
*
* 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 Library General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef PLASMA_INTERFACE_H
#define PLASMA_INTERFACE_H
#include <QtCore/QString>
#include <plasma_export.h>
namespace Plasma
{
class DataEngine;
class PLASMA_EXPORT Interface
{
public:
static Interface* self();
virtual DataEngine* dataEngine(const QString &name) = 0;
virtual DataEngine* loadDataEngine(const QString &name) = 0;
virtual void unloadDataEngine(const QString &name) = 0;
protected:
Interface();
virtual ~Interface();
static Interface* m_interface;
};
} // Plasma namespace
#endif // multiple inclusion guard