Sorting includes (tools directory)

osx/tools/fileio.cpp

@@ -6,26 +6,21 @@
  *
  */
 
-#include <string>
-#include <vector>
-#include <map>
-#include <sstream>
-
-//#include "scen.global.h"
-#include <fstream>
-#include "classes.h"
-//#include "scen.fileio.h"
-//#include "scen.keydlgs.h"
-#include "graphtool.h"
-//#include "scen.core.h"
-//#include "soundtool.h"
-#include "mathutil.h"
 #include "fileio.h"
-#include "porting.h"
+
+#include <fstream>
+#include <boost/filesystem/operations.hpp>
+
 #include "dlogutil.h"
+#include "gzstream.h"
+
+#include "classes.h"
+#include "graphtool.h"
+#include "mathutil.h"
+
+#include "porting.h"
 #include "restypes.hpp"
 #include "tarball.hpp"
-#include "gzstream.h"
 
 extern bool cur_scen_is_mac, mac_is_intel;
 extern cScenario scenario;

osx/tools/fileio.h

@@ -8,8 +8,8 @@
 
 #include <string>
 #include <vector>
-#include <boost/filesystem/path.hpp>
 #include <sstream>
+#include <boost/filesystem/path.hpp>
 
 #include "town.h"
 #include "outdoors.h"

osx/tools/graphtool.cpp

@@ -8,16 +8,20 @@
 
 #define GRAPHTOOL_CPP
 #include "graphtool.h"
-#include "cursors.h"
+
-#include "restypes.hpp"
-#include <boost/filesystem.hpp>
 #ifdef __APPLE__
 #include <OpenGl/GL.h>
 #else
 #include <GL/GL.h>
 #endif
-#include <boost/math/constants/constants.hpp>
+
 #include <typeinfo>
+#include <boost/filesystem.hpp>
+#include <boost/math/constants/constants.hpp>
+
+#include "cursors.h"
+#include "restypes.hpp"
+
 using boost::math::constants::pi;
 
 cursor_type arrow_curs[3][3] = {

osx/tools/graphtool.h

@@ -9,9 +9,9 @@
 #ifndef GRAPHTOOL_H
 #define GRAPHTOOL_H
 
-#include <SFML/Graphics.hpp>
-#include <boost/filesystem/path.hpp>
 #include <string>
+#include <boost/filesystem/path.hpp>
+#include <SFML/Graphics.hpp>
 #include "location.h"
 
 namespace fs = boost::filesystem;

osx/tools/mathutil.h

@@ -8,6 +8,7 @@
 
 #include <cmath>
 #include <SFML/System/Time.hpp>
+
 using std::abs;
 short get_ran (short times,short  min,short  max);
 short s_pow(short x,short y);

osx/tools/porting.h

@@ -6,9 +6,9 @@
  *
  */
 
+#include <cstdint>
 #include "oldstructs.h"
 #include "location.h"
-#include <cstdint>
 
 void flip_long(int32_t *s);
 void flip_spec_node(legacy::special_node_type *spec);

osx/tools/qdpict.cpp

@@ -10,14 +10,16 @@
 #error qdpict.cpp uses Apple APIs at the moment; try omitting it from the build
 #endif
 
-#include <cstdint>
-#include <memory>
-#include "porting.h"
-#include "location.h"
-#include "dlogutil.h"
 // TODO: Don't use the resource manager
 #include <CoreServices/CoreServices.h>
 
+#include <cstdint>
+#include <memory>
+
+#include "dlogutil.h"
+#include "porting.h"
+#include "location.h"
+
 static int16_t extract_word(char* ptr) {
 	int16_t s = *(int16_t*) ptr;
 	flip_short(&s);

osx/tools/soundtool.cpp

@@ -5,16 +5,14 @@
  *  Created by Celtic Minstrel on 16/04/09.
  *
  */
-#include <cmath>
-
-#include "restypes.hpp"
-
-#include <cstdio>
-
 #include "soundtool.h"
 
+#include <cmath>
+#include <cstdio>
 #include <sstream>
+#include <memory>
 
+#include "restypes.hpp"
 #include "mathutil.h"
 
 std::shared_ptr<sf::SoundBuffer> sound_handles[NUM_SOUNDS];

osx/tools/soundtool.h

@@ -10,7 +10,6 @@
 #define _SOUNDTOOL_H
 
 #include <SFML/Audio.hpp>
-#include <memory>
 
 const int NUM_SOUNDS = 100;
 

osx/tools/winutil.h

@@ -9,8 +9,8 @@
 #ifndef BoE_boe_windows_h
 #define BoE_boe_windows_h
 
-#include <SFML/Window.hpp>
 #include <boost/filesystem/path.hpp>
+#include <SFML/Window.hpp>
 
 namespace fs = boost::filesystem; // TODO: Centralize this alias