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

Merge remote-tracking branch 'origin/11.0'

Browse Source 
Change-Id: Ibe5040142ca38fed77ffed163212baf22592e392
This commit is contained in:
Eike Ziller
2023-08-04 14:57:29 +02:00
parent 4d5752edc4 66d49e6a53
commit 0d15b4cded
6 changed files with 51 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/fossil/fossilplugin.cpp
View File

@@ -246,8 +246,10 @@ class RevertDialog : public QDialog
{
public:
RevertDialog(const QString &title, QWidget *parent = nullptr);
QString revision() const { return m_revisionLineEdit->text(); }
QLineEdit *m_revisionLineEdit;
private:
QLineEdit *m_revisionLineEdit = nullptr;
};
FossilPlugin::~FossilPlugin()
@@ -428,15 +430,11 @@ void FossilPluginPrivate::revertCurrentFile()
const VcsBase::VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return);
QDialog dialog(Core::ICore::dialogParent());
auto revisionLineEdit = new QLineEdit;
if (dialog.exec() != QDialog::Accepted)
return;
m_client.revertFile(state.currentFileTopLevel(),
state.relativeCurrentFile(),
revisionLineEdit->text());
RevertDialog dialog(Tr::tr("Revert"), Core::ICore::dialogParent());
if (dialog.exec() == QDialog::Accepted) {
m_client.revertFile(state.currentFileTopLevel(), state.relativeCurrentFile(),
dialog.revision());
}
}
void FossilPluginPrivate::statusCurrentFile()
@@ -511,7 +509,7 @@ void FossilPluginPrivate::revertAll()
RevertDialog dialog(Tr::tr("Revert"), Core::ICore::dialogParent());
if (dialog.exec() == QDialog::Accepted)
m_client.revertAll(state.topLevel(), dialog.m_revisionLineEdit->text());
m_client.revertAll(state.topLevel(), dialog.revision());
}
void FossilPluginPrivate::statusMulti()
@@ -627,7 +625,7 @@ void FossilPluginPrivate::update()
RevertDialog dialog(Tr::tr("Update"), Core::ICore::dialogParent());
if (dialog.exec() == QDialog::Accepted)
m_client.update(state.topLevel(), dialog.m_revisionLineEdit->text());
m_client.update(state.topLevel(), dialog.revision());
}
void FossilPluginPrivate::configureRepository()