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

Adapt to upstream changes

Browse Source 
Change-Id: I1432be3be2b5f5795587fd4263fcb1389966dff0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Christian Stenger
2022-10-20 13:30:14 +02:00
parent 3cbbe91167
commit cd7a378418
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/fossil/fossilplugin.cpp
View File

@@ -196,7 +196,6 @@ public:
void configureRepository(); void configureRepository();
void commit(); void commit();
void showCommitWidget(const QList<VcsBase::VcsBaseClient::StatusItem> &status); void showCommitWidget(const QList<VcsBase::VcsBaseClient::StatusItem> &status);
void commitFromEditor() override;
void diffFromEditorSelected(const QStringList &files); void diffFromEditorSelected(const QStringList &files);
void createRepository(); void createRepository();
@@ -258,7 +257,6 @@ public:
QAction *m_menuAction = nullptr; QAction *m_menuAction = nullptr;
Utils::FilePath m_submitRepository; Utils::FilePath m_submitRepository;
bool m_submitActionTriggered = false;
// To be connected to the VcsTask's success signal to emit the repository/ // To be connected to the VcsTask's success signal to emit the repository/
// files changed signals according to the variant's type: // files changed signals according to the variant's type:
@@ -786,14 +784,6 @@ void FossilPluginPrivate::createRepository()
} }
} }
void FossilPluginPrivate::commitFromEditor()
{
// Close the submit editor
m_submitActionTriggered = true;
QTC_ASSERT(submitEditor(), return);
Core::EditorManager::closeDocuments({submitEditor()->document()});
}
bool FossilPluginPrivate::submitEditorAboutToClose() bool FossilPluginPrivate::submitEditorAboutToClose()
{ {
CommitEditor *commitEditor = qobject_cast<CommitEditor *>(submitEditor()); CommitEditor *commitEditor = qobject_cast<CommitEditor *>(submitEditor());
@@ -801,10 +791,8 @@ bool FossilPluginPrivate::submitEditorAboutToClose()
Core::IDocument *editorDocument = commitEditor->document(); Core::IDocument *editorDocument = commitEditor->document();
QTC_ASSERT(editorDocument, return true); QTC_ASSERT(editorDocument, return true);
bool promptOnSubmit = false;
const VcsBase::VcsBaseSubmitEditor::PromptSubmitResult response const VcsBase::VcsBaseSubmitEditor::PromptSubmitResult response
= commitEditor->promptSubmit(this, &promptOnSubmit, !m_submitActionTriggered); = commitEditor->promptSubmit(this);
m_submitActionTriggered = false;
switch (response) { switch (response) {
case VcsBase::VcsBaseSubmitEditor::SubmitCanceled: case VcsBase::VcsBaseSubmitEditor::SubmitCanceled: