client merge done

1 files changed, 0 insertions, 32 deletions

diff --git a/client/esp/mytcpsocket.h b/client/esp/mytcpsocket.h
deleted file mode 100644
index 4a7e543..0000000
--- a/client/esp/mytcpsocket.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef MYTCPSOCKET_H
-#define MYTCPSOCKET_H
-
-#include <QObject>
-#include <QTcpSocket>
-#include <QAbstractSocket>
-#include <QDebug>
-
-class MyTcpSocket : public QObject
-{
- Q_OBJECT
-public:
-    explicit MyTcpSocket(QObject *parent = 0);
-
-    void doConnect();
-signals:
-public slots:
-    void connected();
-    void disconnected();
-    void bytesWritten(qint64 bytes);
-    void readyRead();
-private:
-    QTcpSocket *socket;
-
-
-
-
-
-};
-
-
-#endif // MYTCPSOCKET_H