summaryrefslogtreecommitdiff
path: root/src/plugins/qmlprojectmanager
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/qmlprojectmanager
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/qmlprojectmanager')
-rw-r--r--src/plugins/qmlprojectmanager/qmlprojectfile.cpp4
-rw-r--r--src/plugins/qmlprojectmanager/qmlprojectfile.h2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlprojectfile.cpp b/src/plugins/qmlprojectmanager/qmlprojectfile.cpp
index bcaf5323c5..64a4c723c7 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectfile.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectfile.cpp
@@ -100,10 +100,12 @@ Core::IFile::ReloadBehavior QmlProjectFile::reloadBehavior(ChangeTrigger state,
return BehaviorSilent;
}
-void QmlProjectFile::reload(ReloadFlag flag, ChangeType type)
+bool QmlProjectFile::reload(QString *errorString, ReloadFlag flag, ChangeType type)
{
+ Q_UNUSED(errorString)
Q_UNUSED(flag)
Q_UNUSED(type)
+ return true;
}
} // namespace Internal
diff --git a/src/plugins/qmlprojectmanager/qmlprojectfile.h b/src/plugins/qmlprojectmanager/qmlprojectfile.h
index 9f30d092ce..e9992fee0a 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectfile.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectfile.h
@@ -62,7 +62,7 @@ public:
virtual bool isSaveAsAllowed() const;
ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const;
- void reload(ReloadFlag flag, ChangeType type);
+ bool reload(QString *errorString, ReloadFlag flag, ChangeType type);
private:
QmlProject *m_project;