From 2e03aeb732646f30c4a946a894e29eefb256b586 Mon Sep 17 00:00:00 2001 From: Vitaly Wool Date: Mon, 3 Dec 2018 21:18:49 +0000 Subject: taskmanager: comunicate using libqtappfw Use libqtappfw to avoid dealing with websocket protocol directly. Change-Id: I67813b38ffba3e54d52e61f60644ee101426e38a Signed-off-by: Vitaly Wool --- app/taskmanager.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'app/taskmanager.h') diff --git a/app/taskmanager.h b/app/taskmanager.h index da4f725..4049f9b 100644 --- a/app/taskmanager.h +++ b/app/taskmanager.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include "procinfo.h" #ifndef TASKMANAGER_H @@ -15,11 +15,12 @@ class TaskManager : public QObject Q_OBJECT public: - explicit TaskManager(QObject* parent = nullptr); + explicit TaskManager(QObject* parent = nullptr); + virtual ~TaskManager(); - Q_INVOKABLE void open(const QUrl& url); - Q_INVOKABLE void kill(int tid); - QTimer *timer; + Q_INVOKABLE void open(const QUrl& url); + Q_INVOKABLE void kill(int tid); + QTimer *timer; signals: void updateProcess(const QString& cmd_, int tid_, int euid_, double scpu_, double ucpu_, double resident_memory_, const QString& state_); @@ -29,14 +30,14 @@ signals: private slots: void query(); void callService(const QString& ccommand, QJsonValue value); - void onSocketTextReceived(QString msg); + void onConnected(); + void onMessageReceived(MessageType type, Message *message); private: - QWebSocket m_socket; - int m_nextCallId; + MessageEngine *m_loop; std::vector m_procinfos; - void ProcessResponse(bool r, const QJsonValue &val); + void ProcessResponse(Message *message); }; #endif // TASKMANAGER_H -- cgit 1.2.3-korg