Modernize code

kaddressbook/importexportplugins/csv/import/templateselectiondialog.cpp

@@ -26,11 +26,11 @@
 #include <QPushButton>
 #include <QStyledItemDelegate>
 
-typedef struct {
+using TemplateInfo = struct {
     QString displayName;
     QString fileName;
     bool isDeletable = false;
-} TemplateInfo;
+};
 
 class TemplatesModel : public QAbstractTableModel
 {

kaddressbook/importexportplugins/gmx/gmximportexportplugininterface.cpp

@@ -202,7 +202,7 @@ void GMXImportExportPluginInterface::doExport(QFile *fp, const KContacts::Addres
     QTextStream t(fp);
     t.setCodec("ISO 8859-1");
 
-    typedef QMap<int, const KContacts::Addressee *> AddresseeMap;
+    using AddresseeMap = QMap<int, const KContacts::Addressee *>;
     AddresseeMap addresseeMap;
     const KContacts::Addressee *addressee = nullptr;
 
@@ -447,7 +447,7 @@ void GMXImportExportPluginInterface::importGMX()
 
     QStringList itemList;
     QMap<QString, QString> categoriesOfAddressee;
-    typedef QMap<QString, KContacts::Addressee *> AddresseeMap;
+    using AddresseeMap = QMap<QString, KContacts::Addressee *>;
     AddresseeMap addresseeMap;
 
     // "Address_id,Nickname,Firstname,Lastname,Title,Birthday,Comments,

kmail/editorsendcheckplugins/checkbeforesend/autotests/checkduplicateemailsjobtest.cpp

@@ -98,7 +98,7 @@ void CheckDuplicateEmailsJobTest::shouldReturnEmails_data()
 void CheckDuplicateEmailsJobTest::shouldReturnEmails()
 {
     QFETCH(QStringList, emails);
-    typedef QMap<QString, int> mapEmails;
+    using mapEmails = QMap<QString, int>;
     QFETCH(mapEmails, result);
     CheckDuplicateEmailsJob job;
     job.setEmails(emails);