summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-03-06 10:25:30 +0100
committerMarc Mutz <marc.mutz@kdab.com>2016-03-06 12:21:41 +0000
commitdd86a8f8cb5b70a01ec43f7ab54a78d2ea2782f5 (patch)
treeaeed042daaa1f55d9cdb9df83b027bcfb5c5e25a
parent2d07f5db4273d4aea7b9f9d924fdd84ce992052d (diff)
downloadqttools-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>
-rw-r--r--src/assistant/help/qhelpcontentwidget.h2
-rw-r--r--src/assistant/help/qhelpengine.h2
-rw-r--r--src/assistant/help/qhelpenginecore.h2
-rw-r--r--src/assistant/help/qhelpsearchengine.h3
-rw-r--r--src/assistant/help/qhelpsearchquerywidget.h2
-rw-r--r--src/designer/src/lib/extension/default_extensionfactory.h2
-rw-r--r--src/designer/src/lib/extension/extension.h4
-rw-r--r--src/designer/src/lib/extension/qextensionmanager.h2
-rw-r--r--src/designer/src/lib/sdk/abstractactioneditor.h2
-rw-r--r--src/designer/src/lib/sdk/abstractformeditor.h2
-rw-r--r--src/designer/src/lib/sdk/abstractformwindow.h6
-rw-r--r--src/designer/src/lib/sdk/abstractformwindowmanager.h4
-rw-r--r--src/designer/src/lib/sdk/abstractformwindowtool.h2
-rw-r--r--src/designer/src/lib/sdk/abstractintegration.h8
-rw-r--r--src/designer/src/lib/sdk/abstractlanguage.h4
-rw-r--r--src/designer/src/lib/sdk/abstractmetadatabase.h2
-rw-r--r--src/designer/src/lib/sdk/abstractnewformwidget.h6
-rw-r--r--src/designer/src/lib/sdk/abstractobjectinspector.h2
-rw-r--r--src/designer/src/lib/sdk/abstractpropertyeditor.h2
-rw-r--r--src/designer/src/lib/sdk/abstractresourcebrowser.h2
-rw-r--r--src/designer/src/lib/sdk/abstractwidgetbox.h2
-rw-r--r--src/designer/src/lib/sdk/abstractwidgetdatabase.h2
-rw-r--r--src/designer/src/lib/sdk/abstractwidgetfactory.h4
-rw-r--r--src/designer/src/lib/sdk/taskmenu.h2
-rw-r--r--src/designer/src/lib/uilib/abstractformbuilder.h2
-rw-r--r--src/designer/src/uitools/quiloader.h12
26 files changed, 42 insertions, 43 deletions
diff --git a/src/assistant/help/qhelpcontentwidget.h b/src/assistant/help/qhelpcontentwidget.h
index 43cd9b37b..2af6c022a 100644
--- a/src/assistant/help/qhelpcontentwidget.h
+++ b/src/assistant/help/qhelpcontentwidget.h
@@ -65,7 +65,7 @@ public:
private:
QHelpContentItem(const QString &name, const QString &link,
- QHelpDBReader *reader, QHelpContentItem *parent = 0);
+ QHelpDBReader *reader, QHelpContentItem *parent = Q_NULLPTR);
void appendChild(QHelpContentItem *child);
QHelpContentItemPrivate *d;
diff --git a/src/assistant/help/qhelpengine.h b/src/assistant/help/qhelpengine.h
index c1b29654c..70216cc81 100644
--- a/src/assistant/help/qhelpengine.h
+++ b/src/assistant/help/qhelpengine.h
@@ -51,7 +51,7 @@ class QHELP_EXPORT QHelpEngine : public QHelpEngineCore
Q_OBJECT
public:
- explicit QHelpEngine(const QString &collectionFile, QObject *parent = 0);
+ explicit QHelpEngine(const QString &collectionFile, QObject *parent = Q_NULLPTR);
~QHelpEngine();
QHelpContentModel *contentModel() const;
diff --git a/src/assistant/help/qhelpenginecore.h b/src/assistant/help/qhelpenginecore.h
index 9476ac273..8b7ee2cdb 100644
--- a/src/assistant/help/qhelpenginecore.h
+++ b/src/assistant/help/qhelpenginecore.h
@@ -54,7 +54,7 @@ class QHELP_EXPORT QHelpEngineCore : public QObject
Q_PROPERTY(QString currentFilter READ currentFilter WRITE setCurrentFilter)
public:
- explicit QHelpEngineCore(const QString &collectionFile, QObject *parent = 0);
+ explicit QHelpEngineCore(const QString &collectionFile, QObject *parent = Q_NULLPTR);
virtual ~QHelpEngineCore();
bool setupData();
diff --git a/src/assistant/help/qhelpsearchengine.h b/src/assistant/help/qhelpsearchengine.h
index 5baee49d0..314e91320 100644
--- a/src/assistant/help/qhelpsearchengine.h
+++ b/src/assistant/help/qhelpsearchengine.h
@@ -69,8 +69,7 @@ class QHELP_EXPORT QHelpSearchEngine : public QObject
Q_OBJECT
public:
- explicit QHelpSearchEngine(QHelpEngineCore *helpEngine,
- QObject *parent = 0);
+ explicit QHelpSearchEngine(QHelpEngineCore *helpEngine, QObject *parent = Q_NULLPTR);
~QHelpSearchEngine();
QHelpSearchQueryWidget* queryWidget();
diff --git a/src/assistant/help/qhelpsearchquerywidget.h b/src/assistant/help/qhelpsearchquerywidget.h
index 7e6b197c8..79a6b2f96 100644
--- a/src/assistant/help/qhelpsearchquerywidget.h
+++ b/src/assistant/help/qhelpsearchquerywidget.h
@@ -54,7 +54,7 @@ class QHELP_EXPORT QHelpSearchQueryWidget : public QWidget
Q_OBJECT
public:
- QHelpSearchQueryWidget(QWidget *parent = 0);
+ QHelpSearchQueryWidget(QWidget *parent = Q_NULLPTR);
~QHelpSearchQueryWidget();
void expandExtendedSearch();
diff --git a/src/designer/src/lib/extension/default_extensionfactory.h b/src/designer/src/lib/extension/default_extensionfactory.h
index e43e6b3a2..2eb5865a7 100644
--- a/src/designer/src/lib/extension/default_extensionfactory.h
+++ b/src/designer/src/lib/extension/default_extensionfactory.h
@@ -50,7 +50,7 @@ class QDESIGNER_EXTENSION_EXPORT QExtensionFactory : public QObject, public QAbs
Q_OBJECT
Q_INTERFACES(QAbstractExtensionFactory)
public:
- QExtensionFactory(QExtensionManager *parent = 0);
+ QExtensionFactory(QExtensionManager *parent = Q_NULLPTR);
QObject *extension(QObject *object, const QString &iid) const Q_DECL_OVERRIDE;
QExtensionManager *extensionManager() const;
diff --git a/src/designer/src/lib/extension/extension.h b/src/designer/src/lib/extension/extension.h
index f15b4415b..924bb9a1f 100644
--- a/src/designer/src/lib/extension/extension.h
+++ b/src/designer/src/lib/extension/extension.h
@@ -82,13 +82,13 @@ template <> inline IFace *qt_extension_helper<IFace *>(QAbstractExtensionManager
template <class T>
inline T qt_extension(QAbstractExtensionManager *, QObject *)
-{ return 0; }
+{ return Q_NULLPTR; }
#define Q_DECLARE_EXTENSION_INTERFACE(IFace, IId) \
const char * const IFace##_iid = IId; \
Q_DECLARE_INTERFACE(IFace, IId) \
template <> inline IFace *qt_extension<IFace *>(QAbstractExtensionManager *manager, QObject *object) \
-{ QObject *extension = manager->extension(object, Q_TYPEID(IFace)); return extension ? static_cast<IFace *>(extension->qt_metacast(IFace##_iid)) : static_cast<IFace *>(0); }
+{ QObject *extension = manager->extension(object, Q_TYPEID(IFace)); return extension ? static_cast<IFace *>(extension->qt_metacast(IFace##_iid)) : static_cast<IFace *>(Q_NULLPTR); }
#endif
diff --git a/src/designer/src/lib/extension/qextensionmanager.h b/src/designer/src/lib/extension/qextensionmanager.h
index e0926aa6a..4275bfbd5 100644
--- a/src/designer/src/lib/extension/qextensionmanager.h
+++ b/src/designer/src/lib/extension/qextensionmanager.h
@@ -47,7 +47,7 @@ class QDESIGNER_EXTENSION_EXPORT QExtensionManager: public QObject, public QAbst
Q_OBJECT
Q_INTERFACES(QAbstractExtensionManager)
public:
- QExtensionManager(QObject *parent = 0);
+ QExtensionManager(QObject *parent = Q_NULLPTR);
~QExtensionManager();
void registerExtensions(QAbstractExtensionFactory *factory, const QString &iid = QString()) Q_DECL_OVERRIDE;
diff --git a/src/designer/src/lib/sdk/abstractactioneditor.h b/src/designer/src/lib/sdk/abstractactioneditor.h
index 24a749e76..85de1b108 100644
--- a/src/designer/src/lib/sdk/abstractactioneditor.h
+++ b/src/designer/src/lib/sdk/abstractactioneditor.h
@@ -47,7 +47,7 @@ class QDESIGNER_SDK_EXPORT QDesignerActionEditorInterface: public QWidget
{
Q_OBJECT
public:
- QDesignerActionEditorInterface(QWidget *parent, Qt::WindowFlags flags = 0);
+ QDesignerActionEditorInterface(QWidget *parent, Qt::WindowFlags flags = Qt::WindowFlags());
virtual ~QDesignerActionEditorInterface();
virtual QDesignerFormEditorInterface *core() const;
diff --git a/src/designer/src/lib/sdk/abstractformeditor.h b/src/designer/src/lib/sdk/abstractformeditor.h
index 35b222361..a2b674694 100644
--- a/src/designer/src/lib/sdk/abstractformeditor.h
+++ b/src/designer/src/lib/sdk/abstractformeditor.h
@@ -70,7 +70,7 @@ class QDESIGNER_SDK_EXPORT QDesignerFormEditorInterface : public QObject
{
Q_OBJECT
public:
- QDesignerFormEditorInterface(QObject *parent = 0);
+ QDesignerFormEditorInterface(QObject *parent = Q_NULLPTR);
virtual ~QDesignerFormEditorInterface();
QExtensionManager *extensionManager() const;
diff --git a/src/designer/src/lib/sdk/abstractformwindow.h b/src/designer/src/lib/sdk/abstractformwindow.h
index d16173ddc..35cadf534 100644
--- a/src/designer/src/lib/sdk/abstractformwindow.h
+++ b/src/designer/src/lib/sdk/abstractformwindow.h
@@ -68,7 +68,7 @@ public:
};
public:
- QDesignerFormWindowInterface(QWidget *parent = 0, Qt::WindowFlags flags = 0);
+ QDesignerFormWindowInterface(QWidget *parent = Q_NULLPTR, Qt::WindowFlags flags = Qt::WindowFlags());
virtual ~QDesignerFormWindowInterface();
virtual QString fileName() const = 0;
@@ -76,7 +76,7 @@ public:
virtual QString contents() const = 0;
virtual QStringList checkContents() const = 0;
- virtual bool setContents(QIODevice *dev, QString *errorMessage = 0) = 0;
+ virtual bool setContents(QIODevice *dev, QString *errorMessage = Q_NULLPTR) = 0;
virtual Feature features() const = 0;
virtual bool hasFeature(Feature f) const = 0;
@@ -162,7 +162,7 @@ public Q_SLOTS:
virtual bool setContents(const QString &contents) = 0;
virtual void editWidgets() = 0;
- void activateResourceFilePaths(const QStringList &paths, int *errorCount = 0, QString *errorMessages = 0);
+ void activateResourceFilePaths(const QStringList &paths, int *errorCount = Q_NULLPTR, QString *errorMessages = Q_NULLPTR);
Q_SIGNALS:
void mainContainerChanged(QWidget *mainContainer);
diff --git a/src/designer/src/lib/sdk/abstractformwindowmanager.h b/src/designer/src/lib/sdk/abstractformwindowmanager.h
index 7f7c5619c..cdcb1a88c 100644
--- a/src/designer/src/lib/sdk/abstractformwindowmanager.h
+++ b/src/designer/src/lib/sdk/abstractformwindowmanager.h
@@ -54,7 +54,7 @@ class QDESIGNER_SDK_EXPORT QDesignerFormWindowManagerInterface: public QObject
{
Q_OBJECT
public:
- explicit QDesignerFormWindowManagerInterface(QObject *parent = 0);
+ explicit QDesignerFormWindowManagerInterface(QObject *parent = Q_NULLPTR);
virtual ~QDesignerFormWindowManagerInterface();
enum Action
@@ -119,7 +119,7 @@ public:
virtual int formWindowCount() const = 0;
virtual QDesignerFormWindowInterface *formWindow(int index) const = 0;
- virtual QDesignerFormWindowInterface *createFormWindow(QWidget *parentWidget = 0, Qt::WindowFlags flags = 0) = 0;
+ virtual QDesignerFormWindowInterface *createFormWindow(QWidget *parentWidget = Q_NULLPTR, Qt::WindowFlags flags = Qt::WindowFlags()) = 0;
virtual QDesignerFormEditorInterface *core() const = 0;
diff --git a/src/designer/src/lib/sdk/abstractformwindowtool.h b/src/designer/src/lib/sdk/abstractformwindowtool.h
index b596df32a..298d1db3f 100644
--- a/src/designer/src/lib/sdk/abstractformwindowtool.h
+++ b/src/designer/src/lib/sdk/abstractformwindowtool.h
@@ -50,7 +50,7 @@ class QDESIGNER_SDK_EXPORT QDesignerFormWindowToolInterface: public QObject
{
Q_OBJECT
public:
- QDesignerFormWindowToolInterface(QObject *parent = 0);
+ QDesignerFormWindowToolInterface(QObject *parent = Q_NULLPTR);
virtual ~QDesignerFormWindowToolInterface();
virtual QDesignerFormEditorInterface *core() const = 0;
diff --git a/src/designer/src/lib/sdk/abstractintegration.h b/src/designer/src/lib/sdk/abstractintegration.h
index 0aef90db5..5e544f929 100644
--- a/src/designer/src/lib/sdk/abstractintegration.h
+++ b/src/designer/src/lib/sdk/abstractintegration.h
@@ -77,7 +77,7 @@ public:
};
Q_DECLARE_FLAGS(Feature, FeatureFlag)
- QDesignerIntegrationInterface(QDesignerFormEditorInterface *core, QObject *parent = 0);
+ QDesignerIntegrationInterface(QDesignerFormEditorInterface *core, QObject *parent = Q_NULLPTR);
virtual ~QDesignerIntegrationInterface();
QDesignerFormEditorInterface *core() const;
@@ -85,7 +85,7 @@ public:
virtual QWidget *containerWindow(QWidget *widget) const = 0;
// Create a resource browser specific to integration. Language integration takes precedence
- virtual QDesignerResourceBrowserInterface *createResourceBrowser(QWidget *parent = 0) = 0;
+ virtual QDesignerResourceBrowserInterface *createResourceBrowser(QWidget *parent = Q_NULLPTR) = 0;
virtual QString headerSuffix() const = 0;
virtual void setHeaderSuffix(const QString &headerSuffix) = 0;
@@ -136,7 +136,7 @@ class QDESIGNER_SDK_EXPORT QDesignerIntegration: public QDesignerIntegrationInte
{
Q_OBJECT
public:
- explicit QDesignerIntegration(QDesignerFormEditorInterface *core, QObject *parent = 0);
+ explicit QDesignerIntegration(QDesignerFormEditorInterface *core, QObject *parent = Q_NULLPTR);
virtual ~QDesignerIntegration();
QString headerSuffix() const;
@@ -157,7 +157,7 @@ public:
static void initializePlugins(QDesignerFormEditorInterface *formEditor);
// Create a resource browser specific to integration. Language integration takes precedence
- virtual QDesignerResourceBrowserInterface *createResourceBrowser(QWidget *parent = 0);
+ virtual QDesignerResourceBrowserInterface *createResourceBrowser(QWidget *parent = Q_NULLPTR);
virtual QString contextHelpId() const;
diff --git a/src/designer/src/lib/sdk/abstractlanguage.h b/src/designer/src/lib/sdk/abstractlanguage.h
index b6a0b36de..66bbcce30 100644
--- a/src/designer/src/lib/sdk/abstractlanguage.h
+++ b/src/designer/src/lib/sdk/abstractlanguage.h
@@ -71,12 +71,12 @@ public:
virtual QDialog *createFormWindowSettingsDialog(QDesignerFormWindowInterface *formWindow, QWidget *parentWidget) = 0;
virtual QDesignerResourceBrowserInterface *createResourceBrowser(QWidget *parentWidget) = 0;
- virtual QDialog *createPromotionDialog(QDesignerFormEditorInterface *formEditor, QWidget *parentWidget = 0) = 0;
+ virtual QDialog *createPromotionDialog(QDesignerFormEditorInterface *formEditor, QWidget *parentWidget = Q_NULLPTR) = 0;
virtual QDialog *createPromotionDialog(QDesignerFormEditorInterface *formEditor,
const QString &promotableWidgetClassName,
QString *promoteToClassName,
- QWidget *parentWidget = 0) = 0;
+ QWidget *parentWidget = Q_NULLPTR) = 0;
virtual bool isLanguageResource(const QString &path) const = 0;
diff --git a/src/designer/src/lib/sdk/abstractmetadatabase.h b/src/designer/src/lib/sdk/abstractmetadatabase.h
index 08db94177..bc9b7882f 100644
--- a/src/designer/src/lib/sdk/abstractmetadatabase.h
+++ b/src/designer/src/lib/sdk/abstractmetadatabase.h
@@ -67,7 +67,7 @@ class QDESIGNER_SDK_EXPORT QDesignerMetaDataBaseInterface: public QObject
{
Q_OBJECT
public:
- QDesignerMetaDataBaseInterface(QObject *parent = 0);
+ QDesignerMetaDataBaseInterface(QObject *parent = Q_NULLPTR);
virtual ~QDesignerMetaDataBaseInterface();
virtual QDesignerMetaDataBaseItemInterface *item(QObject *object) const = 0;
diff --git a/src/designer/src/lib/sdk/abstractnewformwidget.h b/src/designer/src/lib/sdk/abstractnewformwidget.h
index 6db8d5120..65851a245 100644
--- a/src/designer/src/lib/sdk/abstractnewformwidget.h
+++ b/src/designer/src/lib/sdk/abstractnewformwidget.h
@@ -47,13 +47,13 @@ class QDESIGNER_SDK_EXPORT QDesignerNewFormWidgetInterface : public QWidget
Q_DISABLE_COPY(QDesignerNewFormWidgetInterface)
Q_OBJECT
public:
- explicit QDesignerNewFormWidgetInterface(QWidget *parent = 0);
+ explicit QDesignerNewFormWidgetInterface(QWidget *parent = Q_NULLPTR);
virtual ~QDesignerNewFormWidgetInterface();
virtual bool hasCurrentTemplate() const = 0;
- virtual QString currentTemplate(QString *errorMessage = 0) = 0;
+ virtual QString currentTemplate(QString *errorMessage = Q_NULLPTR) = 0;
- static QDesignerNewFormWidgetInterface *createNewFormWidget(QDesignerFormEditorInterface *core, QWidget *parent = 0);
+ static QDesignerNewFormWidgetInterface *createNewFormWidget(QDesignerFormEditorInterface *core, QWidget *parent = Q_NULLPTR);
Q_SIGNALS:
void templateActivated();
diff --git a/src/designer/src/lib/sdk/abstractobjectinspector.h b/src/designer/src/lib/sdk/abstractobjectinspector.h
index dcad701d6..b67e69c21 100644
--- a/src/designer/src/lib/sdk/abstractobjectinspector.h
+++ b/src/designer/src/lib/sdk/abstractobjectinspector.h
@@ -47,7 +47,7 @@ class QDESIGNER_SDK_EXPORT QDesignerObjectInspectorInterface: public QWidget
{
Q_OBJECT
public:
- QDesignerObjectInspectorInterface(QWidget *parent, Qt::WindowFlags flags = 0);
+ QDesignerObjectInspectorInterface(QWidget *parent, Qt::WindowFlags flags = Qt::WindowFlags());
virtual ~QDesignerObjectInspectorInterface();
virtual QDesignerFormEditorInterface *core() const;
diff --git a/src/designer/src/lib/sdk/abstractpropertyeditor.h b/src/designer/src/lib/sdk/abstractpropertyeditor.h
index e01d2e7ad..f54919ef0 100644
--- a/src/designer/src/lib/sdk/abstractpropertyeditor.h
+++ b/src/designer/src/lib/sdk/abstractpropertyeditor.h
@@ -48,7 +48,7 @@ class QDESIGNER_SDK_EXPORT QDesignerPropertyEditorInterface: public QWidget
{
Q_OBJECT
public:
- QDesignerPropertyEditorInterface(QWidget *parent, Qt::WindowFlags flags = 0);
+ QDesignerPropertyEditorInterface(QWidget *parent, Qt::WindowFlags flags = Qt::WindowFlags());
virtual ~QDesignerPropertyEditorInterface();
virtual QDesignerFormEditorInterface *core() const;
diff --git a/src/designer/src/lib/sdk/abstractresourcebrowser.h b/src/designer/src/lib/sdk/abstractresourcebrowser.h
index 12515d384..b0f71ebd8 100644
--- a/src/designer/src/lib/sdk/abstractresourcebrowser.h
+++ b/src/designer/src/lib/sdk/abstractresourcebrowser.h
@@ -46,7 +46,7 @@ class QDESIGNER_SDK_EXPORT QDesignerResourceBrowserInterface: public QWidget
{
Q_OBJECT
public:
- QDesignerResourceBrowserInterface(QWidget *parent = 0);
+ QDesignerResourceBrowserInterface(QWidget *parent = Q_NULLPTR);
virtual ~QDesignerResourceBrowserInterface();
virtual void setCurrentPath(const QString &filePath) = 0;
diff --git a/src/designer/src/lib/sdk/abstractwidgetbox.h b/src/designer/src/lib/sdk/abstractwidgetbox.h
index 2ac4c6d91..e6ccc1568 100644
--- a/src/designer/src/lib/sdk/abstractwidgetbox.h
+++ b/src/designer/src/lib/sdk/abstractwidgetbox.h
@@ -103,7 +103,7 @@ public:
};
typedef QList<Category> CategoryList;
- QDesignerWidgetBoxInterface(QWidget *parent = 0, Qt::WindowFlags flags = 0);
+ QDesignerWidgetBoxInterface(QWidget *parent = Q_NULLPTR, Qt::WindowFlags flags = Qt::WindowFlags());
virtual ~QDesignerWidgetBoxInterface();
virtual int categoryCount() const = 0;
diff --git a/src/designer/src/lib/sdk/abstractwidgetdatabase.h b/src/designer/src/lib/sdk/abstractwidgetdatabase.h
index 0a0ebaa12..d8fd3ab8b 100644
--- a/src/designer/src/lib/sdk/abstractwidgetdatabase.h
+++ b/src/designer/src/lib/sdk/abstractwidgetdatabase.h
@@ -95,7 +95,7 @@ class QDESIGNER_SDK_EXPORT QDesignerWidgetDataBaseInterface: public QObject
{
Q_OBJECT
public:
- QDesignerWidgetDataBaseInterface(QObject *parent = 0);
+ QDesignerWidgetDataBaseInterface(QObject *parent = Q_NULLPTR);
virtual ~QDesignerWidgetDataBaseInterface();
virtual int count() const;
diff --git a/src/designer/src/lib/sdk/abstractwidgetfactory.h b/src/designer/src/lib/sdk/abstractwidgetfactory.h
index f87858087..8019b2685 100644
--- a/src/designer/src/lib/sdk/abstractwidgetfactory.h
+++ b/src/designer/src/lib/sdk/abstractwidgetfactory.h
@@ -47,7 +47,7 @@ class QDESIGNER_SDK_EXPORT QDesignerWidgetFactoryInterface: public QObject
{
Q_OBJECT
public:
- QDesignerWidgetFactoryInterface(QObject *parent = 0);
+ QDesignerWidgetFactoryInterface(QObject *parent = Q_NULLPTR);
virtual ~QDesignerWidgetFactoryInterface();
virtual QDesignerFormEditorInterface *core() const = 0;
@@ -55,7 +55,7 @@ public:
virtual QWidget* containerOfWidget(QWidget *w) const = 0;
virtual QWidget* widgetOfContainer(QWidget *w) const = 0;
- virtual QWidget *createWidget(const QString &name, QWidget *parentWidget = 0) const = 0;
+ virtual QWidget *createWidget(const QString &name, QWidget *parentWidget = Q_NULLPTR) const = 0;
virtual QLayout *createLayout(QWidget *widget, QLayout *layout, int type) const = 0;
virtual bool isPassiveInteractor(QWidget *widget) = 0;
diff --git a/src/designer/src/lib/sdk/taskmenu.h b/src/designer/src/lib/sdk/taskmenu.h
index 16e7add58..c6b602fc0 100644
--- a/src/designer/src/lib/sdk/taskmenu.h
+++ b/src/designer/src/lib/sdk/taskmenu.h
@@ -53,7 +53,7 @@ Q_DECLARE_EXTENSION_INTERFACE(QDesignerTaskMenuExtension, "org.qt-project.Qt.Des
inline QAction *QDesignerTaskMenuExtension::preferredEditAction() const
-{ return 0; }
+{ return Q_NULLPTR; }
QT_END_NAMESPACE
diff --git a/src/designer/src/lib/uilib/abstractformbuilder.h b/src/designer/src/lib/uilib/abstractformbuilder.h
index e5e69edd7..764e4db66 100644
--- a/src/designer/src/lib/uilib/abstractformbuilder.h
+++ b/src/designer/src/lib/uilib/abstractformbuilder.h
@@ -107,7 +107,7 @@ public:
QDir workingDirectory() const;
void setWorkingDirectory(const QDir &directory);
- virtual QWidget *load(QIODevice *dev, QWidget *parentWidget=0);
+ virtual QWidget *load(QIODevice *dev, QWidget *parentWidget = Q_NULLPTR);
virtual void save(QIODevice *dev, QWidget *widget);
QString errorString() const;
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;