diff --git a/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.cpp b/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.cpp index 8fe73d51de09dd0f52b8260bc2d3b21eadb9e47a..dd909f56396d8418229585bb5072815dae9b40c1 100644 --- a/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.cpp +++ b/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.cpp @@ -16,7 +16,6 @@ using namespace KAddressBookImportExport; KAddressBookContactSelectionDialog::KAddressBookContactSelectionDialog(QItemSelectionModel *selectionModel, bool allowToSelectTypeToExport, QWidget *parent) : QDialog(parent) - , mVCardExport(nullptr) { setWindowTitle(i18nc("@title:window", "Select Contacts")); QVBoxLayout *mainLayout = new QVBoxLayout(this); diff --git a/kaddressbookimportexport/src/kaddressbookcontactselectionwidget.cpp b/kaddressbookimportexport/src/kaddressbookcontactselectionwidget.cpp index e1bc89e63243ca2b71e29cb58ca51f0b6a74a90f..2d3d4cc2c9ab1b0cbac744c5c4a3e2bf647787eb 100644 --- a/kaddressbookimportexport/src/kaddressbookcontactselectionwidget.cpp +++ b/kaddressbookimportexport/src/kaddressbookcontactselectionwidget.cpp @@ -31,7 +31,6 @@ using namespace KAddressBookImportExport; KAddressBookContactSelectionWidget::KAddressBookContactSelectionWidget(QItemSelectionModel *selectionModel, QWidget *parent) : QWidget(parent) , mSelectionModel(selectionModel) - , mAddContactGroup(false) { initGui(); diff --git a/kaddressbookimportexport/src/kaddressbookcontactselectionwidget.h b/kaddressbookimportexport/src/kaddressbookcontactselectionwidget.h index c859da6cd79d0c2b36458e58c5888a1f879fcf9c..d727d55f77eba5bf7d5f54e3b4374c22165de7a5 100644 --- a/kaddressbookimportexport/src/kaddressbookcontactselectionwidget.h +++ b/kaddressbookimportexport/src/kaddressbookcontactselectionwidget.h @@ -64,15 +64,15 @@ public: private: void initGui(); - KAddressBookImportExport::KAddressBookImportExportContactList collectAllContacts() const; - KAddressBookImportExport::KAddressBookImportExportContactList collectSelectedContacts() const; - KAddressBookImportExport::KAddressBookImportExportContactList collectAddressBookContacts() const; + Q_REQUIRED_RESULT KAddressBookImportExport::KAddressBookImportExportContactList collectAllContacts() const; + Q_REQUIRED_RESULT KAddressBookImportExport::KAddressBookImportExportContactList collectSelectedContacts() const; + Q_REQUIRED_RESULT KAddressBookImportExport::KAddressBookImportExportContactList collectAddressBookContacts() const; - Akonadi::Item::List collectAllItems() const; - Akonadi::Item::List collectSelectedItems() const; - Akonadi::Item::List collectAddressBookItems() const; + Q_REQUIRED_RESULT Akonadi::Item::List collectAllItems() const; + Q_REQUIRED_RESULT Akonadi::Item::List collectSelectedItems() const; + Q_REQUIRED_RESULT Akonadi::Item::List collectAddressBookItems() const; - QItemSelectionModel *mSelectionModel = nullptr; + QItemSelectionModel *const mSelectionModel; QLabel *mMessageLabel = nullptr; QRadioButton *mAllContactsButton = nullptr; diff --git a/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.cpp b/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.cpp index 36d2b4c31952f3ef736364fca820b9b2710d85a8..0956b3951272988074d348158e52a9e5796c3211 100644 --- a/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.cpp +++ b/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.cpp @@ -10,7 +10,6 @@ using namespace KAddressBookImportExport; KAddressBookImportExportPluginInterface::KAddressBookImportExportPluginInterface(QObject *parent) : PimCommon::AbstractGenericPluginInterface(parent) - , mImportExportAction(Import) { } diff --git a/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h b/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h index b8a70e96f4d5078d199cd2ec589cbe4ead4714a9..84710ab8210bfc73206f38822e5548ed420f6f2d 100644 --- a/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h +++ b/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h @@ -53,7 +53,7 @@ public: protected: QList mImportActions; QList mExportActions; - ImportExportAction mImportExportAction; + ImportExportAction mImportExportAction = Import; Akonadi::Collection mDefaultCollection; QItemSelectionModel *mItemSelectionModel = nullptr; }; diff --git a/kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.cpp b/kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.cpp index b96bc2101a0409c9861975ec26a9152c7ab37dff..57af9ea01cc55f9650819a56b0ab14cb44b5ab2e 100644 --- a/kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.cpp +++ b/kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.cpp @@ -30,23 +30,17 @@ public: delete pluginManager; } - KAddressBookImportExportPluginManager *pluginManager = nullptr; + KAddressBookImportExportPluginManager *const pluginManager; }; class KAddressBookImportExportInfo { public: - KAddressBookImportExportInfo() - : plugin(nullptr) - , isEnabled(true) - { - } - QString metaDataFileNameBaseName; QString metaDataFileName; PimCommon::PluginUtilData pluginData; KAddressBookImportExportPlugin *plugin = nullptr; - bool isEnabled; + bool isEnabled = true; }; Q_GLOBAL_STATIC(KAddressBookImportExportPluginManagerPrivate, sInstance)