Fixed server and client bugs.

[greensite/jasmine.git] / client / tcpclient.h

diff --git a/client/tcpclient.h b/client/tcpclient.h
index f0ce1b9..5225141 100644 (file)
--- a/client/tcpclient.h
+++ b/client/tcpclient.h
@@ -3,7 +3,7 @@
 //By default, timeout (i.e. connection timeout,sending timeout, and receiving timeout) is 10000 ms. which is 10 sec.
 #define TIMEOUT 10000
 namespace network{
-       class tcpClient:virtual public QTcpSocket{
+       class tcpClient:public QTcpSocket{
                Q_OBJECT
        public:
                tcpClient(quint64 buffersize,const QString &senderName,QObject *parent=NULL);
@@ -19,10 +19,9 @@ namespace network{
                void data_available();
        private:
                quint64 buffer_size,timeout_time;
-               bool check_connection_and_wait_connected(),
-                        check_byte_written_and_wait_written(),
+               bool check_byte_written_and_wait_written(),
                         check_and_wait_byte_available();
                bool want_disconnect;
-               const QString *senderName;
+               QString senderName;
        };
 }