Modernize code

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);

kaddressbookimportexport/src/kaddressbookcontactselectionwidget.cpp

@@ -31,7 +31,6 @@ using namespace KAddressBookImportExport;
 KAddressBookContactSelectionWidget::KAddressBookContactSelectionWidget(QItemSelectionModel *selectionModel, QWidget *parent)
     : QWidget(parent)
     , mSelectionModel(selectionModel)
-    , mAddContactGroup(false)
 {
     initGui();
 

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;

kaddressbookimportexport/src/kaddressbookimportexportplugininterface.cpp

@@ -10,7 +10,6 @@ using namespace KAddressBookImportExport;
 
 KAddressBookImportExportPluginInterface::KAddressBookImportExportPluginInterface(QObject *parent)
     : PimCommon::AbstractGenericPluginInterface(parent)
-    , mImportExportAction(Import)
 {
 }
 

kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h

@@ -53,7 +53,7 @@ public:
 protected:
     QList<QAction *> mImportActions;
     QList<QAction *> mExportActions;
-    ImportExportAction mImportExportAction;
+    ImportExportAction mImportExportAction = Import;
     Akonadi::Collection mDefaultCollection;
     QItemSelectionModel *mItemSelectionModel = nullptr;
 };

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)