[Supertuxkart-commit] SF.net SVN: supertuxkart:[13401] main/trunk/src/io/file_manager.cpp

[<hik...@us...>]

Revision: 13401
          http://sourceforge.net/p/supertuxkart/code/13401
Author:   hikerstk
Date:     2013-08-01 06:11:10 +0000 (Thu, 01 Aug 2013)
Log Message:
-----------
Simplified #includes, and changed order to follow our style guide.

Modified Paths:
--------------
    main/trunk/src/io/file_manager.cpp

Modified: main/trunk/src/io/file_manager.cpp
===================================================================
--- main/trunk/src/io/file_manager.cpp	2013-08-01 06:06:09 UTC (rev 13400)
+++ main/trunk/src/io/file_manager.cpp	2013-08-01 06:11:10 UTC (rev 13401)
@@ -17,10 +17,19 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <irrlicht.h>
 
 #include "io/file_manager.hpp"
 
+#include "config/user_config.hpp"
+#include "graphics/irr_driver.hpp"
+#include "graphics/material_manager.hpp"
+#include "karts/kart_properties_manager.hpp"
+#include "tracks/track_manager.hpp"
+#include "utils/log.hpp"
+#include "utils/string_utils.hpp"
+
+#include <irrlicht.h>
+
 #include <stdio.h>
 #include <stdexcept>
 #include <sstream>
@@ -32,37 +41,20 @@
 #if !defined(WIN32)
 #  include <sys/stat.h>
 #  include <sys/types.h>
-// For RemoveDirectory
+#  include <dirent.h>
+#  include <unistd.h>
 #else
 #  include <direct.h>
 #  include <Windows.h>
-#endif
-
-/*Needed by the remove directory function */
-
-#ifndef WIN32
-#  include <dirent.h>
-#endif
-
-#ifdef WIN32
 #  include <stdio.h>
 #  ifndef __CYGWIN__
 #    define S_ISDIR(mode)  (((mode) & S_IFMT) == S_IFDIR)
 #    define S_ISREG(mode)  (((mode) & S_IFMT) == S_IFREG)
 #  endif
-#else
-#  include <unistd.h>
 #endif
 
-#include "btBulletDynamicsCommon.h"
+/*Needed by the remove directory function */
 
-#include "config/user_config.hpp"
-#include "graphics/irr_driver.hpp"
-#include "graphics/material_manager.hpp"
-#include "karts/kart_properties_manager.hpp"
-#include "tracks/track_manager.hpp"
-#include "utils/log.hpp"
-#include "utils/string_utils.hpp"
 
 
 #ifdef __APPLE__

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.