summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Macieira <thiago@kde.org>2011-07-08 14:26:38 +0200
committerQt by Nokia <qt-info@nokia.com>2011-07-08 15:21:28 +0200
commitb384be8ae195dd52f4f7ca18b0790e8b2793c314 (patch)
treeab1732f3868cd6f2c6baeaf1bd990313cddd4544
parent72d76bc759b754d3784f09d80634a14ea1712fe7 (diff)
downloadqtscript-b384be8ae195dd52f4f7ca18b0790e8b2793c314.tar.gz
Use QAtomicInt instead of QBasicAtomicInt
None of these classes are POD, so they don't need to use the POD version of QAtomicInt. Change-Id: Ic7b134c85c4b314560ae79250e05159ffde74dfe Merge-request: 1 Reviewed-by: Jedrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/1377 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Nierob <jedrzej.nowacki@nokia.com>
-rw-r--r--src/script/api/qscriptcontextinfo.cpp2
-rw-r--r--src/script/api/qscriptengine.cpp4
-rw-r--r--src/script/api/qscriptprogram.cpp1
-rw-r--r--src/script/api/qscriptprogram_p.h2
-rw-r--r--src/script/api/qscriptstring_p.h3
-rw-r--r--src/script/api/qscriptvalue_p.h3
-rw-r--r--src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata.cpp3
-rw-r--r--src/scripttools/debugging/qscriptdebuggervalue.cpp3
-rw-r--r--src/scripttools/debugging/qscriptdebuggervalueproperty.cpp3
-rw-r--r--src/scripttools/debugging/qscriptscriptdata.cpp3
-rw-r--r--src/scripttools/debugging/qscriptvalueproperty.cpp3
11 files changed, 11 insertions, 19 deletions
diff --git a/src/script/api/qscriptcontextinfo.cpp b/src/script/api/qscriptcontextinfo.cpp
index 182bc4a..c322fbd 100644
--- a/src/script/api/qscriptcontextinfo.cpp
+++ b/src/script/api/qscriptcontextinfo.cpp
@@ -103,7 +103,7 @@ public:
QStringList parameterNames;
- QBasicAtomicInt ref;
+ QAtomicInt ref;
QScriptContextInfo *q_ptr;
};
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index 1c4f110..d7799f0 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -329,14 +329,14 @@ QT_BEGIN_NAMESPACE
class QScriptSyntaxCheckResultPrivate
{
public:
- QScriptSyntaxCheckResultPrivate() { ref = 0; }
+ QScriptSyntaxCheckResultPrivate() {}
~QScriptSyntaxCheckResultPrivate() {}
QScriptSyntaxCheckResult::State state;
int errorColumnNumber;
int errorLineNumber;
QString errorMessage;
- QBasicAtomicInt ref;
+ QAtomicInt ref;
};
class QScriptTypeInfo
diff --git a/src/script/api/qscriptprogram.cpp b/src/script/api/qscriptprogram.cpp
index c0e2656..b641a5a 100644
--- a/src/script/api/qscriptprogram.cpp
+++ b/src/script/api/qscriptprogram.cpp
@@ -57,7 +57,6 @@ QScriptProgramPrivate::QScriptProgramPrivate(const QString &src,
: sourceCode(src), fileName(fn), firstLineNumber(ln),
engine(0), _executable(0), sourceId(-1), isCompiled(false)
{
- ref = 0;
}
QScriptProgramPrivate::~QScriptProgramPrivate()
diff --git a/src/script/api/qscriptprogram_p.h b/src/script/api/qscriptprogram_p.h
index e7809ab..8898c02 100644
--- a/src/script/api/qscriptprogram_p.h
+++ b/src/script/api/qscriptprogram_p.h
@@ -63,7 +63,7 @@ public:
QScriptEnginePrivate *engine);
void detachFromEngine();
- QBasicAtomicInt ref;
+ QAtomicInt ref;
QString sourceCode;
QString fileName;
diff --git a/src/script/api/qscriptstring_p.h b/src/script/api/qscriptstring_p.h
index b632140..4032e64 100644
--- a/src/script/api/qscriptstring_p.h
+++ b/src/script/api/qscriptstring_p.h
@@ -61,7 +61,7 @@ public:
static inline bool isValid(const QScriptString &q);
- QBasicAtomicInt ref;
+ QAtomicInt ref;
QScriptEnginePrivate *engine;
JSC::Identifier identifier;
AllocationType type;
@@ -75,7 +75,6 @@ inline QScriptStringPrivate::QScriptStringPrivate(QScriptEnginePrivate *e, const
AllocationType tp)
: engine(e), identifier(id), type(tp), prev(0), next(0)
{
- ref = 0;
}
inline QScriptStringPrivate::~QScriptStringPrivate()
diff --git a/src/script/api/qscriptvalue_p.h b/src/script/api/qscriptvalue_p.h
index c996ed3..3ca1d0b 100644
--- a/src/script/api/qscriptvalue_p.h
+++ b/src/script/api/qscriptvalue_p.h
@@ -119,13 +119,12 @@ public:
QScriptValuePrivate *prev;
QScriptValuePrivate *next;
- QBasicAtomicInt ref;
+ QAtomicInt ref;
};
inline QScriptValuePrivate::QScriptValuePrivate(QScriptEnginePrivate *e)
: engine(e), prev(0), next(0)
{
- ref = 0;
}
inline bool QScriptValuePrivate::isJSC() const
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata.cpp b/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata.cpp
index 672372e..7822e12 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata.cpp
@@ -62,12 +62,11 @@ public:
QString shortDescription;
QString longDescription;
- QBasicAtomicInt ref;
+ QAtomicInt ref;
};
QScriptDebuggerConsoleCommandGroupDataPrivate::QScriptDebuggerConsoleCommandGroupDataPrivate()
{
- ref = 0;
}
QScriptDebuggerConsoleCommandGroupDataPrivate::~QScriptDebuggerConsoleCommandGroupDataPrivate()
diff --git a/src/scripttools/debugging/qscriptdebuggervalue.cpp b/src/scripttools/debugging/qscriptdebuggervalue.cpp
index 3882070..5ece13d 100644
--- a/src/scripttools/debugging/qscriptdebuggervalue.cpp
+++ b/src/scripttools/debugging/qscriptdebuggervalue.cpp
@@ -70,13 +70,12 @@ public:
qint64 objectId;
};
- QBasicAtomicInt ref;
+ QAtomicInt ref;
};
QScriptDebuggerValuePrivate::QScriptDebuggerValuePrivate()
: type(QScriptDebuggerValue::NoValue)
{
- ref = 0;
}
QScriptDebuggerValuePrivate::~QScriptDebuggerValuePrivate()
diff --git a/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp b/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp
index ab8f040..02cc43d 100644
--- a/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp
+++ b/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp
@@ -65,12 +65,11 @@ public:
QString valueAsString;
QScriptValue::PropertyFlags flags;
- QBasicAtomicInt ref;
+ QAtomicInt ref;
};
QScriptDebuggerValuePropertyPrivate::QScriptDebuggerValuePropertyPrivate()
{
- ref = 0;
}
QScriptDebuggerValuePropertyPrivate::~QScriptDebuggerValuePropertyPrivate()
diff --git a/src/scripttools/debugging/qscriptscriptdata.cpp b/src/scripttools/debugging/qscriptscriptdata.cpp
index f58d754..7723d6c 100644
--- a/src/scripttools/debugging/qscriptscriptdata.cpp
+++ b/src/scripttools/debugging/qscriptscriptdata.cpp
@@ -66,12 +66,11 @@ public:
int baseLineNumber;
QDateTime timeStamp;
- QBasicAtomicInt ref;
+ QAtomicInt ref;
};
QScriptScriptDataPrivate::QScriptScriptDataPrivate()
{
- ref = 0;
}
QScriptScriptDataPrivate::~QScriptScriptDataPrivate()
diff --git a/src/scripttools/debugging/qscriptvalueproperty.cpp b/src/scripttools/debugging/qscriptvalueproperty.cpp
index 91a59e5..90c4dfc 100644
--- a/src/scripttools/debugging/qscriptvalueproperty.cpp
+++ b/src/scripttools/debugging/qscriptvalueproperty.cpp
@@ -56,12 +56,11 @@ public:
QScriptValue value;
QScriptValue::PropertyFlags flags;
- QBasicAtomicInt ref;
+ QAtomicInt ref;
};
QScriptValuePropertyPrivate::QScriptValuePropertyPrivate()
{
- ref = 0;
}
QScriptValuePropertyPrivate::~QScriptValuePropertyPrivate()