diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-10-26 09:30:52 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-10-26 11:25:00 +0000 |
commit | 17c34f40c51077f01f53c1aa48b01e1a3c3df51c (patch) | |
tree | f0addef8389ef31a518ab049ca7235c9afe1d5dc /src | |
parent | 80a888b303c31725f453dda35f7150b1edf4d674 (diff) |
Qt Designer: Use member initialization in class QDesignerActions
This allows for some simplification in the follow-up patch porting
to the new configure system.
Task-number: PYSIDE-797
Change-Id: I5d4227fb946ac908717ffb08807762e5f1178ca2
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/designer/src/designer/qdesigner_actions.cpp | 10 | ||||
-rw-r--r-- | src/designer/src/designer/qdesigner_actions.h | 10 |
2 files changed, 6 insertions, 14 deletions
diff --git a/src/designer/src/designer/qdesigner_actions.cpp b/src/designer/src/designer/qdesigner_actions.cpp index 70f277e37..28048e9f1 100644 --- a/src/designer/src/designer/qdesigner_actions.cpp +++ b/src/designer/src/designer/qdesigner_actions.cpp @@ -169,8 +169,6 @@ QDesignerActions::QDesignerActions(QDesignerWorkbench *workbench) m_settingsActions(createActionGroup(this)), m_windowActions(createActionGroup(this)), m_toolActions(createActionGroup(this, true)), - m_helpActions(0), - m_styleActions(0), m_editWidgetsAction(new QAction(tr("Edit Widgets"), this)), m_newFormAction(new QAction(qdesigner_internal::createIconSet(QStringLiteral("filenew.png")), tr("&New..."), this)), m_openFormAction(new QAction(qdesigner_internal::createIconSet(QStringLiteral("fileopen.png")), tr("&Open..."), this)), @@ -182,19 +180,13 @@ QDesignerActions::QDesignerActions(QDesignerWorkbench *workbench) m_savePreviewImageAction(new QAction(tr("Save &Image..."), this)), m_printPreviewAction(new QAction(tr("&Print..."), this)), m_quitAction(new QAction(tr("&Quit"), this)), - m_previewFormAction(0), m_viewCodeAction(new QAction(tr("View &Code..."), this)), m_minimizeAction(new QAction(tr("&Minimize"), this)), m_bringAllToFrontSeparator(createSeparator(this)), m_bringAllToFrontAction(new QAction(tr("Bring All to Front"), this)), m_windowListSeparatorAction(createSeparator(this)), m_preferencesAction(new QAction(tr("Preferences..."), this)), - m_appFontAction(new QAction(tr("Additional Fonts..."), this)), - m_appFontDialog(0), -#ifndef QT_NO_PRINTER - m_printer(0), -#endif - m_previewManager(0) + m_appFontAction(new QAction(tr("Additional Fonts..."), this)) { typedef void (QDesignerActions::*VoidSlot)(); diff --git a/src/designer/src/designer/qdesigner_actions.h b/src/designer/src/designer/qdesigner_actions.h index 0daad568f..bfe804bc4 100644 --- a/src/designer/src/designer/qdesigner_actions.h +++ b/src/designer/src/designer/qdesigner_actions.h @@ -176,8 +176,8 @@ private: QActionGroup *m_settingsActions; QActionGroup *m_windowActions; QActionGroup *m_toolActions; - QActionGroup *m_helpActions; - QActionGroup *m_styleActions; + QActionGroup *m_helpActions = nullptr; + QActionGroup *m_styleActions = nullptr; QAction *m_editWidgetsAction; @@ -193,7 +193,7 @@ private: QAction *m_quitAction; - QAction *m_previewFormAction; + QAction *m_previewFormAction = nullptr; QAction *m_viewCodeAction; QAction *m_minimizeAction; @@ -207,10 +207,10 @@ private: QPointer<AppFontDialog> m_appFontDialog; #ifndef QT_NO_PRINTER - QPrinter *m_printer; + QPrinter *m_printer = nullptr; #endif - qdesigner_internal::PreviewManager *m_previewManager; + qdesigner_internal::PreviewManager *m_previewManager = nullptr; }; QT_END_NAMESPACE |