diff options
| author | Jan-Arve Saether <jan-arve.saether@nokia.com> | 2012-04-18 13:58:50 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-21 05:09:12 +0200 |
| commit | 45991b0f31b815afe749e679bb5dda66890bf5f7 (patch) | |
| tree | 14fcbcaad8991a2d0bf34254d3755c95013a4ffe /src/corelib | |
| parent | 40fe0721d61b7aa5549f34422cc4fca080a3d9e7 (diff) | |
Compile on Windows.
The previous code was trying to sum one pointer with one string
literal...
Using QVarLengthArray should also potentially speed things up a bit,
since it will avoid a malloc if className is small enough (less
than 15 bytes).
Change-Id: I41218babb3030e7e6f9c31fc77e4af1c209ae0a5
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 9377ddd87e..2261eb0d12 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -45,6 +45,7 @@ #include <QtCore/qglobal.h> #include <QtCore/qatomic.h> #include <QtCore/qbytearray.h> +#include <QtCore/qvarlengtharray.h> #include <QtCore/qisenum.h> #ifndef QT_NO_QOBJECT #include <QtCore/qobjectdefs.h> @@ -598,9 +599,14 @@ struct QMetaTypeIdQObject<T*, /* isPointerToTypeDerivedFromQObject */ true> static int qt_metatype_id() { static QBasicAtomicInt metatype_id = Q_BASIC_ATOMIC_INITIALIZER(0); - if (!metatype_id.load()) - metatype_id.storeRelease(qRegisterMetaType<T*>(QByteArray(T::staticMetaObject.className() + QByteArray("*")).constData(), + if (!metatype_id.load()) { + int len = strlen(T::staticMetaObject.className()); + QVarLengthArray<char, 16> classNameStar; + classNameStar.append(T::staticMetaObject.className(), len); + classNameStar.append("*\0", 2); + metatype_id.storeRelease(qRegisterMetaType<T*>(classNameStar.constData(), reinterpret_cast<T**>(quintptr(-1)))); + } return metatype_id.loadAcquire(); } }; |