diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2011-08-03 09:52:56 -0500 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-04 08:40:24 +0200 |
| commit | 18176e289745019d0f25521f5cf05f06c41ac419 (patch) | |
| tree | 93637fb325ce378c88f9f1dba7a2ca8d76abd20d | |
| parent | 0e18f86e6c055e60265e1c74b8b4c64cd739eb45 (diff) | |
| download | qtactiveqt-18176e289745019d0f25521f5cf05f06c41ac419.tar.gz | |
Use .toString() instead of deprecated implicit operator QString() cast
Implicit operator QString() case has been deprecated in Qt5
Change-Id: Id6a65a5e203a6ff9383233a54751257d32fd1df1
Reviewed-on: http://codereview.qt.nokia.com/2581
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| -rw-r--r-- | src/activeqt/control/qaxfactory.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/activeqt/control/qaxfactory.h b/src/activeqt/control/qaxfactory.h index 25650ad..d6917f6 100644 --- a/src/activeqt/control/qaxfactory.h +++ b/src/activeqt/control/qaxfactory.h @@ -221,7 +221,7 @@ public: QStringList::Iterator it; \ #define QAXCLASS(Class) \ - factory = new QAxClass<Class>(typeLibID(), appID()); \ + factory = new QAxClass<Class>(typeLibID().toString(), appID().toString()); \ qRegisterMetaType<Class*>(#Class"*"); \ keys = factory->featureList(); \ for (it = keys.begin(); it != keys.end(); ++it) { \ @@ -231,7 +231,7 @@ public: }\ #define QAXTYPE(Class) \ - factory = new QAxClass<Class>(typeLibID(), appID()); \ + factory = new QAxClass<Class>(typeLibID().toString(), appID().toString()); \ qRegisterMetaType<Class*>(#Class"*"); \ keys = factory->featureList(); \ for (it = keys.begin(); it != keys.end(); ++it) { \ |