diff options
Diffstat (limited to 'qrtclient')
| -rw-r--r-- | qrtclient/client.hxx | 22 | ||||
| -rw-r--r-- | qrtclient/ticket.hxx | 5 | ||||
| -rw-r--r-- | qrtclient/user.hxx | 22 |
3 files changed, 27 insertions, 22 deletions
diff --git a/qrtclient/client.hxx b/qrtclient/client.hxx index cf7cba9..b672620 100644 --- a/qrtclient/client.hxx +++ b/qrtclient/client.hxx @@ -5,7 +5,8 @@ #include <rtclient/user.h> struct rtclient_user; -struct rtclient_ticketlist; +struct rtclient_search_ticket_list; +struct rtclient_ticket_history_list; namespace RTClient { @@ -39,8 +40,10 @@ namespace RTClient { , QString const& comments = nullptr , QString const& signature = nullptr , QString const& gecos = nullptr - , rtclient_lang lang = RTCLIENT_LANG_NONE - , rtclient_timezone timeZone = RTCLIENT_TIMEZONE_NONE + , rtclient_user_lang lang + = RTCLIENT_USER_LANG_NONE + , rtclient_user_timezone timezone + = RTCLIENT_USER_TIMEZONE_NONE , bool disabled = false , bool privileged = false); void userShow(unsigned int id); @@ -49,23 +52,24 @@ namespace RTClient { , QString const& requestor = nullptr , QString const& subject = nullptr , QString const& cc = nullptr - , QString const& admincc = nullptr + , QString const& adminCc = nullptr , QString const& owner = nullptr , QString const& status = nullptr , QString const& priority = nullptr - , QString const& initialpriority = nullptr - , QString const& finalpriority = nullptr - , QString const& timeestimated = nullptr + , QString const& initialPriority = nullptr + , QString const& finalPriority = nullptr + , QString const& timeEstimated = nullptr , QString const& starts = nullptr , QString const& due = nullptr , QString const& text = nullptr); - void ticketSearch(QString const& owner); + void searchTicket(QString const& owner); void ticketHistory(int id); signals: void loggedIn(QString const& name); void userShown(rtclient_user* user); - void ticketSearched(rtclient_ticketlist* list); + void searchedTicket(rtclient_search_ticket_list* list); + void gotTicketHistory(rtclient_ticket_history_list* list); }; } diff --git a/qrtclient/ticket.hxx b/qrtclient/ticket.hxx index 25c067f..d02954b 100644 --- a/qrtclient/ticket.hxx +++ b/qrtclient/ticket.hxx @@ -3,8 +3,9 @@ #include <QAbstractListModel> #include <rtclient/ticket.h> +#include <rtclient/search.h> -struct rtclient_ticketlist; +struct rtclient_search_ticket_list; namespace RTClient { @@ -44,7 +45,7 @@ namespace RTClient { ) const Q_DECL_OVERRIDE; public slots: - void update(rtclient_ticketlist* ticketList); + void update(rtclient_search_ticket_list* ticketList); protected: QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE; diff --git a/qrtclient/user.hxx b/qrtclient/user.hxx index 5b692a6..e4a1c45 100644 --- a/qrtclient/user.hxx +++ b/qrtclient/user.hxx @@ -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(rtclient_lang lang READ lang WRITE setLang NOTIFY langChanged) - Q_PROPERTY(rtclient_timezone timeZone READ timeZone WRITE setTimeZone NOTIFY timeZoneChanged) + Q_PROPERTY(rtclient_user_lang lang READ lang WRITE setLang NOTIFY langChanged) + Q_PROPERTY(rtclient_user_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{RTCLIENT_LANG_NONE} - , m_timeZone{RTCLIENT_TIMEZONE_NONE} + , m_lang{RTCLIENT_USER_LANG_NONE} + , m_timezone{RTCLIENT_USER_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; } - rtclient_lang lang() const { return m_lang; } - rtclient_timezone timeZone() const { return m_timeZone; } + rtclient_user_lang lang() const { return m_lang; } + rtclient_user_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(rtclient_lang lang); - void setTimeZone(rtclient_timezone timeZone); + void setLang(rtclient_user_lang lang); + void setTimeZone(rtclient_user_timezone timezone); void setPrivileged(bool privileged); void setDisabled(bool disabled); @@ -146,7 +146,7 @@ namespace RTClient { void signatureChanged(); void gecosChanged(); void langChanged(); - void timeZoneChanged(); + void timezoneChanged(); void privilegedChanged(); void disabledChanged(); @@ -172,8 +172,8 @@ namespace RTClient { QString m_comments; QString m_signature; QString m_gecos; - rtclient_lang m_lang; - rtclient_timezone m_timeZone; + rtclient_user_lang m_lang; + rtclient_user_timezone m_timezone; bool m_privileged; bool m_disabled; }; |