diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-10-23 22:07:46 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2013-10-24 10:38:36 +0200 |
| commit | 4de3b9484051483f6f0329f1ec0c3feef325045c (patch) | |
| tree | ee0c140cfc40fa45b0ea5c1213dd5e03213fc489 /src/plugins/cpptools/cpptoolsplugin.cpp | |
| parent | bc81930f17f5fe897fd0ede57169a52751b72f73 (diff) | |
| download | qt-creator-4de3b9484051483f6f0329f1ec0c3feef325045c.tar.gz | |
Crossify normalizePathName
Denoise usages
get{Short|Long}PathName are now static. They're not used anywhere except
in normalizePathName.
Change-Id: Ief277b6d828faadd98ec7faa39dd682bfaa8805f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cpptoolsplugin.cpp')
| -rw-r--r-- | src/plugins/cpptools/cpptoolsplugin.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp index ff69f7746a..b720645032 100644 --- a/src/plugins/cpptools/cpptoolsplugin.cpp +++ b/src/plugins/cpptools/cpptoolsplugin.cpp @@ -51,11 +51,9 @@ #include <coreplugin/vcsmanager.h> #include <cppeditor/cppeditorconstants.h> +#include <utils/fileutils.h> #include <utils/hostosinfo.h> #include <utils/qtcassert.h> -#ifdef Q_OS_WIN -#include <utils/winutils.h> -#endif #include <QtPlugin> #include <QFileInfo> @@ -352,11 +350,7 @@ QString correspondingHeaderOrSource(const QString &fileName, bool *wasHeader) foreach (const QString &candidateDir, candidateDirs) { foreach (const QString &candidateFileName, candidateFileNames) { const QString candidateFilePath = candidateDir + QLatin1Char('/') + candidateFileName; -#ifdef Q_OS_WIN - const QString normalized = Utils::normalizePathName(candidateFilePath); -#else - const QString normalized = candidateFilePath; -#endif + const QString normalized = Utils::FileUtils::normalizePathName(candidateFilePath); const QFileInfo candidateFi(normalized); if (candidateFi.isFile()) { m_headerSourceMapping[fi.absoluteFilePath()] = candidateFi.absoluteFilePath(); |