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

Utils: Rename FileName to FilePath

Browse Source 
More in line with QFileInfo terminonlogy which appears to be
best-of-breed within Qt.

Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-05-28 13:49:26 +02:00
parent 4704f49fbb
commit 473a741c9f
688 changed files with 3487 additions and 3484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmlprofiler/qmlprofilertextmark.cpp
View File

@@ -39,7 +39,7 @@ namespace QmlProfiler {
namespace Internal {
QmlProfilerTextMark::QmlProfilerTextMark(QmlProfilerViewManager *viewManager, int typeId,
const FileName &fileName, int lineNumber) :
const FilePath &fileName, int lineNumber) :
TextMark(fileName, lineNumber, Constants::TEXT_MARK_CATEGORY, 3.5), m_viewManager(viewManager),
m_typeIds(1, typeId)
{
@@ -116,7 +116,7 @@ void QmlProfilerTextMarkModel::createMarks(QmlProfilerViewManager *viewManager,
lineNumber = id.lineNumber;
m_marks << new QmlProfilerTextMark(viewManager,
id.typeId,
FileName::fromString(fileName),
FilePath::fromString(fileName),
id.lineNumber);
}
}

2
src/plugins/qmlprofiler/qmlprofilertextmark.h
View File

@@ -36,7 +36,7 @@ class QmlProfilerTextMark : public TextEditor::TextMark
{
public:
QmlProfilerTextMark(QmlProfilerViewManager *viewManager, int typeId,
const Utils::FileName &fileName, int lineNumber);
const Utils::FilePath &fileName, int lineNumber);
void addTypeId(int typeId);
void paintIcon(QPainter *painter, const QRect &rect) const override;

14
src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp
View File

@@ -45,7 +45,7 @@ class DummyProject : public ProjectExplorer::Project
{
Q_OBJECT
public:
DummyProject(const Utils::FileName &file) :
DummyProject(const Utils::FilePath &file) :
ProjectExplorer::Project(QString(), file, {})
{
auto fileNode
@@ -53,7 +53,7 @@ public:
auto root = std::make_unique<ProjectExplorer::ProjectNode>(file);
root->addNode(std::move(fileNode));
fileNode = std::make_unique<ProjectExplorer::FileNode>(
Utils::FileName::fromLatin1(
Utils::FilePath::fromLatin1(
":/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp"),
ProjectExplorer::FileType::Source);
root->addNode(std::move(fileNode));
@@ -181,10 +181,10 @@ void QmlProfilerDetailsRewriterTest::testPopulateFileFinder()
QCOMPARE(m_rewriter.getLocalFile("Test.qml"), QString());
// Test that the rewriter will populate from available projects if given nullptr as parameter.
DummyProject *project1 = new DummyProject(Utils::FileName::fromString(":/nix.nix"));
DummyProject *project1 = new DummyProject(Utils::FilePath::fromString(":/nix.nix"));
ProjectExplorer::SessionManager::addProject(project1);
DummyProject *project2 = new DummyProject(
Utils::FileName::fromString(":/qmlprofiler/tests/Test.qml"));
Utils::FilePath::fromString(":/qmlprofiler/tests/Test.qml"));
ProjectExplorer::SessionManager::addProject(project2);
m_rewriter.populateFileFinder(nullptr);
QCOMPARE(m_rewriter.getLocalFile("Test.qml"),
@@ -203,7 +203,7 @@ void QmlProfilerDetailsRewriterTest::seedRewriter()
QFutureInterface<void> result;
QmlJS::PathsAndLanguages lPaths;
lPaths.maybeInsert(
Utils::FileName::fromString(QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath)),
Utils::FilePath::fromString(QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath)),
QmlJS::Dialect::Qml);
QmlJS::ModelManagerInterface::importScan(result, QmlJS::ModelManagerInterface::workingCopy(),
lPaths, m_modelManager, false);
@@ -220,9 +220,9 @@ void QmlProfilerDetailsRewriterTest::seedRewriter()
auto kit = std::make_unique<ProjectExplorer::Kit>();
ProjectExplorer::SysRootKitAspect::setSysRoot(
kit.get(), Utils::FileName::fromLatin1("/nowhere"));
kit.get(), Utils::FilePath::fromLatin1("/nowhere"));
DummyProject *project = new DummyProject(Utils::FileName::fromString(filename));
DummyProject *project = new DummyProject(Utils::FilePath::fromString(filename));
ProjectExplorer::SessionManager::addProject(project);
{