From d0ca0ab6a374454e2d3fd317d0b4ad57ee2e0eaa Mon Sep 17 00:00:00 2001 From: Gavin Bises Date: Fri, 30 Jan 2015 11:35:31 -0500 Subject: [PATCH] Add more gender util methods in messagelogwidget --- cockatrice/src/messagelogwidget.cpp | 20 ++++++++++++++++++-- cockatrice/src/messagelogwidget.h | 5 +++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/cockatrice/src/messagelogwidget.cpp b/cockatrice/src/messagelogwidget.cpp index efdb0ff71..21ba5ee4e 100644 --- a/cockatrice/src/messagelogwidget.cpp +++ b/cockatrice/src/messagelogwidget.cpp @@ -29,9 +29,25 @@ ServerInfo_User::Gender MessageLogWidget::genderOf(Player *player) const return player->getUserInfo()->gender(); } -bool MessageLogWidget::userIsFemale() const +ServerInfo_User::Gender MessageLogWidget::currentUserGender() const { - return (tabSupervisor && tabSupervisor->getUserInfo() && (tabSupervisor->getUserInfo()->gender() & ServerInfo_User::Female)); + if (tabSupervisor && tabSupervisor->getUserInfo()) + return tabSupervisor->getUserInfo()->gender(); + return ServerInfo_User::GenderUnknown; +} + +const char* MessageLogWidget::trGenderHint(const ServerInfo_User::Gender gender) const +{ + switch (gender) { + case ServerInfo_User::GenderUnknown: + return "unspecified gender"; + case ServerInfo_User::Male: + return "male"; + case ServerInfo_User::Female: + return "female"; + case ServerInfo_User::Neutral: + return "gender neutral"; + } } void MessageLogWidget::logGameJoined(int gameId) diff --git a/cockatrice/src/messagelogwidget.h b/cockatrice/src/messagelogwidget.h index 8eced59b0..75d94b6a4 100644 --- a/cockatrice/src/messagelogwidget.h +++ b/cockatrice/src/messagelogwidget.h @@ -28,8 +28,9 @@ private: QString sanitizeHtml(QString dirty) const; QString cardLink(const QString &cardName) const; - bool genderOf(Player *player) const; - bool userIsFemale() const; + ServerInfo_User::Gender genderOf(Player *player) const; + const char* trGenderHint(const ServerInfo_User::Gender g) const; + ServerInfo_User::Gender currentUserGender() const; QPair getFromStr(CardZone *zone, QString cardName, int position, bool ownerChange) const; MessageContext currentContext;