diff --git a/src/libs/ssh/sftpsession.cpp b/src/libs/ssh/sftpsession.cpp index 2ba5db778aa..91379324aab 100644 --- a/src/libs/ssh/sftpsession.cpp +++ b/src/libs/ssh/sftpsession.cpp @@ -26,7 +26,7 @@ #include "sftpsession.h" #include "sshlogging_p.h" -#include "sshprocess_p.h" +#include "sshprocess.h" #include "sshsettings.h" #include diff --git a/src/libs/ssh/sftptransfer.cpp b/src/libs/ssh/sftptransfer.cpp index 3bfc89713d7..5d716c18ada 100644 --- a/src/libs/ssh/sftptransfer.cpp +++ b/src/libs/ssh/sftptransfer.cpp @@ -25,7 +25,7 @@ #include "sftptransfer.h" -#include "sshprocess_p.h" +#include "sshprocess.h" #include "sshsettings.h" #include @@ -43,7 +43,7 @@ namespace QSsh { struct SftpTransfer::SftpTransferPrivate { - Internal::SshProcess sftpProc; + SshProcess sftpProc; FilesToTransfer files; Internal::FileTransferType transferType; FileTransferErrorHandling errorHandlingMode; diff --git a/src/libs/ssh/ssh.pro b/src/libs/ssh/ssh.pro index 2dc628c49ea..3ddba21f79b 100644 --- a/src/libs/ssh/ssh.pro +++ b/src/libs/ssh/ssh.pro @@ -26,7 +26,7 @@ HEADERS = \ sshconnectionmanager.h \ sshkeycreationdialog.h \ sshlogging_p.h \ - sshprocess_p.h \ + sshprocess.h \ sshremoteprocess.h \ sshremoteprocessrunner.h \ sshsettings.h \ diff --git a/src/libs/ssh/ssh.qbs b/src/libs/ssh/ssh.qbs index 4999d5da262..dc6fe547eb6 100644 --- a/src/libs/ssh/ssh.qbs +++ b/src/libs/ssh/ssh.qbs @@ -32,7 +32,7 @@ Project { "sshlogging.cpp", "sshlogging_p.h", "sshprocess.cpp", - "sshprocess_p.h", + "sshprocess.h", "sshremoteprocess.cpp", "sshremoteprocess.h", "sshremoteprocessrunner.cpp", diff --git a/src/libs/ssh/sshconnection.cpp b/src/libs/ssh/sshconnection.cpp index 936b7ace1b4..b507f3c20c0 100644 --- a/src/libs/ssh/sshconnection.cpp +++ b/src/libs/ssh/sshconnection.cpp @@ -28,7 +28,7 @@ #include "sftpsession.h" #include "sftptransfer.h" #include "sshlogging_p.h" -#include "sshprocess_p.h" +#include "sshprocess.h" #include "sshremoteprocess.h" #include "sshsettings.h" diff --git a/src/libs/ssh/sshprocess.cpp b/src/libs/ssh/sshprocess.cpp index 4b1304d37f6..c17a6cbfb82 100644 --- a/src/libs/ssh/sshprocess.cpp +++ b/src/libs/ssh/sshprocess.cpp @@ -23,7 +23,7 @@ ** ****************************************************************************/ -#include "sshprocess_p.h" +#include "sshprocess.h" #include "sshsettings.h" @@ -35,7 +35,6 @@ #endif namespace QSsh { -namespace Internal { SshProcess::SshProcess() { @@ -70,5 +69,4 @@ void SshProcess::setupChildProcess() #endif } -} // namespace Internal } // namespace QSsh diff --git a/src/libs/ssh/sshprocess_p.h b/src/libs/ssh/sshprocess.h similarity index 94% rename from src/libs/ssh/sshprocess_p.h rename to src/libs/ssh/sshprocess.h index 836dc62f96a..af20bd71cdd 100644 --- a/src/libs/ssh/sshprocess_p.h +++ b/src/libs/ssh/sshprocess.h @@ -25,12 +25,13 @@ #pragma once +#include "ssh_global.h" + #include namespace QSsh { -namespace Internal { -class SshProcess : public QProcess +class QSSH_EXPORT SshProcess : public QProcess { public: SshProcess(); @@ -40,5 +41,4 @@ private: void setupChildProcess() override; }; -} // namespace Internal } // namespace QSsh diff --git a/src/libs/ssh/sshremoteprocess.h b/src/libs/ssh/sshremoteprocess.h index 958847fcd81..8d62df2390b 100644 --- a/src/libs/ssh/sshremoteprocess.h +++ b/src/libs/ssh/sshremoteprocess.h @@ -26,7 +26,7 @@ #pragma once #include "ssh_global.h" -#include "sshprocess_p.h" +#include "sshprocess.h" #include @@ -37,7 +37,7 @@ QT_END_NAMESPACE namespace QSsh { class SshConnection; -class QSSH_EXPORT SshRemoteProcess : public Internal::SshProcess +class QSSH_EXPORT SshRemoteProcess : public SshProcess { Q_OBJECT diff --git a/src/plugins/remotelinux/linuxdevicetester.cpp b/src/plugins/remotelinux/linuxdevicetester.cpp index 92692c97cf7..c89f41232a0 100644 --- a/src/plugins/remotelinux/linuxdevicetester.cpp +++ b/src/plugins/remotelinux/linuxdevicetester.cpp @@ -55,7 +55,7 @@ public: SshRemoteProcessPtr process; DeviceUsedPortsGatherer portsGatherer; SftpSessionPtr sftpSession; - QProcess rsyncProcess; + SshProcess rsyncProcess; State state = Inactive; bool sftpWorks = false; }; diff --git a/src/plugins/remotelinux/rsyncdeploystep.cpp b/src/plugins/remotelinux/rsyncdeploystep.cpp index eca82f765c5..3867c3faa0c 100644 --- a/src/plugins/remotelinux/rsyncdeploystep.cpp +++ b/src/plugins/remotelinux/rsyncdeploystep.cpp @@ -69,7 +69,7 @@ private: mutable QList m_deployableFiles; bool m_ignoreMissingFiles = false; - QProcess m_rsync; + SshProcess m_rsync; SshRemoteProcessPtr m_mkdir; };