diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2018-05-31 20:11:40 +0300 |
---|---|---|
committer | Orgad Shaneh <orgads@gmail.com> | 2018-06-01 05:59:04 +0000 |
commit | cf960e478844ce7414093c0f1b71a70d7f46e9ce (patch) | |
tree | e2b07d769a396c3f2d9dea1993279b22370863d0 | |
parent | 0988442e58ae73cb5571c01a7e49c29b5e9b4b34 (diff) | |
download | qt-creator-cf960e478844ce7414093c0f1b71a70d7f46e9ce.tar.gz |
Gerrit: Fix some clang-tidy warnings
Change-Id: Idaccca0bd6d7682feeac8a0964ce2abb788f3e99
Reviewed-by: André Hartmann <aha_1980@gmx.de>
-rw-r--r-- | src/plugins/git/gerrit/gerritmodel.cpp | 6 | ||||
-rw-r--r-- | src/plugins/git/gerrit/gerritplugin.cpp | 1 | ||||
-rw-r--r-- | src/plugins/git/gerrit/gerritplugin.h | 4 | ||||
-rw-r--r-- | src/plugins/git/gerrit/gerritpushdialog.cpp | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/src/plugins/git/gerrit/gerritmodel.cpp b/src/plugins/git/gerrit/gerritmodel.cpp index 980ffa3d0c..549f33196d 100644 --- a/src/plugins/git/gerrit/gerritmodel.cpp +++ b/src/plugins/git/gerrit/gerritmodel.cpp @@ -480,19 +480,19 @@ static QStandardItem *numberSearchRecursion(QStandardItem *item, int number) if (QStandardItem *i = numberSearchRecursion(item->child(r, 0), number)) return i; } - return 0; + return nullptr; } QStandardItem *GerritModel::itemForNumber(int number) const { if (!number) - return 0; + return nullptr; const int numRows = rowCount(); for (int r = 0; r < numRows; ++r) { if (QStandardItem *i = numberSearchRecursion(item(r, 0), number)) return i; } - return 0; + return nullptr; } void GerritModel::refresh(const QSharedPointer<GerritServer> &server, const QString &query) diff --git a/src/plugins/git/gerrit/gerritplugin.cpp b/src/plugins/git/gerrit/gerritplugin.cpp index 5e078d3c8e..9ce2a082d6 100644 --- a/src/plugins/git/gerrit/gerritplugin.cpp +++ b/src/plugins/git/gerrit/gerritplugin.cpp @@ -267,7 +267,6 @@ GerritPlugin::GerritPlugin(QObject *parent) : QObject(parent) , m_parameters(new GerritParameters) , m_server(new GerritServer) - , m_gerritCommand(0), m_pushToGerritCommand(0) { } diff --git a/src/plugins/git/gerrit/gerritplugin.h b/src/plugins/git/gerrit/gerritplugin.h index 404a2c9f25..bd9d554bfb 100644 --- a/src/plugins/git/gerrit/gerritplugin.h +++ b/src/plugins/git/gerrit/gerritplugin.h @@ -78,8 +78,8 @@ private: QSharedPointer<GerritParameters> m_parameters; QSharedPointer<GerritServer> m_server; QPointer<GerritDialog> m_dialog; - Core::Command *m_gerritCommand; - Core::Command *m_pushToGerritCommand; + Core::Command *m_gerritCommand = nullptr; + Core::Command *m_pushToGerritCommand = nullptr; QString m_reviewers; }; diff --git a/src/plugins/git/gerrit/gerritpushdialog.cpp b/src/plugins/git/gerrit/gerritpushdialog.cpp index 622da38179..c7e726a4ea 100644 --- a/src/plugins/git/gerrit/gerritpushdialog.cpp +++ b/src/plugins/git/gerrit/gerritpushdialog.cpp @@ -115,7 +115,7 @@ void GerritPushDialog::initRemoteBranches() continue; const QString ref = entries.at(0).mid(remotesPrefix.size()); int refBranchIndex = ref.indexOf('/'); - int timeT = entries.at(1).leftRef(entries.at(1).indexOf(' ')).toInt(); + unsigned int timeT = entries.at(1).leftRef(entries.at(1).indexOf(' ')).toUInt(); BranchDate bd(ref.mid(refBranchIndex + 1), QDateTime::fromTime_t(timeT).date()); m_remoteBranches.insertMulti(ref.left(refBranchIndex), bd); } |