summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKent Hansen <kent.hansen@nokia.com>2010-02-18 11:25:50 (GMT)
committerKent Hansen <kent.hansen@nokia.com>2010-02-18 16:35:20 (GMT)
commitc86e7dfb0f6bcc0821ece5cf42a793d164d3f7a2 (patch)
treeb22f33cf35f9f096cfc0259e6e07a207b5a4a3af
parent8865e9cd3389956f2e5909a1261566f21eef128f (diff)
downloadQt-c86e7dfb0f6bcc0821ece5cf42a793d164d3f7a2.zip
Qt-c86e7dfb0f6bcc0821ece5cf42a793d164d3f7a2.tar.gz
Qt-c86e7dfb0f6bcc0821ece5cf42a793d164d3f7a2.tar.bz2
Move some helper function declarations outside QT_NO_QOBJECT guard
These are not dependent on QObject, I don't know how they ended up inside there. Reviewed-by: Jedrzej Nowacki
-rw-r--r--src/script/api/qscriptengine_p.h27
1 files changed, 14 insertions, 13 deletions
diff --git a/src/script/api/qscriptengine_p.h b/src/script/api/qscriptengine_p.h
index 86ac5df..9a357e5 100644
--- a/src/script/api/qscriptengine_p.h
+++ b/src/script/api/qscriptengine_p.h
@@ -184,6 +184,20 @@ public:
QScriptValue currentException() const { return m_currentException; }
void clearCurrentException() { m_currentException.d_ptr.reset(); }
+ static QScriptSyntaxCheckResult checkSyntax(const QString &program);
+ static bool canEvaluate(const QString &program);
+
+ inline QScriptValuePrivate *allocateScriptValuePrivate(size_t);
+ inline void freeScriptValuePrivate(QScriptValuePrivate *p);
+
+ inline void registerScriptValue(QScriptValuePrivate *value);
+ inline void unregisterScriptValue(QScriptValuePrivate *value);
+ void detachAllRegisteredScriptValues();
+
+ inline void registerScriptString(QScriptStringPrivate *value);
+ inline void unregisterScriptString(QScriptStringPrivate *value);
+ void detachAllRegisteredScriptStrings();
+
#ifndef QT_NO_QOBJECT
JSC::JSValue newQObject(QObject *object,
QScriptEngine::ValueOwnership ownership = QScriptEngine::QtOwnership,
@@ -191,8 +205,6 @@ public:
JSC::JSValue newQMetaObject(const QMetaObject *metaObject,
JSC::JSValue ctor);
- static QScriptSyntaxCheckResult checkSyntax(const QString &program);
- static bool canEvaluate(const QString &program);
static bool convertToNativeQObject(const QScriptValue &value,
const QByteArray &targetType,
void **result);
@@ -223,17 +235,6 @@ public:
bool scriptDisconnect(JSC::JSValue signal, JSC::JSValue receiver,
JSC::JSValue function);
- inline QScriptValuePrivate *allocateScriptValuePrivate(size_t);
- inline void freeScriptValuePrivate(QScriptValuePrivate *p);
-
- inline void registerScriptValue(QScriptValuePrivate *value);
- inline void unregisterScriptValue(QScriptValuePrivate *value);
- void detachAllRegisteredScriptValues();
-
- inline void registerScriptString(QScriptStringPrivate *value);
- inline void unregisterScriptString(QScriptStringPrivate *value);
- void detachAllRegisteredScriptStrings();
-
// private slots
void _q_objectDestroyed(QObject *);
#endif