From cfc89a685e96653f48f27647a13766d29c60a186 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 14 Jan 2016 14:45:01 +0100 Subject: [PATCH] IDocument: Rename defaultPath and suggestedFileName To fallbackSaveAsPath and fallbackSaveAsFileName. That makes it clearer what they are for, and that they actually belong to each other. Change-Id: Ie5b83b9db77d39a7fe9e979cc8f22b7f5b9101a3 Reviewed-by: David Schulz --- src/plugins/android/androidmanifestdocument.cpp | 4 ++-- src/plugins/android/androidmanifestdocument.h | 4 ++-- src/plugins/android/javaeditor.cpp | 8 ++++---- .../autotoolsprojectmanager/autotoolsprojectfile.cpp | 4 ++-- .../autotoolsprojectmanager/autotoolsprojectfile.h | 4 ++-- src/plugins/bineditor/bineditorplugin.cpp | 4 ++-- src/plugins/clearcase/clearcaseplugin.cpp | 2 +- src/plugins/cmakeprojectmanager/cmakeeditor.cpp | 8 ++++---- src/plugins/cmakeprojectmanager/cmakefile.cpp | 4 ++-- src/plugins/cmakeprojectmanager/cmakefile.h | 4 ++-- src/plugins/coreplugin/dialogs/saveitemsdialog.cpp | 2 +- src/plugins/coreplugin/documentmanager.cpp | 6 +++--- src/plugins/coreplugin/editormanager/documentmodel.cpp | 4 ++-- src/plugins/coreplugin/editormanager/editormanager.cpp | 2 +- src/plugins/coreplugin/idocument.h | 4 ++-- src/plugins/cvs/cvsplugin.cpp | 2 +- src/plugins/debugger/debuggerplugin.cpp | 2 +- src/plugins/designer/formwindowfile.cpp | 6 +++--- src/plugins/designer/formwindowfile.h | 6 +++--- src/plugins/diffeditor/diffeditordocument.cpp | 4 ++-- src/plugins/diffeditor/diffeditordocument.h | 4 ++-- src/plugins/genericprojectmanager/genericproject.cpp | 4 ++-- src/plugins/genericprojectmanager/genericproject.h | 4 ++-- src/plugins/imageviewer/imageviewerfile.cpp | 4 ++-- src/plugins/imageviewer/imageviewerfile.h | 4 ++-- src/plugins/modeleditor/modeldocument.cpp | 4 ++-- src/plugins/modeleditor/modeldocument.h | 4 ++-- src/plugins/perforce/perforceplugin.cpp | 2 +- src/plugins/pythoneditor/pythoneditorplugin.cpp | 4 ++-- src/plugins/qbsprojectmanager/qbsprojectfile.cpp | 4 ++-- src/plugins/qbsprojectmanager/qbsprojectfile.h | 4 ++-- src/plugins/qmakeprojectmanager/profileeditor.cpp | 8 ++++---- src/plugins/qmakeprojectmanager/qmakenodes.cpp | 4 ++-- src/plugins/qmakeprojectmanager/qmakenodes.h | 4 ++-- src/plugins/qmakeprojectmanager/qmakeproject.cpp | 8 ++++---- src/plugins/qmlprojectmanager/qmlprojectfile.cpp | 4 ++-- src/plugins/qmlprojectmanager/qmlprojectfile.h | 4 ++-- src/plugins/resourceeditor/resourceeditorw.cpp | 4 ++-- src/plugins/resourceeditor/resourceeditorw.h | 4 ++-- src/plugins/resourceeditor/resourcenode.cpp | 4 ++-- src/plugins/resourceeditor/resourcenode.h | 4 ++-- src/plugins/subversion/subversionplugin.cpp | 2 +- src/plugins/tasklist/taskfile.cpp | 4 ++-- src/plugins/tasklist/taskfile.h | 4 ++-- src/plugins/texteditor/textdocument.cpp | 8 ++++---- src/plugins/texteditor/textdocument.h | 8 ++++---- src/plugins/vcsbase/submiteditorfile.h | 4 ++-- 47 files changed, 102 insertions(+), 102 deletions(-) diff --git a/src/plugins/android/androidmanifestdocument.cpp b/src/plugins/android/androidmanifestdocument.cpp index 275e8db74cd..07d1259aaab 100644 --- a/src/plugins/android/androidmanifestdocument.cpp +++ b/src/plugins/android/androidmanifestdocument.cpp @@ -59,12 +59,12 @@ bool AndroidManifestDocument::save(QString *errorString, const QString &fileName return result; } -QString AndroidManifestDocument::defaultPath() const +QString AndroidManifestDocument::fallbackSaveAsPath() const { return filePath().toFileInfo().absolutePath(); } -QString AndroidManifestDocument::suggestedFileName() const +QString AndroidManifestDocument::fallbackSaveAsFileName() const { return filePath().fileName(); } diff --git a/src/plugins/android/androidmanifestdocument.h b/src/plugins/android/androidmanifestdocument.h index 999fbf38b8e..308da9d37f4 100644 --- a/src/plugins/android/androidmanifestdocument.h +++ b/src/plugins/android/androidmanifestdocument.h @@ -45,8 +45,8 @@ public: bool save(QString *errorString, const QString &fileName = QString(), bool autoSave = false) override; - QString defaultPath() const override; - QString suggestedFileName() const override; + QString fallbackSaveAsPath() const override; + QString fallbackSaveAsFileName() const override; bool isModified() const override; bool isSaveAsAllowed() const override; diff --git a/src/plugins/android/javaeditor.cpp b/src/plugins/android/javaeditor.cpp index 837d33c1a97..781caf4e6c6 100644 --- a/src/plugins/android/javaeditor.cpp +++ b/src/plugins/android/javaeditor.cpp @@ -58,8 +58,8 @@ class JavaDocument : public TextEditor::TextDocument { public: JavaDocument(); - QString defaultPath() const override; - QString suggestedFileName() const override; + QString fallbackSaveAsPath() const override; + QString fallbackSaveAsFileName() const override; }; @@ -70,12 +70,12 @@ JavaDocument::JavaDocument() setIndenter(new JavaIndenter); } -QString JavaDocument::defaultPath() const +QString JavaDocument::fallbackSaveAsPath() const { return filePath().toFileInfo().absolutePath(); } -QString JavaDocument::suggestedFileName() const +QString JavaDocument::fallbackSaveAsFileName() const { return filePath().fileName(); } diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.cpp b/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.cpp index 84a2790d764..ec735a84d7b 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.cpp @@ -53,12 +53,12 @@ bool AutotoolsProjectFile::save(QString *errorString, const QString &fileName, b return false; } -QString AutotoolsProjectFile::defaultPath() const +QString AutotoolsProjectFile::fallbackSaveAsPath() const { return QString(); } -QString AutotoolsProjectFile::suggestedFileName() const +QString AutotoolsProjectFile::fallbackSaveAsFileName() const { return QString(); } diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.h b/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.h index 6e3bb27ec0b..f0e6b9630bb 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.h +++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.h @@ -58,8 +58,8 @@ public: AutotoolsProjectFile(const QString &fileName); bool save(QString *errorString, const QString &fileName, bool autoSave) override; - QString defaultPath() const override; - QString suggestedFileName() const override; + QString fallbackSaveAsPath() const override; + QString fallbackSaveAsFileName() const override; bool isModified() const override; bool isSaveAsAllowed() const override; bool reload(QString *errorString, ReloadFlag flag, ChangeType type) override; diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp index ac3f75508bb..db12a5044f7 100644 --- a/src/plugins/bineditor/bineditorplugin.cpp +++ b/src/plugins/bineditor/bineditorplugin.cpp @@ -339,9 +339,9 @@ private slots: public: - QString defaultPath() const override { return QString(); } + QString fallbackSaveAsPath() const override { return QString(); } - QString suggestedFileName() const override { return QString(); } + QString fallbackSaveAsFileName() const override { return QString(); } bool isModified() const override { diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index 17d8ccb1bac..d95fd268b8d 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -1541,7 +1541,7 @@ IEditor *ClearCasePlugin::showOutputInEditor(const QString& title, const QString return 0; e->setForceReadOnly(true); s.replace(QLatin1Char(' '), QLatin1Char('_')); - e->textDocument()->setSuggestedFileName(s); + e->textDocument()->setFallbackSaveAsFileName(s); if (!source.isEmpty()) e->setSource(source); if (codec) diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp index 3cdd1eccfc6..3d90db68006 100644 --- a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp @@ -242,8 +242,8 @@ class CMakeDocument : public TextDocument public: CMakeDocument(); - QString defaultPath() const override; - QString suggestedFileName() const override; + QString fallbackSaveAsPath() const override; + QString fallbackSaveAsFileName() const override; }; CMakeDocument::CMakeDocument() @@ -252,12 +252,12 @@ CMakeDocument::CMakeDocument() setMimeType(QLatin1String(Constants::CMAKEMIMETYPE)); } -QString CMakeDocument::defaultPath() const +QString CMakeDocument::fallbackSaveAsPath() const { return filePath().toFileInfo().absolutePath(); } -QString CMakeDocument::suggestedFileName() const +QString CMakeDocument::fallbackSaveAsFileName() const { return filePath().fileName(); } diff --git a/src/plugins/cmakeprojectmanager/cmakefile.cpp b/src/plugins/cmakeprojectmanager/cmakefile.cpp index d0c49d23779..4df98c24cec 100644 --- a/src/plugins/cmakeprojectmanager/cmakefile.cpp +++ b/src/plugins/cmakeprojectmanager/cmakefile.cpp @@ -56,12 +56,12 @@ bool CMakeFile::save(QString *errorString, const QString &fileName, bool autoSav return false; } -QString CMakeFile::defaultPath() const +QString CMakeFile::fallbackSaveAsPath() const { return QString(); } -QString CMakeFile::suggestedFileName() const +QString CMakeFile::fallbackSaveAsFileName() const { return QString(); } diff --git a/src/plugins/cmakeprojectmanager/cmakefile.h b/src/plugins/cmakeprojectmanager/cmakefile.h index 76a65ba8fe5..2a78d8181fb 100644 --- a/src/plugins/cmakeprojectmanager/cmakefile.h +++ b/src/plugins/cmakeprojectmanager/cmakefile.h @@ -46,8 +46,8 @@ public: bool save(QString *errorString, const QString &fileName, bool autoSave) override; - QString defaultPath() const override; - QString suggestedFileName() const override; + QString fallbackSaveAsPath() const override; + QString fallbackSaveAsFileName() const override; bool isModified() const override; bool isSaveAsAllowed() const override; diff --git a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp index 89b59da6d91..a8600030aa1 100644 --- a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp +++ b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp @@ -67,7 +67,7 @@ SaveItemsDialog::SaveItemsDialog(QWidget *parent, QString directory; QString fileName = document->filePath().toString(); if (fileName.isEmpty()) { - visibleName = document->suggestedFileName(); + visibleName = document->fallbackSaveAsFileName(); } else { QFileInfo info = QFileInfo(fileName); directory = info.absolutePath(); diff --git a/src/plugins/coreplugin/documentmanager.cpp b/src/plugins/coreplugin/documentmanager.cpp index 74b4b650b25..b05434a55b2 100644 --- a/src/plugins/coreplugin/documentmanager.cpp +++ b/src/plugins/coreplugin/documentmanager.cpp @@ -559,7 +559,7 @@ static bool saveModifiedFilesHelper(const QList &documents, if (document && document->isModified()) { QString name = document->filePath().toString(); if (name.isEmpty()) - name = document->suggestedFileName(); + name = document->fallbackSaveAsFileName(); // There can be several IDocuments pointing to the same file // Prefer one that is not readonly @@ -719,8 +719,8 @@ QString DocumentManager::getSaveAsFileName(const IDocument *document, const QStr QString path; QString fileName; if (absoluteFilePath.isEmpty()) { - fileName = document->suggestedFileName(); - const QString defaultPath = document->defaultPath(); + fileName = document->fallbackSaveAsFileName(); + const QString defaultPath = document->fallbackSaveAsPath(); if (!defaultPath.isEmpty()) path = defaultPath; } else { diff --git a/src/plugins/coreplugin/editormanager/documentmodel.cpp b/src/plugins/coreplugin/editormanager/documentmodel.cpp index 712a5e19609..b6aa379df05 100644 --- a/src/plugins/coreplugin/editormanager/documentmodel.cpp +++ b/src/plugins/coreplugin/editormanager/documentmodel.cpp @@ -118,8 +118,8 @@ class RestoredDocument : public IDocument { public: bool save(QString *, const QString &, bool) override { return false; } - QString defaultPath() const override { return filePath().toFileInfo().absolutePath(); } - QString suggestedFileName() const override { return filePath().fileName(); } + QString fallbackSaveAsPath() const override { return filePath().toFileInfo().absolutePath(); } + QString fallbackSaveAsFileName() const override { return filePath().fileName(); } bool isModified() const override { return false; } bool isSaveAsAllowed() const override { return false; } bool reload(QString *, ReloadFlag, ChangeType) override { return true; } diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index 7dcd49e7c41..4a271a623c3 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -1930,7 +1930,7 @@ bool EditorManagerPrivate::saveDocumentAs(IDocument *document) if (!filePath.isEmpty()) { selectedFilter = mdb.mimeTypeForFile(filePath).filterString(); } else { - const QString suggestedName = document->suggestedFileName(); + const QString suggestedName = document->fallbackSaveAsFileName(); if (!suggestedName.isEmpty()) { const QList types = mdb.mimeTypesForFileName(suggestedName); if (!types.isEmpty()) diff --git a/src/plugins/coreplugin/idocument.h b/src/plugins/coreplugin/idocument.h index 81c03c622a8..4b5dafde164 100644 --- a/src/plugins/coreplugin/idocument.h +++ b/src/plugins/coreplugin/idocument.h @@ -108,8 +108,8 @@ public: bool isTemporary() const; void setTemporary(bool temporary); - virtual QString defaultPath() const = 0; - virtual QString suggestedFileName() const = 0; + virtual QString fallbackSaveAsPath() const = 0; + virtual QString fallbackSaveAsFileName() const = 0; QString mimeType() const; void setMimeType(const QString &mimeType); diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp index 661e4584a41..2a5a8d13ba7 100644 --- a/src/plugins/cvs/cvsplugin.cpp +++ b/src/plugins/cvs/cvsplugin.cpp @@ -1195,7 +1195,7 @@ IEditor *CvsPlugin::showOutputInEditor(const QString& title, const QString &outp if (!e) return 0; s.replace(QLatin1Char(' '), QLatin1Char('_')); - e->textDocument()->setSuggestedFileName(s); + e->textDocument()->setFallbackSaveAsFileName(s); e->setForceReadOnly(true); if (!source.isEmpty()) e->setSource(source); diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 4461dfde512..cdc4676f1fa 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -3083,7 +3083,7 @@ void openTextEditor(const QString &titlePattern0, const QString &contents) QString suggestion = titlePattern; if (!suggestion.contains(QLatin1Char('.'))) suggestion.append(QLatin1String(".txt")); - textEditor->textDocument()->setSuggestedFileName(suggestion); + textEditor->textDocument()->setFallbackSaveAsFileName(suggestion); } QTC_ASSERT(editor, return); } diff --git a/src/plugins/designer/formwindowfile.cpp b/src/plugins/designer/formwindowfile.cpp index 712b3b55a79..005584757e1 100644 --- a/src/plugins/designer/formwindowfile.cpp +++ b/src/plugins/designer/formwindowfile.cpp @@ -221,12 +221,12 @@ bool FormWindowFile::reload(QString *errorString, ReloadFlag flag, ChangeType ty return true; } -QString FormWindowFile::defaultPath() const +QString FormWindowFile::fallbackSaveAsPath() const { return QString(); } -void FormWindowFile::setSuggestedFileName(const QString &fn) +void FormWindowFile::setFallbackSaveAsFileName(const QString &fn) { if (Designer::Constants::Internal::debug) qDebug() << Q_FUNC_INFO << filePath() << fn; @@ -234,7 +234,7 @@ void FormWindowFile::setSuggestedFileName(const QString &fn) m_suggestedName = fn; } -QString FormWindowFile::suggestedFileName() const +QString FormWindowFile::fallbackSaveAsFileName() const { return m_suggestedName; } diff --git a/src/plugins/designer/formwindowfile.h b/src/plugins/designer/formwindowfile.h index 8982a136ba1..9e176e2ad12 100644 --- a/src/plugins/designer/formwindowfile.h +++ b/src/plugins/designer/formwindowfile.h @@ -61,11 +61,11 @@ public: bool isModified() const override; bool isSaveAsAllowed() const override; bool reload(QString *errorString, ReloadFlag flag, ChangeType type) override; - QString defaultPath() const override; - QString suggestedFileName() const override; + QString fallbackSaveAsPath() const override; + QString fallbackSaveAsFileName() const override; // Internal - void setSuggestedFileName(const QString &fileName); + void setFallbackSaveAsFileName(const QString &fileName); bool writeFile(const QString &fileName, QString *errorString) const; diff --git a/src/plugins/diffeditor/diffeditordocument.cpp b/src/plugins/diffeditor/diffeditordocument.cpp index 74e048517a5..f98f2eef1b3 100644 --- a/src/plugins/diffeditor/diffeditordocument.cpp +++ b/src/plugins/diffeditor/diffeditordocument.cpp @@ -198,7 +198,7 @@ bool DiffEditorDocument::setContents(const QByteArray &contents) return true; } -QString DiffEditorDocument::defaultPath() const +QString DiffEditorDocument::fallbackSaveAsPath() const { if (!m_baseDirectory.isEmpty()) return m_baseDirectory; @@ -274,7 +274,7 @@ Core::IDocument::OpenResult DiffEditorDocument::open(QString *errorString, const return ok ? OpenResult::Success : OpenResult::CannotHandle; } -QString DiffEditorDocument::suggestedFileName() const +QString DiffEditorDocument::fallbackSaveAsFileName() const { const int maxSubjectLength = 50; diff --git a/src/plugins/diffeditor/diffeditordocument.h b/src/plugins/diffeditor/diffeditordocument.h index f8b49a05a70..d7a196c9d34 100644 --- a/src/plugins/diffeditor/diffeditordocument.h +++ b/src/plugins/diffeditor/diffeditordocument.h @@ -71,8 +71,8 @@ public: bool ignoreWhitespace() const; bool setContents(const QByteArray &contents) override; - QString defaultPath() const override; - QString suggestedFileName() const override; + QString fallbackSaveAsPath() const override; + QString fallbackSaveAsFileName() const override; bool isModified() const override { return false; } bool isSaveAsAllowed() const override { return true; } diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index eee0f908816..01778a62fb1 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -452,12 +452,12 @@ bool GenericProjectFile::save(QString *, const QString &, bool) return false; } -QString GenericProjectFile::defaultPath() const +QString GenericProjectFile::fallbackSaveAsPath() const { return QString(); } -QString GenericProjectFile::suggestedFileName() const +QString GenericProjectFile::fallbackSaveAsFileName() const { return QString(); } diff --git a/src/plugins/genericprojectmanager/genericproject.h b/src/plugins/genericprojectmanager/genericproject.h index c0813c338d2..ba64d80bba0 100644 --- a/src/plugins/genericprojectmanager/genericproject.h +++ b/src/plugins/genericprojectmanager/genericproject.h @@ -120,8 +120,8 @@ public: bool save(QString *errorString, const QString &fileName, bool autoSave) override; - QString defaultPath() const override; - QString suggestedFileName() const override; + QString fallbackSaveAsPath() const override; + QString fallbackSaveAsFileName() const override; bool isModified() const override; bool isSaveAsAllowed() const override; diff --git a/src/plugins/imageviewer/imageviewerfile.cpp b/src/plugins/imageviewer/imageviewerfile.cpp index 663f94a1f7b..5573da1e287 100644 --- a/src/plugins/imageviewer/imageviewerfile.cpp +++ b/src/plugins/imageviewer/imageviewerfile.cpp @@ -268,12 +268,12 @@ bool ImageViewerFile::setContents(const QByteArray &contents) return false; } -QString ImageViewerFile::defaultPath() const +QString ImageViewerFile::fallbackSaveAsPath() const { return QString(); } -QString ImageViewerFile::suggestedFileName() const +QString ImageViewerFile::fallbackSaveAsFileName() const { return QString(); } diff --git a/src/plugins/imageviewer/imageviewerfile.h b/src/plugins/imageviewer/imageviewerfile.h index 3b0b6749f5e..0af942a4143 100644 --- a/src/plugins/imageviewer/imageviewerfile.h +++ b/src/plugins/imageviewer/imageviewerfile.h @@ -70,8 +70,8 @@ public: bool save(QString *errorString, const QString &fileName, bool autoSave) override; bool setContents(const QByteArray &contents) override; - QString defaultPath() const override; - QString suggestedFileName() const override; + QString fallbackSaveAsPath() const override; + QString fallbackSaveAsFileName() const override; bool isModified() const override; bool isSaveAsAllowed() const override; diff --git a/src/plugins/modeleditor/modeldocument.cpp b/src/plugins/modeleditor/modeldocument.cpp index 9ec9d6e5a24..4b95cf5fdd5 100644 --- a/src/plugins/modeleditor/modeldocument.cpp +++ b/src/plugins/modeleditor/modeldocument.cpp @@ -106,12 +106,12 @@ bool ModelDocument::save(QString *errorString, const QString &name, bool autoSav return true; } -QString ModelDocument::defaultPath() const +QString ModelDocument::fallbackSaveAsPath() const { return QLatin1String("."); } -QString ModelDocument::suggestedFileName() const +QString ModelDocument::fallbackSaveAsFileName() const { return tr("model.qmodel"); } diff --git a/src/plugins/modeleditor/modeldocument.h b/src/plugins/modeleditor/modeldocument.h index 2a5272f4a28..04b940083cb 100644 --- a/src/plugins/modeleditor/modeldocument.h +++ b/src/plugins/modeleditor/modeldocument.h @@ -57,8 +57,8 @@ public: OpenResult open(QString *errorString, const QString &fileName, const QString &realFileName) override; bool save(QString *errorString, const QString &fileName, bool autoSave) override; - QString defaultPath() const override; - QString suggestedFileName() const override; + QString fallbackSaveAsPath() const override; + QString fallbackSaveAsFileName() const override; bool isModified() const override; bool isSaveAsAllowed() const override; bool reload(QString *errorString, ReloadFlag flag, ChangeType type) override; diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index 42aa669caf0..0cef6b40d82 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/src/plugins/perforce/perforceplugin.cpp @@ -1241,7 +1241,7 @@ IEditor *PerforcePlugin::showOutputInEditor(const QString &title, e->setForceReadOnly(true); e->setSource(source); s.replace(QLatin1Char(' '), QLatin1Char('_')); - e->textDocument()->setSuggestedFileName(s); + e->textDocument()->setFallbackSaveAsFileName(s); if (codec) e->setCodec(codec); return editor; diff --git a/src/plugins/pythoneditor/pythoneditorplugin.cpp b/src/plugins/pythoneditor/pythoneditorplugin.cpp index ec6854bb6da..caa6fb87b99 100644 --- a/src/plugins/pythoneditor/pythoneditorplugin.cpp +++ b/src/plugins/pythoneditor/pythoneditorplugin.cpp @@ -293,8 +293,8 @@ public: return false; } - QString defaultPath() const override { return QString(); } - QString suggestedFileName() const override { return QString(); } + QString fallbackSaveAsPath() const override { return QString(); } + QString fallbackSaveAsFileName() const override { return QString(); } bool isModified() const override { return false; } bool isSaveAsAllowed() const override { return false; } diff --git a/src/plugins/qbsprojectmanager/qbsprojectfile.cpp b/src/plugins/qbsprojectmanager/qbsprojectfile.cpp index 12806e978d0..4b6d6dd9c29 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectfile.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectfile.cpp @@ -49,12 +49,12 @@ bool QbsProjectFile::save(QString *, const QString &, bool) return false; } -QString QbsProjectFile::defaultPath() const +QString QbsProjectFile::fallbackSaveAsPath() const { return QString(); } -QString QbsProjectFile::suggestedFileName() const +QString QbsProjectFile::fallbackSaveAsFileName() const { return QString(); } diff --git a/src/plugins/qbsprojectmanager/qbsprojectfile.h b/src/plugins/qbsprojectmanager/qbsprojectfile.h index 57963bfeada..370c1d939d7 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectfile.h +++ b/src/plugins/qbsprojectmanager/qbsprojectfile.h @@ -47,8 +47,8 @@ public: bool save(QString *errorString, const QString &fileName, bool autoSave) override; - QString defaultPath() const override; - QString suggestedFileName() const override; + QString fallbackSaveAsPath() const override; + QString fallbackSaveAsFileName() const override; bool isModified() const override; bool isSaveAsAllowed() const override; diff --git a/src/plugins/qmakeprojectmanager/profileeditor.cpp b/src/plugins/qmakeprojectmanager/profileeditor.cpp index 41a0d303bb3..4136e61a8ef 100644 --- a/src/plugins/qmakeprojectmanager/profileeditor.cpp +++ b/src/plugins/qmakeprojectmanager/profileeditor.cpp @@ -165,8 +165,8 @@ class ProFileDocument : public TextDocument { public: ProFileDocument(); - QString defaultPath() const override; - QString suggestedFileName() const override; + QString fallbackSaveAsPath() const override; + QString fallbackSaveAsFileName() const override; // qmake project files doesn't support UTF8-BOM // If the BOM would be added qmake would fail and QtCreator couldn't parse the project file @@ -179,12 +179,12 @@ ProFileDocument::ProFileDocument() setMimeType(QLatin1String(Constants::PROFILE_MIMETYPE)); } -QString ProFileDocument::defaultPath() const +QString ProFileDocument::fallbackSaveAsPath() const { return filePath().toFileInfo().absolutePath(); } -QString ProFileDocument::suggestedFileName() const +QString ProFileDocument::fallbackSaveAsFileName() const { return filePath().fileName(); } diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp index 64a49cc3c33..4e4573b8293 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp @@ -280,12 +280,12 @@ bool QmakePriFile::save(QString *errorString, const QString &fileName, bool auto return false; } -QString QmakePriFile::defaultPath() const +QString QmakePriFile::fallbackSaveAsPath() const { return QString(); } -QString QmakePriFile::suggestedFileName() const +QString QmakePriFile::fallbackSaveAsFileName() const { return QString(); } diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.h b/src/plugins/qmakeprojectmanager/qmakenodes.h index 96bc1110b3e..5e82f16de94 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.h +++ b/src/plugins/qmakeprojectmanager/qmakenodes.h @@ -247,8 +247,8 @@ public: QmakePriFile(QmakePriFileNode *qmakePriFile); bool save(QString *errorString, const QString &fileName, bool autoSave) override; - QString defaultPath() const override; - QString suggestedFileName() const override; + QString fallbackSaveAsPath() const override; + QString fallbackSaveAsFileName() const override; bool isModified() const override; bool isSaveAsAllowed() const override; diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index 00740206e4e..3fe51d270da 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -104,8 +104,8 @@ public: bool save(QString *errorString, const QString &fileName, bool autoSave) override; - QString defaultPath() const override; - QString suggestedFileName() const override; + QString fallbackSaveAsPath() const override; + QString fallbackSaveAsFileName() const override; bool isModified() const override; bool isSaveAsAllowed() const override; @@ -266,12 +266,12 @@ bool QmakeProjectFile::save(QString *, const QString &, bool) return false; } -QString QmakeProjectFile::defaultPath() const +QString QmakeProjectFile::fallbackSaveAsPath() const { return QString(); } -QString QmakeProjectFile::suggestedFileName() const +QString QmakeProjectFile::fallbackSaveAsFileName() const { return QString(); } diff --git a/src/plugins/qmlprojectmanager/qmlprojectfile.cpp b/src/plugins/qmlprojectmanager/qmlprojectfile.cpp index 61a36c025b2..7c5ef83ebb4 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectfile.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectfile.cpp @@ -51,12 +51,12 @@ bool QmlProjectFile::save(QString *, const QString &, bool) return false; } -QString QmlProjectFile::defaultPath() const +QString QmlProjectFile::fallbackSaveAsPath() const { return QString(); } -QString QmlProjectFile::suggestedFileName() const +QString QmlProjectFile::fallbackSaveAsFileName() const { return QString(); } diff --git a/src/plugins/qmlprojectmanager/qmlprojectfile.h b/src/plugins/qmlprojectmanager/qmlprojectfile.h index 5c867c8230f..8b28fc7b7d3 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectfile.h +++ b/src/plugins/qmlprojectmanager/qmlprojectfile.h @@ -48,8 +48,8 @@ public: bool save(QString *errorString, const QString &fileName, bool autoSave) override; - QString defaultPath() const override; - QString suggestedFileName() const override; + QString fallbackSaveAsPath() const override; + QString fallbackSaveAsFileName() const override; bool isModified() const override; bool isSaveAsAllowed() const override; diff --git a/src/plugins/resourceeditor/resourceeditorw.cpp b/src/plugins/resourceeditor/resourceeditorw.cpp index 8cd97c490d9..cfe09b2013b 100644 --- a/src/plugins/resourceeditor/resourceeditorw.cpp +++ b/src/plugins/resourceeditor/resourceeditorw.cpp @@ -262,12 +262,12 @@ bool ResourceEditorDocument::reload(QString *errorString, ReloadFlag flag, Chang return true; } -QString ResourceEditorDocument::defaultPath() const +QString ResourceEditorDocument::fallbackSaveAsPath() const { return QString(); } -QString ResourceEditorDocument::suggestedFileName() const +QString ResourceEditorDocument::fallbackSaveAsFileName() const { return QString(); } diff --git a/src/plugins/resourceeditor/resourceeditorw.h b/src/plugins/resourceeditor/resourceeditorw.h index 4ab9a35d49e..5ed211063b0 100644 --- a/src/plugins/resourceeditor/resourceeditorw.h +++ b/src/plugins/resourceeditor/resourceeditorw.h @@ -66,8 +66,8 @@ public: bool isModified() const override; bool isSaveAsAllowed() const override; bool reload(QString *errorString, ReloadFlag flag, ChangeType type) override; - QString defaultPath() const override; - QString suggestedFileName() const override; + QString fallbackSaveAsPath() const override; + QString fallbackSaveAsFileName() const override; void setFilePath(const Utils::FileName &newName) override; void setBlockDirtyChanged(bool value); diff --git a/src/plugins/resourceeditor/resourcenode.cpp b/src/plugins/resourceeditor/resourcenode.cpp index 7e9d2a4fc96..3d2655c931d 100644 --- a/src/plugins/resourceeditor/resourcenode.cpp +++ b/src/plugins/resourceeditor/resourcenode.cpp @@ -565,12 +565,12 @@ bool ResourceFileWatcher::save(QString *errorString, const QString &fileName, bo return false; } -QString ResourceFileWatcher::defaultPath() const +QString ResourceFileWatcher::fallbackSaveAsPath() const { return QString(); } -QString ResourceFileWatcher::suggestedFileName() const +QString ResourceFileWatcher::fallbackSaveAsFileName() const { return QString(); } diff --git a/src/plugins/resourceeditor/resourcenode.h b/src/plugins/resourceeditor/resourcenode.h index 9deb034fc3c..4aead600b5b 100644 --- a/src/plugins/resourceeditor/resourcenode.h +++ b/src/plugins/resourceeditor/resourcenode.h @@ -175,8 +175,8 @@ public: ResourceFileWatcher(ResourceTopLevelNode *node); bool save(QString *errorString, const QString &fileName, bool autoSave) override; - QString defaultPath() const override; - QString suggestedFileName() const override; + QString fallbackSaveAsPath() const override; + QString fallbackSaveAsFileName() const override; bool isModified() const override; bool isSaveAsAllowed() const override; diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index 951e967d740..2b9d975801b 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -919,7 +919,7 @@ IEditor *SubversionPlugin::showOutputInEditor(const QString &title, const QStrin return 0; e->setForceReadOnly(true); s.replace(QLatin1Char(' '), QLatin1Char('_')); - e->textDocument()->setSuggestedFileName(s); + e->textDocument()->setFallbackSaveAsFileName(s); if (!source.isEmpty()) e->setSource(source); if (codec) diff --git a/src/plugins/tasklist/taskfile.cpp b/src/plugins/tasklist/taskfile.cpp index e09a5859e06..4bf8ee2cef4 100644 --- a/src/plugins/tasklist/taskfile.cpp +++ b/src/plugins/tasklist/taskfile.cpp @@ -54,12 +54,12 @@ bool TaskFile::save(QString *errorString, const QString &fileName, bool autoSave return false; } -QString TaskFile::defaultPath() const +QString TaskFile::fallbackSaveAsPath() const { return QString(); } -QString TaskFile::suggestedFileName() const +QString TaskFile::fallbackSaveAsFileName() const { return QString(); } diff --git a/src/plugins/tasklist/taskfile.h b/src/plugins/tasklist/taskfile.h index d562646be13..4f3e4ce62b3 100644 --- a/src/plugins/tasklist/taskfile.h +++ b/src/plugins/tasklist/taskfile.h @@ -45,8 +45,8 @@ public: bool save(QString *errorString, const QString &fileName, bool autoSave) override; - QString defaultPath() const override; - QString suggestedFileName() const override; + QString fallbackSaveAsPath() const override; + QString fallbackSaveAsFileName() const override; bool isModified() const override; bool isSaveAsAllowed() const override; diff --git a/src/plugins/texteditor/textdocument.cpp b/src/plugins/texteditor/textdocument.cpp index 213f15cfccc..8b3712729cb 100644 --- a/src/plugins/texteditor/textdocument.cpp +++ b/src/plugins/texteditor/textdocument.cpp @@ -429,22 +429,22 @@ bool TextDocument::isSaveAsAllowed() const return true; } -QString TextDocument::defaultPath() const +QString TextDocument::fallbackSaveAsPath() const { return d->m_defaultPath; } -QString TextDocument::suggestedFileName() const +QString TextDocument::fallbackSaveAsFileName() const { return d->m_suggestedFileName; } -void TextDocument::setDefaultPath(const QString &defaultPath) +void TextDocument::setFallbackSaveAsPath(const QString &defaultPath) { d->m_defaultPath = defaultPath; } -void TextDocument::setSuggestedFileName(const QString &suggestedFileName) +void TextDocument::setFallbackSaveAsFileName(const QString &suggestedFileName) { d->m_suggestedFileName = suggestedFileName; } diff --git a/src/plugins/texteditor/textdocument.h b/src/plugins/texteditor/textdocument.h index 0780b35e5c0..ae244cb58ac 100644 --- a/src/plugins/texteditor/textdocument.h +++ b/src/plugins/texteditor/textdocument.h @@ -113,11 +113,11 @@ public: bool reload(QString *errorString, ReloadFlag flag, ChangeType type) override; void setFilePath(const Utils::FileName &newName) override; - QString defaultPath() const override; - QString suggestedFileName() const override; + QString fallbackSaveAsPath() const override; + QString fallbackSaveAsFileName() const override; - void setDefaultPath(const QString &defaultPath); - void setSuggestedFileName(const QString &suggestedFileName); + void setFallbackSaveAsPath(const QString &fallbackSaveAsPath); + void setFallbackSaveAsFileName(const QString &fallbackSaveAsFileName); OpenResult open(QString *errorString, const QString &fileName, const QString &realFileName) override; diff --git a/src/plugins/vcsbase/submiteditorfile.h b/src/plugins/vcsbase/submiteditorfile.h index 093e7c6944b..b6618db9737 100644 --- a/src/plugins/vcsbase/submiteditorfile.h +++ b/src/plugins/vcsbase/submiteditorfile.h @@ -50,8 +50,8 @@ public: OpenResult open(QString *errorString, const QString &fileName, const QString &realFileName) override; bool setContents(const QByteArray &contents) override; - QString defaultPath() const override { return QString(); } - QString suggestedFileName() const override { return QString(); } + QString fallbackSaveAsPath() const override { return QString(); } + QString fallbackSaveAsFileName() const override { return QString(); } bool isModified() const override { return m_modified; } bool isSaveAsAllowed() const override { return false; }