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

8
src/plugins/texteditor/basetextdocument.h
View File

@@ -77,7 +77,7 @@ public:
virtual bool isSaveAsAllowed() const;
virtual void checkPermissions();
ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const;
void reload(ReloadFlag flag, ChangeType type);
bool reload(QString *errorString, ReloadFlag flag, ChangeType type);
virtual QString mimeType() const;
void setMimeType(const QString &mt);
virtual void rename(const QString &newName);
@@ -88,8 +88,8 @@ public:
void setDefaultPath(const QString &defaultPath);
void setSuggestedFileName(const QString &suggestedFileName);
virtual bool open(const QString &fileName = QString());
virtual void reload();
virtual bool open(QString *errorString, const QString &fileName = QString());
virtual bool reload(QString *errorString);
QTextDocument *document() const;
void setSyntaxHighlighter(SyntaxHighlighter *highlighter);
@@ -100,7 +100,7 @@ public:
void setCodec(QTextCodec *c);
QByteArray decodingErrorSample() const;
void reload(QTextCodec *codec);
bool reload(QString *errorString, QTextCodec *codec);
void cleanWhitespace(const QTextCursor &cursor);
signals: