Renamed network.?pp to network_http.?pp.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7141 178a84e3-b1eb-0310-8ba1-8eac791a3b58

src/Makefile.am

@@ -12,8 +12,8 @@ supertuxkart_SOURCES = \
  main.cpp \
  main_loop.cpp \
  main_loop.hpp \
- addons/network.cpp \
- addons/network.hpp \
+ addons/network_http.cpp \
+ addons/network_http.hpp \
  addons/addons_manager.cpp \
  addons/addons_manager.hpp \
  addons/zip.cpp \

src/addons/addons_manager.cpp

@@ -30,7 +30,7 @@
 
 #include "irrXML.h"
 
-#include "addons/network.hpp"
+#include "addons/network_http.hpp"
 #include "addons/zip.hpp"
 #include "io/file_manager.hpp"
 #include "karts/kart_properties_manager.hpp"

src/addons/network_http.cpp

@@ -16,7 +16,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #ifdef ADDONS_MANAGER
-#include "addons/network.hpp"
+#include "addons/network_http.hpp"
 
 #include <curl/curl.h>
 #include <stdio.h>

src/addons/network_http.hpp

@@ -17,11 +17,12 @@
 
 #ifdef ADDONS_MANAGER
 
-#ifndef HEADER_NETWORK_HPP
-#define HEADER_NETWORK_HPP
+#ifndef HEADER_NETWORK_HTTP_HPP
+#define HEADER_NETWORK_HTTP_HPP
 
 #include <pthread.h>
 #include <string>
+
 class NetworkHttp
 {
 public:

src/ide/vc9/supertuxkart.vcproj

@@ -1107,7 +1107,7 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\addons\network.cpp"
+					RelativePath="..\..\addons\network_http.cpp"
 					>
 				</File>
 				<File
@@ -2021,7 +2021,7 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\addons\network.hpp"
+					RelativePath="..\..\addons\network_http.hpp"
 					>
 				</File>
 				<File

src/main.cpp

@@ -70,7 +70,7 @@
 #include "utils/translation.hpp"
 
 #ifdef ADDONS_MANAGER
-#include "addons/network.hpp"
+#include "addons/network_http.hpp"
 #include "addons/addons_manager.hpp"
 #endif
 

src/states_screens/addons_screen.cpp

@@ -25,7 +25,7 @@
 #include "irrlicht.h"
 
 #include "addons/addons_manager.hpp"
-#include "addons/network.hpp"
+#include "addons/network_http.hpp"
 #include "guiengine/widget.hpp"
 #include "guiengine/widgets/ribbon_widget.hpp"
 #include "guiengine/CGUISpriteBank.h"

src/states_screens/addons_update_screen.cpp

@@ -17,21 +17,19 @@
 
 #ifdef ADDONS_MANAGER
 
-#include "states_screens/addons_screen.hpp"
 #include "states_screens/addons_update_screen.hpp"
 
-/*pthread aren't supported natively by windows. Here a port: http://sourceware.org/pthreads-win32/ */
-#  include <pthread.h>
-#  include <sstream>
-
+#include <pthread.h>
+#include <sstream>
 
 #include "addons/addons_manager.hpp"
-#include "addons/network.hpp"
+#include "addons/network_http.hpp"
 #include "guiengine/widget.hpp"
 #include "guiengine/widgets/label_widget.hpp"
 #include "guiengine/widgets/ribbon_widget.hpp"
 #include "guiengine/widgets.hpp"
 #include "io/file_manager.hpp"
+#include "states_screens/addons_screen.hpp"
 #include "states_screens/state_manager.hpp"
 #include "states_screens/dialogs/addons_loading.hpp"
 

src/states_screens/dialogs/addons_loading.cpp

@@ -23,7 +23,7 @@
 #include <pthread.h>
 
 #include "addons/addons_manager.hpp"
-#include "addons/network.hpp"
+#include "addons/network_http.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/widgets.hpp"
 #include "input/input_manager.hpp"

src/states_screens/main_menu_screen.cpp

@@ -41,7 +41,7 @@
 #include "states_screens/feature_unlocked.hpp"
 #include "states_screens/grand_prix_lose.hpp"
 #include "states_screens/grand_prix_win.hpp"
-#include "addons/network.hpp"
+#include "addons/network_http.hpp"
 
 #include "tracks/track_manager.hpp"
 #include "tracks/track.hpp"