diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-09-23 22:01:44 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-09-23 22:01:44 +0300 |
commit | 3c404128c4669a1f4f190e20a89553677717fc50 (patch) | |
tree | 2db4e5031089c800c4e00fd6244e578f44a7c910 /src/gui/windows | |
parent | 89b267d6d73bbc59f7c313b8a22b97fbb27f99a8 (diff) | |
download | mv-3c404128c4669a1f4f190e20a89553677717fc50.tar.gz mv-3c404128c4669a1f4f190e20a89553677717fc50.tar.bz2 mv-3c404128c4669a1f4f190e20a89553677717fc50.tar.xz mv-3c404128c4669a1f4f190e20a89553677717fc50.zip |
Add missing comments into defines.
Diffstat (limited to 'src/gui/windows')
23 files changed, 88 insertions, 74 deletions
diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp index ec321a15f..8da750d34 100644 --- a/src/gui/windows/buydialog.cpp +++ b/src/gui/windows/buydialog.cpp @@ -267,7 +267,7 @@ void BuyDialog::init() if (mAdvanced && ( #ifdef TMWA_SUPPORT mNpcId == fromInt(Nick, BeingId) || -#endif +#endif // TMWA_SUPPORT mNpcId == fromInt(Cash, BeingId))) { mAdvanced = false; diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 1b33eab2f..d7392acc6 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -140,13 +140,15 @@ ChatWindow::ChatWindow() : setDefaultSize(w, 90, ImagePosition::UPPER_LEFT, -110, -35); else setDefaultSize(w, 123, ImagePosition::UPPER_LEFT, -110, -35); -#else +#else // ANDROID + if (mainGraphics->getWidth() < 600) w = mainGraphics->getWidth() - 10; if (w < 100) w = 100; setDefaultSize(w, 123, ImagePosition::LOWER_LEFT); -#endif +#endif // ANDROID + setMinWidth(150); setMinHeight(90); @@ -2080,7 +2082,7 @@ void ChatWindow::logicChildren() BasicContainer::logicChildren(); BLOCK_END("ChatWindow::logicChildren") } -#endif +#endif // USE_PROFILER void ChatWindow::addGlobalMessage(const std::string &line) { diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h index 78d87eb6d..26ef6d0bb 100644 --- a/src/gui/windows/chatwindow.h +++ b/src/gui/windows/chatwindow.h @@ -310,7 +310,7 @@ class ChatWindow final : public Window, #ifdef USE_PROFILER void logicChildren(); -#endif +#endif // USE_PROFILER protected: friend class ChannelTab; diff --git a/src/gui/windows/debugwindow.cpp b/src/gui/windows/debugwindow.cpp index 2c9a5c3f6..2a13511f1 100644 --- a/src/gui/windows/debugwindow.cpp +++ b/src/gui/windows/debugwindow.cpp @@ -170,4 +170,4 @@ void DebugWindow::logicChildren() BasicContainer::logicChildren(); BLOCK_END("DebugWindow::logicChildren") } -#endif +#endif // USE_PROFILER diff --git a/src/gui/windows/debugwindow.h b/src/gui/windows/debugwindow.h index 12bb97f13..af4d0732e 100644 --- a/src/gui/windows/debugwindow.h +++ b/src/gui/windows/debugwindow.h @@ -64,7 +64,7 @@ class DebugWindow final : public Window #ifdef USE_PROFILER void logicChildren(); -#endif +#endif // USE_PROFILER private: TabbedArea *mTabs A_NONNULLPOINTER; diff --git a/src/gui/windows/editserverdialog.cpp b/src/gui/windows/editserverdialog.cpp index 8f65bb8f5..2291c9028 100644 --- a/src/gui/windows/editserverdialog.cpp +++ b/src/gui/windows/editserverdialog.cpp @@ -242,14 +242,16 @@ void EditServerDialog::action(const ActionEvent &event) case 2: mServer.type = ServerType::EVOL2; break; -#else +#else // TMWA_SUPPORT + case 0: mServer.type = ServerType::EATHENA; break; case 1: mServer.type = ServerType::EVOL2; break; -#endif +#endif // TMWA_SUPPORT + default: mServer.type = ServerType::UNKNOWN; break; diff --git a/src/gui/windows/itemamountwindow.h b/src/gui/windows/itemamountwindow.h index a89bb83f5..a728e824c 100644 --- a/src/gui/windows/itemamountwindow.h +++ b/src/gui/windows/itemamountwindow.h @@ -87,7 +87,7 @@ class ItemAmountWindow final : public Window, #ifndef UNITTESTS private: -#endif +#endif // UNITTESTS static void finish(Item *const item, const int amount, const int price, diff --git a/src/gui/windows/killstats.cpp b/src/gui/windows/killstats.cpp index 68b57b077..13c1dbbc4 100644 --- a/src/gui/windows/killstats.cpp +++ b/src/gui/windows/killstats.cpp @@ -38,7 +38,7 @@ #ifdef WIN32 #include <sys/time.h> -#endif +#endif // WIN32 #include "debug.h" diff --git a/src/gui/windows/logindialog.cpp b/src/gui/windows/logindialog.cpp index 9ef745cc3..4d58bf968 100644 --- a/src/gui/windows/logindialog.cpp +++ b/src/gui/windows/logindialog.cpp @@ -180,9 +180,11 @@ void LoginDialog::postInit() setContentSize(310, h); #ifdef ANDROID setDefaultSize(310, h, ImagePosition::UPPER_CENTER, 0, 0); -#else +#else // ANDROID + setDefaultSize(310, h, ImagePosition::CENTER, 0, 0); -#endif +#endif // ANDROID + center(); loadWindowState(); reflowLayout(); diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp index 0f3ea0a4d..4dc59e1cd 100644 --- a/src/gui/windows/ministatuswindow.cpp +++ b/src/gui/windows/ministatuswindow.cpp @@ -571,4 +571,4 @@ void MiniStatusWindow::logicChildren() BasicContainer::logicChildren(); BLOCK_END("MiniStatusWindow::logicChildren") } -#endif +#endif // USE_PROFILER diff --git a/src/gui/windows/ministatuswindow.h b/src/gui/windows/ministatuswindow.h index 82fa059c7..400aeb126 100644 --- a/src/gui/windows/ministatuswindow.h +++ b/src/gui/windows/ministatuswindow.h @@ -102,7 +102,7 @@ class MiniStatusWindow final : public Window, #ifdef USE_PROFILER void logicChildren(); -#endif +#endif // USE_PROFILER private: bool isInBar(ProgressBar *bar, int x, int y) const; diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp index 68de46288..3f6c18ff8 100644 --- a/src/gui/windows/serverdialog.cpp +++ b/src/gui/windows/serverdialog.cpp @@ -51,7 +51,7 @@ #ifdef WIN32 #undef ERROR -#endif +#endif // WIN32 static const int MAX_SERVERLIST = 15; @@ -62,9 +62,11 @@ static std::string serverTypeToString(const ServerTypeT type) case ServerType::TMWATHENA: #ifdef TMWA_SUPPORT return "TmwAthena"; -#else +#else // TMWA_SUPPORT + return ""; -#endif +#endif // TMWA_SUPPORT + case ServerType::EATHENA: return "eAthena"; case ServerType::EVOL2: diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp index 1b9d0a94a..5121d531b 100644 --- a/src/gui/windows/shopwindow.cpp +++ b/src/gui/windows/shopwindow.cpp @@ -30,7 +30,7 @@ #include "gui/windows/tradewindow.h" #include "const/gui/chat.h" -#endif +#endif // TMWA_SUPPORT #include "gui/windows/editdialog.h" @@ -54,7 +54,7 @@ #ifdef TMWA_SUPPORT #include "actormanager.h" #include "soundmanager.h" -#endif +#endif // TMWA_SUPPORT #include "configuration.h" #include "settings.h" @@ -64,20 +64,20 @@ #ifdef TMWA_SUPPORT #include "being/playerrelations.h" #include "net/chathandler.h" -#endif +#endif // TMWA_SUPPORT #include "net/buyingstorehandler.h" #include "net/vendinghandler.h" #include "net/serverfeatures.h" #ifdef TMWA_SUPPORT #include "net/tradehandler.h" -#endif +#endif // TMWA_SUPPORT #include "utils/delete2.h" #include "utils/gettext.h" #ifdef TMWA_SUPPORT #include "resources/iteminfo.h" -#endif +#endif // TMWA_SUPPORT #include "resources/inventory/inventory.h" @@ -271,7 +271,7 @@ void ShopWindow::action(const ActionEvent &event) announce(mSellShopItems, SELL); } } -#endif +#endif // TMWA_SUPPORT else if (eventId == "delete") { if (isBuySelected) @@ -1071,7 +1071,7 @@ bool ShopWindow::findShopItem(const ShopItem *const shopItem, } return false; } -#endif +#endif // TMWA_SUPPORT int ShopWindow::sumAmount(const Item *const shopItem) { diff --git a/src/gui/windows/shopwindow.h b/src/gui/windows/shopwindow.h index 50d924a1f..502e5c526 100644 --- a/src/gui/windows/shopwindow.h +++ b/src/gui/windows/shopwindow.h @@ -140,8 +140,8 @@ class ShopWindow final : public Window, bool findShopItem(const ShopItem *const shopItem, const int mode) const A_WARN_UNUSED; +#endif // TMWA_SUPPORT -#endif static int sumAmount(const Item *const shopItem) A_WARN_UNUSED; bool isShopEmpty() const A_WARN_UNUSED; @@ -159,7 +159,8 @@ class ShopWindow final : public Window, private: #ifdef TMWA_SUPPORT void startTrade(); -#endif +#endif // TMWA_SUPPORT + void updateSelection(); void updateShopName(); diff --git a/src/gui/windows/shortcutwindow.cpp b/src/gui/windows/shortcutwindow.cpp index 9d4b34b6d..5184b3e1d 100644 --- a/src/gui/windows/shortcutwindow.cpp +++ b/src/gui/windows/shortcutwindow.cpp @@ -264,4 +264,4 @@ void ShortcutWindow::logicChildren() BasicContainer::logicChildren(); BLOCK_END("ShortcutWindow::logicChildren") } -#endif +#endif // USE_PROFILER diff --git a/src/gui/windows/shortcutwindow.h b/src/gui/windows/shortcutwindow.h index 2e0d8ee83..69d97749f 100644 --- a/src/gui/windows/shortcutwindow.h +++ b/src/gui/windows/shortcutwindow.h @@ -78,7 +78,7 @@ class ShortcutWindow final : public Window #ifdef USE_PROFILER void logicChildren(); -#endif +#endif // USE_PROFILER private: ShortcutWindow(); diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp index 498ffc827..5b465161a 100644 --- a/src/gui/windows/socialwindow.cpp +++ b/src/gui/windows/socialwindow.cpp @@ -41,7 +41,7 @@ #include "gui/widgets/tabs/socialguildtab2.h" #include "net/tmwa/guildmanager.h" -#endif +#endif // TMWA_SUPPORT #include "debug.h" @@ -313,9 +313,10 @@ void SocialWindow::action(const ActionEvent &event) guildHandler->inviteResponse(mGuildInvited, true); else guildManager->inviteResponse(true); -#else +#else // TMWA_SUPPORT + guildHandler->inviteResponse(mGuildInvited, true); -#endif +#endif // TMWA_SUPPORT } else if (eventId == "no") { @@ -332,9 +333,10 @@ void SocialWindow::action(const ActionEvent &event) guildHandler->inviteResponse(mGuildInvited, false); else guildManager->inviteResponse(false); -#else +#else // TMWA_SUPPORT + guildHandler->inviteResponse(mGuildInvited, false); -#endif +#endif // TMWA_SUPPORT } mGuildInvited = 0; @@ -657,4 +659,4 @@ void SocialWindow::logicChildren() BasicContainer::logicChildren(); BLOCK_END("SocialWindow::logicChildren") } -#endif +#endif // USE_PROFILER diff --git a/src/gui/windows/socialwindow.h b/src/gui/windows/socialwindow.h index ad60c9ca8..6c23fd292 100644 --- a/src/gui/windows/socialwindow.h +++ b/src/gui/windows/socialwindow.h @@ -131,7 +131,7 @@ class SocialWindow final : public Window, #ifdef USE_PROFILER void logicChildren(); -#endif +#endif // USE_PROFILER protected: friend class SocialTab; diff --git a/src/gui/windows/textcommandeditor.cpp b/src/gui/windows/textcommandeditor.cpp index 40405f3e8..f22009013 100644 --- a/src/gui/windows/textcommandeditor.cpp +++ b/src/gui/windows/textcommandeditor.cpp @@ -45,7 +45,7 @@ #ifdef TMWA_SUPPORT const unsigned int MAGIC_START_ID = 340; -#endif +#endif // TMWA_SUPPORT TextCommandEditor::TextCommandEditor(TextCommand *const command) : // TRANSLATORS: command editor name @@ -54,14 +54,14 @@ TextCommandEditor::TextCommandEditor(TextCommand *const command) : #ifdef TMWA_SUPPORT mIsMagicCommand(command ? (command->getCommandType() == TextCommandType::Magic) : false), -#endif +#endif // TMWA_SUPPORT mCommand(command), #ifdef TMWA_SUPPORT // TRANSLATORS: command editor button mIsMagic(new RadioButton(this, _("magic"), "magic", mIsMagicCommand)), // TRANSLATORS: command editor button mIsOther(new RadioButton(this, _("other"), "magic", !mIsMagicCommand)), -#endif +#endif // TMWA_SUPPORT // TRANSLATORS: command editor label mSymbolLabel(new Label(this, _("Symbol:"))), mSymbolTextField(new TextField(this)), @@ -93,7 +93,7 @@ TextCommandEditor::TextCommandEditor(TextCommand *const command) : // TRANSLATORS: command editor label mSchoolLvlLabel(new Label(this, _("School level:"))), mSchoolLvlField(new IntTextField(this, 0)), -#endif +#endif // TMWA_SUPPORT // TRANSLATORS: command editor button mCancelButton(new Button(this, _("Cancel"), "cancel", this)), // TRANSLATORS: command editor button @@ -129,7 +129,7 @@ TextCommandEditor::TextCommandEditor(TextCommand *const command) : mSchoolLvlField->setRange(0, 5); mSchoolLvlField->setWidth(20); -#endif +#endif // TMWA_SUPPORT mTypeDropDown->setActionEventId("type"); mTypeDropDown->addActionListener(this); @@ -150,19 +150,13 @@ TextCommandEditor::TextCommandEditor(TextCommand *const command) : showControls(Visible_true); else showControls(Visible_false); -#endif - mSymbolTextField->setText(command->getSymbol()); - mCommandTextField->setText(command->getCommand()); - mCommentTextField->setText(command->getComment()); - mTypeDropDown->setSelected(CAST_S32(command->getTargetType())); -#ifdef TMWA_SUPPORT mManaField->setValue(command->getMana()); mMagicLvlField->setValue(command->getBaseLvl()); mSchoolDropDown->setSelected(CAST_S32(command->getSchool()) - MAGIC_START_ID); mSchoolLvlField->setValue(command->getSchoolLvl()); -#endif +#endif // TMWA_SUPPORT } ContainerPlacer placer; @@ -198,7 +192,8 @@ TextCommandEditor::TextCommandEditor(TextCommand *const command) : placer(0, 10, mSaveButton, 2).setPadding(3); placer(2, 10, mCancelButton, 2).setPadding(3); placer(4, 10, mDeleteButton, 2).setPadding(3); -#else +#else // TMWA_SUPPORT + placer(0, 0, mSymbolLabel, 2).setPadding(3); placer(2, 0, mSymbolTextField, 3).setPadding(3); placer(0, 1, mCommandLabel, 2).setPadding(3); @@ -216,7 +211,7 @@ TextCommandEditor::TextCommandEditor(TextCommand *const command) : placer(0, 5, mSaveButton, 2).setPadding(3); placer(2, 5, mCancelButton, 2).setPadding(3); placer(4, 5, mDeleteButton, 2).setPadding(3); -#endif +#endif // TMWA_SUPPORT setWidth(w); setHeight(h); @@ -239,7 +234,7 @@ TextCommandEditor::~TextCommandEditor() delete2(mTargetTypeModel); #ifdef TMWA_SUPPORT delete2(mMagicSchoolModel); -#endif +#endif // TMWA_SUPPORT } void TextCommandEditor::action(const ActionEvent &event) @@ -270,7 +265,7 @@ void TextCommandEditor::action(const ActionEvent &event) mIsMagicCommand = false; showControls(Visible_false); } -#endif +#endif // TMWA_SUPPORT } #ifdef TMWA_SUPPORT @@ -285,7 +280,7 @@ void TextCommandEditor::showControls(const Visible show) mSchoolLvlLabel->setVisible(show); mSchoolLvlField->setVisible(show); } -#endif +#endif // TMWA_SUPPORT void TextCommandEditor::scheduleDelete() { @@ -302,7 +297,7 @@ void TextCommandEditor::save() mCommand->setCommandType(TextCommandType::Magic); else mCommand->setCommandType(TextCommandType::Text); -#endif +#endif // TMWA_SUPPORT mCommand->setSymbol(mSymbolTextField->getText()); mCommand->setCommand(mCommandTextField->getText()); @@ -317,7 +312,8 @@ void TextCommandEditor::save() mCommand->setSchool(static_cast<MagicSchoolT>( mSchoolDropDown->getSelected() + MAGIC_START_ID)); mCommand->setSchoolLvl(mSchoolLvlField->getValue()); -#endif +#endif // TMWA_SUPPORT + if (spellManager) spellManager->save(); } @@ -337,7 +333,8 @@ void TextCommandEditor::deleteCommand() mCommand->setBaseLvl(0); mCommand->setSchool(MagicSchool::SkillMagic); mCommand->setSchoolLvl(0); -#endif +#endif // TMWA_SUPPORT + if (spellManager) spellManager->save(); } diff --git a/src/gui/windows/textcommandeditor.h b/src/gui/windows/textcommandeditor.h index 07562320a..e651352c9 100644 --- a/src/gui/windows/textcommandeditor.h +++ b/src/gui/windows/textcommandeditor.h @@ -34,7 +34,8 @@ class IntTextField; class Label; #ifdef TMWA_SUPPORT class MagicSchoolModel; -#endif +#endif // TMWA_SUPPORT + class RadioButton; class TargetTypeModel; class TextCommand; @@ -65,7 +66,7 @@ class TextCommandEditor final : public Window, private: #ifdef TMWA_SUPPORT void showControls(const Visible show); -#endif +#endif // TMWA_SUPPORT void save(); @@ -73,12 +74,13 @@ class TextCommandEditor final : public Window, #ifdef TMWA_SUPPORT bool mIsMagicCommand; -#endif +#endif // TMWA_SUPPORT TextCommand* mCommand; #ifdef TMWA_SUPPORT RadioButton* mIsMagic A_NONNULLPOINTER; -#endif +#endif // TMWA_SUPPORT + RadioButton* mIsOther A_NONNULLPOINTER; Label* mSymbolLabel A_NONNULLPOINTER; TextField* mSymbolTextField A_NONNULLPOINTER; @@ -102,7 +104,8 @@ class TextCommandEditor final : public Window, DropDown* mSchoolDropDown A_NONNULLPOINTER; Label* mSchoolLvlLabel A_NONNULLPOINTER; IntTextField* mSchoolLvlField A_NONNULLPOINTER; -#endif +#endif // TMWA_SUPPORT + Button* mCancelButton A_NONNULLPOINTER; Button* mSaveButton A_NONNULLPOINTER; Button* mDeleteButton A_NONNULLPOINTER; diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp index b2adf2be3..fed308094 100644 --- a/src/gui/windows/updaterwindow.cpp +++ b/src/gui/windows/updaterwindow.cpp @@ -464,10 +464,12 @@ void UpdaterWindow::loadPatch() #elif defined(WIN32) const std::string url = "windowsDownloadUrl"; const std::string text = "windowsDownloadUrl"; -#else +#else // defined(ANDROID) + const std::string url = "otherDownloadUrl"; const std::string text = "otherDownloadUrl"; -#endif +#endif // defined(ANDROID) + mBrowserBox->addRow(std::string(" ##1[@@").append( branding.getStringValue(url)).append("|").append( branding.getStringValue(text)).append("@@]"), true); diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp index a138c3994..d07cb9f7d 100644 --- a/src/gui/windows/whoisonline.cpp +++ b/src/gui/windows/whoisonline.cpp @@ -29,7 +29,7 @@ #include "party.h" #ifdef TMWA_SUPPORT #include "settings.h" -#endif +#endif // TMWA_SUPPORT #include "gui/onlineplayer.h" #include "gui/popupmanager.h" @@ -51,7 +51,7 @@ #ifdef TMWA_SUPPORT #include "net/download.h" -#endif +#endif // TMWA_SUPPORT #include "net/packetlimiter.h" #include "net/playerhandler.h" #include "net/serverfeatures.h" @@ -61,17 +61,17 @@ #ifndef TMWA_SUPPORT #include <curl/curl.h> -#endif +#endif // TMWA_SUPPORT #include "debug.h" #ifdef free #undef free -#endif +#endif // free #ifdef malloc #undef malloc -#endif +#endif // malloc WhoIsOnline *whoIsOnline = nullptr; @@ -603,7 +603,7 @@ int WhoIsOnline::downloadThread(void *ptr) wio->mDownloadStatus = UPDATE_ERROR; return 0; } -#endif +#endif // TMWA_SUPPORT void WhoIsOnline::download() { @@ -625,7 +625,7 @@ void WhoIsOnline::download() if (mThread == nullptr) mDownloadStatus = UPDATE_ERROR; } -#endif +#endif // TMWA_SUPPORT } void WhoIsOnline::logic() @@ -698,7 +698,8 @@ void WhoIsOnline::slowLogic() default: break; } -#endif +#endif // TMWA_SUPPORT + BLOCK_END("WhoIsOnline::slowLogic") } @@ -725,7 +726,7 @@ void WhoIsOnline::action(const ActionEvent &event) } } else -#endif +#endif // TMWA_SUPPORT { if (PacketLimiter::limitPackets(PacketType::PACKET_ONLINELIST)) { diff --git a/src/gui/windows/whoisonline.h b/src/gui/windows/whoisonline.h index 5233a17ad..b125bc655 100644 --- a/src/gui/windows/whoisonline.h +++ b/src/gui/windows/whoisonline.h @@ -63,7 +63,7 @@ class WhoIsOnline final : public Window, * Loads and display online list from the memory buffer. */ void loadWebList(); -#endif +#endif // TMWA_SUPPORT void loadList(const std::vector<OnlinePlayer*> &list); @@ -118,7 +118,7 @@ class WhoIsOnline final : public Window, size_t size, size_t nmemb, FILE *restrict stream); -#endif +#endif // TMWA_SUPPORT const std::string prepareNick(const std::string &restrict nick, const int level, |