From 0e13e22e4902eca435812ae002c56ad13233efc6 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 14 Jun 2015 21:16:40 +0300 Subject: Use CREATEWIDGET macro in charserverhandler. --- src/net/ea/charserverhandler.cpp | 19 ++++++++++++------ src/net/eathena/charserverhandler.cpp | 37 +++++++++++++++++++++++------------ src/net/tmwa/charserverhandler.cpp | 11 ++++++++--- 3 files changed, 46 insertions(+), 21 deletions(-) (limited to 'src/net') diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp index e798467e7..eafdaff34 100644 --- a/src/net/ea/charserverhandler.cpp +++ b/src/net/ea/charserverhandler.cpp @@ -27,6 +27,8 @@ #include "gui/windows/charcreatedialog.h" #include "gui/windows/okdialog.h" +#include "gui/widgets/createwidget.h" + #include "net/ea/eaprotocol.h" #include "net/character.h" @@ -135,15 +137,17 @@ void CharServerHandler::processCharCreateFailed(Net::MessageIn &msg) errorMessage = _("Incorrect look."); break; } - // TRANSLATORS: error message header - (new OkDialog(_("Error"), errorMessage, + CREATEWIDGET(OkDialog, + // TRANSLATORS: error message header + _("Error"), + errorMessage, // TRANSLATORS: ok dialog button _("OK"), DialogType::ERROR, Modal_true, ShowCenter_true, nullptr, - 260))->postInit(); + 260); if (mCharCreateDialog) mCharCreateDialog->unlock(); BLOCK_END("CharServerHandler::processCharCreateFailed") @@ -157,15 +161,18 @@ void CharServerHandler::processCharDelete(Net::MessageIn &msg A_UNUSED) mSelectedCharacter = nullptr; updateCharSelectDialog(); unlockCharSelectDialog(); - // TRANSLATORS: info message - (new OkDialog(_("Info"), _("Character deleted."), + CREATEWIDGET(OkDialog, + // TRANSLATORS: info message header + _("Info"), + // TRANSLATORS: info message + _("Character deleted."), // TRANSLATORS: ok dialog button _("OK"), DialogType::OK, Modal_true, ShowCenter_true, nullptr, - 260))->postInit(); + 260); BLOCK_END("CharServerHandler::processCharDelete") } diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp index 893be8f4f..692ea5dfb 100644 --- a/src/net/eathena/charserverhandler.cpp +++ b/src/net/eathena/charserverhandler.cpp @@ -30,6 +30,8 @@ #include "gui/windows/charselectdialog.h" #include "gui/windows/okdialog.h" +#include "gui/widgets/createwidget.h" + #include "net/character.h" #include "net/serverfeatures.h" @@ -578,15 +580,18 @@ void CharServerHandler::processCharCheckRename(Net::MessageIn &msg) } else { - // TRANSLATORS: info message - (new OkDialog(_("Error"), _("Character rename error."), + CREATEWIDGET(OkDialog, + // TRANSLATORS: error header + _("Error"), + // TRANSLATORS: error message + _("Character rename error."), // TRANSLATORS: ok dialog button _("Error"), DialogType::ERROR, Modal_true, ShowCenter_true, nullptr, - 260))->postInit(); + 260); } } @@ -596,15 +601,18 @@ void CharServerHandler::processCharRename(Net::MessageIn &msg) if (!flag) { mCharSelectDialog->setName(mRenameId, mNewName); - // TRANSLATORS: info message - (new OkDialog(_("Info"), _("Character renamed."), + CREATEWIDGET(OkDialog, + // TRANSLATORS: info header + _("Info"), + // TRANSLATORS: info message + _("Character renamed."), // TRANSLATORS: ok dialog button _("OK"), DialogType::OK, Modal_true, ShowCenter_true, nullptr, - 260))->postInit(); + 260); } else { @@ -629,15 +637,17 @@ void CharServerHandler::processCharRename(Net::MessageIn &msg) message = _("Character not found."); break; } - // TRANSLATORS: info message - (new OkDialog(_("Info"), message, + CREATEWIDGET(OkDialog, + // TRANSLATORS: info message + _("Info"), + message, // TRANSLATORS: ok dialog button _("OK"), DialogType::OK, Modal_true, ShowCenter_true, nullptr, - 260))->postInit(); + 260); } } @@ -662,15 +672,18 @@ void CharServerHandler::processCharDeleteFailed(Net::MessageIn &msg) BLOCK_START("CharServerHandler::processCharDeleteFailed") unlockCharSelectDialog(); msg.readUInt8("error"); - // TRANSLATORS: error message - (new OkDialog(_("Error"), _("Failed to delete character."), + CREATEWIDGET(OkDialog, + // TRANSLATORS: error header + _("Error"), + // TRANSLATORS: error message + _("Failed to delete character."), // TRANSLATORS: ok dialog button _("OK"), DialogType::ERROR, Modal_true, ShowCenter_true, nullptr, - 260))->postInit(); + 260); BLOCK_END("CharServerHandler::processCharDeleteFailed") } diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp index e27e2c125..859be0bed 100644 --- a/src/net/tmwa/charserverhandler.cpp +++ b/src/net/tmwa/charserverhandler.cpp @@ -29,6 +29,8 @@ #include "gui/windows/charcreatedialog.h" #include "gui/windows/okdialog.h" +#include "gui/widgets/createwidget.h" + #include "net/character.h" #include "net/serverfeatures.h" @@ -522,15 +524,18 @@ void CharServerHandler::processCharDeleteFailed(Net::MessageIn &msg) BLOCK_START("CharServerHandler::processCharDeleteFailed") unlockCharSelectDialog(); msg.readUInt8("error"); - // TRANSLATORS: error message - (new OkDialog(_("Error"), _("Failed to delete character."), + CREATEWIDGET(OkDialog, + // TRANSLATORS: error header + _("Error"), + // TRANSLATORS: error message + _("Failed to delete character."), // TRANSLATORS: ok dialog button _("OK"), DialogType::ERROR, Modal_true, ShowCenter_true, nullptr, - 260))->postInit(); + 260); BLOCK_END("CharServerHandler::processCharDeleteFailed") } -- cgit v1.2.3-70-g09d2