From fb44a543491fd698ea81be4808cd478ce27d273d Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Wed, 4 May 2022 15:39:19 +0200 Subject: [PATCH] Initialize members in-class where possible - Default constructed Profile::Ptr is null - QHash is empty by default --- src/widgets/EditProfileDialog.cpp | 15 --------------- src/widgets/EditProfileDialog.h | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 27 deletions(-) diff --git a/src/widgets/EditProfileDialog.cpp b/src/widgets/EditProfileDialog.cpp index 8c5ef4ed..ad4ed706 100644 --- a/src/widgets/EditProfileDialog.cpp +++ b/src/widgets/EditProfileDialog.cpp @@ -55,22 +55,7 @@ using namespace Konsole; EditProfileDialog::EditProfileDialog(QWidget *parent) : KPageDialog(parent) - , _generalUi(nullptr) - , _tabsUi(nullptr) - , _appearanceUi(nullptr) - , _scrollingUi(nullptr) - , _keyboardUi(nullptr) - , _mouseUi(nullptr) - , _advancedUi(nullptr) - , _tempProfile(nullptr) - , _profile(nullptr) - , _isDefault(false) - , _previewedProperties(QHash()) - , _delayedPreviewProperties(QHash()) , _delayedPreviewTimer(new QTimer(this)) - , _colorDialog(nullptr) - , _buttonBox(nullptr) - , _fontDialog(nullptr) { setWindowTitle(i18n("Edit Profile")); setFaceType(KPageDialog::List); diff --git a/src/widgets/EditProfileDialog.h b/src/widgets/EditProfileDialog.h index 6367fa56..228735b5 100644 --- a/src/widgets/EditProfileDialog.h +++ b/src/widgets/EditProfileDialog.h @@ -312,13 +312,13 @@ private: // otherwise returns true. bool isProfileNameValid(); - Ui::EditProfileGeneralPage *_generalUi; - Ui::EditProfileTabsPage *_tabsUi; - Ui::EditProfileAppearancePage *_appearanceUi; - Ui::EditProfileScrollingPage *_scrollingUi; - Ui::EditProfileKeyboardPage *_keyboardUi; - Ui::EditProfileMousePage *_mouseUi; - Ui::EditProfileAdvancedPage *_advancedUi; + Ui::EditProfileGeneralPage *_generalUi = nullptr; + Ui::EditProfileTabsPage *_tabsUi = nullptr; + Ui::EditProfileAppearancePage *_appearanceUi = nullptr; + Ui::EditProfileScrollingPage *_scrollingUi = nullptr; + Ui::EditProfileKeyboardPage *_keyboardUi = nullptr; + Ui::EditProfileMousePage *_mouseUi = nullptr; + Ui::EditProfileAdvancedPage *_advancedUi = nullptr; using PageSetupMethod = void (EditProfileDialog::*)(const Profile::Ptr &); struct Page { @@ -338,16 +338,16 @@ private: Profile::Ptr _tempProfile; Profile::Ptr _profile; - bool _isDefault; + bool _isDefault = false; QHash _previewedProperties; QHash _delayedPreviewProperties; - QTimer *_delayedPreviewTimer; + QTimer *_delayedPreviewTimer = nullptr; - ColorSchemeEditor *_colorDialog; - QDialogButtonBox *_buttonBox; - FontDialog *_fontDialog; + ColorSchemeEditor *_colorDialog = nullptr; + QDialogButtonBox *_buttonBox = nullptr; + FontDialog *_fontDialog = nullptr; InitialProfileState _profileState = ExistingProfile; };