diff options
Diffstat (limited to 'src/activeqt/control/qaxfactory.h')
| -rw-r--r-- | src/activeqt/control/qaxfactory.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/activeqt/control/qaxfactory.h b/src/activeqt/control/qaxfactory.h index 9ee9a10..23989e2 100644 --- a/src/activeqt/control/qaxfactory.h +++ b/src/activeqt/control/qaxfactory.h @@ -149,13 +149,13 @@ inline bool QAxFactory::stopServer() { \ if (key == className) \ return &Class::staticMetaObject; \ - return 0; \ + return Q_NULLPTR; \ } \ QObject *createObject(const QString &key) override \ { \ if (key == className) \ - return new Class(0); \ - return 0; \ + return new Class(Q_NULLPTR); \ + return Q_NULLPTR; \ } \ QUuid classID(const QString &key) const override \ { \ @@ -195,10 +195,10 @@ public: { const QMetaObject &mo = T::staticMetaObject; if (key != QLatin1String(mo.className())) - return 0; + return Q_NULLPTR; if (!qstrcmp(mo.classInfo(mo.indexOfClassInfo("Creatable")).value(), "no")) - return 0; - return new T(0); + return Q_NULLPTR; + return new T(Q_NULLPTR); } void registerClass(const QString &key, QSettings *settings) const Q_DECL_OVERRIDE @@ -243,7 +243,7 @@ private: QAxFactoryList() \ : QAxFactory(IDTypeLib, IDApp) \ { \ - QAxFactory *factory = 0; \ + QAxFactory *factory = Q_NULLPTR; \ QStringList keys; \ QStringList::Iterator it; \ @@ -273,13 +273,13 @@ private: QStringList featureList() const Q_DECL_OVERRIDE { return factoryKeys; } \ const QMetaObject *metaObject(const QString&key) const Q_DECL_OVERRIDE { \ QAxFactory *f = factories[key]; \ - return f ? f->metaObject(key) : 0; \ + return f ? f->metaObject(key) : Q_NULLPTR; \ } \ QObject *createObject(const QString &key) Q_DECL_OVERRIDE { \ if (!creatable.value(key)) \ - return 0; \ + return Q_NULLPTR; \ QAxFactory *f = factories[key]; \ - return f ? f->createObject(key) : 0; \ + return f ? f->createObject(key) : Q_NULLPTR; \ } \ QUuid classID(const QString &key) const Q_DECL_OVERRIDE { \ QAxFactory *f = factories.value(key); \ |