diff --git a/src/document/katedocument.h b/src/document/katedocument.h --- a/src/document/katedocument.h +++ b/src/document/katedocument.h @@ -1131,8 +1131,6 @@ public: bool queryClose() override; - static bool checkOverwrite(QUrl u, QWidget *parent); - /** * Configuration */ diff --git a/src/document/katedocument.cpp b/src/document/katedocument.cpp --- a/src/document/katedocument.cpp +++ b/src/document/katedocument.cpp @@ -4293,9 +4293,8 @@ { m_modOnHd = false; QWidget *parentWidget(dialogParent()); - const QUrl res = QFileDialog::getSaveFileUrl(parentWidget, i18n("Save File"), url(), {}, nullptr, - QFileDialog::DontConfirmOverwrite); - if (!res.isEmpty() && checkOverwrite(res, parentWidget)) { + const QUrl res = QFileDialog::getSaveFileUrl(parentWidget, i18n("Save File"), url()); + if (!res.isEmpty()) { if (! saveAs(res)) { KMessageBox::error(parentWidget, i18n("Save failed")); m_modOnHd = true; @@ -4478,20 +4477,18 @@ bool KTextEditor::DocumentPrivate::documentSaveAs() { - const QUrl saveUrl = QFileDialog::getSaveFileUrl(dialogParent(), i18n("Save File"), url(), {}, nullptr, - QFileDialog::DontConfirmOverwrite); - if (saveUrl.isEmpty() || !checkOverwrite(saveUrl, dialogParent())) { + const QUrl saveUrl = QFileDialog::getSaveFileUrl(dialogParent(), i18n("Save File"), url()); + if (saveUrl.isEmpty()) { return false; } return saveAs(saveUrl); } bool KTextEditor::DocumentPrivate::documentSaveAsWithEncoding(const QString &encoding) { - const QUrl saveUrl = QFileDialog::getSaveFileUrl(dialogParent(), i18n("Save File"), url(), {}, nullptr, - QFileDialog::DontConfirmOverwrite); - if (saveUrl.isEmpty() || !checkOverwrite(saveUrl, dialogParent())) { + const QUrl saveUrl = QFileDialog::getSaveFileUrl(dialogParent(), i18n("Save File"), url()); + if (saveUrl.isEmpty()) { return false; } @@ -4501,9 +4498,8 @@ bool KTextEditor::DocumentPrivate::documentSaveCopyAs() { - const QUrl saveUrl = QFileDialog::getSaveFileUrl(dialogParent(), i18n("Save Copy of File"), url(), {}, nullptr, - QFileDialog::DontConfirmOverwrite); - if (saveUrl.isEmpty() || !checkOverwrite(saveUrl, dialogParent())) { + const QUrl saveUrl = QFileDialog::getSaveFileUrl(dialogParent(), i18n("Save Copy of File"), url()); + if (saveUrl.isEmpty()) { return false; } @@ -5199,9 +5195,8 @@ *abortClosing = true; if (this->url().isEmpty()) { QWidget *parentWidget(dialogParent()); - const QUrl res = QFileDialog::getSaveFileUrl(parentWidget, i18n("Save File"), QUrl(), {}, nullptr, - QFileDialog::DontConfirmOverwrite); - if (res.isEmpty() || !checkOverwrite(res, parentWidget)) { + const QUrl res = QFileDialog::getSaveFileUrl(parentWidget, i18n("Save File")); + if (res.isEmpty()) { *abortClosing = true; return; } @@ -5214,24 +5209,6 @@ } -bool KTextEditor::DocumentPrivate::checkOverwrite(QUrl u, QWidget *parent) -{ - if (!u.isLocalFile()) { - return true; - } - - QFileInfo info(u.path()); - if (!info.exists()) { - return true; - } - - return KMessageBox::Cancel != KMessageBox::warningContinueCancel(parent, - i18n("A file named \"%1\" already exists. " - "Are you sure you want to overwrite it?", info.fileName()), - i18n("Overwrite File?"), KStandardGuiItem::overwrite(), - KStandardGuiItem::cancel(), QString(), KMessageBox::Options(KMessageBox::Notify | KMessageBox::Dangerous)); -} - //BEGIN KTextEditor::ConfigInterface // BEGIN ConfigInterface stff