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

Utils: add FilePath::completeBaseName

Browse Source 
Removing some FilePath::toFileInfo() calls again.

Change-Id: I6610beebf2c30754fde525b71f4c4a34ceb5e30b
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
David Schulz
2021-06-04 07:59:00 +02:00
parent 5544fd35c4
commit 5ec611b68e
24 changed files with 48 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/python/pythonproject.cpp
View File

@@ -205,7 +205,7 @@ public:
PythonProjectNode(const Utils::FilePath &path)
: ProjectNode(path)
{
setDisplayName(path.toFileInfo().completeBaseName());
setDisplayName(path.completeBaseName());
setAddFileFilter("*.py");
}
};
@@ -215,7 +215,7 @@ PythonProject::PythonProject(const FilePath &fileName)
{
setId(PythonProjectId);
setProjectLanguages(Context(ProjectExplorer::Constants::PYTHON_LANGUAGE_ID));
setDisplayName(fileName.toFileInfo().completeBaseName());
setDisplayName(fileName.completeBaseName());
setNeedsBuildConfigurations(false);
setBuildSystemCreator([](Target *t) { return new PythonBuildSystem(t); });

5
src/plugins/python/pythonutils.cpp
View File

@@ -504,9 +504,8 @@ static QStringList replImportArgs(const FilePath &pythonFile, ReplType type)
if (type == ReplType::Unmodified || !isPython)
return {};
const auto import = type == ReplType::Import
? QString("import %1").arg(pythonFile.toFileInfo().completeBaseName())
: QString("from %1 import *")
.arg(pythonFile.toFileInfo().completeBaseName());
? QString("import %1").arg(pythonFile.completeBaseName())
: QString("from %1 import *").arg(pythonFile.completeBaseName());
return {"-c", QString("%1; print('Running \"%1\"')").arg(import)};
}