diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-03 16:40:05 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-05 10:26:08 +0200 |
| commit | 13f0365a960538693ee4b52f9e02864d08845fae (patch) | |
| tree | cea2924f8113152ff10bdc126ebe5a0c8d3c4f95 /src/designer/src/lib/shared/layoutinfo_p.h | |
| parent | fac0dcbeef6a0c23e780b9751c17883ec9918d6f (diff) | |
Qt Designer: Introduce nullptr
Apply Fixits by Qt Creator with some amendments.
Change-Id: Idc948b1132fbb61c3ae6706b71659e2e8790fbc6
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/designer/src/lib/shared/layoutinfo_p.h')
| -rw-r--r-- | src/designer/src/lib/shared/layoutinfo_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/designer/src/lib/shared/layoutinfo_p.h b/src/designer/src/lib/shared/layoutinfo_p.h index de3b80296..e5326203a 100644 --- a/src/designer/src/lib/shared/layoutinfo_p.h +++ b/src/designer/src/lib/shared/layoutinfo_p.h @@ -74,14 +74,14 @@ public: // Examines the immediate layout of the widget. static Type layoutType(const QDesignerFormEditorInterface *core, const QWidget *w); // Examines the managed layout of the widget - static Type managedLayoutType(const QDesignerFormEditorInterface *core, const QWidget *w, QLayout **layout = 0); + static Type managedLayoutType(const QDesignerFormEditorInterface *core, const QWidget *w, QLayout **layout = nullptr); static Type layoutType(const QDesignerFormEditorInterface *core, const QLayout *layout); static Type layoutType(const QString &typeName); static QString layoutName(Type t); static QWidget *layoutParent(const QDesignerFormEditorInterface *core, QLayout *layout); - static Type laidoutWidgetType(const QDesignerFormEditorInterface *core, QWidget *widget, bool *isManaged = 0, QLayout **layout = 0); + static Type laidoutWidgetType(const QDesignerFormEditorInterface *core, QWidget *widget, bool *isManaged = nullptr, QLayout **layout = nullptr); static bool inline isWidgetLaidout(const QDesignerFormEditorInterface *core, QWidget *widget) { return laidoutWidgetType(core, widget) != NoLayout; } static QLayout *managedLayout(const QDesignerFormEditorInterface *core, const QWidget *widget); @@ -92,7 +92,7 @@ public: static bool isEmptyItem(QLayoutItem *item); }; -QDESIGNER_SHARED_EXPORT void getFormLayoutItemPosition(const QFormLayout *formLayout, int index, int *rowPtr, int *columnPtr = 0, int *rowspanPtr = 0, int *colspanPtr = 0); +QDESIGNER_SHARED_EXPORT void getFormLayoutItemPosition(const QFormLayout *formLayout, int index, int *rowPtr, int *columnPtr = nullptr, int *rowspanPtr = nullptr, int *colspanPtr = nullptr); QDESIGNER_SHARED_EXPORT void formLayoutAddWidget(QFormLayout *formLayout, QWidget *w, const QRect &r, bool insert); } // namespace qdesigner_internal |