diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-14 01:00:34 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-14 01:00:34 +0200 |
commit | e164d61ca8263fc4b46fdd916e1ea77c7dd2b735 (patch) | |
tree | 06c50077b8baf41b756dc1aa8021c4a9ca34a9d4 /examples/widgets/dialogs/tabdialog | |
parent | 721a0e807881e4d00e752e3c3cf62427eb681dd2 (diff) | |
parent | 8d8140dffa9aa680a519b501fc5bdf08c91dd735 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I129dd579f92cb2592a38ca043472b45cb926ae12
Diffstat (limited to 'examples/widgets/dialogs/tabdialog')
-rw-r--r-- | examples/widgets/dialogs/tabdialog/tabdialog.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/widgets/dialogs/tabdialog/tabdialog.h b/examples/widgets/dialogs/tabdialog/tabdialog.h index 2db47c9ddd..b7c6c5b8da 100644 --- a/examples/widgets/dialogs/tabdialog/tabdialog.h +++ b/examples/widgets/dialogs/tabdialog/tabdialog.h @@ -65,7 +65,7 @@ class GeneralTab : public QWidget Q_OBJECT public: - explicit GeneralTab(const QFileInfo &fileInfo, QWidget *parent = 0); + explicit GeneralTab(const QFileInfo &fileInfo, QWidget *parent = nullptr); }; //! [0] @@ -76,7 +76,7 @@ class PermissionsTab : public QWidget Q_OBJECT public: - explicit PermissionsTab(const QFileInfo &fileInfo, QWidget *parent = 0); + explicit PermissionsTab(const QFileInfo &fileInfo, QWidget *parent = nullptr); }; //! [1] @@ -87,7 +87,7 @@ class ApplicationsTab : public QWidget Q_OBJECT public: - explicit ApplicationsTab(const QFileInfo &fileInfo, QWidget *parent = 0); + explicit ApplicationsTab(const QFileInfo &fileInfo, QWidget *parent = nullptr); }; //! [2] @@ -98,7 +98,7 @@ class TabDialog : public QDialog Q_OBJECT public: - explicit TabDialog(const QString &fileName, QWidget *parent = 0); + explicit TabDialog(const QString &fileName, QWidget *parent = nullptr); private: QTabWidget *tabWidget; |