summaryrefslogtreecommitdiff
path: root/src/plugins/imageviewer/imageviewer.cpp
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@theqtcompany.com>2015-06-02 17:14:48 +0200
committerEike Ziller <eike.ziller@theqtcompany.com>2015-06-10 11:21:17 +0000
commit4f927e4c87f07c4d50efcef5b61478df61cc9d3f (patch)
treea9bbeafa63ea92a5171990bdc8639f93282a7252 /src/plugins/imageviewer/imageviewer.cpp
parentc916d250b3c1ff28a4ad0c93ccbd6005c9ff9f42 (diff)
downloadqt-creator-4f927e4c87f07c4d50efcef5b61478df61cc9d3f.tar.gz
Move "open" from IEditor to IDocument
For non-editor documents it currently is not used, but for editors it makes more sense to have that on the document instead of the editor. Most actual implementations of "open" were done in the documents already anyhow, because it is needed for reloading. Change-Id: I29d4df2078995cbe80172b51a9bebeecb3afad3c Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Diffstat (limited to 'src/plugins/imageviewer/imageviewer.cpp')
-rw-r--r--src/plugins/imageviewer/imageviewer.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp
index 4bb53194e4..718435ef5e 100644
--- a/src/plugins/imageviewer/imageviewer.cpp
+++ b/src/plugins/imageviewer/imageviewer.cpp
@@ -142,6 +142,8 @@ void ImageViewer::ctor()
this, &ImageViewer::playToggled);
connect(d->file.data(), &ImageViewerFile::imageSizeChanged,
this, &ImageViewer::imageSizeUpdated);
+ connect(d->file.data(), &ImageViewerFile::openFinished,
+ d->imageView, &ImageView::createScene);
connect(d->file.data(), &ImageViewerFile::aboutToReload,
d->imageView, &ImageView::reset);
connect(d->file.data(), &ImageViewerFile::reloadFinished,
@@ -159,14 +161,6 @@ ImageViewer::~ImageViewer()
delete d;
}
-bool ImageViewer::open(QString *errorString, const QString &fileName, const QString &realFileName)
-{
- if (!d->file->open(errorString, fileName, realFileName))
- return false;
- d->imageView->createScene();
- return true;
-}
-
Core::IDocument *ImageViewer::document()
{
return d->file.data();