From 5afe88df2538274859a162ffd63ed52118e80c19 Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Fri, 26 Jan 2024 16:07:54 +0100 Subject: Apply C++11 fixits modernize-use-auto modernize-use-nullptr modernize-use-override modernize-use-using --- src/net/net.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/net/net.cpp') diff --git a/src/net/net.cpp b/src/net/net.cpp index 8946945b..c060d2e8 100644 --- a/src/net/net.cpp +++ b/src/net/net.cpp @@ -44,19 +44,19 @@ #include "utils/gettext.h" -Net::AdminHandler *adminHandler = NULL; -Net::CharHandler *charHandler = NULL; -Net::ChatHandler *chatHandler = NULL; -Net::GeneralHandler *generalHandler = NULL; -Net::InventoryHandler *inventoryHandler = NULL; -Net::LoginHandler *loginHandler = NULL; -Net::GameHandler *gameHandler = NULL; -Net::GuildHandler *guildHandler = NULL; -Net::NpcHandler *npcHandler = NULL; -Net::PartyHandler *partyHandler = NULL; -Net::PlayerHandler *playerHandler = NULL; -Net::SpecialHandler *specialHandler = NULL; -Net::TradeHandler *tradeHandler = NULL; +Net::AdminHandler *adminHandler = nullptr; +Net::CharHandler *charHandler = nullptr; +Net::ChatHandler *chatHandler = nullptr; +Net::GeneralHandler *generalHandler = nullptr; +Net::InventoryHandler *inventoryHandler = nullptr; +Net::LoginHandler *loginHandler = nullptr; +Net::GameHandler *gameHandler = nullptr; +Net::GuildHandler *guildHandler = nullptr; +Net::NpcHandler *npcHandler = nullptr; +Net::PartyHandler *partyHandler = nullptr; +Net::PlayerHandler *playerHandler = nullptr; +Net::SpecialHandler *specialHandler = nullptr; +Net::TradeHandler *tradeHandler = nullptr; Net::AdminHandler *Net::getAdminHandler() { @@ -141,13 +141,13 @@ void connectToServer(ServerInfo &server) logger->error(_("Unknown Server Type! Exiting.")); } - if (networkType == server.type && getGeneralHandler() != NULL) + if (networkType == server.type && getGeneralHandler() != nullptr) { getGeneralHandler()->reload(); } else { - if (networkType != ServerInfo::UNKNOWN && getGeneralHandler() != NULL) + if (networkType != ServerInfo::UNKNOWN && getGeneralHandler() != nullptr) { getGeneralHandler()->unload(); } -- cgit v1.2.3-60-g2f50