summaryrefslogtreecommitdiff
path: root/src/plugins/tasklist/taskfile.cpp
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-04-04 15:24:13 +0200
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-04-18 14:10:13 +0200
commitfae7dc9584b4e2f2192f8b7a71c428fcaa2ddb70 (patch)
tree8bef6eb1041468b8a5fafee29e5832bade62729b /src/plugins/tasklist/taskfile.cpp
parentf1f9904d3578fd6790f0598e58cf6e2b5628eb50 (diff)
downloadqt-creator-fae7dc9584b4e2f2192f8b7a71c428fcaa2ddb70.tar.gz
add errorString output argument to IFile::reload() & IEditor::open()
add/unify read error handling in all affected classes
Diffstat (limited to 'src/plugins/tasklist/taskfile.cpp')
-rw-r--r--src/plugins/tasklist/taskfile.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/plugins/tasklist/taskfile.cpp b/src/plugins/tasklist/taskfile.cpp
index 7c0b5429ac..e26a4b6c6c 100644
--- a/src/plugins/tasklist/taskfile.cpp
+++ b/src/plugins/tasklist/taskfile.cpp
@@ -97,15 +97,17 @@ Core::IFile::ReloadBehavior TaskFile::reloadBehavior(ChangeTrigger state, Change
return BehaviorSilent;
}
-void TaskFile::reload(ReloadFlag flag, ChangeType type)
+bool TaskFile::reload(QString *errorString, ReloadFlag flag, ChangeType type)
{
Q_UNUSED(flag);
if (type == TypePermissions)
- return;
- open(m_fileName);
- if (type == TypeRemoved)
+ return true;
+ if (type == TypeRemoved) {
deleteLater();
+ return true;
+ }
+ return open(errorString, m_fileName);
}
void TaskFile::rename(const QString &newName)
@@ -113,10 +115,10 @@ void TaskFile::rename(const QString &newName)
Q_UNUSED(newName);
}
-bool TaskFile::open(const QString &fileName)
+bool TaskFile::open(QString *errorString, const QString &fileName)
{
m_fileName = fileName;
- return TaskList::TaskListPlugin::instance()->loadFile(m_context, m_fileName);
+ return TaskList::TaskListPlugin::instance()->loadFile(errorString, m_context, m_fileName);
}
ProjectExplorer::Project *TaskFile::context() const