diff options
author | Eike Ziller <eike.ziller@digia.com> | 2013-07-04 11:35:56 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@digia.com> | 2013-07-09 10:21:58 +0200 |
commit | 99c383f3d06b93d79172a0bc3984b4f3332a8842 (patch) | |
tree | d47b752f0d82c6535a3fcaf29f19452073ff97a5 /src/plugins/genericprojectmanager | |
parent | 7dd81eca30b69b847709d00cb75fd432385c0917 (diff) | |
download | qt-creator-99c383f3d06b93d79172a0bc3984b4f3332a8842.tar.gz |
Make IDocument::fileName a member with setter.
Instead of requiring subclasses to implement a method.
Also renames IDocument::rename to IDocument::setFileName,
since it doesn't really rename any files or such.
Change-Id: I1344025c24d2f74a6a983e04fb0a5245f1f37aad
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/genericprojectmanager')
-rw-r--r-- | src/plugins/genericprojectmanager/genericproject.cpp | 17 | ||||
-rw-r--r-- | src/plugins/genericprojectmanager/genericproject.h | 3 |
2 files changed, 3 insertions, 17 deletions
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index afa10b6b59..2f36899ba7 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -455,18 +455,14 @@ bool GenericProject::fromMap(const QVariantMap &map) GenericProjectFile::GenericProjectFile(GenericProject *parent, QString fileName, GenericProject::RefreshOptions options) : IDocument(parent), m_project(parent), - m_fileName(fileName), m_options(options) -{ } - -bool GenericProjectFile::save(QString *, const QString &, bool) { - return false; + setFileName(fileName); } -QString GenericProjectFile::fileName() const +bool GenericProjectFile::save(QString *, const QString &, bool) { - return m_fileName; + return false; } QString GenericProjectFile::defaultPath() const @@ -494,13 +490,6 @@ bool GenericProjectFile::isSaveAsAllowed() const return false; } -void GenericProjectFile::rename(const QString &newName) -{ - // Can't happen - Q_UNUSED(newName); - QTC_CHECK(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 917a69482f..f4f2fb5457 100644 --- a/src/plugins/genericprojectmanager/genericproject.h +++ b/src/plugins/genericprojectmanager/genericproject.h @@ -128,7 +128,6 @@ public: GenericProjectFile(GenericProject *parent, QString fileName, GenericProject::RefreshOptions options); bool save(QString *errorString, const QString &fileName, bool autoSave); - QString fileName() const; QString defaultPath() const; QString suggestedFileName() const; @@ -136,14 +135,12 @@ public: bool isModified() const; bool isSaveAsAllowed() const; - void rename(const QString &newName); ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const; bool reload(QString *errorString, ReloadFlag flag, ChangeType type); private: GenericProject *m_project; - QString m_fileName; GenericProject::RefreshOptions m_options; }; |