From 2a7b3e6807c3292a61fff413590e996b6dba83ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Wed, 18 Sep 2019 07:13:30 +0800 Subject: Change RT_ and rt_ to RTCLIENT_ and rtclient_ respectively --- controller.cxx | 11 ++++++----- qrtclient | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/controller.cxx b/controller.cxx index bb3cc15..cdd71cd 100644 --- a/controller.cxx +++ b/controller.cxx @@ -1,7 +1,7 @@ #include #include -#include #include +#include #include "controller.hxx" Controller::Controller(QObject* parent) : QObject{parent} @@ -20,7 +20,7 @@ Controller::Controller(QObject* parent) : QObject{parent} connect(loginView, SIGNAL(signUp(QString, QString, QString, QString)) , client, SLOT(userNew(QString, QString, QString , QString))); - connect(client, SIGNAL(logged(rt_user*)), loginView, SLOT(pushProfile())); + connect(client, SIGNAL(logged(rtclient_user*)), loginView, SLOT(pushProfile())); connect(loginView, SIGNAL(search(QString)), client, SLOT(search(QString))); using RTClient::User; @@ -32,12 +32,13 @@ Controller::Controller(QObject* parent) : QObject{parent} return new User; }); auto user = engine->singletonInstance(typeId); - connect(client, SIGNAL(logged(rt_user*)), user, SLOT(update(rt_user*))); + connect(client, SIGNAL(logged(rtclient_user*)) + , user, SLOT(update(rtclient_user*))); taskList = new RTClient::TicketList; engine->rootContext()->setContextProperty("taskList", taskList); - connect(client, SIGNAL(foundTickets(rt_ticketlist*)) - , taskList, SLOT(addTickets(rt_ticketlist*))); + connect(client, SIGNAL(foundTickets(rtclient_ticketlist*)) + , taskList, SLOT(addTickets(rtclient_ticketlist*))); thread.start(); } diff --git a/qrtclient b/qrtclient index 2ca46c1..b49d11d 160000 --- a/qrtclient +++ b/qrtclient @@ -1 +1 @@ -Subproject commit 2ca46c1ba83fe7c9da8b892c0ada1deb4cba356c +Subproject commit b49d11dd8da38c2113d063de30c9e904a4f2f454 -- cgit v1.2.3