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

Merge remote-tracking branch 'origin/2.8'

Browse Source 
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
This commit is contained in:
Eike Ziller
2013-09-27 10:44:32 +02:00
parent 19c735a491 a12a9f491c
commit 63ff745213
133 changed files with 1386 additions and 1326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libs/utils/textfileformat.cpp
View File

@@ -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