summaryrefslogtreecommitdiffstats
path: root/src/activeqt/container
diff options
context:
space:
mode:
Diffstat (limited to 'src/activeqt/container')
-rw-r--r--src/activeqt/container/qaxbase.h6
-rw-r--r--src/activeqt/container/qaxobject.h10
-rw-r--r--src/activeqt/container/qaxscript.h4
-rw-r--r--src/activeqt/container/qaxselect.h2
-rw-r--r--src/activeqt/container/qaxwidget.h10
5 files changed, 16 insertions, 16 deletions
diff --git a/src/activeqt/container/qaxbase.h b/src/activeqt/container/qaxbase.h
index 7b667af..208a8ba 100644
--- a/src/activeqt/container/qaxbase.h
+++ b/src/activeqt/container/qaxbase.h
@@ -64,7 +64,7 @@ class QAxBase
public:
typedef QMap<QString, QVariant> PropertyBag;
- QAxBase(IUnknown *iface = 0);
+ QAxBase(IUnknown *iface = Q_NULLPTR);
virtual ~QAxBase();
QString control() const;
@@ -173,13 +173,13 @@ private:
template <> inline QAxBase *qobject_cast<QAxBase*>(const QObject *o)
{
- void *result = o ? const_cast<QObject *>(o)->qt_metacast("QAxBase") : 0;
+ void *result = o ? const_cast<QObject *>(o)->qt_metacast("QAxBase") : Q_NULLPTR;
return (QAxBase*)(result);
}
template <> inline QAxBase *qobject_cast<QAxBase*>(QObject *o)
{
- void *result = o ? o->qt_metacast("QAxBase") : 0;
+ void *result = o ? o->qt_metacast("QAxBase") : Q_NULLPTR;
return (QAxBase*)(result);
}
diff --git a/src/activeqt/container/qaxobject.h b/src/activeqt/container/qaxobject.h
index 5c62303..41a8f59 100644
--- a/src/activeqt/container/qaxobject.h
+++ b/src/activeqt/container/qaxobject.h
@@ -53,9 +53,9 @@ public:
QObject* qObject() const Q_DECL_OVERRIDE { return static_cast<QObject *>(const_cast<QAxObject *>(this)); }
const char *className() const Q_DECL_OVERRIDE;
- QAxObject(QObject *parent = 0);
- QAxObject(const QString &c, QObject *parent = 0);
- QAxObject(IUnknown *iface, QObject *parent = 0);
+ QAxObject(QObject *parent = Q_NULLPTR);
+ QAxObject(const QString &c, QObject *parent = Q_NULLPTR);
+ QAxObject(IUnknown *iface, QObject *parent = Q_NULLPTR);
~QAxObject();
bool doVerb(const QString &verb);
@@ -70,13 +70,13 @@ private:
template <> inline QAxObject *qobject_cast<QAxObject*>(const QObject *o)
{
- void *result = o ? const_cast<QObject *>(o)->qt_metacast("QAxObject") : 0;
+ void *result = o ? const_cast<QObject *>(o)->qt_metacast("QAxObject") : Q_NULLPTR;
return (QAxObject*)(result);
}
template <> inline QAxObject *qobject_cast<QAxObject*>(QObject *o)
{
- void *result = o ? o->qt_metacast("QAxObject") : 0;
+ void *result = o ? o->qt_metacast("QAxObject") : Q_NULLPTR;
return (QAxObject*)(result);
}
diff --git a/src/activeqt/container/qaxscript.h b/src/activeqt/container/qaxscript.h
index 8abd72a..b00ed06 100644
--- a/src/activeqt/container/qaxscript.h
+++ b/src/activeqt/container/qaxscript.h
@@ -149,7 +149,7 @@ class QAxScriptManager : public QObject
Q_OBJECT
public:
- QAxScriptManager(QObject *parent = 0);
+ QAxScriptManager(QObject *parent = Q_NULLPTR);
~QAxScriptManager();
void addObject(QAxBase *object);
@@ -212,7 +212,7 @@ inline QAxScriptEngine *QAxScript::scriptEngine() const
inline bool QAxScriptEngine::isValid() const
{
- return engine != 0;
+ return engine != Q_NULLPTR;
}
inline QString QAxScriptEngine::scriptLanguage() const
diff --git a/src/activeqt/container/qaxselect.h b/src/activeqt/container/qaxselect.h
index 0b21c02..dc0a082 100644
--- a/src/activeqt/container/qaxselect.h
+++ b/src/activeqt/container/qaxselect.h
@@ -51,7 +51,7 @@ class QAxSelect : public QDialog
{
Q_OBJECT
public:
- QAxSelect(QWidget *parent = 0, Qt::WindowFlags flags = 0);
+ QAxSelect(QWidget *parent = Q_NULLPTR, Qt::WindowFlags flags = Qt::WindowFlags());
~QAxSelect();
QString clsid() const;
diff --git a/src/activeqt/container/qaxwidget.h b/src/activeqt/container/qaxwidget.h
index 2cfa37f..93ab7c1 100644
--- a/src/activeqt/container/qaxwidget.h
+++ b/src/activeqt/container/qaxwidget.h
@@ -59,9 +59,9 @@ public:
QObject* qObject() const { return (QWidget*)this; }
const char *className() const;
- QAxWidget(QWidget* parent = 0, Qt::WindowFlags f = 0);
- QAxWidget(const QString &c, QWidget *parent = 0, Qt::WindowFlags f = 0);
- QAxWidget(IUnknown *iface, QWidget *parent = 0, Qt::WindowFlags f = 0);
+ QAxWidget(QWidget* parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags());
+ QAxWidget(const QString &c, QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags());
+ QAxWidget(IUnknown *iface, QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags());
~QAxWidget();
void clear();
@@ -94,13 +94,13 @@ private:
template <> inline QAxWidget *qobject_cast<QAxWidget*>(const QObject *o)
{
- void *result = o ? const_cast<QObject *>(o)->qt_metacast("QAxWidget") : 0;
+ void *result = o ? const_cast<QObject *>(o)->qt_metacast("QAxWidget") : Q_NULLPTR;
return (QAxWidget*)(result);
}
template <> inline QAxWidget *qobject_cast<QAxWidget*>(QObject *o)
{
- void *result = o ? o->qt_metacast("QAxWidget") : 0;
+ void *result = o ? o->qt_metacast("QAxWidget") : Q_NULLPTR;
return (QAxWidget*)(result);
}