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

Clang: Tests: Mini refactorings

Browse Source 
Change-Id: I4a058d4c68c126d74badfc699a239ef9b2790f3a
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2015-07-17 11:17:11 +02:00
parent e8041f2254
commit 73cee4d64a
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
View File

@@ -71,10 +71,15 @@ using namespace ClangCodeModel::Internal;
namespace { namespace {
QString _(const char text[]) { return QString::fromUtf8(text); } QString _(const char text[])
{ return QString::fromUtf8(text); }
QString qrcPath(const QByteArray relativeFilePath) QString qrcPath(const QByteArray relativeFilePath)
{ return QLatin1String(":/unittests/ClangCodeModel/") + QString::fromUtf8(relativeFilePath); } { return QLatin1String(":/unittests/ClangCodeModel/") + QString::fromUtf8(relativeFilePath); }
QString fileName(const QString &filePath)
{ return QFileInfo(filePath).fileName(); }
struct LogOutput struct LogOutput
{ {
LogOutput(const QString &text) : text(text.toUtf8()) {} LogOutput(const QString &text) : text(text.toUtf8()) {}
@@ -260,8 +265,8 @@ QString toString(const FileContainer &fileContainer)
{ {
QString out; QString out;
QTextStream ts(&out); QTextStream ts(&out);
ts << " Path: " << QFileInfo(fileContainer.filePath().toString()).fileName() ts << " Path: " << fileName(fileContainer.filePath().toString())
<< " ProjectPart: " << fileContainer.projectPartId().toString() << "\n"; << " ProjectPart: " << fileName(fileContainer.projectPartId().toString()) << "\n";
return out; return out;
} }
@@ -279,7 +284,7 @@ QString toString(const ProjectPartContainer &projectPartContainer)
QString out; QString out;
QTextStream ts(&out); QTextStream ts(&out);
ts << " ProjectPartContainer" ts << " ProjectPartContainer"
<< " id: " << QFileInfo(projectPartContainer.projectPartId().toString()).fileName(); << " id: " << fileName(projectPartContainer.projectPartId().toString());
return out; return out;
} }