From 73cee4d64aa99ce04ecdd03761ceed68ab4f70f0 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Date: Fri, 17 Jul 2015 11:17:11 +0200
Subject: [PATCH] Clang: Tests: Mini refactorings
Change-Id: I4a058d4c68c126d74badfc699a239ef9b2790f3a
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
---
.../test/clangcodecompletion_test.cpp | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp b/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
index 9cbcaf92727..584b47b3c21 100644
--- a/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
+++ b/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
@@ -71,10 +71,15 @@ using namespace ClangCodeModel::Internal;
namespace {
-QString _(const char text[]) { return QString::fromUtf8(text); }
+QString _(const char text[])
+{ return QString::fromUtf8(text); }
+
QString qrcPath(const QByteArray relativeFilePath)
{ return QLatin1String(":/unittests/ClangCodeModel/") + QString::fromUtf8(relativeFilePath); }
+QString fileName(const QString &filePath)
+{ return QFileInfo(filePath).fileName(); }
+
struct LogOutput
{
LogOutput(const QString &text) : text(text.toUtf8()) {}
@@ -260,8 +265,8 @@ QString toString(const FileContainer &fileContainer)
{
QString out;
QTextStream ts(&out);
- ts << " Path: " << QFileInfo(fileContainer.filePath().toString()).fileName()
- << " ProjectPart: " << fileContainer.projectPartId().toString() << "\n";
+ ts << " Path: " << fileName(fileContainer.filePath().toString())
+ << " ProjectPart: " << fileName(fileContainer.projectPartId().toString()) << "\n";
return out;
}
@@ -279,7 +284,7 @@ QString toString(const ProjectPartContainer &projectPartContainer)
QString out;
QTextStream ts(&out);
ts << " ProjectPartContainer"
- << " id: " << QFileInfo(projectPartContainer.projectPartId().toString()).fileName();
+ << " id: " << fileName(projectPartContainer.projectPartId().toString());
return out;
}
--
GitLab