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

get rid of abstractjsappletscript.h

Browse Source
This commit is contained in:
Marco Martin 2013-02-06 17:26:00 +01:00
parent 53957252a5
commit df6d918dec
7 changed files with 12 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scriptengines/qml/CMakeLists.txt
View File

@ -20,7 +20,6 @@ set(declarative_appletscript_SRCS
declarative/packageaccessmanager.cpp
declarative/packageaccessmanagerfactory.cpp
declarative/qmlobject.cpp
plasmoid/abstractjsappletscript.cpp
plasmoid/appletauthorization.cpp
plasmoid/appletinterface.cpp
plasmoid/declarativeappletscript.cpp

32
scriptengines/qml/plasmoid/abstractjsappletscript.cpp
View File

@ -1,32 +0,0 @@
/*
* Copyright 2010 Marco Martin <mart@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.
*/
#include "plasmoid/abstractjsappletscript.h"
AbstractJsAppletScript::AbstractJsAppletScript(QObject *parent, const QVariantList &args)
: Plasma::AppletScript(parent)
{
Q_UNUSED(args);
}
AbstractJsAppletScript::~AbstractJsAppletScript()
{
}

40
scriptengines/qml/plasmoid/abstractjsappletscript.h
View File

@ -1,40 +0,0 @@
/*
* Copyright 2010 Marco Martin <mart@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 ABSTRACTJS_APPLETSCRIPT_H
#define ABSTRACTJS_APPLETSCRIPT_H
#include <QQmlEngine>
#include <Plasma/AppletScript>
class AbstractJsAppletScript : public Plasma::AppletScript
{
Q_OBJECT
public:
AbstractJsAppletScript(QObject *parent, const QVariantList &args = QVariantList());
~AbstractJsAppletScript();
virtual QQmlEngine *engine() const = 0;
virtual bool include(const QString &path) = 0;
virtual QString filePath(const QString &type, const QString &file) const = 0;
};
#endif

4
scriptengines/qml/plasmoid/appletinterface.cpp
View File

@ -43,7 +43,7 @@
Q_DECLARE_METATYPE(AppletInterface*)
AppletInterface::AppletInterface(AbstractJsAppletScript *parent)
AppletInterface::AppletInterface(DeclarativeAppletScript *parent)
: QObject(parent),
m_appletScriptEngine(parent),
m_actionSignals(0)
@ -387,7 +387,7 @@ void AppletInterface::gc()
///////////// ContainmentInterface
ContainmentInterface::ContainmentInterface(AbstractJsAppletScript *parent)
ContainmentInterface::ContainmentInterface(DeclarativeAppletScript *parent)
: APPLETSUPERCLASS(parent),
m_movableApplets(true)
{

10
scriptengines/qml/plasmoid/appletinterface.h
View File

@ -31,7 +31,7 @@
#include <Plasma/DataEngine>
#include <Plasma/Theme>
#include "abstractjsappletscript.h"
#include "declarativeappletscript.h"
class QAction;
class QmlAppletScript;
@ -76,7 +76,7 @@ class AppletInterface : public QObject
Q_PROPERTY(QString associatedApplication WRITE setAssociatedApplication READ associatedApplication)
public:
AppletInterface(AbstractJsAppletScript *parent);
AppletInterface(DeclarativeAppletScript *parent);
~AppletInterface();
//------------------------------------------------------------------
@ -292,7 +292,7 @@ Q_SIGNALS:
void statusChanged();
protected:
AbstractJsAppletScript *m_appletScriptEngine;
DeclarativeAppletScript *m_appletScriptEngine;
private:
QStringList m_actions;
@ -307,7 +307,7 @@ class JsAppletInterface : public AppletInterface
Q_PROPERTY(QObject *sender READ sender)
public:
JsAppletInterface(AbstractJsAppletScript *parent)
JsAppletInterface(DeclarativeAppletScript *parent)
: AppletInterface(parent)
{
}
@ -339,7 +339,7 @@ public:
but something application specific */
CustomPanelContainment = 128 /**< A customized desktop panel */
};
ContainmentInterface(AbstractJsAppletScript *parent);
ContainmentInterface(DeclarativeAppletScript *parent);
inline Plasma::Containment *containment() const { return static_cast<Plasma::Containment *>(m_appletScriptEngine->applet()); }

2
scriptengines/qml/plasmoid/declarativeappletscript.cpp
View File

@ -57,7 +57,7 @@ QScriptValue constructKUrlClass(QScriptEngine *engine);
QScriptValue constructQPointClass(QScriptEngine *engine);
void registerSimpleAppletMetaTypes(QScriptEngine *engine);
DeclarativeAppletScript::DeclarativeAppletScript(QObject *parent, const QVariantList &args)
: AbstractJsAppletScript(parent, args),
: Plasma::AppletScript(parent),
m_qmlObject(0),
m_toolBoxObject(0),
m_interface(0),

6
scriptengines/qml/plasmoid/declarativeappletscript.h
View File

@ -23,7 +23,9 @@
#include <kdemacros.h>
#include "abstractjsappletscript.h"
#include <QQmlEngine>
#include <Plasma/AppletScript>
#include "plasmoid/appletauthorization.h"
#include <Plasma/DataEngine>
@ -33,7 +35,7 @@ class QmlObject;
class ScriptEnv;
class EngineAccess;
class DeclarativeAppletScript : public AbstractJsAppletScript
class DeclarativeAppletScript : public Plasma::AppletScript
{
Q_OBJECT