Changeset 58483 in webkit for trunk/JavaScriptCore/qt/api/qscriptvalue.cpp

Timestamp:

Apr 29, 2010, 1:14:50 AM (15 years ago)

Author:

[email protected]

Message:

2010-04-29 Jedrzej Nowacki <​[email protected]>

Reviewed by Simon Hausmann.

Small cleanup.

QScriptValuePrivate constructor shouldn't take QScriptEngine pointer
as a parameter, because it breaks a private / public separation rule.
QScriptEnginePrivate::get(QScriptEngine*) should return
a QScriptEnginePrivate pointer instead of a QScriptEnginePtr, it simplifies
implementation.

[Qt] QScriptValuePrivate class needs some cleanup.
​https://bugs.webkit.org/show_bug.cgi?id=37729

• qt/api/qscriptengine_p.h: (QScriptEnginePrivate::get):
• qt/api/qscriptvalue.cpp: (QScriptValue::QScriptValue):
• qt/api/qscriptvalue_p.h: (QScriptValuePrivate::QScriptValuePrivate):

File:

• trunk/JavaScriptCore/qt/api/qscriptvalue.cpp (modified) (7 diffs)

trunk/JavaScriptCore/qt/api/qscriptvalue.cpp

@@ -116 +116 @@
 */
 QScriptValue::QScriptValue(QScriptEngine* engine, bool value)
-    : d_ptr(new QScriptValuePrivate(engine, value))
-{
+{
+    if (engine)
+        d_ptr = new QScriptValuePrivate(QScriptEnginePrivate::get(engine), value);
+    else
+        d_ptr = new QScriptValuePrivate(value);
 }
 
@@ -127 +130 @@
 */
 QScriptValue::QScriptValue(QScriptEngine* engine, int value)
-    : d_ptr(new QScriptValuePrivate(engine, value))
-{
+{
+    if (engine)
+        d_ptr = new QScriptValuePrivate(QScriptEnginePrivate::get(engine), value);
+    else
+        d_ptr = new QScriptValuePrivate(value);
 }
 
@@ -138 +144 @@
  */
 QScriptValue::QScriptValue(QScriptEngine* engine, uint value)
-    : d_ptr(new QScriptValuePrivate(engine, value))
-{
+{
+    if (engine)
+        d_ptr = new QScriptValuePrivate(QScriptEnginePrivate::get(engine), value);
+    else
+        d_ptr = new QScriptValuePrivate(value);
 }
 
@@ -149 +158 @@
 */
 QScriptValue::QScriptValue(QScriptEngine* engine, qsreal value)
-    : d_ptr(new QScriptValuePrivate(engine, value))
-{
+{
+    if (engine)
+        d_ptr = new QScriptValuePrivate(QScriptEnginePrivate::get(engine), value);
+    else
+        d_ptr = new QScriptValuePrivate(value);
 }
 
@@ -160 +172 @@
 */
 QScriptValue::QScriptValue(QScriptEngine* engine, const QString& value)
-    : d_ptr(new QScriptValuePrivate(engine, value))
-{
+{
+    if (engine)
+        d_ptr = new QScriptValuePrivate(QScriptEnginePrivate::get(engine), value);
+    else
+        d_ptr = new QScriptValuePrivate(value);
 }
 
@@ -171 +186 @@
 */
 QScriptValue::QScriptValue(QScriptEngine* engine, const char* value)
-    : d_ptr(new QScriptValuePrivate(engine, QString::fromUtf8(value)))
-{
+{
+    if (engine)
+        d_ptr = new QScriptValuePrivate(QScriptEnginePrivate::get(engine), QString::fromUtf8(value));
+    else
+        d_ptr = new QScriptValuePrivate(QString::fromUtf8(value));
 }
 
@@ -182 +200 @@
 */
 QScriptValue::QScriptValue(QScriptEngine* engine, SpecialValue value)
-    : d_ptr(new QScriptValuePrivate(engine, value))
-{
+{
+    if (engine)
+        d_ptr = new QScriptValuePrivate(QScriptEnginePrivate::get(engine), value);
+    else
+        d_ptr = new QScriptValuePrivate(value);
 }