diff options
| -rw-r--r-- | client.cxx | 20 | ||||
| m--------- | libicclient | 0 | ||||
| -rw-r--r-- | qicclient/client.hxx | 6 | ||||
| -rw-r--r-- | qicclient/user.hxx | 4 | ||||
| -rw-r--r-- | user.cxx | 54 |
5 files changed, 42 insertions, 42 deletions
@@ -49,17 +49,17 @@ namespace QICClient { order.setData(c_order); } - void Client::logIn(size_t (*handler)(void*, size_t, size_t, void*) - , icclient_user* user, QString const& username - , QString const& password, QString const& successPage - , QString const& nextPage, QString const& failPage) + void Client::logIn(size_t (*handler)(void*, size_t, size_t, void*), + icclient_member* member, QString const& username, + QString const& password, QString const& successPage, + QString const& nextPage, QString const& failPage) { - icclient_login(handler, user, username.toLatin1().constData() - , password.toLatin1().constData() - , successPage.toLatin1().constData() - , nextPage.toLatin1().constData() - , failPage.toLatin1().constData()); - emit loggedIn(user); + icclient_login(handler, member, username.toLatin1().constData(), + password.toLatin1().constData(), + successPage.toLatin1().constData(), + nextPage.toLatin1().constData(), + failPage.toLatin1().constData()); + emit loggedIn(member); } void Client::logOut() diff --git a/libicclient b/libicclient -Subproject 3074a867e052af594f1c7252c9cb967ff0747f4 +Subproject 6ff383c3d12dc215123fb975b453ca74b1bef16 diff --git a/qicclient/client.hxx b/qicclient/client.hxx index c6344f7..26d540d 100644 --- a/qicclient/client.hxx +++ b/qicclient/client.hxx @@ -3,7 +3,7 @@ #include <QObject> -struct icclient_user; +struct icclient_member; namespace QICClient { @@ -57,7 +57,7 @@ namespace QICClient { Basket& order); void logIn(size_t (*handler)(void*, size_t, size_t, void*), - icclient_user* user, + icclient_member* member, QString const& username, QString const& password, QString const& successPage = nullptr, @@ -94,7 +94,7 @@ namespace QICClient { signals: void gotResults(Catalog* catalog); void gotFlyPage(shared_ptr<Product> product); - void loggedIn(icclient_user* user); + void loggedIn(icclient_member* member); void loggedOut(); }; diff --git a/qicclient/user.hxx b/qicclient/user.hxx index a100b8d..bb3ca00 100644 --- a/qicclient/user.hxx +++ b/qicclient/user.hxx @@ -4,7 +4,7 @@ #include <QObject> #include <icclient/member.h> -struct icclient_user; +struct icclient_member; namespace QICClient { @@ -97,7 +97,7 @@ namespace QICClient { void setEmail(QString const& email); public slots: - void update(icclient_user* user); + void update(icclient_member* member); signals: void userNameChanged(); @@ -156,58 +156,58 @@ namespace QICClient { } } - void User::update(icclient_user* user) + void User::update(icclient_member* member) { - if (user->username) - m_userName = QString{user->username}; + if (member->username) + m_userName = QString{member->username}; else m_userName = ""; - if (user->usernick) - m_userNick = QString{user->usernick}; + if (member->usernick) + m_userNick = QString{member->usernick}; else m_userNick = ""; - if (user->fname) - m_fName = QString{user->fname}; + if (member->fname) + m_fName = QString{member->fname}; else m_fName = ""; - if (user->lname) - m_lName = QString{user->lname}; + if (member->lname) + m_lName = QString{member->lname}; else m_lName = ""; - if (user->address1) - m_address1 = QString{user->address1}; + if (member->address1) + m_address1 = QString{member->address1}; else m_address1 = ""; - if (user->address2) - m_address2 = QString{user->address2}; + if (member->address2) + m_address2 = QString{member->address2}; else m_address2 = ""; - if (user->address3) - m_address3 = QString{user->address3}; + if (member->address3) + m_address3 = QString{member->address3}; else m_address3 = ""; - if (user->city) - m_city = QString{user->city}; + if (member->city) + m_city = QString{member->city}; else m_city = ""; - if (user->state) - m_state = QString{user->state}; + if (member->state) + m_state = QString{member->state}; else m_state = ""; - if (user->zip) - m_zip = QString{user->zip}; + if (member->zip) + m_zip = QString{member->zip}; else m_zip = ""; - if (user->country) - m_country = QString{user->country}; + if (member->country) + m_country = QString{member->country}; else m_country = ""; - if (user->phone_day) - m_phoneDay = QString{user->phone_day}; + if (member->phone_day) + m_phoneDay = QString{member->phone_day}; else m_phoneDay = ""; - if (user->email) - m_email = QString{user->email}; + if (member->email) + m_email = QString{member->email}; else m_email = ""; |