Initialize members in-class where possible

- Default constructed Profile::Ptr is null
- QHash is empty by default
wilder
Ahmad Samir 4 years ago committed by Kurt Hindenburg
parent 2cd1f0b375
commit fb44a54349
  1. 15
      src/widgets/EditProfileDialog.cpp
  2. 24
      src/widgets/EditProfileDialog.h

@ -55,22 +55,7 @@ using namespace Konsole;
EditProfileDialog::EditProfileDialog(QWidget *parent) EditProfileDialog::EditProfileDialog(QWidget *parent)
: KPageDialog(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<int, QVariant>())
, _delayedPreviewProperties(QHash<int, QVariant>())
, _delayedPreviewTimer(new QTimer(this)) , _delayedPreviewTimer(new QTimer(this))
, _colorDialog(nullptr)
, _buttonBox(nullptr)
, _fontDialog(nullptr)
{ {
setWindowTitle(i18n("Edit Profile")); setWindowTitle(i18n("Edit Profile"));
setFaceType(KPageDialog::List); setFaceType(KPageDialog::List);

@ -312,13 +312,13 @@ private:
// otherwise returns true. // otherwise returns true.
bool isProfileNameValid(); bool isProfileNameValid();
Ui::EditProfileGeneralPage *_generalUi; Ui::EditProfileGeneralPage *_generalUi = nullptr;
Ui::EditProfileTabsPage *_tabsUi; Ui::EditProfileTabsPage *_tabsUi = nullptr;
Ui::EditProfileAppearancePage *_appearanceUi; Ui::EditProfileAppearancePage *_appearanceUi = nullptr;
Ui::EditProfileScrollingPage *_scrollingUi; Ui::EditProfileScrollingPage *_scrollingUi = nullptr;
Ui::EditProfileKeyboardPage *_keyboardUi; Ui::EditProfileKeyboardPage *_keyboardUi = nullptr;
Ui::EditProfileMousePage *_mouseUi; Ui::EditProfileMousePage *_mouseUi = nullptr;
Ui::EditProfileAdvancedPage *_advancedUi; Ui::EditProfileAdvancedPage *_advancedUi = nullptr;
using PageSetupMethod = void (EditProfileDialog::*)(const Profile::Ptr &); using PageSetupMethod = void (EditProfileDialog::*)(const Profile::Ptr &);
struct Page { struct Page {
@ -338,16 +338,16 @@ private:
Profile::Ptr _tempProfile; Profile::Ptr _tempProfile;
Profile::Ptr _profile; Profile::Ptr _profile;
bool _isDefault; bool _isDefault = false;
QHash<int, QVariant> _previewedProperties; QHash<int, QVariant> _previewedProperties;
QHash<int, QVariant> _delayedPreviewProperties; QHash<int, QVariant> _delayedPreviewProperties;
QTimer *_delayedPreviewTimer; QTimer *_delayedPreviewTimer = nullptr;
ColorSchemeEditor *_colorDialog; ColorSchemeEditor *_colorDialog = nullptr;
QDialogButtonBox *_buttonBox; QDialogButtonBox *_buttonBox = nullptr;
FontDialog *_fontDialog; FontDialog *_fontDialog = nullptr;
InitialProfileState _profileState = ExistingProfile; InitialProfileState _profileState = ExistingProfile;
}; };

Loading…
Cancel
Save