get rid of declarativescriptenv

This commit is contained in:
Marco Martin 2013-02-06 17:42:35 +01:00
parent 9116e3f1d4
commit c282d222d7
3 changed files with 2 additions and 31 deletions

View File

@ -1,22 +0,0 @@
/*
* Copyright 2010 Aaron J. 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.
*/
#define USEGUI
#define DECLARATIVE
#include "scriptenv.cpp"

View File

@ -65,9 +65,7 @@ void ScriptEnv::setupGlobalObject()
global.setProperty("__plasma_scriptenv", m_engine->newQObject(this),
QScriptValue::ReadOnly|QScriptValue::Undeletable|QScriptValue::SkipInEnumeration);
// Add utility functions
#ifndef DECLARATIVE
global.setProperty("print", m_engine->newFunction(ScriptEnv::print));
#endif
global.setProperty("debug", m_engine->newFunction(ScriptEnv::debug));
}
@ -522,6 +520,4 @@ bool ScriptEnv::removeEventListener(const QString &event, const QScriptValue &fu
return found;
}
#ifndef USEGUI
#include "scriptenv.moc"
#endif
#include "moc_scriptenv.cpp"

View File

@ -20,9 +20,6 @@
#ifndef SCRIPTENV_H
#define SCRIPTENV_H
#define USEGUI
#define DECLARATIVE
#include <kdemacros.h>
#include <QScriptEngine>
#include <QSet>