feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Gerrit: Rename member

Browse Source 
This is more in line with what we do elsewhere.

Change-Id: If5fb57a498c021c2c2f830d9aaa375bc13afeb19
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2015-02-04 16:08:07 +01:00
committed by Orgad Shaneh
parent 6a4d6efb3b
commit 2998d33562
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/gerrit/gerritplugin.cpp
View File

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

8
src/plugins/git/gerrit/gerritpushdialog.cpp
View File

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

4
src/plugins/git/gerrit/gerritpushdialog.h
View File

@@ -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;
};