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/imageviewer | |
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/imageviewer')
-rw-r--r-- | src/plugins/imageviewer/imageviewerfile.cpp | 22 | ||||
-rw-r--r-- | src/plugins/imageviewer/imageviewerfile.h | 5 |
2 files changed, 5 insertions, 22 deletions
diff --git a/src/plugins/imageviewer/imageviewerfile.cpp b/src/plugins/imageviewer/imageviewerfile.cpp index 0f3850f896..36da85b7f7 100644 --- a/src/plugins/imageviewer/imageviewerfile.cpp +++ b/src/plugins/imageviewer/imageviewerfile.cpp @@ -61,7 +61,7 @@ bool ImageViewerFile::reload(QString *errorString, emit changed(); return true; } - return m_editor->open(errorString, m_fileName, m_fileName); + return m_editor->open(errorString, fileName(), fileName()); } bool ImageViewerFile::save(QString *errorString, const QString &fileName, bool autoSave) @@ -72,18 +72,10 @@ bool ImageViewerFile::save(QString *errorString, const QString &fileName, bool a return false; } -void ImageViewerFile::rename(const QString &newName) +void ImageViewerFile::setFileName(const QString &newName) { - const QString oldFilename = m_fileName; - m_fileName = newName; - m_editor->setDisplayName(QFileInfo(m_fileName).fileName()); - emit fileNameChanged(oldFilename, newName); - emit changed(); -} - -QString ImageViewerFile::fileName() const -{ - return m_fileName; + m_editor->setDisplayName(QFileInfo(newName).fileName()); + IDocument::setFileName(newName); } QString ImageViewerFile::defaultPath() const @@ -117,11 +109,5 @@ void ImageViewerFile::setMimetype(const QString &mimetype) emit changed(); } -void ImageViewerFile::setFileName(const QString &filename) -{ - m_fileName = filename; - emit changed(); -} - } // namespace Internal } // namespace ImageViewer diff --git a/src/plugins/imageviewer/imageviewerfile.h b/src/plugins/imageviewer/imageviewerfile.h index ab913de68a..bc2c254d29 100644 --- a/src/plugins/imageviewer/imageviewerfile.h +++ b/src/plugins/imageviewer/imageviewerfile.h @@ -46,8 +46,7 @@ public: explicit ImageViewerFile(ImageViewer *parent = 0); bool save(QString *errorString, const QString &fileName, bool autoSave); - void rename(const QString &newName); - QString fileName() const; + void setFileName(const QString &newName); QString defaultPath() const; QString suggestedFileName() const; @@ -60,10 +59,8 @@ public: bool reload(QString *errorString, ReloadFlag flag, ChangeType type); void setMimetype(const QString &mimetype); - void setFileName(const QString &filename); private: - QString m_fileName; QString m_mimeType; ImageViewer *m_editor; }; |