Code cleanup

client/CServerHandler.cpp

@@ -90,22 +90,22 @@ public:
 	{
 		boost::mutex::scoped_lock interfaceLock(GH.interfaceMutex);
 
-		T & ptr = static_cast<T &>(pack);
+		auto & ref = static_cast<T&>(pack);
 		ApplyOnLobbyHandlerNetPackVisitor visitor(*handler);
 
-		logNetwork->trace("\tImmediately apply on lobby: %s", typeid(ptr).name());
-		ptr.visit(visitor);
+		logNetwork->trace("\tImmediately apply on lobby: %s", typeid(ref).name());
+		ref.visit(visitor);
 
 		return visitor.getResult();
 	}
 
 	void applyOnLobbyScreen(CLobbyScreen * lobby, CServerHandler * handler, CPackForLobby & pack) const override
 	{
-		T & ptr = static_cast<T &>(pack);
+		auto & ref = static_cast<T &>(pack);
 		ApplyOnLobbyScreenNetPackVisitor visitor(*handler, lobby);
 
-		logNetwork->trace("\tApply on lobby from queue: %s", typeid(ptr).name());
-		ptr.visit(visitor);
+		logNetwork->trace("\tApply on lobby from queue: %s", typeid(ref).name());
+		ref.visit(visitor);
 	}
 };
 
@@ -260,11 +260,11 @@ void CServerHandler::connectToServer(const std::string & addr, const ui16 port)
 
 	if (!isServerLocal())
 	{
-		Settings serverAddress = settings.write["server"]["remoteHostname"];
-		serverAddress->String() = addr;
+		Settings remoteAddress = settings.write["server"]["remoteHostname"];
+		remoteAddress->String() = addr;
 
-		Settings serverPort = settings.write["server"]["remotePort"];
-		serverPort->Integer() = port;
+		Settings remotePort = settings.write["server"]["remotePort"];
+		remotePort->Integer() = port;
 	}
 
 	networkHandler->connectToRemote(*this, addr, port);
@@ -312,7 +312,7 @@ void CServerHandler::onConnectionEstablished(const std::shared_ptr<INetworkConne
 void CServerHandler::applyPackOnLobbyScreen(CPackForLobby & pack)
 {
 	boost::mutex::scoped_lock interfaceLock(GH.interfaceMutex);
-	CBaseForLobbyApply * apply = applier->getApplier(CTypeList::getInstance().getTypeID(&pack)); //find the applier
+	const CBaseForLobbyApply * apply = applier->getApplier(CTypeList::getInstance().getTypeID(&pack)); //find the applier
 	apply->applyOnLobbyScreen(dynamic_cast<CLobbyScreen *>(SEL), this, pack);
 	GH.windows().totalRedraw();
 }

client/CServerHandler.h

@@ -82,7 +82,7 @@ public:
 };
 
 /// structure to handle running server and connecting to it
-class CServerHandler : public IServerAPI, public LobbyInfo, public INetworkClientListener, public INetworkTimerListener, boost::noncopyable
+class CServerHandler final : public IServerAPI, public LobbyInfo, public INetworkClientListener, public INetworkTimerListener, boost::noncopyable
 {
 	friend class ApplyOnLobbyHandlerNetPackVisitor;
 

lib/network/NetworkConnection.cpp

@@ -26,7 +26,7 @@ void NetworkConnection::start()
 	boost::asio::async_read(*socket,
 							readBuffer,
 							boost::asio::transfer_exactly(messageHeaderSize),
-							std::bind(&NetworkConnection::onHeaderReceived,this, _1));
+							[this](const auto & ec, const auto & endpoint) { onHeaderReceived(ec); });
 }
 
 void NetworkConnection::onHeaderReceived(const boost::system::error_code & ec)
@@ -42,7 +42,7 @@ void NetworkConnection::onHeaderReceived(const boost::system::error_code & ec)
 	boost::asio::async_read(*socket,
 							readBuffer,
 							boost::asio::transfer_exactly(messageSize),
-							std::bind(&NetworkConnection::onPacketReceived,this, _1, messageSize));
+							[this, messageSize](const auto & ec, const auto & endpoint) { onPacketReceived(ec, messageSize); });
 }
 
 uint32_t NetworkConnection::readPacketSize()

lib/network/NetworkServer.cpp

@@ -14,8 +14,8 @@
 VCMI_LIB_NAMESPACE_BEGIN
 
 NetworkServer::NetworkServer(INetworkServerListener & listener, const std::shared_ptr<NetworkContext> & context)
-	: listener(listener)
-	, io(context)
+	: io(context)
+	, listener(listener)
 {
 }
 

lobby/SQLiteConnection.h

@@ -9,8 +9,8 @@
  */
 #pragma once
 
-typedef struct sqlite3 sqlite3;
-typedef struct sqlite3_stmt sqlite3_stmt;
+using sqlite3 = struct sqlite3;
+using sqlite3_stmt = struct sqlite3_stmt;
 
 class SQLiteInstance;
 class SQLiteStatement;