diff --git a/src/plugins/git/gerrit/gerritplugin.cpp b/src/plugins/git/gerrit/gerritplugin.cpp index d7a35ffd899..878b50a7dad 100644 --- a/src/plugins/git/gerrit/gerritplugin.cpp +++ b/src/plugins/git/gerrit/gerritplugin.cpp @@ -316,7 +316,7 @@ void GerritPlugin::push(const QString &topLevel) // QScopedPointer is required to delete the dialog when leaving the function GerritPushDialog dialog(topLevel, m_reviewers, ICore::mainWindow()); - if (!dialog.valid()) { + if (!dialog.isValid()) { QMessageBox::warning(ICore::mainWindow(), tr("Initialization Failed"), tr("Failed to initialize dialog. Aborting.")); return; diff --git a/src/plugins/git/gerrit/gerritpushdialog.cpp b/src/plugins/git/gerrit/gerritpushdialog.cpp index 61164e7eda0..7038234b58b 100644 --- a/src/plugins/git/gerrit/gerritpushdialog.cpp +++ b/src/plugins/git/gerrit/gerritpushdialog.cpp @@ -136,7 +136,7 @@ GerritPushDialog::GerritPushDialog(const QString &workingDir, const QString &rev QDialog(parent), m_workingDir(workingDir), m_ui(new Ui::GerritPushDialog), - m_valid(false) + m_isValid(false) { m_client = GitPlugin::instance()->gitClient(); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); @@ -166,7 +166,7 @@ GerritPushDialog::GerritPushDialog(const QString &workingDir, const QString &rev m_ui->reviewersLineEdit->setValidator(noSpaceValidator); m_ui->topicLineEdit->setValidator(noSpaceValidator); - m_valid = true; + m_isValid = true; } GerritPushDialog::~GerritPushDialog() @@ -216,9 +216,9 @@ void GerritPushDialog::setChangeRange() .arg(calculateChangeRange(branch))); } -bool GerritPushDialog::valid() const +bool GerritPushDialog::isValid() const { - return m_valid; + return m_isValid; } void GerritPushDialog::setRemoteBranches(bool includeOld) diff --git a/src/plugins/git/gerrit/gerritpushdialog.h b/src/plugins/git/gerrit/gerritpushdialog.h index e8127c463d6..95da539cbcd 100644 --- a/src/plugins/git/gerrit/gerritpushdialog.h +++ b/src/plugins/git/gerrit/gerritpushdialog.h @@ -58,7 +58,7 @@ public: QString selectedPushType() const; QString selectedTopic() const; QString reviewers() const; - bool valid() const; + bool isValid() const; private slots: void setChangeRange(); @@ -76,7 +76,7 @@ private: QString m_suggestedRemoteBranch; Ui::GerritPushDialog *m_ui; RemoteBranchesMap m_remoteBranches; - bool m_valid; + bool m_isValid; Git::Internal::GitClient *m_client; };