From a431906ecd20783ace0f2557ff277aa13a0112fe Mon Sep 17 00:00:00 2001 From: rankun Date: Tue, 6 Nov 2018 11:44:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96qt=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/QtScrcpy.pro | 3 ++- src/devicesocket.cpp | 10 ++-------- src/qscrcpyevent.h | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 src/qscrcpyevent.h diff --git a/src/QtScrcpy.pro b/src/QtScrcpy.pro index b574be9..3efba5e 100644 --- a/src/QtScrcpy.pro +++ b/src/QtScrcpy.pro @@ -50,7 +50,8 @@ HEADERS += \ qyuvopenglwidget.h \ videoform.h \ devicesocket.h \ - tcpserver.h + tcpserver.h \ + qscrcpyevent.h FORMS += \ dialog.ui \ diff --git a/src/devicesocket.cpp b/src/devicesocket.cpp index 82372b3..ea11c7b 100644 --- a/src/devicesocket.cpp +++ b/src/devicesocket.cpp @@ -1,15 +1,9 @@ #include #include +#include "qscrcpyevent.h" #include "devicesocket.h" -static const int GetDataEvent = QEvent::registerEventType(QEvent::User+1); -class DeviceSocketEvent : public QEvent -{ -public: - DeviceSocketEvent() : QEvent(QEvent::Type(GetDataEvent)){} -}; - DeviceSocket::DeviceSocket(QObject *parent) : QTcpSocket(parent) { connect(this, &DeviceSocket::readyRead, this, &DeviceSocket::onReadyRead); @@ -47,7 +41,7 @@ qint32 DeviceSocket::recvData(quint8 *buf, qint32 bufSize) bool DeviceSocket::eventFilter(QObject *watched, QEvent *event) { - if (event->type() == GetDataEvent) { + if (event->type() == QScrcpyEvent::DeviceSocket) { onReadyRead(); return true; } diff --git a/src/qscrcpyevent.h b/src/qscrcpyevent.h new file mode 100644 index 0000000..bd32aa6 --- /dev/null +++ b/src/qscrcpyevent.h @@ -0,0 +1,19 @@ +#ifndef QSCRCPYEVENT_H +#define QSCRCPYEVENT_H +#include +#include +class QScrcpyEvent : public QEvent +{ +public: + enum Type { + DeviceSocket = QEvent::User + 1, + }; + QScrcpyEvent(Type type) : QEvent(QEvent::Type(type)){} +}; + +class DeviceSocketEvent : public QScrcpyEvent +{ +public: + DeviceSocketEvent() : QScrcpyEvent(DeviceSocket){} +}; +#endif // QSCRCPYEVENT_H