style: Code format clean[009312]

Greedysky · Mar 23, 2024 · 94bac56 · 94bac56
1 parent 9d4c92c
commit 94bac56
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/TTKModule/TTKNetwork/TTKSocket/tcpclient.h b/TTKModule/TTKNetwork/TTKSocket/tcpclient.h
@@ -46,6 +46,8 @@ private Q_SLOTS:
     void disConnect();
 
 private:
+    using QTcpSocket::readData;
+
     int m_clientID;
 
 };

diff --git a/TTKModule/TTKNetwork/TTKSocket/tcpserver.cpp b/TTKModule/TTKNetwork/TTKSocket/tcpserver.cpp
@@ -25,8 +25,11 @@ void TcpServer::closeAllClient()
         client->close();
     }
 }
-
+#if TTK_QT_VERSION_CHECK(5,0,0)
+void TcpServer::incomingConnection(qintptr handle)
+#else
 void TcpServer::incomingConnection(int handle)
+#endif
 {
     TcpClient *client = new TcpClient(handle, this);
     client->setSocketDescriptor(handle);

diff --git a/TTKModule/TTKNetwork/TTKSocket/tcpserver.h b/TTKModule/TTKNetwork/TTKSocket/tcpserver.h
@@ -40,7 +40,11 @@ private Q_SLOTS:
     void clientDisConnectChanged(const ClientData &pair);
 
 private:
-    void incomingConnection(int handle);
+#if TTK_QT_VERSION_CHECK(5,0,0)
+    virtual void incomingConnection(qintptr handle) override;
+#else
+    virtual void incomingConnection(int handle) override;
+#endif
 
     QList<TcpClient*> m_clientList;