Move SshKeyCreationDialog into RemoteLinux plugin

It's being used only there.

Change-Id: Ie2917f34268eba3ada4f152d3feeaa4130350236
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Jarek Kobus
2022-05-12 23:55:09 +02:00
parent 760cf632af
commit b9e53428b5
9 changed files with 17 additions and 15 deletions

View File

@@ -3,7 +3,6 @@ add_qtc_library(QtcSsh
SOURCES
ssh.qrc
ssh_global.h
sshkeycreationdialog.cpp sshkeycreationdialog.h sshkeycreationdialog.ui
sshparameters.cpp sshparameters.h
sshsettings.cpp sshsettings.h
)

View File

@@ -18,9 +18,6 @@ Project {
files: [
"ssh.qrc",
"sshkeycreationdialog.cpp",
"sshkeycreationdialog.h",
"sshkeycreationdialog.ui",
"sshparameters.cpp",
"sshparameters.h",
"sshsettings.cpp",

View File

@@ -39,6 +39,7 @@ add_qtc_plugin(RemoteLinux
remotelinuxsignaloperation.cpp remotelinuxsignaloperation.h
remotelinuxx11forwardingaspect.cpp remotelinuxx11forwardingaspect.h
rsyncdeploystep.cpp rsyncdeploystep.h
sshkeycreationdialog.cpp sshkeycreationdialog.h sshkeycreationdialog.ui
sshprocessinterface.h
tarpackagecreationstep.cpp tarpackagecreationstep.h
uploadandinstalltarpackagestep.cpp uploadandinstalltarpackagestep.h

View File

@@ -26,13 +26,14 @@
#include "genericlinuxdeviceconfigurationwidget.h"
#include "ui_genericlinuxdeviceconfigurationwidget.h"
#include "sshkeycreationdialog.h"
#include <coreplugin/coreconstants.h>
#include <projectexplorer/devicesupport/idevice.h>
#include <utils/portlist.h>
#include <utils/fancylineedit.h>
#include <utils/utilsicons.h>
#include <ssh/sshparameters.h>
#include <ssh/sshkeycreationdialog.h>
using namespace ProjectExplorer;
using namespace RemoteLinux;

View File

@@ -27,9 +27,9 @@
#include "ui_genericlinuxdeviceconfigurationwizardsetuppage.h"
#include "publickeydeploymentdialog.h"
#include "sshkeycreationdialog.h"
#include <projectexplorer/devicesupport/idevice.h>
#include <ssh/sshkeycreationdialog.h>
#include <ssh/sshparameters.h>
#include <utils/pathchooser.h>
#include <utils/utilsicons.h>

View File

@@ -83,6 +83,9 @@ Project {
"remotelinuxx11forwardingaspect.h",
"rsyncdeploystep.cpp",
"rsyncdeploystep.h",
"sshkeycreationdialog.cpp",
"sshkeycreationdialog.h",
"sshkeycreationdialog.ui",
"sshprocessinterface.h",
"tarpackagecreationstep.cpp",
"tarpackagecreationstep.h",

View File

@@ -26,7 +26,7 @@
#include "sshkeycreationdialog.h"
#include "ui_sshkeycreationdialog.h"
#include "sshsettings.h"
#include <ssh/sshsettings.h>
#include <utils/fileutils.h>
#include <utils/pathchooser.h>
@@ -36,9 +36,10 @@
#include <QMessageBox>
#include <QStandardPaths>
using namespace QSsh;
using namespace Utils;
namespace QSsh {
namespace RemoteLinux {
SshKeyCreationDialog::SshKeyCreationDialog(QWidget *parent)
: QDialog(parent), m_ui(new Ui::SshKeyCreationDialog)

View File

@@ -25,17 +25,17 @@
#pragma once
#include "ssh_global.h"
#include "remotelinux_export.h"
#include <utils/filepath.h>
#include <QDialog>
namespace QSsh {
namespace RemoteLinux {
namespace Ui { class SshKeyCreationDialog; }
class QSSH_EXPORT SshKeyCreationDialog : public QDialog
class SshKeyCreationDialog : public QDialog
{
Q_OBJECT
public:
@@ -56,4 +56,4 @@ private:
Ui::SshKeyCreationDialog *m_ui;
};
} // namespace QSsh
} // namespace RemoteLinux

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>QSsh::SshKeyCreationDialog</class>
<widget class="QDialog" name="QSsh::SshKeyCreationDialog">
<class>RemoteLinux::SshKeyCreationDialog</class>
<widget class="QDialog" name="RemoteLinux::SshKeyCreationDialog">
<property name="enabled">
<bool>true</bool>
</property>
@@ -233,7 +233,7 @@
<connection>
<sender>closeButton</sender>
<signal>clicked()</signal>
<receiver>QSsh::SshKeyCreationDialog</receiver>
<receiver>RemoteLinux::SshKeyCreationDialog</receiver>
<slot>close()</slot>
<hints>
<hint type="sourcelabel">