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

Utils: Use more FilePath in TerminalCommand

Browse Source 
Change-Id: Ide9a09f61f3b2c10378d90a4a907e1e37d7407df
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
hjk
2023-02-07 17:19:01 +01:00
parent 49561eaeb8
commit 85bed557f3
5 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libs/utils/terminalcommand.cpp
View File

@@ -15,7 +15,7 @@ namespace Utils {
static QSettings *s_settings = nullptr;
TerminalCommand::TerminalCommand(const QString &command, const QString &openArgs,
TerminalCommand::TerminalCommand(const FilePath &command, const QString &openArgs,
const QString &executeArgs, bool needsQuotes)
: command(command)
, openArgs(openArgs)
@@ -65,9 +65,9 @@ TerminalCommand TerminalCommand::defaultTerminalEmulator()
if (defaultTerm.command.isEmpty()) {
if (HostOsInfo::isMacHost()) {
const QString termCmd = QCoreApplication::applicationDirPath()
+ "/../Resources/scripts/openTerminal.py";
if (QFileInfo::exists(termCmd))
const FilePath termCmd = FilePath::fromString(QCoreApplication::applicationDirPath())
/ "../Resources/scripts/openTerminal.py";
if (termCmd.exists())
defaultTerm = {termCmd, "", ""};
else
defaultTerm = {"/usr/X11/bin/xterm", "", "-e"};
@@ -76,7 +76,7 @@ TerminalCommand TerminalCommand::defaultTerminalEmulator()
defaultTerm = {"xterm", "", "-e"};
const Environment env = Environment::systemEnvironment();
for (const TerminalCommand &term : *knownTerminals) {
const QString result = env.searchInPath(term.command).toString();
const FilePath result = env.searchInPath(term.command.path());
if (!result.isEmpty()) {
defaultTerm = {result, term.openArgs, term.executeArgs, term.needsQuotes};
break;
@@ -95,7 +95,7 @@ QVector<TerminalCommand> TerminalCommand::availableTerminalEmulators()
if (HostOsInfo::isAnyUnixHost()) {
const Environment env = Environment::systemEnvironment();
for (const TerminalCommand &term : *knownTerminals) {
const QString command = env.searchInPath(term.command).toString();
const FilePath command = env.searchInPath(term.command.path());
if (!command.isEmpty())
result.push_back({command, term.openArgs, term.executeArgs});
}
@@ -118,7 +118,7 @@ const char kTerminalExecuteOptionsKey[] = "General/Terminal/ExecuteOptions";
TerminalCommand TerminalCommand::terminalEmulator()
{
if (s_settings && HostOsInfo::isAnyUnixHost() && s_settings->contains(kTerminalCommandKey)) {
return {s_settings->value(kTerminalCommandKey).toString(),
return {FilePath::fromSettings(s_settings->value(kTerminalCommandKey)),
s_settings->value(kTerminalOpenOptionsKey).toString(),
s_settings->value(kTerminalExecuteOptionsKey).toString()};
}
@@ -135,7 +135,7 @@ void TerminalCommand::setTerminalEmulator(const TerminalCommand &term)
s_settings->remove(kTerminalOpenOptionsKey);
s_settings->remove(kTerminalExecuteOptionsKey);
} else {
s_settings->setValue(kTerminalCommandKey, term.command);
s_settings->setValue(kTerminalCommandKey, term.command.toSettings());
s_settings->setValue(kTerminalOpenOptionsKey, term.openArgs);
s_settings->setValue(kTerminalExecuteOptionsKey, term.executeArgs);
}