diff options
author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-06-02 17:14:48 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-06-10 11:21:17 +0000 |
commit | 4f927e4c87f07c4d50efcef5b61478df61cc9d3f (patch) | |
tree | a9bbeafa63ea92a5171990bdc8639f93282a7252 /src/plugins/tasklist | |
parent | c916d250b3c1ff28a4ad0c93ccbd6005c9ff9f42 (diff) | |
download | qt-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/tasklist')
-rw-r--r-- | src/plugins/tasklist/taskfile.cpp | 5 | ||||
-rw-r--r-- | src/plugins/tasklist/taskfile.h | 2 | ||||
-rw-r--r-- | src/plugins/tasklist/tasklistplugin.cpp | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/tasklist/taskfile.cpp b/src/plugins/tasklist/taskfile.cpp index 5e1fcf60fd..c481079bdb 100644 --- a/src/plugins/tasklist/taskfile.cpp +++ b/src/plugins/tasklist/taskfile.cpp @@ -94,11 +94,12 @@ bool TaskFile::reload(QString *errorString, ReloadFlag flag, ChangeType type) deleteLater(); return true; } - return open(errorString, filePath().toString()); + return open(errorString, filePath().toString(), filePath().toString()); } -bool TaskFile::open(QString *errorString, const QString &fileName) +bool TaskFile::open(QString *errorString, const QString &fileName, const QString &realFileName) { + Q_UNUSED(realFileName) setFilePath(Utils::FileName::fromString(fileName)); return TaskListPlugin::loadFile(errorString, m_baseDir, fileName); } diff --git a/src/plugins/tasklist/taskfile.h b/src/plugins/tasklist/taskfile.h index 6e701024c0..2550c94b1d 100644 --- a/src/plugins/tasklist/taskfile.h +++ b/src/plugins/tasklist/taskfile.h @@ -55,7 +55,7 @@ public: ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const; bool reload(QString *errorString, ReloadFlag flag, ChangeType type); - bool open(QString *errorString, const QString &fileName); + bool open(QString *errorString, const QString &fileName, const QString &realFileName); QString baseDir() const; void setBaseDir(const QString &base); diff --git a/src/plugins/tasklist/tasklistplugin.cpp b/src/plugins/tasklist/tasklistplugin.cpp index a272b07dca..c8921ad9d3 100644 --- a/src/plugins/tasklist/tasklistplugin.cpp +++ b/src/plugins/tasklist/tasklistplugin.cpp @@ -177,7 +177,7 @@ IDocument *TaskListPlugin::openTasks(const QString &base, const QString &fileNam file->setBaseDir(base); QString errorString; - if (!file->open(&errorString, fileName)) { + if (!file->open(&errorString, fileName, fileName)) { QMessageBox::critical(ICore::mainWindow(), tr("File Error"), errorString); delete file; return 0; |