From 7bc53ada3e7546b9f84b2e3de471f6628e31d996 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 15 Feb 2017 03:34:12 +0100 Subject: [PATCH] refs #883, fixes and formatting * QProcess::startDetached is static, removed startNewProcess * QStringBuilder --- samples/blackmiscdbus/main.cpp | 3 +- samples/blackmiscdbus/servicetool.cpp | 7 ----- samples/blackmiscdbus/servicetool.h | 3 -- src/blackcore/application.cpp | 41 +++++++++++++++------------ src/blackmisc/audio/audioutils.cpp | 3 +- src/swiftlauncher/main.cpp | 4 +-- src/swiftlauncher/swiftlauncher.h | 1 - 7 files changed, 28 insertions(+), 34 deletions(-) diff --git a/samples/blackmiscdbus/main.cpp b/samples/blackmiscdbus/main.cpp index bea8a0c61..db743b32b 100644 --- a/samples/blackmiscdbus/main.cpp +++ b/samples/blackmiscdbus/main.cpp @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -180,7 +181,7 @@ int main(int argc, char *argv[]) } // testing in new process - BlackSample::ServiceTool::startNewProcess(executable, args, &a); + QProcess::startDetached(executable, args); // testing in same process // BlackSample::ServiceTool::dataTransferTestClient(address); diff --git a/samples/blackmiscdbus/servicetool.cpp b/samples/blackmiscdbus/servicetool.cpp index 2eeae50ea..50262ae52 100644 --- a/samples/blackmiscdbus/servicetool.cpp +++ b/samples/blackmiscdbus/servicetool.cpp @@ -56,13 +56,6 @@ using namespace BlackCore; namespace BlackSample { - QProcess *ServiceTool::startNewProcess(const QString &executable, const QStringList &arguments, QObject *parent) - { - QProcess *process = new QProcess(parent); - process->startDetached(executable, arguments); - return process; - } - void ServiceTool::dataTransferTestServer(BlackMisc::CDBusServer *dBusServer, bool verbose) { QDBusConnection sessionBusConnection = QDBusConnection::sessionBus(); diff --git a/samples/blackmiscdbus/servicetool.h b/samples/blackmiscdbus/servicetool.h index ee57308ac..8222264e7 100644 --- a/samples/blackmiscdbus/servicetool.h +++ b/samples/blackmiscdbus/servicetool.h @@ -40,9 +40,6 @@ namespace BlackSample //! Server side of data transfer test static void dataTransferTestServer(BlackMisc::CDBusServer *dBusServer, bool verbose); - //! Start a new process - static QProcess *startNewProcess(const QString &executable, const QStringList &arguments = QStringList(), QObject *parent = 0); - //! Loop to send data to test service (slots on server) static void sendDataToTestservice(const QDBusConnection &connection); diff --git a/src/blackcore/application.cpp b/src/blackcore/application.cpp index b76a234da..6d8e74d57 100644 --- a/src/blackcore/application.cpp +++ b/src/blackcore/application.cpp @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -420,11 +421,14 @@ namespace BlackCore QString CApplication::getEnvironmentInfoString(const QString &separator) const { - QString env("Beta: "); - env.append(boolToYesNo(CBuildConfig::isBetaTest())); - env = env.append(" dev.env,: ").append(boolToYesNo(isRunningInDeveloperEnvironment())); - env = env.append(separator); - env.append("Windows: ").append(boolToYesNo(CBuildConfig::isRunningOnWindowsNtPlatform())); + const QString env = + QLatin1Literal("Beta: ") % + boolToYesNo(CBuildConfig::isBetaTest()) % + QLatin1Literal(" dev.env,: ") % + boolToYesNo(isRunningInDeveloperEnvironment()) % + separator % + QLatin1Literal("Windows: ") % + boolToYesNo(CBuildConfig::isRunningOnWindowsNtPlatform()); return env; } @@ -465,12 +469,13 @@ namespace BlackCore QString CApplication::getInfoString(const QString &separator) const { - QString str(CVersion::version()); - str = str.append(" ").append(CBuildConfig::isReleaseBuild() ? "Release build" : "Debug build"); - str = str.append(separator); - str = str.append(getEnvironmentInfoString(separator)); - str = str.append(separator); - str.append(CBuildConfig::compiledWithInfo(false)); + const QString str = + CVersion::version() % + QLatin1Char(' ') % (CBuildConfig::isReleaseBuild() ? QLatin1Literal("Release build") : QLatin1Literal("Debug build")) % + separator % + getEnvironmentInfoString(separator) % + separator % + CBuildConfig::compiledWithInfo(false); return str; } @@ -1077,13 +1082,13 @@ namespace BlackCore if (isUnitTest()) { return CStatusMessage(this).info("No crash handler for unit tests"); } static const QString extension = CBuildConfig::isRunningOnWindowsNtPlatform() ? ".exe" : QString(); - static const QString handler = CDirectoryUtils::applicationDirectoryPath() + "/" + "swift_crashpad_handler" + extension; - static const QString crashpadPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + - "/org.swift-project/" + - CDirectoryUtils::normalizedApplicationDirectory() + - "/crashpad"; - static const QString database = crashpadPath + "/database"; - static const QString metrics = crashpadPath + "/metrics"; + static const QString handler = CDirectoryUtils::applicationDirectoryPath() % QLatin1Char('/') % "swift_crashpad_handler" + extension; + static const QString crashpadPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) % + QLatin1Literal("/org.swift-project/") % + CDirectoryUtils::normalizedApplicationDirectory() % + QLatin1Literal("/crashpad"); + static const QString database = crashpadPath % QLatin1Literal("/database"); + static const QString metrics = crashpadPath % QLatin1Literal("/metrics"); if (!QFileInfo::exists(handler)) { diff --git a/src/blackmisc/audio/audioutils.cpp b/src/blackmisc/audio/audioutils.cpp index 156343e8a..79b91acd1 100644 --- a/src/blackmisc/audio/audioutils.cpp +++ b/src/blackmisc/audio/audioutils.cpp @@ -22,8 +22,7 @@ namespace BlackMisc bool startWindowsMixer() { if (!CBuildConfig::isRunningOnWindowsNtPlatform()) { return false; } - QStringList parameterlist; - return QProcess::startDetached("SndVol.exe", parameterlist); + return QProcess::startDetached("SndVol.exe"); } } // ns } // ns diff --git a/src/swiftlauncher/main.cpp b/src/swiftlauncher/main.cpp index 1e0f42b16..e36cd51f1 100644 --- a/src/swiftlauncher/main.cpp +++ b/src/swiftlauncher/main.cpp @@ -47,8 +47,8 @@ int main(int argc, char *argv[]) if (launcher.exec() == QDialog::Rejected) { return EXIT_SUCCESS; } launcher.close(); - QString exe(launcher.getExecutable()); - QStringList exeArgs(launcher.getExecutableArgs()); + const QString exe(launcher.getExecutable()); + const QStringList exeArgs(launcher.getExecutableArgs()); Q_ASSERT_X(!exe.isEmpty(), Q_FUNC_INFO, "Missing executable"); CLogMessage(QCoreApplication::instance()).info(launcher.getCmdLine()); QProcess::startDetached(exe, exeArgs); diff --git a/src/swiftlauncher/swiftlauncher.h b/src/swiftlauncher/swiftlauncher.h index 1b2f3f4aa..b120a9e15 100644 --- a/src/swiftlauncher/swiftlauncher.h +++ b/src/swiftlauncher/swiftlauncher.h @@ -41,7 +41,6 @@ class CSwiftLauncher : Q_INTERFACES(BlackGui::IMainWindowAccess) public: - //! Pages enum Pages {