diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.cpp b/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.cpp index 385c7c7e7de..096ed7301a2 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.cpp @@ -29,8 +29,8 @@ #include "autotoolsproject.h" #include "autotoolsprojectconstants.h" -using namespace AutotoolsProjectManager; -using namespace AutotoolsProjectManager::Internal; +namespace AutotoolsProjectManager { +namespace Internal { AutotoolsProjectFile::AutotoolsProjectFile(const QString &fileName) { @@ -39,30 +39,5 @@ AutotoolsProjectFile::AutotoolsProjectFile(const QString &fileName) setFilePath(Utils::FileName::fromString(fileName)); } -bool AutotoolsProjectFile::save(QString *errorString, const QString &fileName, bool autoSave) -{ - Q_UNUSED(errorString); - Q_UNUSED(fileName); - Q_UNUSED(autoSave); - - return false; -} - -bool AutotoolsProjectFile::isModified() const -{ - return false; -} - -bool AutotoolsProjectFile::isSaveAsAllowed() const -{ - return false; -} - -bool AutotoolsProjectFile::reload(QString *errorString, ReloadFlag flag, ChangeType type) -{ - Q_UNUSED(errorString); - Q_UNUSED(flag); - Q_UNUSED(type); - - return false; -} +} // namespace Internal +} // namespace AutotoolsProjectManager diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.h b/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.h index b4c6187d676..58cdfa08c98 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.h +++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.h @@ -32,8 +32,6 @@ namespace AutotoolsProjectManager { namespace Internal { -class AutotoolsProject; - /** * @brief Implementation of the Core::IDocument interface. * @@ -47,14 +45,8 @@ class AutotoolsProject; class AutotoolsProjectFile : public Core::IDocument { Q_OBJECT - public: AutotoolsProjectFile(const QString &fileName); - - bool save(QString *errorString, const QString &fileName, bool autoSave) override; - bool isModified() const override; - bool isSaveAsAllowed() const override; - bool reload(QString *errorString, ReloadFlag flag, ChangeType type) override; }; } // namespace Internal diff --git a/src/plugins/cmakeprojectmanager/cmakefile.cpp b/src/plugins/cmakeprojectmanager/cmakefile.cpp index ec0bcb48187..0d338840166 100644 --- a/src/plugins/cmakeprojectmanager/cmakefile.cpp +++ b/src/plugins/cmakeprojectmanager/cmakefile.cpp @@ -41,26 +41,6 @@ CMakeFile::CMakeFile(const FileName &fileName) setFilePath(fileName); } -bool CMakeFile::save(QString *errorString, const QString &fileName, bool autoSave) -{ - // Once we have an texteditor open for this file, we probably do - // need to implement this, don't we. - Q_UNUSED(errorString) - Q_UNUSED(fileName) - Q_UNUSED(autoSave) - return false; -} - -bool CMakeFile::isModified() const -{ - return false; -} - -bool CMakeFile::isSaveAsAllowed() const -{ - return false; -} - Core::IDocument::ReloadBehavior CMakeFile::reloadBehavior(ChangeTrigger state, ChangeType type) const { Q_UNUSED(state) @@ -68,12 +48,5 @@ Core::IDocument::ReloadBehavior CMakeFile::reloadBehavior(ChangeTrigger state, C return BehaviorSilent; } -bool CMakeFile::reload(QString *errorString, ReloadFlag flag, ChangeType type) -{ - Q_UNUSED(errorString) - Q_UNUSED(flag) - Q_UNUSED(type) - return true; -} } // namespace Internal } // namespace CMakeProjectManager diff --git a/src/plugins/cmakeprojectmanager/cmakefile.h b/src/plugins/cmakeprojectmanager/cmakefile.h index 675c3c9d989..0b5d0992c4b 100644 --- a/src/plugins/cmakeprojectmanager/cmakefile.h +++ b/src/plugins/cmakeprojectmanager/cmakefile.h @@ -38,13 +38,7 @@ class CMakeFile : public Core::IDocument public: CMakeFile(const Utils::FileName &fileName); - bool save(QString *errorString, const QString &fileName, bool autoSave) override; - - bool isModified() const override; - bool isSaveAsAllowed() const override; - ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const override; - bool reload(QString *errorString, ReloadFlag flag, ChangeType type) override; }; } // namespace Internal diff --git a/src/plugins/coreplugin/editormanager/documentmodel.cpp b/src/plugins/coreplugin/editormanager/documentmodel.cpp index 4fb99ae9a5b..03da7fadc51 100644 --- a/src/plugins/coreplugin/editormanager/documentmodel.cpp +++ b/src/plugins/coreplugin/editormanager/documentmodel.cpp @@ -109,15 +109,6 @@ private: QHash m_entryByFixedPath; }; -class SuspendedDocument : public IDocument -{ -public: - bool save(QString *, const QString &, bool) override { return false; } - bool isModified() const override { return false; } - bool isSaveAsAllowed() const override { return false; } - bool reload(QString *, ReloadFlag, ChangeType) override { return true; } -}; - DocumentModelPrivate::DocumentModelPrivate() : m_lockedIcon(Icons::LOCKED.icon()), m_unlockedIcon(Icons::UNLOCKED.icon()) @@ -226,7 +217,7 @@ void DocumentModel::addEditor(IEditor *editor, bool *isNewDocument) void DocumentModel::addSuspendedDocument(const QString &fileName, const QString &displayName, Id id) { Entry *entry = new Entry; - entry->document = new SuspendedDocument; + entry->document = new IDocument; entry->document->setFilePath(Utils::FileName::fromString(fileName)); entry->document->setPreferredDisplayName(displayName); entry->document->setId(id); diff --git a/src/plugins/coreplugin/idocument.cpp b/src/plugins/coreplugin/idocument.cpp index 92114a8f3c7..3a282a45d65 100644 --- a/src/plugins/coreplugin/idocument.cpp +++ b/src/plugins/coreplugin/idocument.cpp @@ -145,6 +145,14 @@ IDocument::OpenResult IDocument::open(QString *errorString, const QString &fileN return OpenResult::CannotHandle; } +bool IDocument::save(QString *errorString, const QString &fileName, bool autoSave) +{ + Q_UNUSED(errorString) + Q_UNUSED(fileName) + Q_UNUSED(autoSave) + return false; +} + /*! * Returns the current contents of the document. The base implementation returns an empty * QByteArray. @@ -180,6 +188,14 @@ IDocument::ReloadBehavior IDocument::reloadBehavior(ChangeTrigger state, ChangeT return BehaviorAsk; } +bool IDocument::reload(QString *errorString, ReloadFlag flag, ChangeType type) +{ + Q_UNUSED(errorString) + Q_UNUSED(flag) + Q_UNUSED(type) + return true; +} + void IDocument::checkPermissions() { } @@ -189,6 +205,16 @@ bool IDocument::shouldAutoSave() const return false; } +bool IDocument::isModified() const +{ + return false; +} + +bool IDocument::isSaveAsAllowed() const +{ + return false; +} + bool IDocument::isFileReadOnly() const { if (filePath().isEmpty()) diff --git a/src/plugins/coreplugin/idocument.h b/src/plugins/coreplugin/idocument.h index 21b64ef31a7..72a3dd43337 100644 --- a/src/plugins/coreplugin/idocument.h +++ b/src/plugins/coreplugin/idocument.h @@ -89,7 +89,7 @@ public: // required to be re-implemented for documents of IEditors virtual OpenResult open(QString *errorString, const QString &fileName, const QString &realFileName); - virtual bool save(QString *errorString, const QString &fileName = QString(), bool autoSave = false) = 0; + virtual bool save(QString *errorString, const QString &fileName = QString(), bool autoSave = false); virtual QByteArray contents() const; virtual bool setContents(const QByteArray &contents); @@ -112,11 +112,11 @@ public: void setMimeType(const QString &mimeType); virtual bool shouldAutoSave() const; - virtual bool isModified() const = 0; - virtual bool isSaveAsAllowed() const = 0; + virtual bool isModified() const; + virtual bool isSaveAsAllowed() const; virtual ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const; - virtual bool reload(QString *errorString, ReloadFlag flag, ChangeType type) = 0; + virtual bool reload(QString *errorString, ReloadFlag flag, ChangeType type); virtual void checkPermissions(); diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index fca94a5a5e2..880798fcdaa 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -442,21 +442,6 @@ GenericProjectFile::GenericProjectFile(GenericProject *parent, QString fileName, setFilePath(Utils::FileName::fromString(fileName)); } -bool GenericProjectFile::save(QString *, const QString &, bool) -{ - return false; -} - -bool GenericProjectFile::isModified() const -{ - return false; -} - -bool GenericProjectFile::isSaveAsAllowed() const -{ - return false; -} - IDocument::ReloadBehavior GenericProjectFile::reloadBehavior(ChangeTrigger state, ChangeType type) const { Q_UNUSED(state); diff --git a/src/plugins/genericprojectmanager/genericproject.h b/src/plugins/genericprojectmanager/genericproject.h index 044dddb7ad9..2ecd8ddd8de 100644 --- a/src/plugins/genericprojectmanager/genericproject.h +++ b/src/plugins/genericprojectmanager/genericproject.h @@ -108,15 +108,9 @@ private: class GenericProjectFile : public Core::IDocument { Q_OBJECT - public: GenericProjectFile(GenericProject *parent, QString fileName, GenericProject::RefreshOptions options); - bool save(QString *errorString, const QString &fileName, bool autoSave) override; - - bool isModified() const override; - bool isSaveAsAllowed() const override; - ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const override; bool reload(QString *errorString, ReloadFlag flag, ChangeType type) override; diff --git a/src/plugins/imageviewer/imageviewerfile.cpp b/src/plugins/imageviewer/imageviewerfile.cpp index 64cd09a7d65..f5192db521c 100644 --- a/src/plugins/imageviewer/imageviewerfile.cpp +++ b/src/plugins/imageviewer/imageviewerfile.cpp @@ -249,23 +249,5 @@ void ImageViewerFile::cleanUp() m_type = TypeInvalid; } -bool ImageViewerFile::save(QString *errorString, const QString &fileName, bool autoSave) -{ - Q_UNUSED(errorString) - Q_UNUSED(fileName); - Q_UNUSED(autoSave) - return false; -} - -bool ImageViewerFile::isModified() const -{ - return false; -} - -bool ImageViewerFile::isSaveAsAllowed() const -{ - return false; -} - } // namespace Internal } // namespace ImageViewer diff --git a/src/plugins/imageviewer/imageviewerfile.h b/src/plugins/imageviewer/imageviewerfile.h index 1e5c3739807..772dc42955f 100644 --- a/src/plugins/imageviewer/imageviewerfile.h +++ b/src/plugins/imageviewer/imageviewerfile.h @@ -62,10 +62,6 @@ public: OpenResult open(QString *errorString, const QString &fileName, const QString &realFileName) override; - bool save(QString *errorString, const QString &fileName, bool autoSave) override; - - bool isModified() const override; - bool isSaveAsAllowed() const override; ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) 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 fdeb8e2134e..92648cdad3a 100644 --- a/src/plugins/pythoneditor/pythoneditorplugin.cpp +++ b/src/plugins/pythoneditor/pythoneditorplugin.cpp @@ -281,17 +281,6 @@ public: setFilePath(FileName::fromString(fileName)); } - bool save(QString *errorString, const QString &fileName, bool autoSave) override - { - Q_UNUSED(errorString) - Q_UNUSED(fileName) - Q_UNUSED(autoSave) - return false; - } - - bool isModified() const override { return false; } - bool isSaveAsAllowed() const override { return false; } - ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const override { Q_UNUSED(state) diff --git a/src/plugins/qbsprojectmanager/qbsprojectfile.cpp b/src/plugins/qbsprojectmanager/qbsprojectfile.cpp index e7b74c7d41d..21455d7e4a2 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectfile.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectfile.cpp @@ -39,21 +39,6 @@ QbsProjectFile::QbsProjectFile(QbsProject *parent, QString fileName) : Core::IDo setFilePath(Utils::FileName::fromString(fileName)); } -bool QbsProjectFile::save(QString *, const QString &, bool) -{ - return false; -} - -bool QbsProjectFile::isModified() const -{ - return false; -} - -bool QbsProjectFile::isSaveAsAllowed() const -{ - return false; -} - Core::IDocument::ReloadBehavior QbsProjectFile::reloadBehavior(ChangeTrigger state, ChangeType type) const { Q_UNUSED(state); diff --git a/src/plugins/qbsprojectmanager/qbsprojectfile.h b/src/plugins/qbsprojectmanager/qbsprojectfile.h index 13aa2ac037b..b57fcbcd33f 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectfile.h +++ b/src/plugins/qbsprojectmanager/qbsprojectfile.h @@ -36,15 +36,9 @@ class QbsProject; class QbsProjectFile : public Core::IDocument { Q_OBJECT - public: QbsProjectFile(QbsProject *parent, QString fileName); - bool save(QString *errorString, const QString &fileName, bool autoSave) override; - - bool isModified() const override; - bool isSaveAsAllowed() const override; - ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const override; bool reload(QString *errorString, ReloadFlag flag, ChangeType type) override; diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp index 6b5834db09a..65611128b0a 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp @@ -268,24 +268,6 @@ QmakePriFile::QmakePriFile(QmakeProjectManager::QmakePriFileNode *qmakePriFile) setFilePath(m_priFile->filePath()); } -bool QmakePriFile::save(QString *errorString, const QString &fileName, bool autoSave) -{ - Q_UNUSED(errorString); - Q_UNUSED(fileName); - Q_UNUSED(autoSave); - return false; -} - -bool QmakePriFile::isModified() const -{ - return false; -} - -bool QmakePriFile::isSaveAsAllowed() const -{ - return false; -} - Core::IDocument::ReloadBehavior QmakePriFile::reloadBehavior(ChangeTrigger state, ChangeType type) const { Q_UNUSED(state) diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.h b/src/plugins/qmakeprojectmanager/qmakenodes.h index 3705c99703f..ca565a45157 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.h +++ b/src/plugins/qmakeprojectmanager/qmakenodes.h @@ -241,10 +241,6 @@ class QmakePriFile : public Core::IDocument Q_OBJECT public: QmakePriFile(QmakePriFileNode *qmakePriFile); - bool save(QString *errorString, const QString &fileName, bool autoSave) override; - - bool isModified() const override; - bool isSaveAsAllowed() const override; ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const override; bool reload(QString *errorString, ReloadFlag flag, ChangeType type) override; diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index 6f8c2f90b41..8ae36a74bd1 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -95,15 +95,9 @@ namespace Internal { class QmakeProjectFile : public Core::IDocument { Q_OBJECT - public: QmakeProjectFile(const QString &filePath); - bool save(QString *errorString, const QString &fileName, bool autoSave) override; - - bool isModified() const override; - bool isSaveAsAllowed() const override; - ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const override; bool reload(QString *errorString, ReloadFlag flag, ChangeType type) override; }; @@ -254,22 +248,6 @@ QmakeProjectFile::QmakeProjectFile(const QString &filePath) setFilePath(FileName::fromString(filePath)); } -bool QmakeProjectFile::save(QString *, const QString &, bool) -{ - // This is never used - return false; -} - -bool QmakeProjectFile::isModified() const -{ - return false; // we save after changing anyway -} - -bool QmakeProjectFile::isSaveAsAllowed() const -{ - return false; -} - Core::IDocument::ReloadBehavior QmakeProjectFile::reloadBehavior(ChangeTrigger state, ChangeType type) const { Q_UNUSED(state) diff --git a/src/plugins/qmlprojectmanager/qmlprojectfile.cpp b/src/plugins/qmlprojectmanager/qmlprojectfile.cpp index c97820a5c47..3794f1d11a9 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectfile.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectfile.cpp @@ -41,21 +41,6 @@ QmlProjectFile::QmlProjectFile(QmlProject *parent, const Utils::FileName &fileNa setFilePath(fileName); } -bool QmlProjectFile::save(QString *, const QString &, bool) -{ - return false; -} - -bool QmlProjectFile::isModified() const -{ - return false; -} - -bool QmlProjectFile::isSaveAsAllowed() const -{ - return false; -} - Core::IDocument::ReloadBehavior QmlProjectFile::reloadBehavior(ChangeTrigger state, ChangeType type) const { Q_UNUSED(state) diff --git a/src/plugins/qmlprojectmanager/qmlprojectfile.h b/src/plugins/qmlprojectmanager/qmlprojectfile.h index 73dc4ace989..bd9077397e0 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectfile.h +++ b/src/plugins/qmlprojectmanager/qmlprojectfile.h @@ -37,15 +37,9 @@ namespace Internal { class QmlProjectFile : public Core::IDocument { Q_OBJECT - public: QmlProjectFile(QmlProject *parent, const Utils::FileName &fileName); - bool save(QString *errorString, const QString &fileName, bool autoSave) override; - - bool isModified() const override; - bool isSaveAsAllowed() const override; - ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const override; bool reload(QString *errorString, ReloadFlag flag, ChangeType type) override; diff --git a/src/plugins/resourceeditor/resourcenode.cpp b/src/plugins/resourceeditor/resourcenode.cpp index e2f8ca16caf..c77c2632b78 100644 --- a/src/plugins/resourceeditor/resourcenode.cpp +++ b/src/plugins/resourceeditor/resourcenode.cpp @@ -552,24 +552,6 @@ ResourceFileWatcher::ResourceFileWatcher(ResourceTopLevelNode *node) setFilePath(node->filePath()); } -bool ResourceFileWatcher::save(QString *errorString, const QString &fileName, bool autoSave) -{ - Q_UNUSED(errorString); - Q_UNUSED(fileName); - Q_UNUSED(autoSave); - return false; -} - -bool ResourceFileWatcher::isModified() const -{ - return false; -} - -bool ResourceFileWatcher::isSaveAsAllowed() const -{ - return false; -} - Core::IDocument::ReloadBehavior ResourceFileWatcher::reloadBehavior(ChangeTrigger state, ChangeType type) const { Q_UNUSED(state) diff --git a/src/plugins/resourceeditor/resourcenode.h b/src/plugins/resourceeditor/resourcenode.h index d006d8225a9..7d1fce7ebf2 100644 --- a/src/plugins/resourceeditor/resourcenode.h +++ b/src/plugins/resourceeditor/resourcenode.h @@ -168,10 +168,6 @@ class ResourceFileWatcher : public Core::IDocument Q_OBJECT public: ResourceFileWatcher(ResourceTopLevelNode *node); - bool save(QString *errorString, const QString &fileName, bool autoSave) override; - - bool isModified() const override; - bool isSaveAsAllowed() const override; ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const override; bool reload(QString *errorString, ReloadFlag flag, ChangeType type) override; diff --git a/src/plugins/tasklist/taskfile.cpp b/src/plugins/tasklist/taskfile.cpp index ddf1077b115..36206164383 100644 --- a/src/plugins/tasklist/taskfile.cpp +++ b/src/plugins/tasklist/taskfile.cpp @@ -41,24 +41,6 @@ TaskFile::TaskFile(QObject *parent) : Core::IDocument(parent) setId("TaskList.TaskFile"); } -bool TaskFile::save(QString *errorString, const QString &fileName, bool autoSave) -{ - Q_UNUSED(errorString) - Q_UNUSED(fileName); - Q_UNUSED(autoSave) - return false; -} - -bool TaskFile::isModified() const -{ - return false; -} - -bool TaskFile::isSaveAsAllowed() const -{ - return false; -} - Core::IDocument::ReloadBehavior TaskFile::reloadBehavior(ChangeTrigger state, ChangeType type) const { Q_UNUSED(state); diff --git a/src/plugins/tasklist/taskfile.h b/src/plugins/tasklist/taskfile.h index bfe98f35734..11bfce115bb 100644 --- a/src/plugins/tasklist/taskfile.h +++ b/src/plugins/tasklist/taskfile.h @@ -38,11 +38,6 @@ class TaskFile : public Core::IDocument public: TaskFile(QObject *parent); - bool save(QString *errorString, const QString &fileName, bool autoSave) override; - - bool isModified() const override; - bool isSaveAsAllowed() const override; - ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const override; bool reload(QString *errorString, ReloadFlag flag, ChangeType type) override; diff --git a/src/plugins/vcsbase/submiteditorfile.cpp b/src/plugins/vcsbase/submiteditorfile.cpp index 44bf91a884f..9136118bf7e 100644 --- a/src/plugins/vcsbase/submiteditorfile.cpp +++ b/src/plugins/vcsbase/submiteditorfile.cpp @@ -115,11 +115,3 @@ Core::IDocument::ReloadBehavior SubmitEditorFile::reloadBehavior(ChangeTrigger s Q_UNUSED(type) return BehaviorSilent; } - -bool SubmitEditorFile::reload(QString *errorString, ReloadFlag flag, ChangeType type) -{ - Q_UNUSED(errorString) - Q_UNUSED(flag) - Q_UNUSED(type) - return true; -} diff --git a/src/plugins/vcsbase/submiteditorfile.h b/src/plugins/vcsbase/submiteditorfile.h index 9fe7fa2238e..3961eecdda9 100644 --- a/src/plugins/vcsbase/submiteditorfile.h +++ b/src/plugins/vcsbase/submiteditorfile.h @@ -47,10 +47,8 @@ public: bool setContents(const QByteArray &contents) override; bool isModified() const override { return m_modified; } - bool isSaveAsAllowed() const override { return false; } bool save(QString *errorString, const QString &fileName, bool autoSave) override; ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const override; - bool reload(QString *errorString, ReloadFlag flag, ChangeType type) override; void setModified(bool modified = true);