aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/utils/textfileformat.cpp
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2014-07-15 23:33:17 +0300
committerhjk <hjk121@nokiamail.com>2014-07-16 14:15:09 +0200
commit62d98daa586e8ed9af1f769451875e2e64d816dd (patch)
tree8634ca5ef2cf714fb2ead376138b4bfb559c86c3 /src/libs/utils/textfileformat.cpp
parente63945593621e87c8afd64624f29e5a04ff6e1b6 (diff)
Utils: Remove unneeded namespace qualifications
Change-Id: Iacab8410ab4d3b63f96e7541b450e3cc729ab662 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src/libs/utils/textfileformat.cpp')
-rw-r--r--src/libs/utils/textfileformat.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/libs/utils/textfileformat.cpp b/src/libs/utils/textfileformat.cpp
index f9a2e21c86..9aceec7dd1 100644
--- a/src/libs/utils/textfileformat.cpp
+++ b/src/libs/utils/textfileformat.cpp
@@ -213,7 +213,7 @@ TextFileFormat::ReadResult readTextFile(const QString &fileName, const QTextCode
QByteArray data;
try {
- Utils::FileReader reader;
+ FileReader reader;
if (!reader.fetch(fileName, errorString))
return TextFileFormat::ReadIOError;
data = reader.data();
@@ -277,16 +277,16 @@ TextFileFormat::ReadResult TextFileFormat::readFileUTF8(const QString &fileName,
{
QByteArray data;
try {
- Utils::FileReader reader;
+ FileReader reader;
if (!reader.fetch(fileName, errorString))
- return Utils::TextFileFormat::ReadIOError;
+ return TextFileFormat::ReadIOError;
data = reader.data();
} catch (const std::bad_alloc &) {
*errorString = QCoreApplication::translate("Utils::TextFileFormat", "Out of memory.");
- return Utils::TextFileFormat::ReadMemoryAllocationError;
+ return TextFileFormat::ReadMemoryAllocationError;
}
- Utils::TextFileFormat format = Utils::TextFileFormat::detect(data);
+ TextFileFormat format = TextFileFormat::detect(data);
if (!format.codec)
format.codec = defaultCodec ? defaultCodec : QTextCodec::codecForLocale();
QString target;
@@ -294,10 +294,10 @@ TextFileFormat::ReadResult TextFileFormat::readFileUTF8(const QString &fileName,
if (format.hasUtf8Bom)
data.remove(0, 3);
*plainText = data;
- return Utils::TextFileFormat::ReadSuccess;
+ return TextFileFormat::ReadSuccess;
}
*plainText = target.toUtf8();
- return Utils::TextFileFormat::ReadSuccess;
+ return TextFileFormat::ReadSuccess;
}
/*!
@@ -318,7 +318,7 @@ bool TextFileFormat::writeFile(const QString &fileName, QString plainText, QStri
plainText.replace(QLatin1Char('\n'), QLatin1String("\r\n"));
}
- Utils::FileSaver saver(fileName, fileMode);
+ FileSaver saver(fileName, fileMode);
if (!saver.hasError()) {
if (hasUtf8Bom && codec->name() == "UTF-8")
saver.write("\xef\xbb\xbf", 3);