Utils: Use QtcProcess

Change-Id: Ia3cd4706c6b23a17bc4d84d06018ad16a4e3f428
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Artem Sokolovskii
2021-08-25 13:51:49 +02:00
parent e3d87f9d0f
commit d3ff45ad8b
3 changed files with 9 additions and 6 deletions

View File

@@ -131,6 +131,7 @@ public:
bool operator>(const FilePath &other) const;
bool operator>=(const FilePath &other) const;
FilePath operator+(const QString &s) const;
FilePath operator/(const QString &str) const;
bool isChildOf(const FilePath &s) const;
bool isChildOf(const QDir &dir) const;
@@ -163,8 +164,6 @@ public:
FilePath resolveSymlinks() const;
FilePath withExecutableSuffix() const;
FilePath operator/(const QString &str) const;
void clear();
bool isEmpty() const;

View File

@@ -37,6 +37,7 @@
#include <utils/commandline.h>
#include <utils/textfileformat.h>
#include <utils/unixutils.h>
#include <utils/qtcprocess.h>
#include <QApplication>
#include <QDir>
@@ -88,17 +89,20 @@ void FileUtils::showInGraphicalShell(QWidget *parent, const FilePath &pathIn)
if (!pathIn.isDir())
param += QLatin1String("/select,");
param += QDir::toNativeSeparators(fileInfo.canonicalFilePath());
QProcess::startDetached(explorer.toString(), param);
QtcProcess::startDetached({explorer, param});
} else if (HostOsInfo::isMacHost()) {
QStringList scriptArgs;
scriptArgs << QLatin1String("-e")
<< QString::fromLatin1("tell application \"Finder\" to reveal POSIX file \"%1\"")
.arg(fileInfo.canonicalFilePath());
QProcess::execute(QLatin1String("/usr/bin/osascript"), scriptArgs);
QtcProcess osascriptProcess;
osascriptProcess.setCommand({"/usr/bin/osascript", scriptArgs});
osascriptProcess.runBlocking();
scriptArgs.clear();
scriptArgs << QLatin1String("-e")
<< QLatin1String("tell application \"Finder\" to activate");
QProcess::execute(QLatin1String("/usr/bin/osascript"), scriptArgs);
osascriptProcess.setCommand({"/usr/bin/osascript", scriptArgs});
osascriptProcess.runBlocking();
} else {
// we cannot select a file here, because no file browser really supports it...
const QString folder = fileInfo.isDir() ? fileInfo.absoluteFilePath() : fileInfo.filePath();

View File

@@ -383,7 +383,7 @@ QDate UpdateInfoPlugin::nextCheckDate(CheckUpdateInterval interval) const
void UpdateInfoPlugin::startUpdater()
{
QProcess::startDetached(d->m_maintenanceTool, QStringList(QLatin1String("--updater")));
Utils::QtcProcess::startDetached({Utils::FilePath::fromString(d->m_maintenanceTool), {"--updater"}});
}
} //namespace Internal