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

Git: Fix clang warning

Browse Source 
src/plugins/git/changeselectiondialog.h:72: warning:
'Git::Internal::ChangeSelectionDialog::accept' hides overloaded virtual
function [-Woverloaded-virtual]
    void accept(ChangeCommand command);
         ^

Change-Id: Ia0685c2347e943687e2c0ad34b4d456a30912d0a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Christian Kandeler
2020-04-23 11:06:10 +02:00
parent 548223762d
commit 03fab2cdc0
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/git/changeselectiondialog.cpp
View File

@@ -74,15 +74,15 @@ ChangeSelectionDialog::ChangeSelectionDialog(const QString &workingDirectory, Co
connect(m_ui->selectFromHistoryButton, &QPushButton::clicked, connect(m_ui->selectFromHistoryButton, &QPushButton::clicked,
this, &ChangeSelectionDialog::selectCommitFromRecentHistory); this, &ChangeSelectionDialog::selectCommitFromRecentHistory);
connect(m_ui->showButton, &QPushButton::clicked, connect(m_ui->showButton, &QPushButton::clicked,
this, std::bind(&ChangeSelectionDialog::accept, this, Show)); this, std::bind(&ChangeSelectionDialog::acceptCommand, this, Show));
connect(m_ui->cherryPickButton, &QPushButton::clicked, connect(m_ui->cherryPickButton, &QPushButton::clicked,
this, std::bind(&ChangeSelectionDialog::accept, this, CherryPick)); this, std::bind(&ChangeSelectionDialog::acceptCommand, this, CherryPick));
connect(m_ui->revertButton, &QPushButton::clicked, connect(m_ui->revertButton, &QPushButton::clicked,
this, std::bind(&ChangeSelectionDialog::accept, this, Revert)); this, std::bind(&ChangeSelectionDialog::acceptCommand, this, Revert));
connect(m_ui->checkoutButton, &QPushButton::clicked, connect(m_ui->checkoutButton, &QPushButton::clicked,
this, std::bind(&ChangeSelectionDialog::accept, this, Checkout)); this, std::bind(&ChangeSelectionDialog::acceptCommand, this, Checkout));
connect(m_ui->archiveButton, &QPushButton::clicked, connect(m_ui->archiveButton, &QPushButton::clicked,
this, std::bind(&ChangeSelectionDialog::accept, this, Archive)); this, std::bind(&ChangeSelectionDialog::acceptCommand, this, Archive));
if (id == "Git.Revert") if (id == "Git.Revert")
m_ui->revertButton->setDefault(true); m_ui->revertButton->setDefault(true);
@@ -149,7 +149,7 @@ ChangeCommand ChangeSelectionDialog::command() const
return m_command; return m_command;
} }
void ChangeSelectionDialog::accept(ChangeCommand command) void ChangeSelectionDialog::acceptCommand(ChangeCommand command)
{ {
m_command = command; m_command = command;
QDialog::accept(); QDialog::accept();

2
src/plugins/git/changeselectiondialog.h
View File

@@ -69,7 +69,7 @@ private:
void recalculateCompletion(); void recalculateCompletion();
void recalculateDetails(); void recalculateDetails();
void changeTextChanged(const QString &text); void changeTextChanged(const QString &text);
void accept(ChangeCommand command); void acceptCommand(ChangeCommand command);
void enableButtons(bool b); void enableButtons(bool b);
void terminateProcess(); void terminateProcess();