From b49d11dd8da38c2113d063de30c9e904a4f2f454 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:08 +0800 Subject: Change RT_ and rt_ to RTCLIENT_ and rtclient_ respectively --- client.cxx | 8 ++++---- librtclient | 2 +- qrtclient/client.hxx | 12 ++++++------ qrtclient/ticket.hxx | 4 ++-- qrtclient/user.hxx | 24 ++++++++++++------------ ticket.cxx | 2 +- user.cxx | 10 +++++----- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/client.cxx b/client.cxx index 3efd103..68bc470 100644 --- a/client.cxx +++ b/client.cxx @@ -11,7 +11,7 @@ namespace RTClient { void Client::logIn(QString const& name, QString const& password) { rtclient_login(name.toLatin1().constData(), password.toLatin1().constData()); - struct rt_user* user = NULL; + rtclient_user* user = NULL; rtclient_user_show(&user, name.toLatin1().constData()); if (user) emit logged(user); } @@ -36,8 +36,8 @@ namespace RTClient { , QString const& comments , QString const& signature , QString const& gecos - , enum rt_lang lang - , enum rt_timezone timeZone + , rtclient_lang lang + , rtclient_timezone timeZone , bool disabled , bool privileged) { @@ -72,7 +72,7 @@ namespace RTClient { QString query{"Owner='"}; query.append(owner); query.append("'"); - rt_ticketlist* ticketList = NULL; + rtclient_ticketlist* ticketList = NULL; rtclient_ticket_search(&ticketList, query.toLatin1().constData()); if (ticketList) emit foundTickets(ticketList); } diff --git a/librtclient b/librtclient index bca38d6..a47c5c3 160000 --- a/librtclient +++ b/librtclient @@ -1 +1 @@ -Subproject commit bca38d6c015727c66248cd59908591806165ac83 +Subproject commit a47c5c334245e2c93edd37be156d9560843deca6 diff --git a/qrtclient/client.hxx b/qrtclient/client.hxx index 452dc9d..d92d9e8 100644 --- a/qrtclient/client.hxx +++ b/qrtclient/client.hxx @@ -4,8 +4,8 @@ #include #include -struct rt_user; -struct rt_ticketlist; +struct rtclient_user; +struct rtclient_ticketlist; namespace RTClient { @@ -39,15 +39,15 @@ namespace RTClient { , QString const& comments = nullptr , QString const& signature = nullptr , QString const& gecos = nullptr - , enum rt_lang lang = RT_LANG_NONE - , enum rt_timezone timeZone = RT_TIMEZONE_NONE + , rtclient_lang lang = RTCLIENT_LANG_NONE + , rtclient_timezone timeZone = RTCLIENT_TIMEZONE_NONE , bool disabled = false , bool privileged = false); void search(QString const& owner); signals: - void logged(struct rt_user* user); - void foundTickets(struct rt_ticketlist* list); + void logged(rtclient_user* user); + void foundTickets(rtclient_ticketlist* list); }; } diff --git a/qrtclient/ticket.hxx b/qrtclient/ticket.hxx index 1e3d1bd..9cf66a3 100644 --- a/qrtclient/ticket.hxx +++ b/qrtclient/ticket.hxx @@ -3,7 +3,7 @@ #include -struct rt_ticketlist; +struct rtclient_ticketlist; namespace RTClient { @@ -43,7 +43,7 @@ namespace RTClient { void rowCountChanged(); private slots: - void addTickets(struct rt_ticketlist* ticketList); + void addTickets(rtclient_ticketlist* ticketList); private: QList tickets; diff --git a/qrtclient/user.hxx b/qrtclient/user.hxx index 8300c19..8b8f911 100644 --- a/qrtclient/user.hxx +++ b/qrtclient/user.hxx @@ -4,7 +4,7 @@ #include #include -struct rt_user; +struct rtclient_user; namespace RTClient { @@ -32,8 +32,8 @@ namespace RTClient { Q_PROPERTY(QString comments READ comments WRITE setComments NOTIFY commentsChanged) Q_PROPERTY(QString signature READ signature WRITE setSignature NOTIFY signatureChanged) Q_PROPERTY(QString gecos READ gecos WRITE setGecos NOTIFY gecosChanged) - Q_PROPERTY(rt_lang lang READ lang WRITE setLang NOTIFY langChanged) - Q_PROPERTY(rt_timezone timeZone READ timeZone WRITE setTimeZone NOTIFY timeZoneChanged) + Q_PROPERTY(rtclient_lang lang READ lang WRITE setLang NOTIFY langChanged) + Q_PROPERTY(rtclient_timezone timeZone READ timeZone WRITE setTimeZone NOTIFY timeZoneChanged) Q_PROPERTY(bool privileged READ privileged WRITE setPrivileged NOTIFY privilegedChanged) Q_PROPERTY(bool disabled READ disabled WRITE setDisabled NOTIFY disabledChanged) @@ -61,8 +61,8 @@ namespace RTClient { , m_comments{""} , m_signature{""} , m_gecos{""} - , m_lang{RT_LANG_NONE} - , m_timeZone{RT_TIMEZONE_NONE} + , m_lang{RTCLIENT_LANG_NONE} + , m_timeZone{RTCLIENT_TIMEZONE_NONE} , m_privileged{false} , m_disabled{true} {} @@ -89,8 +89,8 @@ namespace RTClient { QString const& comments() const { return m_comments; } QString const& signature() const { return m_signature; } QString const& gecos() const { return m_gecos; } - rt_lang lang() const { return m_lang; } - rt_timezone timeZone() const { return m_timeZone; } + rtclient_lang lang() const { return m_lang; } + rtclient_timezone timeZone() const { return m_timeZone; } bool privileged() const { return m_privileged; } bool disabled() const { return m_disabled; } @@ -115,8 +115,8 @@ namespace RTClient { void setComments(QString const& comments); void setSignature(QString const& signature); void setGecos(QString const& gecos); - void setLang(rt_lang lang); - void setTimeZone(rt_timezone timeZone); + void setLang(rtclient_lang lang); + void setTimeZone(rtclient_timezone timeZone); void setPrivileged(bool privileged); void setDisabled(bool disabled); @@ -148,7 +148,7 @@ namespace RTClient { void disabledChanged(); private slots: - void update(rt_user* user); + void update(rtclient_user* user); private: QString m_id; @@ -172,8 +172,8 @@ namespace RTClient { QString m_comments; QString m_signature; QString m_gecos; - rt_lang m_lang; - rt_timezone m_timeZone; + rtclient_lang m_lang; + rtclient_timezone m_timeZone; bool m_privileged; bool m_disabled; }; diff --git a/ticket.cxx b/ticket.cxx index 381e573..d16ff9c 100644 --- a/ticket.cxx +++ b/ticket.cxx @@ -39,7 +39,7 @@ namespace RTClient { emit rowCountChanged(); } - void TicketList::addTickets(rt_ticketlist* ticketList) + void TicketList::addTickets(rtclient_ticketlist* ticketList) { for (unsigned int i = 0; i < ticketList->length; i++) addTicket(Ticket{ticketList->tickets[i]}); diff --git a/user.cxx b/user.cxx index d8d3c1a..c9984cb 100644 --- a/user.cxx +++ b/user.cxx @@ -171,7 +171,7 @@ namespace RTClient { } } - void User::setLang(rt_lang lang) + void User::setLang(rtclient_lang lang) { if (m_lang != lang) { m_lang = lang; @@ -179,7 +179,7 @@ namespace RTClient { } } - void User::setTimeZone(rt_timezone timeZone) + void User::setTimeZone(rtclient_timezone timeZone) { if (m_timeZone != timeZone) { m_timeZone = timeZone; @@ -203,7 +203,7 @@ namespace RTClient { } } - void User::update(rt_user* user) + void User::update(rtclient_user* user) { if (user) { if (user->id) { @@ -309,8 +309,8 @@ namespace RTClient { m_comments = ""; m_signature = ""; m_gecos = ""; - m_lang = RT_LANG_NONE; - m_timeZone = RT_TIMEZONE_NONE; + m_lang = RTCLIENT_LANG_NONE; + m_timeZone = RTCLIENT_TIMEZONE_NONE; m_privileged = false; m_disabled = true; } -- cgit v1.2.3