From 308d3ad84b50ddc37773e9132f9aca4df39c209e Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Thu, 19 Jul 2012 13:57:55 +0200 Subject: [PATCH] Use constructor initialization lists where possible. --- src/core/Entry.cpp | 5 ++--- src/core/Group.cpp | 11 +++++------ src/core/Metadata.cpp | 31 ++++++++++++++----------------- src/core/TimeInfo.cpp | 5 ++--- src/gui/DragTabBar.h | 2 +- src/gui/EditWidgetIcons.cpp | 7 +++---- src/gui/EditWidgetIcons.h | 4 ++-- src/gui/LineEdit.cpp | 2 +- src/gui/LineEdit.h | 2 +- 9 files changed, 31 insertions(+), 38 deletions(-) diff --git a/src/core/Entry.cpp b/src/core/Entry.cpp index 97c1a402e..544f270d0 100644 --- a/src/core/Entry.cpp +++ b/src/core/Entry.cpp @@ -29,10 +29,9 @@ Entry::Entry() : m_attributes(new EntryAttributes(this)) , m_attachments(new EntryAttachments(this)) , m_autoTypeAssociations(new AutoTypeAssociations(this)) + , m_tmpHistoryItem(Q_NULLPTR) + , m_updateTimeinfo(true) { - m_updateTimeinfo = true; - m_tmpHistoryItem = Q_NULLPTR; - m_data.iconNumber = DefaultIconNumber; m_data.autoTypeEnabled = true; m_data.autoTypeObfuscation = 0; diff --git a/src/core/Group.cpp b/src/core/Group.cpp index ccd3bf255..35492edac 100644 --- a/src/core/Group.cpp +++ b/src/core/Group.cpp @@ -25,13 +25,12 @@ const int Group::DefaultIconNumber = 48; Group::Group() + : m_iconNumber(DefaultIconNumber) + , m_isExpanded(true) + , m_autoTypeEnabled(Inherit) + , m_searchingEnabled(Inherit) + , m_updateTimeinfo(true) { - m_iconNumber = DefaultIconNumber; - m_isExpanded = true; - m_autoTypeEnabled = Inherit; - m_searchingEnabled = Inherit; - - m_updateTimeinfo = true; } Group::~Group() diff --git a/src/core/Metadata.cpp b/src/core/Metadata.cpp index db45826c8..9e150bd9f 100644 --- a/src/core/Metadata.cpp +++ b/src/core/Metadata.cpp @@ -26,15 +26,21 @@ const int Metadata::DefaultHistoryMaxSize = 6 * 1024 * 1024; Metadata::Metadata(QObject* parent) : QObject(parent) + , m_generator("KeePassX") + , m_maintenanceHistoryDays(365) + , m_protectTitle(false) + , m_protectUsername(false) + , m_protectPassword(true) + , m_protectUrl(false) + , m_protectNotes(false) + // , m_autoEnableVisualHiding(false) + , m_recycleBinEnabled(true) + , m_masterKeyChangeRec(-1) + , m_masterKeyChangeForce(-1) + , m_historyMaxItems(DefaultHistoryMaxItems) + , m_historyMaxSize(DefaultHistoryMaxSize) + , m_updateDatetime(true) { - m_generator = "KeePassX"; - m_maintenanceHistoryDays = 365; - m_recycleBinEnabled = true; - m_masterKeyChangeRec = -1; - m_masterKeyChangeForce = -1; - m_historyMaxItems = DefaultHistoryMaxItems; - m_historyMaxSize = DefaultHistoryMaxSize; - QDateTime now = Tools::currentDateTimeUtc(); m_nameChanged = now; m_descriptionChanged = now; @@ -42,15 +48,6 @@ Metadata::Metadata(QObject* parent) m_recycleBinChanged = now; m_entryTemplatesGroupChanged = now; m_masterKeyChanged = now; - - m_protectTitle = false; - m_protectUsername = false; - m_protectPassword = true; - m_protectUrl = false; - m_protectNotes = false; - // m_autoEnableVisualHiding = false; - - m_updateDatetime = true; } template bool Metadata::set(P& property, const V& value) diff --git a/src/core/TimeInfo.cpp b/src/core/TimeInfo.cpp index 91a8218b7..26133259d 100644 --- a/src/core/TimeInfo.cpp +++ b/src/core/TimeInfo.cpp @@ -20,10 +20,9 @@ #include "core/Tools.h" TimeInfo::TimeInfo() + : m_expires(false) + , m_usageCount(0) { - m_expires = false; - m_usageCount = 0; - QDateTime now = Tools::currentDateTimeUtc(); m_lastModificationTime = now; m_creationTime = now; diff --git a/src/gui/DragTabBar.h b/src/gui/DragTabBar.h index dec7caa98..d4fd42c39 100644 --- a/src/gui/DragTabBar.h +++ b/src/gui/DragTabBar.h @@ -40,7 +40,7 @@ private Q_SLOTS: void dragSwitchTab(); private: - QTimer* m_tabSwitchTimer; + QTimer* const m_tabSwitchTimer; int m_tabSwitchIndex; }; diff --git a/src/gui/EditWidgetIcons.cpp b/src/gui/EditWidgetIcons.cpp index a29c644a3..db4a29176 100644 --- a/src/gui/EditWidgetIcons.cpp +++ b/src/gui/EditWidgetIcons.cpp @@ -34,14 +34,13 @@ IconStruct::IconStruct() EditWidgetIcons::EditWidgetIcons(QWidget* parent) : QWidget(parent) - , m_ui(new Ui::EditWidgetIcons()) + , m_ui(new Ui::EditWidgetIcons()) + , m_defaultIconModel(new DefaultIconModel(this)) + , m_customIconModel(new CustomIconModel(this)) { m_ui->setupUi(this); - m_defaultIconModel = new DefaultIconModel(this); m_ui->defaultIconsView->setModel(m_defaultIconModel); - - m_customIconModel = new CustomIconModel(this); m_ui->customIconsView->setModel(m_customIconModel); connect(m_ui->defaultIconsView, SIGNAL(clicked(QModelIndex)), diff --git a/src/gui/EditWidgetIcons.h b/src/gui/EditWidgetIcons.h index 859b4f1f1..50eec6034 100644 --- a/src/gui/EditWidgetIcons.h +++ b/src/gui/EditWidgetIcons.h @@ -62,8 +62,8 @@ private: const QScopedPointer m_ui; Database* m_database; Uuid m_currentUuid; - DefaultIconModel* m_defaultIconModel; - CustomIconModel* m_customIconModel; + DefaultIconModel* const m_defaultIconModel; + CustomIconModel* const m_customIconModel; Q_DISABLE_COPY(EditWidgetIcons) }; diff --git a/src/gui/LineEdit.cpp b/src/gui/LineEdit.cpp index ca1bccdad..ac43a2ac1 100644 --- a/src/gui/LineEdit.cpp +++ b/src/gui/LineEdit.cpp @@ -26,8 +26,8 @@ LineEdit::LineEdit(QWidget* parent) : QLineEdit(parent) + , m_clearButton(new QToolButton(this)) { - m_clearButton = new QToolButton(this); m_clearButton->setObjectName("clearButton"); QIcon icon; diff --git a/src/gui/LineEdit.h b/src/gui/LineEdit.h index 8ee2c8107..1dbfe78db 100644 --- a/src/gui/LineEdit.h +++ b/src/gui/LineEdit.h @@ -40,7 +40,7 @@ private Q_SLOTS: void updateCloseButton(const QString& text); private: - QToolButton* m_clearButton; + QToolButton* const m_clearButton; }; #endif // KEEPASSX_LINEEDIT_H