fix build error, terminate qprocess instead of close() it in Processo…

…r destructor
QuickLogic-Corp · Nov 16, 2023 · bd2dbb1 · bd2dbb1
1 parent 7d0848e
commit bd2dbb1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/InteractivePathAnalysis/client/process.cpp b/src/InteractivePathAnalysis/client/process.cpp
@@ -26,14 +26,14 @@ Process::Process(const QString& name)
 
 Process::~Process()
 {
-    qInfo() << "~~~ ~Process() START";
+    qDebug() << "~~~ ~Process() START";
     m_watcherTimer.stop();
-    close();
+    terminate();
     if (!waitForFinished(PROCESS_FINISH_TIMOUT_MS)) {
         kill();
         waitForFinished();
     }
-    qInfo() << "~~~ ~Process() END";
+    qDebug() << "~~~ ~Process() END";
 }
 
 void Process::start(const QString& fullCmd)

diff --git a/src/InteractivePathAnalysis/client/tcpsocket.cpp b/src/InteractivePathAnalysis/client/tcpsocket.cpp
@@ -12,7 +12,7 @@ TcpSocket::TcpSocket()
 
     QObject::connect(&m_socket, &QAbstractSocket::stateChanged, this, &TcpSocket::handleStateChanged);
     QObject::connect(&m_socket, &QIODevice::readyRead, this, &TcpSocket::handleDataReady);
-    QObject::connect(&m_socket, &QTcpSocket::errorOccurred, this, &TcpSocket::handleSocketError);
+    QObject::connect(&m_socket, qOverload<QAbstractSocket::SocketError>(&QAbstractSocket::error), this, &TcpSocket::handleError);
 }
 
 TcpSocket::~TcpSocket()
@@ -79,7 +79,7 @@ void TcpSocket::handleDataReady()
     }
 }
 
-void TcpSocket::handleSocketError(QAbstractSocket::SocketError)
+void TcpSocket::handleError(QAbstractSocket::SocketError)
 {
     m_bytesBuf.clear();
     qDebug() << m_socket.errorString();

diff --git a/src/InteractivePathAnalysis/client/tcpsocket.h b/src/InteractivePathAnalysis/client/tcpsocket.h
@@ -39,6 +39,6 @@ class TcpSocket : public QObject {
 private slots:
     void handleStateChanged(QAbstractSocket::SocketState);
     void handleDataReady();
-    void handleSocketError(QAbstractSocket::SocketError);
+    void handleError(QAbstractSocket::SocketError);
 };