summaryrefslogtreecommitdiffstats
path: root/src/script/qscriptvalue.cpp
diff options
context:
space:
mode:
authorHarald Fernengel <harald@trolltech.com>2009-08-03 13:12:46 (GMT)
committerHarald Fernengel <harald@trolltech.com>2009-08-03 13:12:46 (GMT)
commit41a83e1ff19ad1396e6001e6b0ac003c701ba55a (patch)
tree609e40eda10418bbf925002c36552074796b96b6 /src/script/qscriptvalue.cpp
parentd1f3b9df2bc5c57d414da73a7d4f9ed7b25df3db (diff)
downloadQt-41a83e1ff19ad1396e6001e6b0ac003c701ba55a.zip
Qt-41a83e1ff19ad1396e6001e6b0ac003c701ba55a.tar.gz
Qt-41a83e1ff19ad1396e6001e6b0ac003c701ba55a.tar.bz2
Squashed commit of the topic/exceptions branch.
Contains some smaller fixes and renaming of macros. Looks big, but isn't scary at all ;)
Diffstat (limited to 'src/script/qscriptvalue.cpp')
-rw-r--r--src/script/qscriptvalue.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/script/qscriptvalue.cpp b/src/script/qscriptvalue.cpp
index d99e912..608fef3 100644
--- a/src/script/qscriptvalue.cpp
+++ b/src/script/qscriptvalue.cpp
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
/*! \internal
*/
-struct QScriptValuePrivatePointerHandler
+struct QScriptValuePrivatePointerDeleter
{
static inline void cleanup(QScriptValuePrivate *d)
{
@@ -71,12 +71,6 @@ struct QScriptValuePrivatePointerHandler
delete d;
}
}
-
- static inline void reset(QScriptValuePrivate *&d, QScriptValuePrivate *other)
- {
- cleanup(d);
- d = other;
- }
};
/*!