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

split out the private class into its own file

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1047325
This commit is contained in:
Aaron J. Seigo 2009-11-11 00:25:27 +00:00
parent 4aba68d9d7
commit b9ea759162
2 changed files with 95 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
abstractrunner.cpp
View File

@ -24,7 +24,6 @@
#include <QMenu>
#include <QMutex>
#include <QMutexLocker>
#include <QReadWriteLock>
#include <QTimer>
#include <kdebug.h>
@ -36,70 +35,13 @@
#include <plasma/package.h>
#include <plasma/querymatch.h>
#include "scripting/runnerscript.h"
#include "private/abstractrunner_p.h"
#include "runnercontext.h"
#include "scripting/runnerscript.h"
namespace Plasma
{
class AbstractRunnerPrivate
{
public:
AbstractRunnerPrivate(AbstractRunner *r, KService::Ptr service)
: priority(AbstractRunner::NormalPriority),
speed(AbstractRunner::NormalSpeed),
blackListed(0),
script(0),
runnerDescription(service),
runner(r),
fastRuns(0),
package(0),
hasRunOptions(false)
{
if (runnerDescription.isValid()) {
const QString api = runnerDescription.property("X-Plasma-API").toString();
if (!api.isEmpty()) {
const QString path = KStandardDirs::locate("data",
"plasma/runners/" + runnerDescription.pluginName() + '/');
PackageStructure::Ptr structure =
Plasma::packageStructure(api, Plasma::RunnerComponent);
structure->setPath(path);
package = new Package(path, structure);
script = Plasma::loadScriptEngine(api, runner);
if (!script) {
kDebug() << "Could not create a(n)" << api << "ScriptEngine for the"
<< runnerDescription.name() << "Runner.";
delete package;
package = 0;
}
}
}
}
~AbstractRunnerPrivate()
{
delete script;
script = 0;
delete package;
package = 0;
}
AbstractRunner::Priority priority;
AbstractRunner::Speed speed;
RunnerContext::Types blackListed;
RunnerScript *script;
KPluginInfo runnerDescription;
AbstractRunner *runner;
int fastRuns;
Package *package;
QHash<QString, QAction*> actions;
QList<RunnerSyntax> syntaxes;
bool hasRunOptions;
QReadWriteLock speedLock;
};
K_GLOBAL_STATIC(QMutex, s_bigLock)
AbstractRunner::AbstractRunner(QObject *parent, const QString &serviceId)
@ -357,6 +299,46 @@ void AbstractRunner::init()
}
}
AbstractRunnerPrivate::AbstractRunnerPrivate(AbstractRunner *r, KService::Ptr service)
: priority(AbstractRunner::NormalPriority),
speed(AbstractRunner::NormalSpeed),
blackListed(0),
script(0),
runnerDescription(service),
runner(r),
fastRuns(0),
package(0),
hasRunOptions(false)
{
if (runnerDescription.isValid()) {
const QString api = runnerDescription.property("X-Plasma-API").toString();
if (!api.isEmpty()) {
const QString path = KStandardDirs::locate("data",
"plasma/runners/" + runnerDescription.pluginName() + '/');
PackageStructure::Ptr structure =
Plasma::packageStructure(api, Plasma::RunnerComponent);
structure->setPath(path);
package = new Package(path, structure);
script = Plasma::loadScriptEngine(api, runner);
if (!script) {
kDebug() << "Could not create a(n)" << api << "ScriptEngine for the"
<< runnerDescription.name() << "Runner.";
delete package;
package = 0;
}
}
}
}
AbstractRunnerPrivate::~AbstractRunnerPrivate()
{
delete script;
script = 0;
delete package;
package = 0;
}
} // Plasma namespace
#include "abstractrunner.moc"

53
private/abstractrunner_p.h Normal file
View File

@ -0,0 +1,53 @@
/*
* Copyright 2006-2009 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 as
* published by the Free Software Foundation; either version 2, 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 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 ABSTRACTRUNNER_P_H
#define ABSTRACTRUNNER_P_H
#include <QReadWriteLock>
namespace Plasma
{
class AbstractRunner;
class AbstractRunnerPrivate
{
public:
AbstractRunnerPrivate(AbstractRunner *r, KService::Ptr service);
~AbstractRunnerPrivate();
AbstractRunner::Priority priority;
AbstractRunner::Speed speed;
RunnerContext::Types blackListed;
RunnerScript *script;
KPluginInfo runnerDescription;
AbstractRunner *runner;
int fastRuns;
Package *package;
QHash<QString, QAction*> actions;
QList<RunnerSyntax> syntaxes;
bool hasRunOptions;
QReadWriteLock speedLock;
};
} // namespace Plasma
#endif