From 555e68e24f2bb7d38f7ce52ce9a43198c0ccedec Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 4 Feb 2009 11:46:03 -0700
Subject: Went through the gui folder and revised the include statements to not
 include anything not needed by that specific widget or window. This appears
 to have cleaned up system performance a bit on my current setup, where it
 went from idling on 45% in game with opengl down to 30% now.

Also moved iptostring to the tostring header, as importing all of
network.h is a little overkill to use that function, and it goes along
with the basic functions that are in that header file anyways. TODO:
find out a way to get rid of warnings when a class doesn't use this
function.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/net/charserverhandler.cpp |  3 ++-
 src/net/loginhandler.cpp      |  3 ++-
 src/net/network.cpp           | 14 +-------------
 src/net/network.h             |  3 ---
 4 files changed, 5 insertions(+), 18 deletions(-)

(limited to 'src/net')

diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp
index b91a506a..bd3685f3 100644
--- a/src/net/charserverhandler.cpp
+++ b/src/net/charserverhandler.cpp
@@ -21,7 +21,6 @@
 
 #include "charserverhandler.h"
 #include "messagein.h"
-#include "network.h"
 #include "protocol.h"
 
 #include "../extensions.h"
@@ -34,6 +33,8 @@
 #include "../gui/char_select.h"
 #include "../gui/ok_dialog.h"
 
+#include "../utils/tostring.h"
+
 /*
  * Yeah, this is a global.  Get over it.
  */
diff --git a/src/net/loginhandler.cpp b/src/net/loginhandler.cpp
index db601214..6ad410ec 100644
--- a/src/net/loginhandler.cpp
+++ b/src/net/loginhandler.cpp
@@ -21,7 +21,6 @@
 
 #include "loginhandler.h"
 #include "messagein.h"
-#include "network.h"
 #include "protocol.h"
 
 #include "../log.h"
@@ -29,6 +28,8 @@
 #include "../main.h"
 #include "../serverinfo.h"
 
+#include "../utils/tostring.h"
+
 extern SERVER_INFO **server_info;
 
 LoginHandler::LoginHandler()
diff --git a/src/net/network.cpp b/src/net/network.cpp
index 941995c9..059da779 100644
--- a/src/net/network.cpp
+++ b/src/net/network.cpp
@@ -26,6 +26,7 @@
 #include "network.h"
 
 #include "../log.h"
+#include "../utils/tostring.h"
 
 /** Warning: buffers and other variables are shared,
     so there can be only one connection active at a time */
@@ -418,19 +419,6 @@ void Network::receive()
     SDLNet_FreeSocketSet(set);
 }
 
-char *iptostring(int address)
-{
-    static char asciiIP[16];
-
-    sprintf(asciiIP, "%i.%i.%i.%i",
-            (unsigned char)(address),
-            (unsigned char)(address >> 8),
-            (unsigned char)(address >> 16),
-            (unsigned char)(address >> 24));
-
-    return asciiIP;
-}
-
 void Network::setError(const std::string& error)
 {
     logger->log("Network error: %s", error.c_str());
diff --git a/src/net/network.h b/src/net/network.h
index c035f55c..02fe7538 100644
--- a/src/net/network.h
+++ b/src/net/network.h
@@ -115,7 +115,4 @@ class Network
         MessageHandlers mMessageHandlers;
 };
 
-/** Convert an address from int format to string */
-char *iptostring(int address);
-
 #endif
-- 
cgit v1.2.3-70-g09d2