feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

add errorString output argument to IFile::reload() & IEditor::open()

Browse Source 
add/unify read error handling in all affected classes
This commit is contained in:
Oswald Buddenhagen
2011-04-04 15:24:13 +02:00
parent f1f9904d35
commit fae7dc9584
44 changed files with 204 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/designer/formwindowfile.cpp
View File

@@ -141,17 +141,20 @@ Core::IFile::ReloadBehavior FormWindowFile::reloadBehavior(ChangeTrigger state,
return BehaviorAsk;
}
void FormWindowFile::reload(ReloadFlag flag, ChangeType type)
bool FormWindowFile::reload(QString *errorString, ReloadFlag flag, ChangeType type)
{
if (flag == FlagIgnore)
return;
return true;
if (type == TypePermissions) {
emit changed();
} else {
emit aboutToReload();
emit reload(m_fileName);
emit reload(errorString, m_fileName);
if (!errorString->isEmpty())
return false;
emit reloaded();
}
return true;
}
QString FormWindowFile::defaultPath() const