From d8ffbfb3ff47d4da850223a08c26f33b5be6b440 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Fri, 21 Jul 2023 01:31:04 +0200 Subject: [PATCH] RemoteLinux: Rename into sshdevicewizard{cpp, h} Change-Id: I0a385887791be962f5ad4435b2b1b01913ae32c7 Reviewed-by: hjk --- src/plugins/qnx/qnxdevice.cpp | 4 ++-- src/plugins/remotelinux/CMakeLists.txt | 2 +- src/plugins/remotelinux/linuxdevice.cpp | 2 +- src/plugins/remotelinux/remotelinux.qbs | 4 ++-- ...linuxdeviceconfigurationwizard.cpp => sshdevicewizard.cpp} | 2 +- ...ericlinuxdeviceconfigurationwizard.h => sshdevicewizard.h} | 0 6 files changed, 7 insertions(+), 7 deletions(-) rename src/plugins/remotelinux/{genericlinuxdeviceconfigurationwizard.cpp => sshdevicewizard.cpp} (99%) rename src/plugins/remotelinux/{genericlinuxdeviceconfigurationwizard.h => sshdevicewizard.h} (100%) diff --git a/src/plugins/qnx/qnxdevice.cpp b/src/plugins/qnx/qnxdevice.cpp index 733772a10c6..e355183c89d 100644 --- a/src/plugins/qnx/qnxdevice.cpp +++ b/src/plugins/qnx/qnxdevice.cpp @@ -12,9 +12,9 @@ #include -#include -#include #include +#include +#include #include #include diff --git a/src/plugins/remotelinux/CMakeLists.txt b/src/plugins/remotelinux/CMakeLists.txt index c49f49793be..3b2133b85a5 100644 --- a/src/plugins/remotelinux/CMakeLists.txt +++ b/src/plugins/remotelinux/CMakeLists.txt @@ -7,7 +7,6 @@ add_qtc_plugin(RemoteLinux deploymenttimeinfo.cpp deploymenttimeinfo.h genericdirectuploadstep.cpp genericdirectuploadstep.h genericlinuxdeviceconfigurationwidget.cpp genericlinuxdeviceconfigurationwidget.h - genericlinuxdeviceconfigurationwizard.cpp genericlinuxdeviceconfigurationwizard.h killappstep.cpp killappstep.h linuxdevice.cpp linuxdevice.h linuxdevicetester.cpp linuxdevicetester.h @@ -26,6 +25,7 @@ add_qtc_plugin(RemoteLinux remotelinuxsignaloperation.cpp remotelinuxsignaloperation.h remotelinuxtr.h rsyncdeploystep.cpp rsyncdeploystep.h + sshdevicewizard.cpp sshdevicewizard.h sshkeycreationdialog.cpp sshkeycreationdialog.h tarpackagecreationstep.cpp tarpackagecreationstep.h tarpackagedeploystep.cpp tarpackagedeploystep.h diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp index a80e4380b06..0db57bd3133 100644 --- a/src/plugins/remotelinux/linuxdevice.cpp +++ b/src/plugins/remotelinux/linuxdevice.cpp @@ -4,13 +4,13 @@ #include "linuxdevice.h" #include "genericlinuxdeviceconfigurationwidget.h" -#include "genericlinuxdeviceconfigurationwizard.h" #include "linuxdevicetester.h" #include "linuxprocessinterface.h" #include "publickeydeploymentdialog.h" #include "remotelinux_constants.h" #include "remotelinuxsignaloperation.h" #include "remotelinuxtr.h" +#include "sshdevicewizard.h" #include #include diff --git a/src/plugins/remotelinux/remotelinux.qbs b/src/plugins/remotelinux/remotelinux.qbs index d363603cd99..3bf972697b2 100644 --- a/src/plugins/remotelinux/remotelinux.qbs +++ b/src/plugins/remotelinux/remotelinux.qbs @@ -23,8 +23,6 @@ Project { "genericdirectuploadstep.h", "genericlinuxdeviceconfigurationwidget.cpp", "genericlinuxdeviceconfigurationwidget.h", - "genericlinuxdeviceconfigurationwizard.cpp", - "genericlinuxdeviceconfigurationwizard.h", "killappstep.cpp", "killappstep.h", "linuxdevice.cpp", @@ -56,6 +54,8 @@ Project { "remotelinuxtr.h", "rsyncdeploystep.cpp", "rsyncdeploystep.h", + "sshdevicewizard.cpp", + "sshdevicewizard.h", "sshkeycreationdialog.cpp", "sshkeycreationdialog.h", "tarpackagecreationstep.cpp", diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp b/src/plugins/remotelinux/sshdevicewizard.cpp similarity index 99% rename from src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp rename to src/plugins/remotelinux/sshdevicewizard.cpp index da0aa3b8cd8..f23db7b4035 100644 --- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp +++ b/src/plugins/remotelinux/sshdevicewizard.cpp @@ -1,7 +1,7 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -#include "genericlinuxdeviceconfigurationwizard.h" +#include "sshdevicewizard.h" #include "publickeydeploymentdialog.h" #include "remotelinuxtr.h" diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.h b/src/plugins/remotelinux/sshdevicewizard.h similarity index 100% rename from src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.h rename to src/plugins/remotelinux/sshdevicewizard.h