From e05fbf153d98a34ddda63b12402c15642994acdc Mon Sep 17 00:00:00 2001
From: hjk <hjk@theqtcompany.com>
Date: Thu, 19 May 2016 08:56:05 +0200
Subject: Qnx: Rename qnxdeviceconfiguration* to qnxdevice*

All other targets call their devices "Device",
not "DeviceConfiguration".

Also, add a few namespaces and inline the trivial
QnxDeviceConfigurationWizardSetupPage files.

Change-Id: I26168d1b676f6a646b11b61d4cdb7d0f30e18242
Reviewed-by: Anton Kreuzkamp <anton.kreuzkamp@kdab.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/qnx/qnxruncontrolfactory.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'src/plugins/qnx/qnxruncontrolfactory.cpp')

diff --git a/src/plugins/qnx/qnxruncontrolfactory.cpp b/src/plugins/qnx/qnxruncontrolfactory.cpp
index 144c69221c..510ac87bd0 100644
--- a/src/plugins/qnx/qnxruncontrolfactory.cpp
+++ b/src/plugins/qnx/qnxruncontrolfactory.cpp
@@ -27,11 +27,11 @@
 #include "qnxconstants.h"
 #include "qnxrunconfiguration.h"
 #include "qnxdebugsupport.h"
+#include "qnxdevice.h"
 #include "qnxanalyzesupport.h"
 #include "qnxqtversion.h"
 #include "qnxruncontrol.h"
 #include "qnxutils.h"
-#include "qnxdeviceconfiguration.h"
 
 #include <debugger/debuggerruncontrol.h>
 #include <debugger/debuggerrunconfigurationaspect.h>
@@ -50,8 +50,9 @@
 
 using namespace Debugger;
 using namespace ProjectExplorer;
-using namespace Qnx;
-using namespace Qnx::Internal;
+
+namespace Qnx {
+namespace Internal {
 
 static DebuggerStartParameters createDebuggerStartParameters(QnxRunConfiguration *runConfig)
 {
@@ -103,8 +104,8 @@ bool QnxRunControlFactory::canRun(RunConfiguration *runConfiguration, Core::Id m
         return false;
     }
 
-    const QnxDeviceConfiguration::ConstPtr dev = DeviceKitInformation::device(runConfiguration->target()->kit())
-            .dynamicCast<const QnxDeviceConfiguration>();
+    const QnxDevice::ConstPtr dev = DeviceKitInformation::device(runConfiguration->target()->kit())
+            .dynamicCast<const QnxDevice>();
     if (dev.isNull())
         return false;
 
@@ -157,3 +158,6 @@ RunControl *QnxRunControlFactory::create(RunConfiguration *runConfig, Core::Id m
     QTC_CHECK(false);
     return 0;
 }
+
+} // namespace Internal
+} // namespace Qnx
-- 
cgit v1.2.1