diff --git a/src/plugins/android/androidmanifestdocument.cpp b/src/plugins/android/androidmanifestdocument.cpp index 07d1259aaab..cdcc01478b2 100644 --- a/src/plugins/android/androidmanifestdocument.cpp +++ b/src/plugins/android/androidmanifestdocument.cpp @@ -59,16 +59,6 @@ bool AndroidManifestDocument::save(QString *errorString, const QString &fileName return result; } -QString AndroidManifestDocument::fallbackSaveAsPath() const -{ - return filePath().toFileInfo().absolutePath(); -} - -QString AndroidManifestDocument::fallbackSaveAsFileName() const -{ - return filePath().fileName(); -} - bool AndroidManifestDocument::isModified() const { return TextDocument::isModified() || m_editorWidget->isModified(); diff --git a/src/plugins/android/androidmanifestdocument.h b/src/plugins/android/androidmanifestdocument.h index 308da9d37f4..b6320db530a 100644 --- a/src/plugins/android/androidmanifestdocument.h +++ b/src/plugins/android/androidmanifestdocument.h @@ -45,9 +45,6 @@ public: bool save(QString *errorString, const QString &fileName = QString(), bool autoSave = false) 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 781caf4e6c6..9ef4ff1adf1 100644 --- a/src/plugins/android/javaeditor.cpp +++ b/src/plugins/android/javaeditor.cpp @@ -58,8 +58,6 @@ class JavaDocument : public TextEditor::TextDocument { public: JavaDocument(); - QString fallbackSaveAsPath() const override; - QString fallbackSaveAsFileName() const override; }; @@ -70,17 +68,6 @@ JavaDocument::JavaDocument() setIndenter(new JavaIndenter); } -QString JavaDocument::fallbackSaveAsPath() const -{ - return filePath().toFileInfo().absolutePath(); -} - -QString JavaDocument::fallbackSaveAsFileName() const -{ - return filePath().fileName(); -} - - // // JavaEditorFactory // diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.cpp b/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.cpp index ec735a84d7b..c634be41b28 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.cpp @@ -53,16 +53,6 @@ bool AutotoolsProjectFile::save(QString *errorString, const QString &fileName, b return false; } -QString AutotoolsProjectFile::fallbackSaveAsPath() const -{ - return QString(); -} - -QString AutotoolsProjectFile::fallbackSaveAsFileName() const -{ - return QString(); -} - bool AutotoolsProjectFile::isModified() const { return false; diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.h b/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.h index f0e6b9630bb..c30264f73cd 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.h +++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.h @@ -58,8 +58,6 @@ public: AutotoolsProjectFile(const QString &fileName); bool save(QString *errorString, const QString &fileName, bool autoSave) 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 db12a5044f7..abda8da3e61 100644 --- a/src/plugins/bineditor/bineditorplugin.cpp +++ b/src/plugins/bineditor/bineditorplugin.cpp @@ -339,10 +339,6 @@ private slots: public: - QString fallbackSaveAsPath() const override { return QString(); } - - QString fallbackSaveAsFileName() const override { return QString(); } - bool isModified() const override { return isTemporary()/*e.g. memory view*/ ? false diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp index 3d90db68006..d6c8be5dba8 100644 --- a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp @@ -241,9 +241,6 @@ class CMakeDocument : public TextDocument { public: CMakeDocument(); - - QString fallbackSaveAsPath() const override; - QString fallbackSaveAsFileName() const override; }; CMakeDocument::CMakeDocument() @@ -252,16 +249,6 @@ CMakeDocument::CMakeDocument() setMimeType(QLatin1String(Constants::CMAKEMIMETYPE)); } -QString CMakeDocument::fallbackSaveAsPath() const -{ - return filePath().toFileInfo().absolutePath(); -} - -QString CMakeDocument::fallbackSaveAsFileName() const -{ - return filePath().fileName(); -} - // // CMakeEditorFactory // diff --git a/src/plugins/cmakeprojectmanager/cmakefile.cpp b/src/plugins/cmakeprojectmanager/cmakefile.cpp index 4df98c24cec..e314a6d20a8 100644 --- a/src/plugins/cmakeprojectmanager/cmakefile.cpp +++ b/src/plugins/cmakeprojectmanager/cmakefile.cpp @@ -56,16 +56,6 @@ bool CMakeFile::save(QString *errorString, const QString &fileName, bool autoSav return false; } -QString CMakeFile::fallbackSaveAsPath() const -{ - return QString(); -} - -QString CMakeFile::fallbackSaveAsFileName() const -{ - return QString(); -} - bool CMakeFile::isModified() const { return false; diff --git a/src/plugins/cmakeprojectmanager/cmakefile.h b/src/plugins/cmakeprojectmanager/cmakefile.h index 2a78d8181fb..ff272c481fc 100644 --- a/src/plugins/cmakeprojectmanager/cmakefile.h +++ b/src/plugins/cmakeprojectmanager/cmakefile.h @@ -46,9 +46,6 @@ public: bool save(QString *errorString, const QString &fileName, bool autoSave) override; - QString fallbackSaveAsPath() const override; - QString fallbackSaveAsFileName() const override; - bool isModified() const override; bool isSaveAsAllowed() const override; diff --git a/src/plugins/coreplugin/editormanager/documentmodel.cpp b/src/plugins/coreplugin/editormanager/documentmodel.cpp index b6aa379df05..37341bb89f6 100644 --- a/src/plugins/coreplugin/editormanager/documentmodel.cpp +++ b/src/plugins/coreplugin/editormanager/documentmodel.cpp @@ -118,8 +118,6 @@ class RestoredDocument : public IDocument { public: bool save(QString *, const QString &, bool) override { return false; } - 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/idocument.cpp b/src/plugins/coreplugin/idocument.cpp index 106831c253b..1ed0804b1df 100644 --- a/src/plugins/coreplugin/idocument.cpp +++ b/src/plugins/coreplugin/idocument.cpp @@ -211,6 +211,16 @@ void IDocument::setTemporary(bool temporary) d->temporary = temporary; } +QString IDocument::fallbackSaveAsPath() const +{ + return QString(); +} + +QString IDocument::fallbackSaveAsFileName() const +{ + return QString(); +} + QString IDocument::mimeType() const { return d->mimeType; diff --git a/src/plugins/coreplugin/idocument.h b/src/plugins/coreplugin/idocument.h index 4b5dafde164..d173a6b0bb2 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 fallbackSaveAsPath() const = 0; - virtual QString fallbackSaveAsFileName() const = 0; + virtual QString fallbackSaveAsPath() const; + virtual QString fallbackSaveAsFileName() const; QString mimeType() const; void setMimeType(const QString &mimeType); diff --git a/src/plugins/designer/formwindowfile.cpp b/src/plugins/designer/formwindowfile.cpp index 005584757e1..35187b7b424 100644 --- a/src/plugins/designer/formwindowfile.cpp +++ b/src/plugins/designer/formwindowfile.cpp @@ -221,11 +221,6 @@ bool FormWindowFile::reload(QString *errorString, ReloadFlag flag, ChangeType ty return true; } -QString FormWindowFile::fallbackSaveAsPath() const -{ - return QString(); -} - void FormWindowFile::setFallbackSaveAsFileName(const QString &fn) { if (Designer::Constants::Internal::debug) diff --git a/src/plugins/designer/formwindowfile.h b/src/plugins/designer/formwindowfile.h index 9e176e2ad12..e015bd4fa16 100644 --- a/src/plugins/designer/formwindowfile.h +++ b/src/plugins/designer/formwindowfile.h @@ -61,7 +61,6 @@ public: bool isModified() const override; bool isSaveAsAllowed() const override; bool reload(QString *errorString, ReloadFlag flag, ChangeType type) override; - QString fallbackSaveAsPath() const override; QString fallbackSaveAsFileName() const override; // Internal diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index 01778a62fb1..b25c42989f0 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -452,16 +452,6 @@ bool GenericProjectFile::save(QString *, const QString &, bool) return false; } -QString GenericProjectFile::fallbackSaveAsPath() const -{ - return QString(); -} - -QString GenericProjectFile::fallbackSaveAsFileName() const -{ - return QString(); -} - bool GenericProjectFile::isModified() const { return false; diff --git a/src/plugins/genericprojectmanager/genericproject.h b/src/plugins/genericprojectmanager/genericproject.h index ba64d80bba0..2ec0aaa550c 100644 --- a/src/plugins/genericprojectmanager/genericproject.h +++ b/src/plugins/genericprojectmanager/genericproject.h @@ -120,9 +120,6 @@ public: bool save(QString *errorString, const QString &fileName, bool autoSave) 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 bacaa4b3f1f..46fead0cf1c 100644 --- a/src/plugins/imageviewer/imageviewerfile.cpp +++ b/src/plugins/imageviewer/imageviewerfile.cpp @@ -262,16 +262,6 @@ bool ImageViewerFile::save(QString *errorString, const QString &fileName, bool a return false; } -QString ImageViewerFile::fallbackSaveAsPath() const -{ - return QString(); -} - -QString ImageViewerFile::fallbackSaveAsFileName() const -{ - return QString(); -} - bool ImageViewerFile::isModified() const { return false; diff --git a/src/plugins/imageviewer/imageviewerfile.h b/src/plugins/imageviewer/imageviewerfile.h index 4b4928be814..9177a3604c1 100644 --- a/src/plugins/imageviewer/imageviewerfile.h +++ b/src/plugins/imageviewer/imageviewerfile.h @@ -69,9 +69,6 @@ public: const QString &realFileName) override; bool save(QString *errorString, const QString &fileName, bool autoSave) 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 4b95cf5fdd5..376abf4d07d 100644 --- a/src/plugins/modeleditor/modeldocument.cpp +++ b/src/plugins/modeleditor/modeldocument.cpp @@ -106,16 +106,6 @@ bool ModelDocument::save(QString *errorString, const QString &name, bool autoSav return true; } -QString ModelDocument::fallbackSaveAsPath() const -{ - return QLatin1String("."); -} - -QString ModelDocument::fallbackSaveAsFileName() const -{ - return tr("model.qmodel"); -} - bool ModelDocument::isModified() const { return d->documentController ? d->documentController->projectController()->isModified() : false; diff --git a/src/plugins/modeleditor/modeldocument.h b/src/plugins/modeleditor/modeldocument.h index 04b940083cb..1b79ef98cb5 100644 --- a/src/plugins/modeleditor/modeldocument.h +++ b/src/plugins/modeleditor/modeldocument.h @@ -57,8 +57,6 @@ public: OpenResult open(QString *errorString, const QString &fileName, const QString &realFileName) override; bool save(QString *errorString, const QString &fileName, bool autoSave) 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/pythoneditor/pythoneditorplugin.cpp b/src/plugins/pythoneditor/pythoneditorplugin.cpp index caa6fb87b99..c3c6558fbfe 100644 --- a/src/plugins/pythoneditor/pythoneditorplugin.cpp +++ b/src/plugins/pythoneditor/pythoneditorplugin.cpp @@ -293,9 +293,6 @@ public: return false; } - 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 4b6d6dd9c29..f9deb7b2362 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectfile.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectfile.cpp @@ -49,16 +49,6 @@ bool QbsProjectFile::save(QString *, const QString &, bool) return false; } -QString QbsProjectFile::fallbackSaveAsPath() const -{ - return QString(); -} - -QString QbsProjectFile::fallbackSaveAsFileName() const -{ - return QString(); -} - bool QbsProjectFile::isModified() const { return false; diff --git a/src/plugins/qbsprojectmanager/qbsprojectfile.h b/src/plugins/qbsprojectmanager/qbsprojectfile.h index 370c1d939d7..d10cb389fc1 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectfile.h +++ b/src/plugins/qbsprojectmanager/qbsprojectfile.h @@ -47,9 +47,6 @@ public: bool save(QString *errorString, const QString &fileName, bool autoSave) 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 4136e61a8ef..c6108867780 100644 --- a/src/plugins/qmakeprojectmanager/profileeditor.cpp +++ b/src/plugins/qmakeprojectmanager/profileeditor.cpp @@ -165,8 +165,6 @@ class ProFileDocument : public TextDocument { public: ProFileDocument(); - 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,16 +177,6 @@ ProFileDocument::ProFileDocument() setMimeType(QLatin1String(Constants::PROFILE_MIMETYPE)); } -QString ProFileDocument::fallbackSaveAsPath() const -{ - return filePath().toFileInfo().absolutePath(); -} - -QString ProFileDocument::fallbackSaveAsFileName() const -{ - return filePath().fileName(); -} - // // ProFileEditorFactory // diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp index 4e4573b8293..da16f289805 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp @@ -280,16 +280,6 @@ bool QmakePriFile::save(QString *errorString, const QString &fileName, bool auto return false; } -QString QmakePriFile::fallbackSaveAsPath() const -{ - return QString(); -} - -QString QmakePriFile::fallbackSaveAsFileName() const -{ - return QString(); -} - bool QmakePriFile::isModified() const { return false; diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.h b/src/plugins/qmakeprojectmanager/qmakenodes.h index 5e82f16de94..f5d3ffd0e03 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.h +++ b/src/plugins/qmakeprojectmanager/qmakenodes.h @@ -247,9 +247,6 @@ public: QmakePriFile(QmakePriFileNode *qmakePriFile); bool save(QString *errorString, const QString &fileName, bool autoSave) 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 3fe51d270da..72f2665e651 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -104,9 +104,6 @@ public: bool save(QString *errorString, const QString &fileName, bool autoSave) override; - QString fallbackSaveAsPath() const override; - QString fallbackSaveAsFileName() const override; - bool isModified() const override; bool isSaveAsAllowed() const override; @@ -266,16 +263,6 @@ bool QmakeProjectFile::save(QString *, const QString &, bool) return false; } -QString QmakeProjectFile::fallbackSaveAsPath() const -{ - return QString(); -} - -QString QmakeProjectFile::fallbackSaveAsFileName() const -{ - return QString(); -} - bool QmakeProjectFile::isModified() const { return false; // we save after changing anyway diff --git a/src/plugins/qmlprojectmanager/qmlprojectfile.cpp b/src/plugins/qmlprojectmanager/qmlprojectfile.cpp index 7c5ef83ebb4..b8d07d2ae51 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectfile.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectfile.cpp @@ -51,16 +51,6 @@ bool QmlProjectFile::save(QString *, const QString &, bool) return false; } -QString QmlProjectFile::fallbackSaveAsPath() const -{ - return QString(); -} - -QString QmlProjectFile::fallbackSaveAsFileName() const -{ - return QString(); -} - bool QmlProjectFile::isModified() const { return false; diff --git a/src/plugins/qmlprojectmanager/qmlprojectfile.h b/src/plugins/qmlprojectmanager/qmlprojectfile.h index 8b28fc7b7d3..f9dae041d63 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectfile.h +++ b/src/plugins/qmlprojectmanager/qmlprojectfile.h @@ -48,9 +48,6 @@ public: bool save(QString *errorString, const QString &fileName, bool autoSave) 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 cfe09b2013b..da738d13a8c 100644 --- a/src/plugins/resourceeditor/resourceeditorw.cpp +++ b/src/plugins/resourceeditor/resourceeditorw.cpp @@ -262,16 +262,6 @@ bool ResourceEditorDocument::reload(QString *errorString, ReloadFlag flag, Chang return true; } -QString ResourceEditorDocument::fallbackSaveAsPath() const -{ - return QString(); -} - -QString ResourceEditorDocument::fallbackSaveAsFileName() const -{ - return QString(); -} - void ResourceEditorDocument::dirtyChanged(bool dirty) { if (m_blockDirtyChanged) diff --git a/src/plugins/resourceeditor/resourceeditorw.h b/src/plugins/resourceeditor/resourceeditorw.h index 5ed211063b0..cd797fa4a59 100644 --- a/src/plugins/resourceeditor/resourceeditorw.h +++ b/src/plugins/resourceeditor/resourceeditorw.h @@ -66,8 +66,6 @@ public: bool isModified() const override; bool isSaveAsAllowed() const override; bool reload(QString *errorString, ReloadFlag flag, ChangeType type) 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 3d2655c931d..c521fb7a349 100644 --- a/src/plugins/resourceeditor/resourcenode.cpp +++ b/src/plugins/resourceeditor/resourcenode.cpp @@ -565,16 +565,6 @@ bool ResourceFileWatcher::save(QString *errorString, const QString &fileName, bo return false; } -QString ResourceFileWatcher::fallbackSaveAsPath() const -{ - return QString(); -} - -QString ResourceFileWatcher::fallbackSaveAsFileName() const -{ - return QString(); -} - bool ResourceFileWatcher::isModified() const { return false; diff --git a/src/plugins/resourceeditor/resourcenode.h b/src/plugins/resourceeditor/resourcenode.h index 4aead600b5b..0a62635aff2 100644 --- a/src/plugins/resourceeditor/resourcenode.h +++ b/src/plugins/resourceeditor/resourcenode.h @@ -175,9 +175,6 @@ public: ResourceFileWatcher(ResourceTopLevelNode *node); bool save(QString *errorString, const QString &fileName, bool autoSave) override; - QString fallbackSaveAsPath() const override; - QString fallbackSaveAsFileName() const override; - bool isModified() const override; bool isSaveAsAllowed() const override; diff --git a/src/plugins/tasklist/taskfile.cpp b/src/plugins/tasklist/taskfile.cpp index 4bf8ee2cef4..8d78648cba2 100644 --- a/src/plugins/tasklist/taskfile.cpp +++ b/src/plugins/tasklist/taskfile.cpp @@ -54,16 +54,6 @@ bool TaskFile::save(QString *errorString, const QString &fileName, bool autoSave return false; } -QString TaskFile::fallbackSaveAsPath() const -{ - return QString(); -} - -QString TaskFile::fallbackSaveAsFileName() const -{ - return QString(); -} - bool TaskFile::isModified() const { return false; diff --git a/src/plugins/tasklist/taskfile.h b/src/plugins/tasklist/taskfile.h index 4f3e4ce62b3..0d073f245c1 100644 --- a/src/plugins/tasklist/taskfile.h +++ b/src/plugins/tasklist/taskfile.h @@ -45,9 +45,6 @@ public: bool save(QString *errorString, const QString &fileName, bool autoSave) override; - QString fallbackSaveAsPath() const override; - QString fallbackSaveAsFileName() const override; - bool isModified() const override; bool isSaveAsAllowed() const override; diff --git a/src/plugins/vcsbase/submiteditorfile.h b/src/plugins/vcsbase/submiteditorfile.h index b6618db9737..3a8d9535c38 100644 --- a/src/plugins/vcsbase/submiteditorfile.h +++ b/src/plugins/vcsbase/submiteditorfile.h @@ -50,8 +50,6 @@ public: OpenResult open(QString *errorString, const QString &fileName, const QString &realFileName) override; bool setContents(const QByteArray &contents) override; - 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; }