From 18176e289745019d0f25521f5cf05f06c41ac419 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Wed, 3 Aug 2011 09:52:56 -0500 Subject: 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 Reviewed-by: Friedemann Kleint --- src/activeqt/control/qaxfactory.h | 4 ++-- 1 file 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(typeLibID(), appID()); \ + factory = new QAxClass(typeLibID().toString(), appID().toString()); \ qRegisterMetaType(#Class"*"); \ keys = factory->featureList(); \ for (it = keys.begin(); it != keys.end(); ++it) { \ @@ -231,7 +231,7 @@ public: }\ #define QAXTYPE(Class) \ - factory = new QAxClass(typeLibID(), appID()); \ + factory = new QAxClass(typeLibID().toString(), appID().toString()); \ qRegisterMetaType(#Class"*"); \ keys = factory->featureList(); \ for (it = keys.begin(); it != keys.end(); ++it) { \ -- cgit v1.2.1