From 5233a6650692e29a2b811359ea7d3f201b157c74 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 15 Nov 2015 02:01:59 +0300 Subject: Rename haveOtherGender into haveAccountOtherGender --- src/gui/windows/registerdialog.cpp | 2 +- src/net/eathena/serverfeatures.cpp | 2 +- src/net/eathena/serverfeatures.h | 2 +- src/net/serverfeatures.h | 2 +- src/net/tmwa/serverfeatures.cpp | 2 +- src/net/tmwa/serverfeatures.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gui/windows/registerdialog.cpp b/src/gui/windows/registerdialog.cpp index b4f9d8868..373a0f118 100644 --- a/src/gui/windows/registerdialog.cpp +++ b/src/gui/windows/registerdialog.cpp @@ -94,7 +94,7 @@ RegisterDialog::RegisterDialog(LoginData &data) : mMaleButton = new RadioButton(this, _("Male"), "sex", true); // TRANSLATORS: register dialog. button. mFemaleButton = new RadioButton(this, _("Female"), "sex", false); - if (serverFeatures->haveOtherGender()) + if (serverFeatures->haveAccountOtherGender()) { // TRANSLATORS: register dialog. button. mOtherButton = new RadioButton(this, _("Other"), "sex", false); diff --git a/src/net/eathena/serverfeatures.cpp b/src/net/eathena/serverfeatures.cpp index fbc97b97e..688e03c46 100644 --- a/src/net/eathena/serverfeatures.cpp +++ b/src/net/eathena/serverfeatures.cpp @@ -110,7 +110,7 @@ bool ServerFeatures::haveItemColors() const return true; } -bool ServerFeatures::haveOtherGender() const +bool ServerFeatures::haveAccountOtherGender() const { return false; } diff --git a/src/net/eathena/serverfeatures.h b/src/net/eathena/serverfeatures.h index 6bb2176ae..0423bde57 100644 --- a/src/net/eathena/serverfeatures.h +++ b/src/net/eathena/serverfeatures.h @@ -64,7 +64,7 @@ class ServerFeatures final : public Net::ServerFeatures bool haveItemColors() const override final; - bool haveOtherGender() const override final; + bool haveAccountOtherGender() const override final; bool haveMonsterAttackRange() const override final; diff --git a/src/net/serverfeatures.h b/src/net/serverfeatures.h index 5926d9d3a..c0f8fe5c8 100644 --- a/src/net/serverfeatures.h +++ b/src/net/serverfeatures.h @@ -61,7 +61,7 @@ class ServerFeatures notfinal virtual bool haveItemColors() const = 0; - virtual bool haveOtherGender() const = 0; + virtual bool haveAccountOtherGender() const = 0; virtual bool haveMonsterAttackRange() const = 0; diff --git a/src/net/tmwa/serverfeatures.cpp b/src/net/tmwa/serverfeatures.cpp index a2d60675a..461c25e8d 100644 --- a/src/net/tmwa/serverfeatures.cpp +++ b/src/net/tmwa/serverfeatures.cpp @@ -109,7 +109,7 @@ bool ServerFeatures::haveItemColors() const return false; } -bool ServerFeatures::haveOtherGender() const +bool ServerFeatures::haveAccountOtherGender() const { return false; } diff --git a/src/net/tmwa/serverfeatures.h b/src/net/tmwa/serverfeatures.h index 7a0008583..582bea20b 100644 --- a/src/net/tmwa/serverfeatures.h +++ b/src/net/tmwa/serverfeatures.h @@ -64,7 +64,7 @@ class ServerFeatures final : public Net::ServerFeatures bool haveItemColors() const override final; - bool haveOtherGender() const override final; + bool haveAccountOtherGender() const override final; bool haveMonsterAttackRange() const override final; -- cgit v1.2.3-60-g2f50