Remove double includes part 2 (cuberite#3890)

424ever · Aug 3, 2017 · 759618b · 759618b
1 parent 0397535
commit 759618b
Show file tree

Hide file tree

Showing 84 changed files with 28 additions and 148 deletions.
diff --git a/Tools/GrownBiomeGenVisualiser/Globals.h b/Tools/GrownBiomeGenVisualiser/Globals.h
@@ -210,7 +210,10 @@ typedef unsigned char Byte;
 #include <map>
 #include <algorithm>
 #include <memory>
-
+#include <atomic>
+#include <mutex>
+#include <thread>
+#include <condition_variable>
 
 
 
@@ -258,5 +261,6 @@ template <typename Type> class cItemCallback
 } ;
 
 
+#include "BiomeDef.h"
 
 
diff --git a/Tools/MCADefrag/Globals.h b/Tools/MCADefrag/Globals.h
@@ -187,7 +187,10 @@ typedef unsigned char Byte;
 #include <map>
 #include <algorithm>
 #include <memory>
-
+#include <atomic>
+#include <mutex>
+#include <thread>
+#include <condition_variable>
 
 
 
@@ -239,5 +242,8 @@ template <typename Type> class cItemCallback
 } ;
 
 
+#include "BiomeDef.h"
+
+
 
 
diff --git a/Tools/NoiseSpeedTest/Globals.h b/Tools/NoiseSpeedTest/Globals.h
@@ -187,6 +187,10 @@ typedef unsigned char Byte;
 #include <map>
 #include <algorithm>
 #include <memory>
+#include <atomic>
+#include <mutex>
+#include <thread>
+#include <condition_variable>
 
 
 

diff --git a/Tools/ProtoProxy/Globals.h b/Tools/ProtoProxy/Globals.h
@@ -168,13 +168,18 @@ typedef unsigned char Byte;
 
 
 // STL stuff:
+#include <chrono>
 #include <vector>
 #include <list>
 #include <deque>
 #include <string>
 #include <map>
 #include <algorithm>
 #include <memory>
+#include <atomic>
+#include <mutex>
+#include <thread>
+#include <condition_variable>
 
 
 

diff --git a/src/AllocationPool.h b/src/AllocationPool.h
@@ -1,8 +1,6 @@
 
 #pragma once
 
-#include <memory>
-
 
 
 

diff --git a/src/Bindings/DeprecatedBindings.cpp b/src/Bindings/DeprecatedBindings.cpp
@@ -6,7 +6,6 @@
 #include "tolua++/include/tolua++.h"
 
 
-#include "../BlockInfo.h"
 #include "../World.h"
 #include "../Entities/Player.h"
 #include "LuaState.h"

diff --git a/src/Bindings/LuaFunctions.h b/src/Bindings/LuaFunctions.h
@@ -2,7 +2,6 @@
 
 #include "Logger.h"
 #include <time.h>
-#include <chrono>
 // tolua_begin
 
 inline unsigned int GetTime()

diff --git a/src/Bindings/LuaState.h b/src/Bindings/LuaState.h
@@ -35,8 +35,6 @@ extern "C"
 	#include "lua/src/lauxlib.h"
 }
 
-#include <atomic>
-#include "../Vector3.h"
 #include "../Defines.h"
 #include "PluginManager.h"
 #include "LuaState_Typedefs.inc"

diff --git a/src/Bindings/LuaWindow.h b/src/Bindings/LuaWindow.h
@@ -9,7 +9,6 @@
 
 #pragma once
 
-#include <atomic>
 #include "LuaState.h"
 #include "../UI/Window.h"
 #include "../ItemGrid.h"

diff --git a/src/Bindings/ManualBindings.cpp b/src/Bindings/ManualBindings.cpp
@@ -5,7 +5,6 @@
 #undef TOLUA_TEMPLATE_BIND
 #include <sstream>
 #include <iomanip>
-#include <array>
 #include "tolua++/include/tolua++.h"
 #include "polarssl/md5.h"
 #include "polarssl/sha1.h"

diff --git a/src/BiomeDef.cpp b/src/BiomeDef.cpp
@@ -4,7 +4,6 @@
 // Implements biome helper functions
 
 #include "Globals.h"
-#include "BiomeDef.h"
 
 
 

diff --git a/src/BiomeDef.h b/src/BiomeDef.h
@@ -10,7 +10,7 @@
 #pragma once
 
 
-#include "StringUtils.h"
+
 
 
 // tolua_begin

diff --git a/src/BlockArea.h b/src/BlockArea.h
@@ -15,7 +15,6 @@
 #pragma once
 
 #include "ForEachChunkProvider.h"
-#include "Vector3.h"
 #include "ChunkDataCallback.h"
 #include "Cuboid.h"
 

diff --git a/src/BlockID.cpp b/src/BlockID.cpp
@@ -3,7 +3,6 @@
 // Implements the helper functions for converting Block ID string to int etc.
 
 #include "Globals.h"
-#include "BlockID.h"
 #include "IniFile.h"
 #include "Item.h"
 #include "Mobs/Monster.h"

diff --git a/src/BlockInfo.cpp b/src/BlockInfo.cpp
@@ -1,7 +1,6 @@
 
 #include "Globals.h"
 
-#include "BlockInfo.h"
 #include "Blocks/BlockHandler.h"
 
 

diff --git a/src/Blocks/BlockDirt.h b/src/Blocks/BlockDirt.h
@@ -3,7 +3,6 @@
 
 #include "BlockHandler.h"
 #include "../FastRandom.h"
-#include "../BlockInfo.h"
 #include "Root.h"
 #include "Bindings/PluginManager.h"
 

diff --git a/src/Blocks/BlockFence.h b/src/Blocks/BlockFence.h
@@ -2,7 +2,6 @@
 #pragma once
 
 #include "BlockHandler.h"
-#include "BlockID.h"
 #include "../BoundingBox.h"
 
 

diff --git a/src/Blocks/BlockPiston.cpp b/src/Blocks/BlockPiston.cpp
@@ -7,9 +7,6 @@
 #include "BlockInServerPluginInterface.h"
 #include "ChunkInterface.h"
 
-#include <vector>
-#include <array>
-
 
 
 

diff --git a/src/Blocks/BlockStone.h b/src/Blocks/BlockStone.h
@@ -2,7 +2,6 @@
 #pragma once
 
 #include "BlockHandler.h"
-#include "BlockID.h"
 
 
 

diff --git a/src/BoundingBox.h b/src/BoundingBox.h
@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include "Vector3.h"
 #include "Defines.h"
 
 

diff --git a/src/Broadcaster.h b/src/Broadcaster.h
@@ -1,8 +1,6 @@
 
 class cWorld;
 
-#include <array>
-
 class cBroadcaster
 {
 

diff --git a/src/Chunk.h b/src/Chunk.h
@@ -2,7 +2,6 @@
 #pragma once
 
 #include "Entities/Entity.h"
-#include "ChunkDef.h"
 #include "ChunkData.h"
 
 #include "Simulator/FireSimulator.h"

diff --git a/src/ChunkData.h b/src/ChunkData.h
@@ -12,9 +12,6 @@
 
 #include <cstring>
 
-
-#include "ChunkDef.h"
-
 #include "AllocationPool.h"
 
 

diff --git a/src/ChunkDef.h b/src/ChunkDef.h
@@ -9,9 +9,6 @@
 
 #pragma once
 
-#include "Vector3.h"
-#include "BiomeDef.h"
-
 
 
 

diff --git a/src/ChunkSender.h b/src/ChunkSender.h
@@ -26,7 +26,6 @@ Note that it may be called by world's BroadcastToChunk() if the client is still
 #pragma once
 
 #include "OSSupport/IsThread.h"
-#include "ChunkDef.h"
 #include "ChunkDataCallback.h"
 
 #include <unordered_set>

diff --git a/src/ClientHandle.h b/src/ClientHandle.h
@@ -11,8 +11,6 @@
 
 #include "OSSupport/Network.h"
 #include "Defines.h"
-#include "Vector3.h"
-#include "ChunkDef.h"
 #include "ByteBuffer.h"
 #include "Scoreboard.h"
 #include "Map.h"
@@ -23,8 +21,7 @@
 #include "EffectID.h"
 
 
-#include <array>
-#include <atomic>
+
 
 
 // fwd:

diff --git a/src/Cuboid.h b/src/Cuboid.h
@@ -1,8 +1,6 @@
 
 #pragma once
 
-#include "Vector3.h"
-
 
 
 

diff --git a/src/Defines.h b/src/Defines.h
@@ -1,9 +1,6 @@
 
 #pragma once
 
-#include <limits>
-#include <cmath>
-
 
 
 

diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h
@@ -2,7 +2,6 @@
 #pragma once
 
 #include "../Item.h"
-#include "../Vector3.h"
 
 
 

diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
@@ -1,7 +1,6 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include <cmath>
 #include <unordered_map>
 
 #include "Player.h"
@@ -17,7 +16,6 @@
 #include "../Root.h"
 #include "../Chunk.h"
 #include "../Items/ItemHandler.h"
-#include "../Vector3.h"
 #include "../FastRandom.h"
 #include "../ClientHandle.h"
 

diff --git a/src/FastRandom.cpp b/src/FastRandom.cpp
@@ -5,9 +5,6 @@
 #include "Globals.h"
 #include "FastRandom.h"
 
-#include <mutex>
-#include <random>
-
 #if defined (__GNUC__)
 	#define ATTRIBUTE_TLS static __thread
 #elif defined (_MSC_VER)

diff --git a/src/Generating/BioGen.cpp b/src/Generating/BioGen.cpp
@@ -5,7 +5,6 @@
 
 #include "Globals.h"
 #include "BioGen.h"
-#include <chrono>
 #include <iostream>
 #include "IntGen.h"
 #include "ProtIntGen.h"

diff --git a/src/Generating/ChunkDesc.h b/src/Generating/ChunkDesc.h
@@ -10,7 +10,6 @@
 #pragma once
 
 #include "../BlockArea.h"
-#include "../ChunkDef.h"
 #include "../Cuboid.h"
 
 

diff --git a/src/Generating/ChunkGenerator.h b/src/Generating/ChunkGenerator.h
@@ -19,7 +19,6 @@ If the generator queue is overloaded, the generator skips chunks with no clients
 #pragma once
 
 #include "../OSSupport/IsThread.h"
-#include "../ChunkDef.h"
 
 
 

diff --git a/src/Generating/CompoGen.cpp b/src/Generating/CompoGen.cpp
@@ -9,7 +9,6 @@
 
 #include "Globals.h"
 #include "CompoGen.h"
-#include "../BlockID.h"
 #include "../Item.h"
 #include "../LinearUpscale.h"
 #include "../IniFile.h"

diff --git a/src/Generating/DistortedHeightmap.cpp b/src/Generating/DistortedHeightmap.cpp
@@ -6,7 +6,6 @@
 #include "Globals.h"
 
 #include "DistortedHeightmap.h"
-#include "../OSSupport/File.h"
 #include "../IniFile.h"
 #include "../LinearUpscale.h"
 

diff --git a/src/Generating/FinishGen.cpp b/src/Generating/FinishGen.cpp
@@ -10,7 +10,6 @@
 #include "Globals.h"
 
 #include "FinishGen.h"
-#include "../BlockID.h"
 #include "../Simulator/FluidSimulator.h"  // for cFluidSimulator::CanWashAway()
 #include "../Simulator/FireSimulator.h"
 #include "../World.h"

diff --git a/src/Generating/IntGen.h b/src/Generating/IntGen.h
@@ -30,7 +30,6 @@ by using templates.
 #pragma once
 
 #include <tuple>
-#include "../BiomeDef.h"
 #include "../Noise/Noise.h"
 
 

diff --git a/src/Generating/Noise3DGenerator.cpp b/src/Generating/Noise3DGenerator.cpp
@@ -5,7 +5,6 @@
 
 #include "Globals.h"
 #include "Noise3DGenerator.h"
-#include "../OSSupport/File.h"
 #include "../IniFile.h"
 #include "../LinearInterpolation.h"
 #include "../LinearUpscale.h"

diff --git a/src/Generating/StructGen.cpp b/src/Generating/StructGen.cpp
@@ -3,7 +3,6 @@
 
 #include "Globals.h"
 #include "StructGen.h"
-#include "../BlockID.h"
 #include "Trees.h"
 #include "../BlockArea.h"
 #include "../LinearUpscale.h"

diff --git a/src/Generating/Trees.cpp b/src/Generating/Trees.cpp
@@ -5,7 +5,6 @@
 
 #include "Globals.h"
 #include "Trees.h"
-#include "../BlockID.h"
 #include "../World.h"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,7 +4,6 @@
		// Implements biome helper functions

		#include "Globals.h"
		#include "BiomeDef.h"



Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,7 +10,7 @@
		#pragma once


		#include "StringUtils.h"



		// tolua_begin
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,7 +2,6 @@
		#pragma once

		#include "BlockHandler.h"
		#include "BlockID.h"



Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,7 +8,6 @@

		#pragma once

		#include "Vector3.h"
		#include "Defines.h"


Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,9 +12,6 @@

		#include <cstring>


		#include "ChunkDef.h"

		#include "AllocationPool.h"


Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,9 +9,6 @@

		#pragma once

		#include "Vector3.h"
		#include "BiomeDef.h"




Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,7 +19,6 @@ If the generator queue is overloaded, the generator skips chunks with no clients
		#pragma once

		#include "../OSSupport/IsThread.h"
		#include "../ChunkDef.h"



Expand Down