diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2016-03-06 10:25:30 +0100 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2016-03-06 12:21:41 +0000 |
commit | dd86a8f8cb5b70a01ec43f7ab54a78d2ea2782f5 (patch) | |
tree | aeed042daaa1f55d9cdb9df83b027bcfb5c5e25a /src/designer/src/uitools | |
parent | 2d07f5db4273d4aea7b9f9d924fdd84ce992052d (diff) | |
download | qttools-dd86a8f8cb5b70a01ec43f7ab54a78d2ea2782f5.tar.gz |
Make public headers compile with -Wzero-as-null-pointer-constant
... or equivalent.
QtBase 5.6 headers already compile that way, so let the other
modules follow suit.
Change-Id: I0f056b1acb2b223ad224faea1747339247a8a3c4
Task-number: QTBUG-45291
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/designer/src/uitools')
-rw-r--r-- | src/designer/src/uitools/quiloader.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/designer/src/uitools/quiloader.h b/src/designer/src/uitools/quiloader.h index 7968e41d2..51a076545 100644 --- a/src/designer/src/uitools/quiloader.h +++ b/src/designer/src/uitools/quiloader.h @@ -52,21 +52,21 @@ class QUiLoader : public QObject { Q_OBJECT public: - QUiLoader(QObject *parent = 0); + QUiLoader(QObject *parent = Q_NULLPTR); virtual ~QUiLoader(); QStringList pluginPaths() const; void clearPluginPaths(); void addPluginPath(const QString &path); - QWidget *load(QIODevice *device, QWidget *parentWidget = 0); + QWidget *load(QIODevice *device, QWidget *parentWidget = Q_NULLPTR); QStringList availableWidgets() const; QStringList availableLayouts() const; - virtual QWidget *createWidget(const QString &className, QWidget *parent = 0, const QString &name = QString()); - virtual QLayout *createLayout(const QString &className, QObject *parent = 0, const QString &name = QString()); - virtual QActionGroup *createActionGroup(QObject *parent = 0, const QString &name = QString()); - virtual QAction *createAction(QObject *parent = 0, const QString &name = QString()); + virtual QWidget *createWidget(const QString &className, QWidget *parent = Q_NULLPTR, const QString &name = QString()); + virtual QLayout *createLayout(const QString &className, QObject *parent = Q_NULLPTR, const QString &name = QString()); + virtual QActionGroup *createActionGroup(QObject *parent = Q_NULLPTR, const QString &name = QString()); + virtual QAction *createAction(QObject *parent = Q_NULLPTR, const QString &name = QString()); void setWorkingDirectory(const QDir &dir); QDir workingDirectory() const; |