Git: Modernize

modernize-use-using
modernize-use-default-member-init
modernize-use-equals-default

Change-Id: Iaccd5611cfc2056d357a0545f8522f02d6f8f0ed
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

4 files changed, 10 insertions, 16 deletions

diff --git a/src/plugins/git/gerrit/gerritmodel.cpp b/src/plugins/git/gerrit/gerritmodel.cpp
index 2887d750ec1..6c53345ef99 100644
--- a/src/plugins/git/gerrit/gerritmodel.cpp
+++ b/src/plugins/git/gerrit/gerritmodel.cpp
@@ -140,9 +140,9 @@ static inline void applyApproval(int approval, int *total)
 // by a type character followed by the approval level: "C: -2, S: 1"
 QString GerritPatchSet::approvalsColumn() const
 {
-    typedef QMap<QChar, int> TypeReviewMap;
-    typedef TypeReviewMap::iterator TypeReviewMapIterator;
-    typedef TypeReviewMap::const_iterator TypeReviewMapConstIterator;
+    using TypeReviewMap = QMap<QChar, int>;
+    using TypeReviewMapIterator = TypeReviewMap::iterator;
+    using TypeReviewMapConstIterator = TypeReviewMap::const_iterator;
 
     QString result;
     if (approvals.isEmpty())
@@ -398,8 +398,7 @@ GerritModel::GerritModel(const QSharedPointer<GerritParameters> &p, QObject *par
     setHorizontalHeaderLabels(headers);
 }
 
-GerritModel::~GerritModel()
-{ }
+GerritModel::~GerritModel() = default;
 
 QVariant GerritModel::data(const QModelIndex &index, int role) const
 {
diff --git a/src/plugins/git/gerrit/gerritmodel.h b/src/plugins/git/gerrit/gerritmodel.h
index c8e89bfae78..45268fb9ec9 100644
--- a/src/plugins/git/gerrit/gerritmodel.h
+++ b/src/plugins/git/gerrit/gerritmodel.h
@@ -38,17 +38,14 @@ class QueryContext;
 
 class GerritApproval {
 public:
-    GerritApproval() : approval(-1) {}
-
     QString type; // Review type
     QString description; // Type description, possibly empty
     GerritUser reviewer;
-    int approval;
+    int approval = -1;
 };
 
 class GerritPatchSet {
 public:
-    GerritPatchSet() : patchSetNumber(1) {}
     QString approvalsToHtml() const;
     QString approvalsColumn() const;
     bool hasApproval(const GerritUser &user) const;
@@ -56,7 +53,7 @@ public:
 
     QString url;
     QString ref;
-    int patchSetNumber;
+    int patchSetNumber = 1;
     QList<GerritApproval> approvals;
 };
 
@@ -82,7 +79,7 @@ public:
     int depth = -1;
 };
 
-typedef QSharedPointer<GerritChange> GerritChangePtr;
+using GerritChangePtr = QSharedPointer<GerritChange>;
 
 class GerritModel : public QStandardItemModel
 {
diff --git a/src/plugins/git/gerrit/gerritplugin.cpp b/src/plugins/git/gerrit/gerritplugin.cpp
index 13a49c4903a..036505dc99f 100644
--- a/src/plugins/git/gerrit/gerritplugin.cpp
+++ b/src/plugins/git/gerrit/gerritplugin.cpp
@@ -270,9 +270,7 @@ GerritPlugin::GerritPlugin(QObject *parent)
 {
 }
 
-GerritPlugin::~GerritPlugin()
-{
-}
+GerritPlugin::~GerritPlugin() = default;
 
 bool GerritPlugin::initialize(ActionContainer *ac)
 {
diff --git a/src/plugins/git/gerrit/gerritpushdialog.h b/src/plugins/git/gerrit/gerritpushdialog.h
index 3814fbce3f2..652cab479e2 100644
--- a/src/plugins/git/gerrit/gerritpushdialog.h
+++ b/src/plugins/git/gerrit/gerritpushdialog.h
@@ -66,8 +66,8 @@ private:
     void updateCommits(int index);
     void validate();
 
-    typedef QPair<QString, QDate> BranchDate;
-    typedef QMultiMap<QString, BranchDate> RemoteBranchesMap;
+    using BranchDate = QPair<QString, QDate>;
+    using RemoteBranchesMap = QMultiMap<QString, BranchDate>;
 
     QString determineRemoteBranch(const QString &localBranch);
     void initRemoteBranches();