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

A few more direct FilePathAspect value accesses

Browse Source 
Task-number: QTCREATORBUG-29167
Change-Id: I8eba582303c16dddbdb5cea5bce43f048bac06b7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2023-06-29 17:21:18 +02:00
parent 2cc4967451
commit d0d1e1af1f
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -132,7 +132,7 @@ void PythonWizardPage::initializePage()
const FilePath projectDir = FilePath::fromString(wiz->property("ProjectDirectory").toString()); const FilePath projectDir = FilePath::fromString(wiz->property("ProjectDirectory").toString());
m_createVenv.setValue(!projectDir.isEmpty()); m_createVenv.setValue(!projectDir.isEmpty());
if (m_venvPath.filePath().isEmpty()) if (m_venvPath().isEmpty())
m_venvPath.setValue(projectDir.isEmpty() ? FilePath{} : projectDir / "venv"); m_venvPath.setValue(projectDir.isEmpty() ? FilePath{} : projectDir / "venv");
updateInterpreters(); updateInterpreters();
@@ -171,7 +171,7 @@ void PythonWizardPage::setupProject(const JsonWizard::GeneratorFiles &files)
} }
} }
}; };
PythonSettings::createVirtualEnvironment(m_venvPath.filePath(), PythonSettings::createVirtualEnvironment(m_venvPath(),
interpreter, interpreter,
openProjectWithInterpreter, openProjectWithInterpreter,
project ? project->displayName() project ? project->displayName()

6
src/plugins/qmlprofiler/qmlprofilertool.cpp
View File

@@ -567,7 +567,7 @@ void QmlProfilerTool::showErrorDialog(const QString &error)
static void saveLastTraceFile(const FilePath &filePath) static void saveLastTraceFile(const FilePath &filePath)
{ {
QmlProfilerSettings *settings = QmlProfilerPlugin::globalSettings(); QmlProfilerSettings *settings = QmlProfilerPlugin::globalSettings();
if (filePath != settings->lastTraceFile.filePath()) { if (filePath != settings->lastTraceFile()) {
settings->lastTraceFile.setValue(filePath); settings->lastTraceFile.setValue(filePath);
settings->writeGlobalSettings(); settings->writeGlobalSettings();
} }
@@ -579,7 +579,7 @@ void QmlProfilerTool::showSaveDialog()
QLatin1String zFile(QztFileExtension); QLatin1String zFile(QztFileExtension);
FilePath filePath = FileUtils::getSaveFilePath( FilePath filePath = FileUtils::getSaveFilePath(
nullptr, Tr::tr("Save QML Trace"), nullptr, Tr::tr("Save QML Trace"),
QmlProfilerPlugin::globalSettings()->lastTraceFile.filePath(), QmlProfilerPlugin::globalSettings()->lastTraceFile(),
Tr::tr("QML traces (*%1 *%2)").arg(zFile).arg(tFile)); Tr::tr("QML traces (*%1 *%2)").arg(zFile).arg(tFile));
if (!filePath.isEmpty()) { if (!filePath.isEmpty()) {
if (!filePath.endsWith(zFile) && !filePath.endsWith(tFile)) if (!filePath.endsWith(zFile) && !filePath.endsWith(tFile))
@@ -603,7 +603,7 @@ void QmlProfilerTool::showLoadDialog()
QLatin1String zFile(QztFileExtension); QLatin1String zFile(QztFileExtension);
FilePath filePath = FileUtils::getOpenFilePath( FilePath filePath = FileUtils::getOpenFilePath(
nullptr, Tr::tr("Load QML Trace"), nullptr, Tr::tr("Load QML Trace"),
QmlProfilerPlugin::globalSettings()->lastTraceFile.filePath(), QmlProfilerPlugin::globalSettings()->lastTraceFile(),
Tr::tr("QML traces (*%1 *%2)").arg(zFile).arg(tFile)); Tr::tr("QML traces (*%1 *%2)").arg(zFile).arg(tFile));
if (!filePath.isEmpty()) { if (!filePath.isEmpty()) {

2
src/plugins/terminal/terminalwidget.cpp
View File

@@ -142,7 +142,7 @@ void TerminalWidget::setupPty()
m_process = std::make_unique<Process>(); m_process = std::make_unique<Process>();
CommandLine shellCommand = m_openParameters.shellCommand.value_or( CommandLine shellCommand = m_openParameters.shellCommand.value_or(
CommandLine{TerminalSettings::instance().shell.filePath(), CommandLine{TerminalSettings::instance().shell(),
TerminalSettings::instance().shellArguments.value(), TerminalSettings::instance().shellArguments.value(),
CommandLine::Raw}); CommandLine::Raw});

2
src/plugins/valgrind/valgrindsettings.cpp
View File

@@ -64,7 +64,7 @@ void SuppressionAspectPrivate::slotAddSuppression()
const FilePaths files = const FilePaths files =
FileUtils::getOpenFilePaths(nullptr, FileUtils::getOpenFilePaths(nullptr,
Tr::tr("Valgrind Suppression Files"), Tr::tr("Valgrind Suppression Files"),
conf->lastSuppressionDirectory.filePath(), conf->lastSuppressionDirectory(),
Tr::tr("Valgrind Suppression File (*.supp);;All Files (*)")); Tr::tr("Valgrind Suppression File (*.supp);;All Files (*)"));
//dialog.setHistory(conf->lastSuppressionDialogHistory()); //dialog.setHistory(conf->lastSuppressionDialogHistory());
if (!files.isEmpty()) { if (!files.isEmpty()) {