From 65bb5856d0f771c069f0687bc9382ae963fe126c Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Wed, 3 Dec 2014 14:40:08 +0100 Subject: [PATCH] CppTools: Do not append '/' to fallback header paths ...since this will confuse the completer. Task-number: QTCREATORBUG-13567 Change-Id: I4172d433f23f3907690d4c00f92fadb68fa354e8 Reviewed-by: Erik Verbruggen Reviewed-by: Eike Ziller --- src/plugins/coreplugin/testdatadir.cpp | 11 +---------- src/plugins/cpptools/cppmodelmanager.cpp | 3 +-- src/plugins/cpptools/cppmodelmanager_test.cpp | 2 +- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/plugins/coreplugin/testdatadir.cpp b/src/plugins/coreplugin/testdatadir.cpp index b582d6ea68f..1da766c6236 100644 --- a/src/plugins/coreplugin/testdatadir.cpp +++ b/src/plugins/coreplugin/testdatadir.cpp @@ -38,17 +38,9 @@ using namespace Core::Tests; -static void maybeAppendSlash(QString *string) -{ - const QChar slash = QLatin1Char('/'); - if (!string->endsWith(slash)) - string->append(slash); -} - TestDataDir::TestDataDir(const QString &directory) : m_directory(directory) { - maybeAppendSlash(&m_directory); QFileInfo fi(m_directory); QVERIFY(fi.exists()); QVERIFY(fi.isDir()); @@ -56,7 +48,7 @@ TestDataDir::TestDataDir(const QString &directory) QString TestDataDir::file(const QString &fileName) const { - return directory() + fileName; + return directory() + QLatin1Char('/') + fileName; } QString TestDataDir::directory(const QString &subdir, bool clean) const @@ -66,6 +58,5 @@ QString TestDataDir::directory(const QString &subdir, bool clean) const path += QLatin1Char('/') + subdir; if (clean) path = QDir::cleanPath(path); - maybeAppendSlash(&path); return path; } diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index e2948e9fd75..3ba59d1d88e 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -393,8 +393,7 @@ ProjectPart::HeaderPaths CppModelManager::internalHeaderPaths() const const ProjectInfo pinfo = it.value(); foreach (const ProjectPart::Ptr &part, pinfo.projectParts()) { foreach (const ProjectPart::HeaderPath &path, part->headerPaths) { - const ProjectPart::HeaderPath hp(CppSourceProcessor::cleanPath(path.path), - path.type); + const ProjectPart::HeaderPath hp(QDir::cleanPath(path.path), path.type); if (!headerPaths.contains(hp)) headerPaths += hp; } diff --git a/src/plugins/cpptools/cppmodelmanager_test.cpp b/src/plugins/cpptools/cppmodelmanager_test.cpp index 0e7b35f3643..3d380359529 100644 --- a/src/plugins/cpptools/cppmodelmanager_test.cpp +++ b/src/plugins/cpptools/cppmodelmanager_test.cpp @@ -75,7 +75,7 @@ public: { return directory(_("frameworks"), cleaned); } QString fileFromSourcesDir(const QString &fileName) const - { return directory(_("sources")) + fileName; } + { return directory(_("sources")) + QLatin1Char('/') + fileName; } }; // TODO: When possible, use this helper class in all tests