Qnx: Modernize a bit

Drop unused Q_DECLARE_TR_FUNCTIONS and QObject, C++17 namespaces, ...

Change-Id: Iea5351cbd7e3d434f3ff7123fc385aeb16c1adf9
Reviewed-by: Rafael Roquetto <rafael.roquetto@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

src/plugins/qnx/qnxconfiguration.cpp

@@ -62,8 +62,7 @@ using namespace QtSupport;
 using namespace Utils;
 using namespace Debugger;
 
-namespace Qnx {
+namespace Qnx::Internal {
-namespace Internal {
 
 const QLatin1String QNXEnvFileKey("EnvFile");
 const QLatin1String QNXVersionKey("QNXVersion");
@@ -474,5 +473,4 @@ QString QnxConfiguration::Target::cpuDir() const
     return m_path.fileName();
 }
 
-} // namespace Internal
+} // Qnx::Internal
-} // namespace Qnx

src/plugins/qnx/qnxconfiguration.h

@@ -43,8 +43,7 @@ namespace ProjectExplorer
     class ToolChain;
 }
 
-namespace Qnx {
+namespace Qnx::Internal {
-namespace Internal {
 
 class QnxToolChain;
 class QnxQtVersion;
@@ -135,5 +134,4 @@ private:
     void assignDebuggersToTargets();
 };
 
-} // Internal
+} // Qnx::Internal
-} // Qnx

src/plugins/qnx/qnxconfigurationmanager.cpp

@@ -34,8 +34,7 @@
 
 using namespace Utils;
 
-namespace Qnx {
+namespace Qnx::Internal {
-namespace Internal {
 
 const QLatin1String QNXConfigDataKey("QNXConfiguration.");
 const QLatin1String QNXConfigCountKey("QNXConfiguration.Count");
@@ -146,5 +145,4 @@ void QnxConfigurationManager::restoreConfigurations()
     }
 }
 
-} // Internal
+} // Qnx::Internal
-} // Qnx

src/plugins/qnx/qnxconfigurationmanager.h

@@ -28,8 +28,8 @@
 #include <utils/fileutils.h>
 
 namespace Utils { class PersistentSettingsWriter; }
-namespace Qnx {
+
-namespace Internal {
+namespace Qnx::Internal {
 
 class QnxConfiguration;
 class QnxPlugin;
@@ -59,5 +59,4 @@ private:
     void restoreConfigurations();
 };
 
-}
+} // Qnx::Internal
-}

src/plugins/qnx/qnxdebugsupport.cpp

@@ -27,7 +27,6 @@
 
 #include "qnxconstants.h"
 #include "qnxqtversion.h"
-#include "qnxrunconfiguration.h"
 #include "qnxtr.h"
 #include "slog2inforunner.h"
 
@@ -67,8 +66,7 @@ using namespace Debugger;
 using namespace ProjectExplorer;
 using namespace Utils;
 
-namespace Qnx {
+namespace Qnx::Internal {
-namespace Internal {
 
 const char QNX_DEBUG_EXECUTABLE[] = "pdebug";
 
@@ -237,10 +235,7 @@ void QnxAttachDebugSupport::showProcessesDialog()
         return;
 
     // FIXME: That should be somehow related to the selected kit.
-    auto startRunConfig = SessionManager::startupRunConfiguration();
+    auto runConfig = SessionManager::startupRunConfiguration();
-    auto runConfig = qobject_cast<QnxRunConfiguration *>(startRunConfig);
-    if (!runConfig)
-        return;
 
     const int pid = dlg.currentProcess().processId;
 //    QString projectSourceDirectory = dlg.projectSource();
@@ -268,5 +263,4 @@ void QnxAttachDebugSupport::showProcessesDialog()
     ProjectExplorerPlugin::startRunControl(runControl);
 }
 
-} // namespace Internal
+} // Qnx::Internal
-} // namespace Qnx

src/plugins/qnx/qnxdebugsupport.h

@@ -27,26 +27,20 @@
 
 #include <debugger/debuggerruncontrol.h>
 
-namespace Qnx {
+namespace Qnx::Internal {
-namespace Internal {
 
 class QnxDebugSupport : public Debugger::DebuggerRunTool
 {
-    Q_OBJECT
-
 public:
     explicit QnxDebugSupport(ProjectExplorer::RunControl *runControl);
 };
 
 class QnxAttachDebugSupport : public Debugger::DebuggerRunTool
 {
-    Q_OBJECT
-
 public:
     explicit QnxAttachDebugSupport(ProjectExplorer::RunControl *runControl);
 
     static void showProcessesDialog();
 };
 
-} // namespace Internal
+} // Qnx::Internal
-} // namespace Qnx

src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp

@@ -57,8 +57,7 @@ using namespace QtSupport;
 using namespace RemoteLinux;
 using namespace Utils;
 
-namespace Qnx {
+namespace Qnx::Internal {
-namespace Internal {
 
 QnxDeployQtLibrariesDialog::QnxDeployQtLibrariesDialog(const IDevice::ConstPtr &device,
                                                        QWidget *parent)
@@ -362,5 +361,4 @@ bool QnxDeployQtLibrariesDialog::handleError(const QtcProcess &process)
     return true;
 }
 
-} // namespace Internal
+} // Qnx::Internal
-} // namespace Qnx

src/plugins/qnx/qnxdeployqtlibrariesdialog.h

@@ -41,13 +41,10 @@ QT_END_NAMESPACE
 namespace ProjectExplorer { class DeployableFile; }
 namespace RemoteLinux { class GenericDirectUploadService; }
 
-namespace Qnx {
+namespace Qnx::Internal {
-namespace Internal {
 
 class QnxDeployQtLibrariesDialog : public QDialog
 {
-    Q_OBJECT
-
 public:
     enum State {
         Inactive,
@@ -103,5 +100,4 @@ private:
     State m_state = Inactive;
 };
 
-} // namespace Internal
+} // Qnx::Internal
-} // namespace Qnx

src/plugins/qnx/qnxdevice.cpp

@@ -26,12 +26,12 @@
 #include "qnxdevice.h"
 
 #include "qnxconstants.h"
+#include "qnxdeployqtlibrariesdialog.h"
 #include "qnxdevicetester.h"
 #include "qnxdeviceprocesslist.h"
 #include "qnxdeviceprocesssignaloperation.h"
 #include "qnxdevicewizard.h"
 #include "qnxtr.h"
-#include "qnxdeployqtlibrariesdialog.h"
 
 #include <remotelinux/sshprocessinterface.h>
 
@@ -45,8 +45,7 @@ using namespace ProjectExplorer;
 using namespace RemoteLinux;
 using namespace Utils;
 
-namespace Qnx {
+namespace Qnx::Internal {
-namespace Internal {
 
 class QnxProcessImpl final : public SshProcessInterface
 {
@@ -208,5 +207,4 @@ QnxDeviceFactory::QnxDeviceFactory() : IDeviceFactory(Constants::QNX_QNX_OS_TYPE
     });
 }
 
-} // namespace Internal
+} // Qnx::Internal
-} // namespace Qnx

src/plugins/qnx/qnxdevice.h

@@ -29,8 +29,7 @@
 
 #include <remotelinux/linuxdevice.h>
 
-namespace Qnx {
+namespace Qnx::Internal {
-namespace Internal {
 
 class QnxDevice final : public RemoteLinux::LinuxDevice
 {
@@ -70,5 +69,4 @@ public:
     QnxDeviceFactory();
 };
 
-} // namespace Internal
+} // Qnx::Internal
-} // namespace Qnx

src/plugins/qnx/qnxdeviceprocesslist.cpp

@@ -33,10 +33,10 @@
 #include <QRegularExpression>
 #include <QStringList>
 
-using namespace Qnx;
-using namespace Qnx::Internal;
 using namespace Utils;
 
+namespace Qnx::Internal {
+
 QnxDeviceProcessList::QnxDeviceProcessList(
         const ProjectExplorer::IDevice::ConstPtr &device, QObject *parent)
     : ProjectExplorer::SshDeviceProcessList(device, parent)
@@ -78,3 +78,5 @@ QList<ProcessInfo> QnxDeviceProcessList::buildProcessList(const QString &listPro
     Utils::sort(processes);
     return processes;
 }
+
+} // Qnx::Internal

src/plugins/qnx/qnxdeviceprocesslist.h

@@ -27,12 +27,10 @@
 
 #include <projectexplorer/devicesupport/sshdeviceprocesslist.h>
 
-namespace Qnx {
+namespace Qnx::Internal {
-namespace Internal {
 
 class QnxDeviceProcessList : public ProjectExplorer::SshDeviceProcessList
 {
-    Q_OBJECT
 public:
     explicit QnxDeviceProcessList(
             const ProjectExplorer::IDeviceConstPtr &device, QObject *parent = nullptr);
@@ -42,5 +40,4 @@ private:
     QList<Utils::ProcessInfo> buildProcessList(const QString &listProcessesReply) const override;
 };
 
-} // namespace Internal
+} // Qnx::Internal
-} // namespace Qnx

src/plugins/qnx/qnxdeviceprocesssignaloperation.cpp

@@ -25,7 +25,7 @@
 
 #include "qnxdeviceprocesssignaloperation.h"
 
-using namespace Qnx::Internal;
+namespace Qnx::Internal {
 
 QnxDeviceProcessSignalOperation::QnxDeviceProcessSignalOperation(
         const ProjectExplorer::IDeviceConstPtr &device)
@@ -54,3 +54,5 @@ QString QnxDeviceProcessSignalOperation::interruptProcessByNameCommandLine(
 {
     return signalProcessByNameQnxCommandLine(filePath, 2);
 }
+
+} // Qnx::Internal

src/plugins/qnx/qnxdeviceprocesssignaloperation.h

@@ -27,12 +27,10 @@
 
 #include <remotelinux/remotelinuxsignaloperation.h>
 
-namespace Qnx {
+namespace Qnx::Internal {
-namespace Internal {
 
 class QnxDeviceProcessSignalOperation : public RemoteLinux::RemoteLinuxSignalOperation
 {
-    Q_OBJECT
 protected:
     explicit QnxDeviceProcessSignalOperation(const ProjectExplorer::IDeviceConstPtr &device);
 
@@ -43,5 +41,4 @@ private:
     friend class QnxDevice;
 };
 
-} // namespace Internal
+} // Qnx::Internal
-} // namespace Qnx

src/plugins/qnx/qnxdevicetester.cpp

@@ -31,8 +31,7 @@
 
 using namespace Utils;
 
-namespace Qnx {
+namespace Qnx::Internal {
-namespace Internal {
 
 QnxDeviceTester::QnxDeviceTester(QObject *parent)
     : ProjectExplorer::DeviceTester(parent)
@@ -47,23 +46,25 @@ QnxDeviceTester::QnxDeviceTester(QObject *parent)
 
     connect(&m_process, &QtcProcess::done, this, &QnxDeviceTester::handleProcessDone);
 
-    m_commandsToTest << QLatin1String("awk")
+    m_commandsToTest = {
-                     << QLatin1String("cat")
+        "awk",
-                     << QLatin1String("cut")
+        "cat",
-                     << QLatin1String("df")
+        "cut",
-                     << QLatin1String("grep")
+        "df",
-                     << QLatin1String("kill")
+        "grep",
-                     << QLatin1String("netstat")
+        "kill",
-                     << QLatin1String("mkdir")
+        "netstat",
-                     << QLatin1String("print")
+        "mkdir",
-                     << QLatin1String("printf")
+        "print",
-                     << QLatin1String("pidin")
+        "printf",
-                     << QLatin1String("read")
+        "pidin",
-                     << QLatin1String("rm")
+        "read",
-                     << QLatin1String("sed")
+        "rm",
-                     << QLatin1String("sleep")
+        "sed",
-                     << QLatin1String("tail")
+        "sleep",
-                     << QLatin1String("uname");
+        "tail",
+        "uname"
+    };
 }
 
 void QnxDeviceTester::testDevice(const ProjectExplorer::IDevice::Ptr &deviceConfiguration)
@@ -183,5 +184,4 @@ QStringList QnxDeviceTester::versionSpecificCommandsToTest(int versionNumber) co
     return result;
 }
 
-} // namespace Internal
+} // Qnx::Internal
-} // namespace Qnx

src/plugins/qnx/qnxdevicewizard.cpp

@@ -34,8 +34,7 @@
 
 using namespace ProjectExplorer;
 
-namespace Qnx {
+namespace Qnx::Internal {
-namespace Internal {
 
 QnxDeviceWizard::QnxDeviceWizard(QWidget *parent) :
     Utils::Wizard(parent)
@@ -68,5 +67,4 @@ IDevice::Ptr QnxDeviceWizard::device()
     return m_device;
 }
 
-} // namespace Internal
+} // Qnx::Internal
-} // namespace Qnx

src/plugins/qnx/qnxdevicewizard.h

@@ -35,13 +35,10 @@ class GenericLinuxDeviceConfigurationWizardKeyDeploymentPage;
 class GenericLinuxDeviceConfigurationWizardFinalPage;
 }
 
-namespace Qnx {
+namespace Qnx::Internal {
-namespace Internal {
 
 class QnxDeviceWizard : public Utils::Wizard
 {
-    Q_OBJECT
-
 public:
     explicit QnxDeviceWizard(QWidget *parent = nullptr);
 
@@ -60,5 +57,4 @@ private:
     QnxDevice::Ptr m_device;
 };
 
-} // namespace Internal
+} // Qnx::Internal
-} // namespace Qnx

src/plugins/qnx/qnxplugin.cpp

@@ -64,8 +64,7 @@
 
 using namespace ProjectExplorer;
 
-namespace Qnx {
+namespace Qnx::Internal {
-namespace Internal {
 
 class QnxUploadStep : public RemoteLinux::GenericDirectUploadStep
 {
@@ -193,5 +192,4 @@ void QnxPluginPrivate::updateDebuggerActions()
     m_debugSeparator->setVisible(hasValidQnxKit);
 }
 
-} // Internal
+} // Qnx::Internal
-} // Qnx

src/plugins/qnx/qnxplugin.h

@@ -27,8 +27,7 @@
 
 #include <extensionsystem/iplugin.h>
 
-namespace Qnx {
+namespace Qnx::Internal {
-namespace Internal {
 
 class QnxPlugin final : public ExtensionSystem::IPlugin
 {
@@ -43,5 +42,4 @@ private:
     void extensionsInitialized() final;
 };
 
-} // namespace Internal
+} // Qnx::Internal
-} // namespace Qnx

src/plugins/qnx/qnxqtversion.cpp

@@ -45,8 +45,7 @@
 using namespace ProjectExplorer;
 using namespace Utils;
 
-namespace Qnx {
+namespace Qnx::Internal {
-namespace Internal {
 
 const char SDP_PATH_KEY[] = "SDKPath";
 
@@ -221,5 +220,4 @@ QnxQtVersionFactory::QnxQtVersionFactory()
     setRestrictionChecker([](const SetupData &setup) { return setup.isQnx; });
 }
 
-} // namespace Internal
+} // Qnx::Internal
-} // namespace Qnx

src/plugins/qnx/qnxqtversion.h

@@ -32,8 +32,7 @@
 
 #include <utils/environment.h>
 
-namespace Qnx {
+namespace Qnx::Internal {
-namespace Internal {
 
 class QnxQtVersion : public QtSupport::QtVersion
 {
@@ -84,5 +83,4 @@ public:
     QnxQtVersionFactory();
 };
 
-} // namespace Internal
+} // Qnx::Internal
-} // namespace Qnx

src/plugins/qnx/qnxrunconfiguration.cpp

@@ -31,6 +31,7 @@
 #include <projectexplorer/buildsystem.h>
 #include <projectexplorer/deployablefile.h>
 #include <projectexplorer/project.h>
+#include <projectexplorer/runconfigurationaspects.h>
 #include <projectexplorer/runcontrol.h>
 #include <projectexplorer/target.h>
 
@@ -42,8 +43,13 @@ using namespace ProjectExplorer;
 using namespace RemoteLinux;
 using namespace Utils;
 
-namespace Qnx {
+namespace Qnx::Internal {
-namespace Internal {
+
+class QnxRunConfiguration final : public ProjectExplorer::RunConfiguration
+{
+public:
+    QnxRunConfiguration(ProjectExplorer::Target *target, Utils::Id id);
+};
 
 QnxRunConfiguration::QnxRunConfiguration(Target *target, Id id)
     : RunConfiguration(target, id)
@@ -101,5 +107,4 @@ QnxRunConfigurationFactory::QnxRunConfigurationFactory()
     addSupportedTargetDeviceType(Constants::QNX_QNX_OS_TYPE);
 }
 
-} // namespace Internal
+} // Qnx::Internal
-} // namespace Qnx

src/plugins/qnx/qnxrunconfiguration.h

@@ -25,19 +25,9 @@
 
 #pragma once
 
-#include <projectexplorer/runconfigurationaspects.h>
+#include <projectexplorer/runconfiguration.h>
-#include <remotelinux/remotelinuxrunconfiguration.h>
 
-namespace Qnx {
+namespace Qnx::Internal {
-namespace Internal {
-
-class QnxRunConfiguration final : public ProjectExplorer::RunConfiguration
-{
-    Q_OBJECT
-
-public:
-    QnxRunConfiguration(ProjectExplorer::Target *target, Utils::Id id);
-};
 
 class QnxRunConfigurationFactory final : public ProjectExplorer::RunConfigurationFactory
 {
@@ -45,5 +35,4 @@ public:
     QnxRunConfigurationFactory();
 };
 
-} // namespace Internal
+} // Qnx::Internal
-} // namespace Qnx

src/plugins/qnx/qnxsettingspage.cpp

@@ -50,13 +50,10 @@
 
 using namespace Utils;
 
-namespace Qnx {
+namespace Qnx::Internal {
-namespace Internal {
 
 class QnxSettingsWidget final : public Core::IOptionsPageWidget
 {
-    Q_DECLARE_TR_FUNCTIONS(Qnx::Internal::QnxSettingsWidget)
-
 public:
     QnxSettingsWidget();
 
@@ -325,5 +322,4 @@ QnxSettingsPage::QnxSettingsPage()
     setWidgetCreator([] { return new QnxSettingsWidget; });
 }
 
-} // namespace Internal
+} // Qnx::Internal
-} // namespace Qnx

src/plugins/qnx/qnxsettingspage.h

@@ -27,8 +27,7 @@
 
 #include <coreplugin/dialogs/ioptionspage.h>
 
-namespace Qnx {
+namespace Qnx::Internal {
-namespace Internal {
 
 class QnxSettingsPage final : public Core::IOptionsPage
 {
@@ -36,5 +35,4 @@ public:
     QnxSettingsPage();
 };
 
-} // namespace Internal
+} // Qnx::Internal
-} // namespace Qnx

src/plugins/qnx/qnxtoolchain.cpp

@@ -41,12 +41,32 @@
 using namespace ProjectExplorer;
 using namespace Utils;
 
-namespace Qnx {
+namespace Qnx::Internal {
-namespace Internal {
 
 const char CompilerSdpPath[] = "Qnx.QnxToolChain.NDKPath";
 const char CpuDirKey[] = "Qnx.QnxToolChain.CpuDir";
 
+// QnxToolChainConfigWidget
+
+class QnxToolChainConfigWidget : public ToolChainConfigWidget
+{
+public:
+    QnxToolChainConfigWidget(QnxToolChain *tc);
+
+private:
+    void applyImpl() override;
+    void discardImpl() override;
+    bool isDirtyImpl() const override;
+    void makeReadOnlyImpl() override { }
+
+    void handleSdpPathChange();
+
+    Utils::PathChooser *m_compilerCommand;
+    Utils::PathChooser *m_sdpPath;
+    ProjectExplorer::AbiWidget *m_abiWidget;
+
+};
+
 static Abis detectTargetAbis(const FilePath &sdpPath)
 {
     Abis result;
@@ -323,5 +343,4 @@ void QnxToolChainConfigWidget::handleSdpPathChange()
     emit dirty();
 }
 
-} // namespace Internal
+} // Qnx::Internal
-} // namespace Qnx

src/plugins/qnx/qnxtoolchain.h

@@ -31,8 +31,7 @@
 namespace ProjectExplorer { class AbiWidget; }
 namespace Utils { class PathChooser; }
 
-namespace Qnx {
+namespace Qnx::Internal {
-namespace Internal {
 
 class QnxToolChain : public ProjectExplorer::GccToolChain
 {
@@ -75,30 +74,4 @@ public:
             const ProjectExplorer::ToolchainDetector &detector) const final;
 };
 
-//----------------------------------------------------------------------------
+} // Qnx::Internal
-// QnxToolChainConfigWidget
-//----------------------------------------------------------------------------
-
-class QnxToolChainConfigWidget : public ProjectExplorer::ToolChainConfigWidget
-{
-    Q_OBJECT
-
-public:
-    QnxToolChainConfigWidget(QnxToolChain *tc);
-
-private:
-    void applyImpl() override;
-    void discardImpl() override;
-    bool isDirtyImpl() const override;
-    void makeReadOnlyImpl() override { }
-
-    void handleSdpPathChange();
-
-    Utils::PathChooser *m_compilerCommand;
-    Utils::PathChooser *m_sdpPath;
-    ProjectExplorer::AbiWidget *m_abiWidget;
-
-};
-
-} // namespace Internal
-} // namespace Qnx

src/plugins/qnx/qnxutils.cpp

@@ -41,8 +41,7 @@
 using namespace ProjectExplorer;
 using namespace Utils;
 
-namespace Qnx {
+namespace Qnx::Internal {
-namespace Internal {
 
 const char *EVAL_ENV_VARS[] = {
     "QNX_TARGET", "QNX_HOST", "QNX_CONFIGURATION", "QNX_CONFIGURATION_EXCLUSIVE",
@@ -253,5 +252,4 @@ Abis QnxUtils::convertAbis(const Abis &abis)
     return Utils::transform(abis, &QnxUtils::convertAbi);
 }
 
-} // Internal
+} // Qnx::Internal
-} // Qnx

src/plugins/qnx/qnxutils.h

@@ -28,15 +28,12 @@
 #include "qnxconstants.h"
 
 #include <projectexplorer/abi.h>
+
 #include <utils/environment.h>
 #include <utils/qtcassert.h>
 #include <utils/fileutils.h>
 
-#include <QTextStream>
+namespace Qnx::Internal {
-#include <QString>
-
-namespace Qnx {
-namespace Internal {
 
 class ConfigInstallInformation
 {
@@ -78,5 +75,4 @@ public:
     static ProjectExplorer::Abis convertAbis(const ProjectExplorer::Abis &abis);
 };
 
-} // namespace Internal
+} // Qnx::Internal
-} // namespace Qnx

src/plugins/qnx/qnxversionnumber.cpp

@@ -28,8 +28,7 @@
 #include <QDir>
 #include <QRegularExpression>
 
-namespace Qnx {
+namespace Qnx::Internal {
-namespace Internal {
 
 static const char NONDIGIT_SEGMENT_REGEXP[] = "(?<=\\d)(?=\\D)|(?<=\\D)(?=\\d)";
 
@@ -112,5 +111,4 @@ bool QnxVersionNumber::isEmpty() const
     return m_segments.isEmpty();
 }
 
-} // namespace Internal
+} // Qnx::Internal
-} // namespace Qnx

src/plugins/qnx/qnxversionnumber.h

@@ -27,8 +27,8 @@
 
 #include <QStringList>
 
-namespace Qnx {
+namespace Qnx::Internal {
-namespace Internal {
+
 class QnxVersionNumber
 {
 public:
@@ -50,5 +50,4 @@ private:
     QStringList m_segments;
 };
 
-} // namespace Internal
+} // Qnx::Internal
-} // namespace Qnx

src/plugins/qnx/slog2inforunner.cpp

@@ -38,8 +38,7 @@
 using namespace ProjectExplorer;
 using namespace Utils;
 
-namespace Qnx {
+namespace Qnx::Internal {
-namespace Internal {
 
 Slog2InfoRunner::Slog2InfoRunner(RunControl *runControl)
     : RunWorker(runControl)
@@ -186,12 +185,12 @@ void Slog2InfoRunner::processLogLine(const QString &line)
     if (bufferName == QLatin1String("default") && bufferId == 8900)
         return;
 
-    appendMessage(match.captured(6).trimmed() + '\n', Utils::StdOutFormat);
+    appendMessage(match.captured(6).trimmed() + '\n', StdOutFormat);
 }
 
 void Slog2InfoRunner::readLogStandardError()
 {
-    appendMessage(QString::fromLatin1(m_logProcess->readAllStandardError()), Utils::StdErrFormat);
+    appendMessage(QString::fromLatin1(m_logProcess->readAllStandardError()), StdErrFormat);
 }
 
 void Slog2InfoRunner::handleLogDone()
@@ -200,8 +199,7 @@ void Slog2InfoRunner::handleLogDone()
         return;
 
     appendMessage(Tr::tr("Cannot show slog2info output. Error: %1")
-                  .arg(m_logProcess->errorString()), Utils::StdErrFormat);
+                  .arg(m_logProcess->errorString()), StdErrFormat);
 }
 
-} // namespace Internal
+} // Qnx::Internal
-} // namespace Qnx

src/plugins/qnx/slog2inforunner.h

@@ -25,22 +25,16 @@
 
 #pragma once
 
-#include <QObject>
-
 #include <projectexplorer/runcontrol.h>
-#include <utils/outputformat.h>
 
 #include <QDateTime>
-#include <QByteArray>
 
 namespace Utils { class QtcProcess; }
 
-namespace Qnx {
+namespace Qnx::Internal {
-namespace Internal {
 
 class Slog2InfoRunner : public ProjectExplorer::RunWorker
 {
-    Q_OBJECT
 public:
     explicit Slog2InfoRunner(ProjectExplorer::RunControl *runControl);
 
@@ -74,5 +68,4 @@ private:
     Utils::QtcProcess *m_logProcess = nullptr;
 };
 
-} // namespace Internal
+} // Qnx::Internal
-} // namespace Qnx