summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-03-22 11:09:43 +0100
committerMarc Mutz <marc.mutz@kdab.com>2016-03-22 12:35:56 +0000
commitcc32d8626e4017ef18e4c26ce23bb5f6339008cd (patch)
tree9944f06944c0a62277fc31009af3bd90a7974df8
parent433cfc3907b96c4172be03c267b6cb357f896e40 (diff)
Make more ctors explicit
Added explicit where it was missing. This is not a source- incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. Change-Id: Idbe6108bfc1f66e3e1a6fefbb77be7c13c9b2a18 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
-rw-r--r--src/activeqt/container/qaxbase.h2
-rw-r--r--src/activeqt/container/qaxobject.h6
-rw-r--r--src/activeqt/container/qaxscript.h2
-rw-r--r--src/activeqt/container/qaxselect.h2
-rw-r--r--src/activeqt/container/qaxwidget.h6
5 files changed, 9 insertions, 9 deletions
diff --git a/src/activeqt/container/qaxbase.h b/src/activeqt/container/qaxbase.h
index 208a8ba..b3e3f3e 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 = Q_NULLPTR);
+ explicit QAxBase(IUnknown *iface = Q_NULLPTR);
virtual ~QAxBase();
QString control() const;
diff --git a/src/activeqt/container/qaxobject.h b/src/activeqt/container/qaxobject.h
index 41a8f59..288e533 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 = Q_NULLPTR);
- QAxObject(const QString &c, QObject *parent = Q_NULLPTR);
- QAxObject(IUnknown *iface, QObject *parent = Q_NULLPTR);
+ explicit QAxObject(QObject *parent = Q_NULLPTR);
+ explicit QAxObject(const QString &c, QObject *parent = Q_NULLPTR);
+ explicit QAxObject(IUnknown *iface, QObject *parent = Q_NULLPTR);
~QAxObject();
bool doVerb(const QString &verb);
diff --git a/src/activeqt/container/qaxscript.h b/src/activeqt/container/qaxscript.h
index b00ed06..bce6d37 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 = Q_NULLPTR);
+ explicit QAxScriptManager(QObject *parent = Q_NULLPTR);
~QAxScriptManager();
void addObject(QAxBase *object);
diff --git a/src/activeqt/container/qaxselect.h b/src/activeqt/container/qaxselect.h
index dc0a082..160b436 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 = Q_NULLPTR, Qt::WindowFlags flags = Qt::WindowFlags());
+ explicit 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 93ab7c1..1841958 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 = 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());
+ explicit QAxWidget(QWidget* parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags());
+ explicit QAxWidget(const QString &c, QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags());
+ explicit QAxWidget(IUnknown *iface, QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags());
~QAxWidget();
void clear();