From 1fd5a493d8edd6a77ed7a8d1fd602f59b3797acc Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 20 Jan 2017 21:08:24 +0300 Subject: Fix code style. --- src/being/localplayer.cpp | 1 + src/beingequipbackend.cpp | 4 +++- src/dyetool/gui/viewport.cpp | 1 + src/eventsmanager.cpp | 1 + src/gui/models/colormodel.cpp | 1 + src/gui/models/modelistmodel.cpp | 1 + src/gui/models/namesmodel.cpp | 1 + src/gui/models/shopitems.cpp | 1 + src/gui/userpalette.cpp | 3 ++- src/gui/viewport.cpp | 1 + src/gui/widgets/guitable.cpp | 1 + src/gui/widgets/tabs/chat/emulateguildtab.cpp | 3 ++- src/gui/windowmenu.cpp | 1 + src/gui/windows/helpwindow.cpp | 1 + src/net/ea/beinghandler.cpp | 3 ++- src/net/ea/inventoryhandler.cpp | 3 ++- src/net/ea/tradehandler.cpp | 3 ++- src/net/eathena/bankhandler.cpp | 3 ++- src/net/eathena/cashshophandler.cpp | 3 ++- src/net/eathena/elementalhandler.cpp | 3 ++- src/net/eathena/familyhandler.cpp | 3 ++- src/net/eathena/maphandler.cpp | 3 ++- src/net/eathena/markethandler.cpp | 3 ++- src/net/eathena/roulettehandler.cpp | 3 ++- src/net/eathena/searchstorehandler.cpp | 3 ++- src/net/eathena/serverfeatures.cpp | 3 ++- src/net/tmwa/bankhandler.cpp | 3 ++- src/net/tmwa/cashshophandler.cpp | 3 ++- src/net/tmwa/elementalhandler.cpp | 3 ++- src/net/tmwa/familyhandler.cpp | 3 ++- src/net/tmwa/maphandler.cpp | 3 ++- src/net/tmwa/markethandler.cpp | 3 ++- src/net/tmwa/roulettehandler.cpp | 3 ++- src/net/tmwa/searchstorehandler.cpp | 3 ++- src/net/tmwa/serverfeatures.cpp | 3 ++- src/soundmanager.cpp | 1 + 36 files changed, 61 insertions(+), 24 deletions(-) diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index 0bc0e51ed..f3ec36a14 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -118,6 +118,7 @@ extern SkillDialog *skillDialog; LocalPlayer::LocalPlayer(const BeingId id, const BeingTypeId subtype) : Being(id, ActorType::Player, subtype, nullptr), + ActorSpriteListener(), AttributeListener(), PlayerDeathListener(), StatListener(), diff --git a/src/beingequipbackend.cpp b/src/beingequipbackend.cpp index 5af3ba808..aa89c1773 100644 --- a/src/beingequipbackend.cpp +++ b/src/beingequipbackend.cpp @@ -30,7 +30,9 @@ #include "debug.h" -BeingEquipBackend::BeingEquipBackend(Being *const being) +BeingEquipBackend::BeingEquipBackend(Being *const being) : + Equipment::Backend(), + mEquipment() { memset(mEquipment, 0, sizeof(mEquipment)); if (being) diff --git a/src/dyetool/gui/viewport.cpp b/src/dyetool/gui/viewport.cpp index fce14dc71..bb86a0401 100644 --- a/src/dyetool/gui/viewport.cpp +++ b/src/dyetool/gui/viewport.cpp @@ -39,6 +39,7 @@ extern volatile int tick_time; Viewport::Viewport() : WindowContainer(nullptr), MouseListener(), + ConfigListener(), mMouseX(0), mMouseY(0), mMap(nullptr), diff --git a/src/eventsmanager.cpp b/src/eventsmanager.cpp index fc0e0ef3a..fa34821e2 100644 --- a/src/eventsmanager.cpp +++ b/src/eventsmanager.cpp @@ -50,6 +50,7 @@ EventsManager eventsManager; EventsManager::EventsManager() : + ConfigListener(), mLogInput(false) { } diff --git a/src/gui/models/colormodel.cpp b/src/gui/models/colormodel.cpp index 39406e3ff..76a7da8fa 100644 --- a/src/gui/models/colormodel.cpp +++ b/src/gui/models/colormodel.cpp @@ -27,6 +27,7 @@ #include "debug.h" ColorModel::ColorModel() : + ListModel(), mNames(), mColors() { diff --git a/src/gui/models/modelistmodel.cpp b/src/gui/models/modelistmodel.cpp index d70be4b1f..60974bb7e 100644 --- a/src/gui/models/modelistmodel.cpp +++ b/src/gui/models/modelistmodel.cpp @@ -54,6 +54,7 @@ static bool modeSorter(const std::string &mode1, const std::string &mode2) #endif // ANDROID ModeListModel::ModeListModel() : + ListModel(), mVideoModes() { SDL::getAllVideoModes(mVideoModes); diff --git a/src/gui/models/namesmodel.cpp b/src/gui/models/namesmodel.cpp index 6d831cab9..9c90ff4c0 100644 --- a/src/gui/models/namesmodel.cpp +++ b/src/gui/models/namesmodel.cpp @@ -25,6 +25,7 @@ #include "debug.h" NamesModel::NamesModel() : + ListModel(), mNames() { } diff --git a/src/gui/models/shopitems.cpp b/src/gui/models/shopitems.cpp index 402d2f641..061da5110 100644 --- a/src/gui/models/shopitems.cpp +++ b/src/gui/models/shopitems.cpp @@ -29,6 +29,7 @@ #include "debug.h" ShopItems::ShopItems(const bool mergeDuplicates) : + ListModel(), mAllShopItems(), mShopItems(), mMergeDuplicates(mergeDuplicates) diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp index 0f09603a1..ce48fea70 100644 --- a/src/gui/userpalette.cpp +++ b/src/gui/userpalette.cpp @@ -124,7 +124,8 @@ std::string UserPalette::getConfigName(const std::string &typeName) } UserPalette::UserPalette() : - Palette(CAST_S32(UserColorId::USER_COLOR_LAST)) + Palette(CAST_S32(UserColorId::USER_COLOR_LAST)), + ListModel() { mColors[CAST_SIZE(UserColorId::BEING)] = ColorElem(); mColors[CAST_SIZE(UserColorId::PC)] = ColorElem(); diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 317c3170d..db8af7ebe 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -66,6 +66,7 @@ extern MiniStatusWindow *miniStatusWindow; Viewport::Viewport() : WindowContainer(nullptr), MouseListener(), + ConfigListener(), mMouseX(0), mMouseY(0), mMap(nullptr), diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp index d362f0bd5..3c22dd4b1 100644 --- a/src/gui/widgets/guitable.cpp +++ b/src/gui/widgets/guitable.cpp @@ -45,6 +45,7 @@ GuiTable::GuiTable(const Widget2 *const widget, Widget(widget), MouseListener(), KeyListener(), + TableModelListener(), mModel(nullptr), mTopWidget(nullptr), mActionListeners2(), diff --git a/src/gui/widgets/tabs/chat/emulateguildtab.cpp b/src/gui/widgets/tabs/chat/emulateguildtab.cpp index 2f24a8092..e6ca1c498 100644 --- a/src/gui/widgets/tabs/chat/emulateguildtab.cpp +++ b/src/gui/widgets/tabs/chat/emulateguildtab.cpp @@ -37,7 +37,8 @@ EmulateGuildTab::EmulateGuildTab(const Widget2 *const widget) : // TRANSLATORS: guild chat tab name - ChatTab(widget, _("Guild"), "", "#Guild", ChatTabType::GUILD) + ChatTab(widget, _("Guild"), "", "#Guild", ChatTabType::GUILD), + ConfigListener() { setTabColors(ThemeColorId::GUILD_CHAT_TAB); mShowOnline = config.getBoolValue("showGuildOnline"); diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp index 87df85ba1..d193ffaa0 100644 --- a/src/gui/windowmenu.cpp +++ b/src/gui/windowmenu.cpp @@ -47,6 +47,7 @@ WindowMenu *windowMenu = nullptr; WindowMenu::WindowMenu(const Widget2 *const widget) : Container(widget), + ConfigListener(), ActionListener(), SelectionListener(), MouseListener(), diff --git a/src/gui/windows/helpwindow.cpp b/src/gui/windows/helpwindow.cpp index 78a7ee362..14be15074 100644 --- a/src/gui/windows/helpwindow.cpp +++ b/src/gui/windows/helpwindow.cpp @@ -52,6 +52,7 @@ HelpWindow *helpWindow = nullptr; HelpWindow::HelpWindow() : // TRANSLATORS: help window name Window(_("Help"), Modal_false, nullptr, "help.xml"), + LinkHandler(), ActionListener(), // TRANSLATORS: help window. button. mDYKButton(new Button(this, _("Did you know..."), "DYK", this)), diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index ab26998a1..4f62175c3 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -29,7 +29,8 @@ namespace Ea { -BeingHandler::BeingHandler(const bool enableSync) +BeingHandler::BeingHandler(const bool enableSync) : + Net::BeingHandler() { BeingRecv::mSync = enableSync; BeingRecv::mSpawnId = BeingId_zero; diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index 85bfb61ac..30b282bb4 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -32,7 +32,8 @@ namespace Ea { -InventoryHandler::InventoryHandler() +InventoryHandler::InventoryHandler() : + Net::InventoryHandler() { InventoryRecv::mEquips.clear(); InventoryRecv::mInventoryItems.clear(); diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp index 8c85bde51..a56136b3d 100644 --- a/src/net/ea/tradehandler.cpp +++ b/src/net/ea/tradehandler.cpp @@ -37,7 +37,8 @@ namespace namespace Ea { -TradeHandler::TradeHandler() +TradeHandler::TradeHandler() : + Net::TradeHandler() { confirmDlg = nullptr; } diff --git a/src/net/eathena/bankhandler.cpp b/src/net/eathena/bankhandler.cpp index 67357d2d5..0caa516ad 100644 --- a/src/net/eathena/bankhandler.cpp +++ b/src/net/eathena/bankhandler.cpp @@ -31,7 +31,8 @@ extern int packetVersion; namespace EAthena { -BankHandler::BankHandler() +BankHandler::BankHandler() : + Net::BankHandler() { bankHandler = this; } diff --git a/src/net/eathena/cashshophandler.cpp b/src/net/eathena/cashshophandler.cpp index cca4e0d42..1179f0823 100644 --- a/src/net/eathena/cashshophandler.cpp +++ b/src/net/eathena/cashshophandler.cpp @@ -32,7 +32,8 @@ extern int packetVersion; namespace EAthena { -CashShopHandler::CashShopHandler() +CashShopHandler::CashShopHandler() : + Net::CashShopHandler() { cashShopHandler = this; CashShopRecv::mBuyDialog = nullptr; diff --git a/src/net/eathena/elementalhandler.cpp b/src/net/eathena/elementalhandler.cpp index 2265283a0..c80a47b99 100644 --- a/src/net/eathena/elementalhandler.cpp +++ b/src/net/eathena/elementalhandler.cpp @@ -27,7 +27,8 @@ extern Net::ElementalHandler *elementalHandler; namespace EAthena { -ElementalHandler::ElementalHandler() +ElementalHandler::ElementalHandler() : + Net::ElementalHandler() { elementalHandler = this; } diff --git a/src/net/eathena/familyhandler.cpp b/src/net/eathena/familyhandler.cpp index 816d485dc..02bd5b43b 100644 --- a/src/net/eathena/familyhandler.cpp +++ b/src/net/eathena/familyhandler.cpp @@ -33,7 +33,8 @@ extern Net::FamilyHandler *familyHandler; namespace EAthena { -FamilyHandler::FamilyHandler() +FamilyHandler::FamilyHandler() : + Net::FamilyHandler() { FamilyRecv::mParent1 = BeingId_zero; FamilyRecv::mParent2 = BeingId_zero; diff --git a/src/net/eathena/maphandler.cpp b/src/net/eathena/maphandler.cpp index 1a6c76798..380b5c48c 100644 --- a/src/net/eathena/maphandler.cpp +++ b/src/net/eathena/maphandler.cpp @@ -27,7 +27,8 @@ extern Net::MapHandler *mapHandler; namespace EAthena { -MapHandler::MapHandler() +MapHandler::MapHandler() : + Net::MapHandler() { mapHandler = this; } diff --git a/src/net/eathena/markethandler.cpp b/src/net/eathena/markethandler.cpp index aadee0bc2..ba3304aa5 100644 --- a/src/net/eathena/markethandler.cpp +++ b/src/net/eathena/markethandler.cpp @@ -34,7 +34,8 @@ extern int packetVersion; namespace EAthena { -MarketHandler::MarketHandler() +MarketHandler::MarketHandler() : + Net::MarketHandler() { marketHandler = this; MarketRecv::mBuyDialog = nullptr; diff --git a/src/net/eathena/roulettehandler.cpp b/src/net/eathena/roulettehandler.cpp index 1e2a292e2..5804e1b70 100644 --- a/src/net/eathena/roulettehandler.cpp +++ b/src/net/eathena/roulettehandler.cpp @@ -27,7 +27,8 @@ extern Net::RouletteHandler *rouletteHandler; namespace EAthena { -RouletteHandler::RouletteHandler() +RouletteHandler::RouletteHandler() : + Net::RouletteHandler() { rouletteHandler = this; } diff --git a/src/net/eathena/searchstorehandler.cpp b/src/net/eathena/searchstorehandler.cpp index 893df8c5e..d0b98be08 100644 --- a/src/net/eathena/searchstorehandler.cpp +++ b/src/net/eathena/searchstorehandler.cpp @@ -31,7 +31,8 @@ extern int packetVersion; namespace EAthena { -SearchStoreHandler::SearchStoreHandler() +SearchStoreHandler::SearchStoreHandler() : + Net::SearchStoreHandler() { searchStoreHandler = this; } diff --git a/src/net/eathena/serverfeatures.cpp b/src/net/eathena/serverfeatures.cpp index 8007b31a0..8567dedff 100644 --- a/src/net/eathena/serverfeatures.cpp +++ b/src/net/eathena/serverfeatures.cpp @@ -30,7 +30,8 @@ extern Net::ServerFeatures *serverFeatures; namespace EAthena { -ServerFeatures::ServerFeatures() +ServerFeatures::ServerFeatures() : + Net::ServerFeatures() { serverFeatures = this; } diff --git a/src/net/tmwa/bankhandler.cpp b/src/net/tmwa/bankhandler.cpp index ac7eb3baa..25fccc368 100644 --- a/src/net/tmwa/bankhandler.cpp +++ b/src/net/tmwa/bankhandler.cpp @@ -27,7 +27,8 @@ extern Net::BankHandler *bankHandler; namespace TmwAthena { -BankHandler::BankHandler() +BankHandler::BankHandler() : + Net::BankHandler() { bankHandler = this; } diff --git a/src/net/tmwa/cashshophandler.cpp b/src/net/tmwa/cashshophandler.cpp index edc503869..d8263033e 100644 --- a/src/net/tmwa/cashshophandler.cpp +++ b/src/net/tmwa/cashshophandler.cpp @@ -27,7 +27,8 @@ extern Net::CashShopHandler *cashShopHandler; namespace TmwAthena { -CashShopHandler::CashShopHandler() +CashShopHandler::CashShopHandler() : + Net::CashShopHandler() { cashShopHandler = this; } diff --git a/src/net/tmwa/elementalhandler.cpp b/src/net/tmwa/elementalhandler.cpp index eb9e501aa..19bcd3dfc 100644 --- a/src/net/tmwa/elementalhandler.cpp +++ b/src/net/tmwa/elementalhandler.cpp @@ -27,7 +27,8 @@ extern Net::ElementalHandler *elementalHandler; namespace TmwAthena { -ElementalHandler::ElementalHandler() +ElementalHandler::ElementalHandler() : + Net::ElementalHandler() { elementalHandler = this; } diff --git a/src/net/tmwa/familyhandler.cpp b/src/net/tmwa/familyhandler.cpp index 799b79ef6..8a06a0d2d 100644 --- a/src/net/tmwa/familyhandler.cpp +++ b/src/net/tmwa/familyhandler.cpp @@ -27,7 +27,8 @@ extern Net::FamilyHandler *familyHandler; namespace TmwAthena { -FamilyHandler::FamilyHandler() +FamilyHandler::FamilyHandler() : + Net::FamilyHandler() { familyHandler = this; } diff --git a/src/net/tmwa/maphandler.cpp b/src/net/tmwa/maphandler.cpp index 1d8f1acc3..4302ac52d 100644 --- a/src/net/tmwa/maphandler.cpp +++ b/src/net/tmwa/maphandler.cpp @@ -27,7 +27,8 @@ extern Net::MapHandler *mapHandler; namespace TmwAthena { -MapHandler::MapHandler() +MapHandler::MapHandler() : + Net::MapHandler() { mapHandler = this; } diff --git a/src/net/tmwa/markethandler.cpp b/src/net/tmwa/markethandler.cpp index 8e85f245c..9576499b1 100644 --- a/src/net/tmwa/markethandler.cpp +++ b/src/net/tmwa/markethandler.cpp @@ -27,7 +27,8 @@ extern Net::MarketHandler *marketHandler; namespace TmwAthena { -MarketHandler::MarketHandler() +MarketHandler::MarketHandler() : + Net::MarketHandler() { marketHandler = this; } diff --git a/src/net/tmwa/roulettehandler.cpp b/src/net/tmwa/roulettehandler.cpp index 566355ec1..800d0144a 100644 --- a/src/net/tmwa/roulettehandler.cpp +++ b/src/net/tmwa/roulettehandler.cpp @@ -27,7 +27,8 @@ extern Net::RouletteHandler *rouletteHandler; namespace TmwAthena { -RouletteHandler::RouletteHandler() +RouletteHandler::RouletteHandler() : + Net::RouletteHandler() { rouletteHandler = this; } diff --git a/src/net/tmwa/searchstorehandler.cpp b/src/net/tmwa/searchstorehandler.cpp index 596dd0935..a124351a8 100644 --- a/src/net/tmwa/searchstorehandler.cpp +++ b/src/net/tmwa/searchstorehandler.cpp @@ -27,7 +27,8 @@ extern Net::SearchStoreHandler *searchStoreHandler; namespace TmwAthena { -SearchStoreHandler::SearchStoreHandler() +SearchStoreHandler::SearchStoreHandler() : + Net::SearchStoreHandler() { searchStoreHandler = this; } diff --git a/src/net/tmwa/serverfeatures.cpp b/src/net/tmwa/serverfeatures.cpp index 359c60546..2341435e6 100644 --- a/src/net/tmwa/serverfeatures.cpp +++ b/src/net/tmwa/serverfeatures.cpp @@ -28,7 +28,8 @@ extern Net::ServerFeatures *serverFeatures; namespace TmwAthena { -ServerFeatures::ServerFeatures() +ServerFeatures::ServerFeatures() : + Net::ServerFeatures() { serverFeatures = this; } diff --git a/src/soundmanager.cpp b/src/soundmanager.cpp index 19c7abc4c..00d285ca5 100644 --- a/src/soundmanager.cpp +++ b/src/soundmanager.cpp @@ -59,6 +59,7 @@ static void fadeOutCallBack() } SoundManager::SoundManager() : + ConfigListener(), mNextMusicFile(), mInstalled(false), mSfxVolume(100), -- cgit v1.2.3-60-g2f50