From 7a8ffbbb3777e69b2b7a7e695e792965ecac0321 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sun, 30 Aug 2020 20:00:31 +0200 Subject: [PATCH] Clean up code --- .../viewerpluginexternalscriptinfo.cpp | 1 - .../externalscriptplugin/viewerpluginexternalscriptinfo.h | 2 +- .../adblock/adblockinterceptorinterface.cpp | 3 --- .../imapfoldercompletion/selectimapfoldertreeview.cpp | 1 - .../imapfoldercompletion/selectimapfoldertreeview.h | 2 +- sieveeditor/imapfoldercompletion/selectimaplineedit.cpp | 1 - .../selectimaplineeditcompletermodel.cpp | 1 - .../imapfoldercompletion/selectimaploadfoldersjob.cpp | 1 - .../imapfoldercompletion/selectimaploadfoldersjob.h | 2 +- sieveeditor/regexeditorlineedit/regexpeditorlineedit.cpp | 8 +------- 10 files changed, 4 insertions(+), 18 deletions(-) diff --git a/plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscriptinfo.cpp b/plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscriptinfo.cpp index 30b1454d..0105b353 100644 --- a/plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscriptinfo.cpp +++ b/plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscriptinfo.cpp @@ -7,7 +7,6 @@ #include "viewerpluginexternalscriptinfo.h" ViewerPluginExternalScriptInfo::ViewerPluginExternalScriptInfo() - : mIsReadOnly(false) { } diff --git a/plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscriptinfo.h b/plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscriptinfo.h index 331ceddd..d5740cbc 100644 --- a/plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscriptinfo.h +++ b/plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscriptinfo.h @@ -44,7 +44,7 @@ private: QString mDescription; QString mIcon; QString mFileName; - bool mIsReadOnly; + bool mIsReadOnly = false; }; Q_DECLARE_TYPEINFO(ViewerPluginExternalScriptInfo, Q_MOVABLE_TYPE); Q_DECLARE_METATYPE(ViewerPluginExternalScriptInfo) diff --git a/plugins/webengineurlinterceptor/adblock/adblockinterceptorinterface.cpp b/plugins/webengineurlinterceptor/adblock/adblockinterceptorinterface.cpp index c46c80c9..39d40533 100644 --- a/plugins/webengineurlinterceptor/adblock/adblockinterceptorinterface.cpp +++ b/plugins/webengineurlinterceptor/adblock/adblockinterceptorinterface.cpp @@ -18,9 +18,6 @@ AdblockInterceptorInterface::AdblockInterceptorInterface(QObject *parent) : WebEngineViewer::NetworkPluginUrlInterceptorInterface(parent) - , mShowBlockableItems(nullptr) - , mBlockImage(nullptr) - , mWebEngineView(nullptr) { mAdblockManager = new AdBlock::AdblockManager(this); } diff --git a/sieveeditor/imapfoldercompletion/selectimapfoldertreeview.cpp b/sieveeditor/imapfoldercompletion/selectimapfoldertreeview.cpp index 4bbcb416..4b985370 100644 --- a/sieveeditor/imapfoldercompletion/selectimapfoldertreeview.cpp +++ b/sieveeditor/imapfoldercompletion/selectimapfoldertreeview.cpp @@ -11,7 +11,6 @@ SelectImapFolderTreeView::SelectImapFolderTreeView(QWidget *parent) : QTreeView(parent) - , mStatus(InProgress) { } diff --git a/sieveeditor/imapfoldercompletion/selectimapfoldertreeview.h b/sieveeditor/imapfoldercompletion/selectimapfoldertreeview.h index 712b7a2e..93f128cb 100644 --- a/sieveeditor/imapfoldercompletion/selectimapfoldertreeview.h +++ b/sieveeditor/imapfoldercompletion/selectimapfoldertreeview.h @@ -29,7 +29,7 @@ protected: private: void generalPaletteChanged(); QColor mTextColor; - LoadingStatus mStatus; + LoadingStatus mStatus = InProgress; }; #endif // SELECTIMAPFOLDERTREEVIEW_H diff --git a/sieveeditor/imapfoldercompletion/selectimaplineedit.cpp b/sieveeditor/imapfoldercompletion/selectimaplineedit.cpp index 6d4b1a9d..3c1671f5 100644 --- a/sieveeditor/imapfoldercompletion/selectimaplineedit.cpp +++ b/sieveeditor/imapfoldercompletion/selectimaplineedit.cpp @@ -10,7 +10,6 @@ //#define COMPLETION_LINE_EDIT 1 SelectImapLineEdit::SelectImapLineEdit(QWidget *parent) : QLineEdit(parent) - , mCompleter(nullptr) { setClearButtonEnabled(true); } diff --git a/sieveeditor/imapfoldercompletion/selectimaplineeditcompletermodel.cpp b/sieveeditor/imapfoldercompletion/selectimaplineeditcompletermodel.cpp index 945b155f..3f866c25 100644 --- a/sieveeditor/imapfoldercompletion/selectimaplineeditcompletermodel.cpp +++ b/sieveeditor/imapfoldercompletion/selectimaplineeditcompletermodel.cpp @@ -18,7 +18,6 @@ SelectImapLineEditCompleterModel::SelectImapLineEditCompleterModel(const KSieveU mFlatProxy->setAncestorSeparator(QStringLiteral("/")); bool modelIsInitalized = false; mFlatProxy->setSourceModel(SelectImapFolderModel::self()->folderModel(account, modelIsInitalized)); - //TODO } SelectImapLineEditCompleterModel::~SelectImapLineEditCompleterModel() diff --git a/sieveeditor/imapfoldercompletion/selectimaploadfoldersjob.cpp b/sieveeditor/imapfoldercompletion/selectimaploadfoldersjob.cpp index 7a9133be..56927f89 100644 --- a/sieveeditor/imapfoldercompletion/selectimaploadfoldersjob.cpp +++ b/sieveeditor/imapfoldercompletion/selectimaploadfoldersjob.cpp @@ -15,7 +15,6 @@ SelectImapLoadFoldersJob::SelectImapLoadFoldersJob(QStandardItemModel *model, QObject *parent) : QObject(parent) - , mSession(nullptr) , mModel(model) { } diff --git a/sieveeditor/imapfoldercompletion/selectimaploadfoldersjob.h b/sieveeditor/imapfoldercompletion/selectimaploadfoldersjob.h index e13cbec4..9c634e6c 100644 --- a/sieveeditor/imapfoldercompletion/selectimaploadfoldersjob.h +++ b/sieveeditor/imapfoldercompletion/selectimaploadfoldersjob.h @@ -44,7 +44,7 @@ private: KSieveUi::SieveImapAccountSettings mSieveImapAccount; QMap mItemsMap; KIMAP::Session *mSession = nullptr; - QStandardItemModel *mModel = nullptr; + QStandardItemModel *const mModel; }; #endif // SELECTIMAPLOADFOLDERSJOB_H diff --git a/sieveeditor/regexeditorlineedit/regexpeditorlineedit.cpp b/sieveeditor/regexeditorlineedit/regexpeditorlineedit.cpp index 88945b54..101527bb 100644 --- a/sieveeditor/regexeditorlineedit/regexpeditorlineedit.cpp +++ b/sieveeditor/regexeditorlineedit/regexpeditorlineedit.cpp @@ -20,18 +20,12 @@ K_PLUGIN_CLASS_WITH_JSON(RegexpEditorLineEdit, "regexepeditorlineedit.json") struct InfoRegExp { - InfoRegExp() - : status(Unknown) - , mEditorDialog(nullptr) - { - } - enum RegexpEditorStatus { Unknown = 0, Installed, NotInstalled }; - RegexpEditorStatus status; + RegexpEditorStatus status = Unknown; QDialog *mEditorDialog = nullptr; }; -- GitLab