Commit 42d614b3 authored by Jan Möbius's avatar Jan Möbius
Browse files

Moved and renamed a bit


git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@13313 383ad7c9-94d9-4d36-a494-682f7c89f535
parent be72d67b
...@@ -421,7 +421,7 @@ Core::init() { ...@@ -421,7 +421,7 @@ Core::init() {
// Set a reference to the scriptengine for simple rpc calls // Set a reference to the scriptengine for simple rpc calls
RPC::setScriptEngine(&scriptEngine_); RPC::setScriptEngine(&scriptEngine_);
connect(&scriptEngine_, SIGNAL( signalHandlerException(const QScriptValue &) ), this, SLOT( slot_script_error(const QScriptValue &) )); connect(&scriptEngine_, SIGNAL( signalHandlerException(const QScriptValue &) ), this, SLOT( slotScriptError(const QScriptValue &) ));
// process Events every 500 msecs during script execution // process Events every 500 msecs during script execution
scriptEngine_.setProcessEventsInterval( 500 ); scriptEngine_.setProcessEventsInterval( 500 );
...@@ -1773,8 +1773,4 @@ bool Core::checkOpenGLCapabilities() { ...@@ -1773,8 +1773,4 @@ bool Core::checkOpenGLCapabilities() {
return ok; return ok;
} }
void Core::slot_script_error(const QScriptValue &error) {
emit log(LOGERR, tr("Script error: ") + error.toString());
}
//============================================================================= //=============================================================================
...@@ -1223,7 +1223,7 @@ private slots: ...@@ -1223,7 +1223,7 @@ private slots:
void slotGetDescription(QString _function, QString& _fnDescription, void slotGetDescription(QString _function, QString& _fnDescription,
QStringList& _parameters, QStringList& _descriptions ); QStringList& _parameters, QStringList& _descriptions );
void slot_script_error(const QScriptValue &error); void slotScriptError(const QScriptValue &error);
private: private:
......
...@@ -308,6 +308,10 @@ void Core::setToolBoxActive(QString _toolBoxName, bool _active) ...@@ -308,6 +308,10 @@ void Core::setToolBoxActive(QString _toolBoxName, bool _active)
//== Script Special Functions ================================================= //== Script Special Functions =================================================
//============================================================================= //=============================================================================
void Core::slotScriptError(const QScriptValue &error) {
emit log(LOGERR, tr("Script error: ") + error.toString());
}
QScriptValue myPrintFunction(QScriptContext *context, QScriptEngine *engine) QScriptValue myPrintFunction(QScriptContext *context, QScriptEngine *engine)
{ {
QString result; QString result;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment