forked from qt-creator/qt-creator
CppEditor: Proliferate FilePath use
Remove SnapShot::{find,contains}(QString) overloads and fix fallout.
Change-Id: I50c415826939e09ac111f33def611c7478fa5d97
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
@@ -5,10 +5,13 @@
|
||||
|
||||
#include <QDir>
|
||||
#include <QFileInfo>
|
||||
#include <QString>
|
||||
#include <QTest>
|
||||
|
||||
using namespace Core::Tests;
|
||||
#include <utils/filepath.h>
|
||||
|
||||
using namespace Utils;
|
||||
|
||||
namespace Core::Tests {
|
||||
|
||||
TestDataDir::TestDataDir(const QString &directory)
|
||||
: m_directory(directory)
|
||||
@@ -23,6 +26,11 @@ QString TestDataDir::file(const QString &fileName) const
|
||||
return directory() + QLatin1Char('/') + fileName;
|
||||
}
|
||||
|
||||
FilePath TestDataDir::filePath(const QString &fileName) const
|
||||
{
|
||||
return FilePath::fromString(directory()) / fileName;
|
||||
}
|
||||
|
||||
QString TestDataDir::path() const
|
||||
{
|
||||
return m_directory;
|
||||
@@ -37,3 +45,5 @@ QString TestDataDir::directory(const QString &subdir, bool clean) const
|
||||
path = QDir::cleanPath(path);
|
||||
return path;
|
||||
}
|
||||
|
||||
} // Core::Tests
|
||||
|
||||
Reference in New Issue
Block a user