From fae7dc9584b4e2f2192f8b7a71c428fcaa2ddb70 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Mon, 4 Apr 2011 15:24:13 +0200
Subject: add errorString output argument to IFile::reload() & IEditor::open()

add/unify read error handling in all affected classes
---
 src/plugins/qmlprojectmanager/qmlprojectfile.cpp | 4 +++-
 src/plugins/qmlprojectmanager/qmlprojectfile.h   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/plugins/qmlprojectmanager')

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;
-- 
cgit v1.2.1