summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJedrzej Nowacki <jedrzej.nowacki@nokia.com>2011-05-27 13:50:27 +0200
committerJedrzej Nowacki <jedrzej.nowacki@nokia.com>2011-05-27 13:52:54 +0200
commitb4d89f8f9e6ff0c29b77c5798b64436e3c6a1777 (patch)
tree6d6c01d0a679e1d974187c09adf475e64c182ad1
parentcc91f70f6f9a6318f36914db401e61fa17329680 (diff)
QScriptIsolate code cleanup.
Remove redundant include of a header file. Inline init function into the ctor.
-rw-r--r--src/script/api/qscriptisolate_p.h14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/script/api/qscriptisolate_p.h b/src/script/api/qscriptisolate_p.h
index eb626f9..081d4fb 100644
--- a/src/script/api/qscriptisolate_p.h
+++ b/src/script/api/qscriptisolate_p.h
@@ -25,7 +25,6 @@
#define APIPREAMBLE_P_H
#include <v8.h>
-#include <QtCore/qsharedpointer.h>
#include "qscriptengine_p.h"
QT_BEGIN_NAMESPACE
@@ -47,7 +46,10 @@ public:
: m_engine(engine)
, m_mode(mode)
{
- init();
+ if (m_mode == NotNullEngine || m_engine) {
+ Q_ASSERT(m_engine);
+ m_engine->enterIsolate();
+ }
}
inline ~QScriptIsolate()
@@ -58,14 +60,6 @@ public:
}
private:
- inline void init() const
- {
- if (m_mode == NotNullEngine || m_engine) {
- Q_ASSERT(m_engine);
- m_engine->enterIsolate();
- }
- }
-
Q_DISABLE_COPY(QScriptIsolate);
const QScriptEnginePrivate *m_engine;
const OperationMode m_mode;