diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-09-27 10:44:32 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-09-27 10:44:32 +0200 |
| commit | 63ff7452137958215988d9f2f6066de955500be0 (patch) | |
| tree | d645a26ae9db68cdbf37e9fd997a221c81eea008 /src/libs/utils/textfileformat.cpp | |
| parent | 19c735a4912487e8038f08ea0b617ccce62cd1a3 (diff) | |
| parent | a12a9f491cb31ff5c22f1051bb22ccfef6c65217 (diff) | |
| download | qt-creator-63ff7452137958215988d9f2f6066de955500be0.tar.gz | |
Merge remote-tracking branch 'origin/2.8'
Conflicts:
src/libs/extensionsystem/pluginmanager.cpp
src/libs/extensionsystem/pluginspec.cpp
src/plugins/coreplugin/basefilewizard.cpp
src/plugins/coreplugin/coreplugin.pro
src/plugins/coreplugin/coreplugin.qbs
src/plugins/coreplugin/editormanager/ieditor.cpp
src/plugins/coreplugin/externaltool.cpp
src/plugins/coreplugin/icore.cpp
src/plugins/cpptools/cppmodelmanager.cpp
src/plugins/fakevim/fakevimhandler.cpp
src/plugins/find/ifindfilter.cpp
src/plugins/projectexplorer/buildstep.cpp
src/plugins/projectexplorer/devicesupport/idevice.cpp
src/plugins/projectexplorer/runconfiguration.cpp
src/plugins/vcsbase/vcsbaseeditor.cpp
tests/system/suite_debugger/tst_simple_analyze/test.py
Change-Id: I11dc9e60bfc14bad4f8af747d041fc7678a07c17
Diffstat (limited to 'src/libs/utils/textfileformat.cpp')
| -rw-r--r-- | src/libs/utils/textfileformat.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libs/utils/textfileformat.cpp b/src/libs/utils/textfileformat.cpp index 26dac75df3..bbd90e7a8a 100644 --- a/src/libs/utils/textfileformat.cpp +++ b/src/libs/utils/textfileformat.cpp @@ -78,7 +78,7 @@ TextFileFormat::TextFileFormat() : } /*! - \brief Detect the format of text data. + Detects the format of text data. */ TextFileFormat TextFileFormat::detect(const QByteArray &data) @@ -111,7 +111,7 @@ TextFileFormat TextFileFormat::detect(const QByteArray &data) } /*! - \brief Returns a piece of text suitable as display for a encoding error. + Returns a piece of text suitable as display for a encoding error. */ QByteArray TextFileFormat::decodingErrorSample(const QByteArray &data) @@ -179,7 +179,7 @@ bool decodeTextFileContent(const QByteArray &dataBA, } /*! - \brief Decode data to a plain string. + Decodes data to a plain string. */ bool TextFileFormat::decode(const QByteArray &data, QString *target) const @@ -189,7 +189,7 @@ bool TextFileFormat::decode(const QByteArray &data, QString *target) const } /*! - \brief Decode data to a list of strings. + Decodes data to a list of strings. Intended for use with progress bars loading large files. */ @@ -236,7 +236,7 @@ TextFileFormat::ReadResult readTextFile(const QString &fileName, const QTextCode } /*! - \brief Read text file into a list of strings. + Reads a text file into a list of strings. */ TextFileFormat::ReadResult @@ -254,7 +254,7 @@ TextFileFormat::ReadResult } /*! - \brief Read text file into a string. + Reads a text file into a string. */ TextFileFormat::ReadResult @@ -305,7 +305,7 @@ TextFileFormat::ReadResult TextFileFormat::readFileUTF8(const QString &fileName, } /*! - \brief Write out a text file. + Writes out a text file. */ bool TextFileFormat::writeFile(const QString &fileName, QString plainText, QString *errorString) const |