Source files cleanup: OSSupport-related files in a separate subfolder, renamed.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@885 0a769ca7-a7f5-676a-18bf-c427514a06d6

VC2008/MCServer.vcproj

@@ -1113,110 +1113,110 @@
 				</File>
 			</Filter>
 			<Filter
-				Name="OS Support"
+				Name="OSSupport"
 				>
 				<File
-					RelativePath="..\source\cBlockingTCPLink.cpp"
+					RelativePath="..\source\OSSupport\BlockingTCPLink.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cBlockingTCPLink.h"
+					RelativePath="..\source\OSSupport\BlockingTCPLink.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cCriticalSection.cpp"
+					RelativePath="..\source\OSSupport\CriticalSection.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cCriticalSection.h"
+					RelativePath="..\source\OSSupport\CriticalSection.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cEvent.cpp"
+					RelativePath="..\source\OSSupport\Event.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cEvent.h"
+					RelativePath="..\source\OSSupport\Event.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cFile.cpp"
+					RelativePath="..\source\OSSupport\File.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cFile.h"
+					RelativePath="..\source\OSSupport\File.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cIsThread.cpp"
+					RelativePath="..\source\OSSupport\IsThread.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cIsThread.h"
+					RelativePath="..\source\OSSupport\IsThread.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cMakeDir.cpp"
+					RelativePath="..\source\OSSupport\MakeDir.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cMakeDir.h"
+					RelativePath="..\source\OSSupport\MakeDir.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cSemaphore.cpp"
+					RelativePath="..\source\OSSupport\Semaphore.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cSemaphore.h"
+					RelativePath="..\source\OSSupport\Semaphore.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cSleep.cpp"
+					RelativePath="..\source\OSSupport\Sleep.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cSleep.h"
+					RelativePath="..\source\OSSupport\Sleep.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cSocket.cpp"
+					RelativePath="..\source\OSSupport\Socket.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cSocket.h"
+					RelativePath="..\source\OSSupport\Socket.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cSocketThreads.cpp"
+					RelativePath="..\source\OSSupport\SocketThreads.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cSocketThreads.h"
+					RelativePath="..\source\OSSupport\SocketThreads.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cTCPLink.cpp"
+					RelativePath="..\source\OSSupport\TCPLink.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cTCPLink.h"
+					RelativePath="..\source\OSSupport\TCPLink.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cThread.cpp"
+					RelativePath="..\source\OSSupport\Thread.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cThread.h"
+					RelativePath="..\source\OSSupport\Thread.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cTimer.cpp"
+					RelativePath="..\source\OSSupport\Timer.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cTimer.h"
+					RelativePath="..\source\OSSupport\Timer.h"
 					>
 				</File>
 				<Filter

source/AllToLua.pkg

@@ -34,7 +34,7 @@ $cfile "cWebAdmin.h"
 $cfile "cWebPlugin.h"
 $cfile "cPickup.h"
 $cfile "cRoot.h"
-$cfile "cTCPLink.h"
+$cfile "OSSupport/TCPLink.h"
 $cfile "Vector3f.h"
 $cfile "Vector3d.h"
 $cfile "Vector3i.h"

source/Bindings.cpp

@@ -1,6 +1,6 @@
 /*
 ** Lua binding: AllToLua
-** Generated automatically by tolua++-1.0.92 on 09/23/12 23:08:35.
+** Generated automatically by tolua++-1.0.92 on 09/23/12 23:22:26.
 */
 
 #ifndef __cplusplus
@@ -43,7 +43,7 @@ TOLUA_API int  tolua_AllToLua_open (lua_State* tolua_S);
 #include "cWebPlugin.h"
 #include "cPickup.h"
 #include "cRoot.h"
-#include "cTCPLink.h"
+#include "OSSupport/TCPLink.h"
 #include "Vector3f.h"
 #include "Vector3d.h"
 #include "Vector3i.h"

source/Bindings.h

@@ -1,6 +1,6 @@
 /*
 ** Lua binding: AllToLua
-** Generated automatically by tolua++-1.0.92 on 09/23/12 23:08:36.
+** Generated automatically by tolua++-1.0.92 on 09/23/12 23:22:26.
 */
 
 /* Exported function */

source/ChunkSender.h

@@ -25,7 +25,7 @@ Note that it may be called by world's BroadcastToChunk() if the client is still
 
 #pragma once
 
-#include "cIsThread.h"
+#include "OSSupport/IsThread.h"
 #include "ChunkDef.h"
 
 

source/Generating/ChunkGenerator.h

@@ -24,7 +24,7 @@ See http://forum.mc-server.org/showthread.php?tid=409 for details.
 
 #pragma once
 
-#include "../cIsThread.h"
+#include "../OSSupport/IsThread.h"
 #include "../ChunkDef.h"
 
 

source/Globals.h

@@ -163,12 +163,12 @@ typedef short     Int16;
 
 // Common headers (part 1, without macros):
 #include "StringUtils.h"
-#include "cSleep.h"
-#include "cCriticalSection.h"
-#include "cSemaphore.h"
-#include "cEvent.h"
-#include "cThread.h"
-#include "cFile.h"
+#include "OSSupport/Sleep.h"
+#include "OSSupport/CriticalSection.h"
+#include "OSSupport/Semaphore.h"
+#include "OSSupport/Event.h"
+#include "OSSupport/Thread.h"
+#include "OSSupport/File.h"
 #include "cMCLogger.h"
 
 

source/LightingThread.h

@@ -31,7 +31,7 @@ Chunks from m_PostponedQueue are moved back into m_Queue when their neighbors ge
 
 #pragma once
 
-#include "cIsThread.h"
+#include "OSSupport/IsThread.h"
 #include "ChunkDef.h"
 
 

source/OSSupport/BlockingTCPLink.cpp

@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cBlockingTCPLink.h"
+#include "BlockingTCPLink.h"
 
 
 

source/OSSupport/BlockingTCPLink.h

@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include "cSocket.h"
+#include "Socket.h"
 
 
 

source/OSSupport/CriticalSection.cpp

@@ -1,6 +1,6 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
-#include "cIsThread.h"
+#include "IsThread.h"
 
 
 

source/OSSupport/Event.cpp

@@ -1,12 +1,12 @@
 
-// cEvent.cpp
+// Event.cpp
 
 // Implements the cEvent object representing an OS-specific synchronization primitive that can be waited-for
 // Implemented as an Event on Win and as a 1-semaphore on *nix
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cEvent.h"
+#include "Event.h"
 
 
 

source/OSSupport/Event.h

@@ -1,5 +1,5 @@
 
-// cEvent.h
+// Event.h
 
 // Interfaces to the cEvent object representing an OS-specific synchronization primitive that can be waited-for
 // Implemented as an Event on Win and as a 1-semaphore on *nix

source/OSSupport/File.cpp

@@ -5,7 +5,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cFile.h"
+#include "File.h"
 
 
 

source/OSSupport/IsThread.cpp

@@ -1,12 +1,12 @@
 
-// cIsThread.cpp
+// IsThread.cpp
 
 // Implements the cIsThread class representing an OS-independent wrapper for a class that implements a thread.
 // This class will eventually suupersede the old cThread class
 
 #include "Globals.h"
 
-#include "cIsThread.h"
+#include "IsThread.h"
 
 
 

source/OSSupport/IsThread.h

@@ -1,5 +1,5 @@
 
-// cIsThread.h
+// IsThread.h
 
 // Interfaces to the cIsThread class representing an OS-independent wrapper for a class that implements a thread.
 // This class will eventually suupersede the old cThread class

source/OSSupport/MakeDir.cpp

@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cMakeDir.h"
+#include "MakeDir.h"
 
 
 

source/OSSupport/Socket.cpp

@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cSocket.h"
+#include "Socket.h"
 
 #ifndef _WIN32
 	#include <netdb.h>

source/OSSupport/SocketThreads.cpp

@@ -6,8 +6,7 @@
 // For more detail, see http://forum.mc-server.org/showthread.php?tid=327
 
 #include "Globals.h"
-#include "cSocketThreads.h"
-#include "cClientHandle.h"
+#include "SocketThreads.h"
 
 
 

source/OSSupport/SocketThreads.h

@@ -1,5 +1,5 @@
 
-// cSocketThreads.h
+// SocketThreads.h
 
 // Interfaces to the cSocketThreads class representing the heart of MCS's client networking.
 // This object takes care of network communication, groups sockets into threads and uses as little threads as possible for full read / write support
@@ -30,8 +30,8 @@ This means that the socket can be written to several times before finally closin
 #ifndef CSOCKETTHREADS_H_INCLUDED
 #define CSOCKETTHREADS_H_INCLUDED
 
-#include "cSocket.h"
-#include "cIsThread.h"
+#include "Socket.h"
+#include "IsThread.h"
 
 
 

source/OSSupport/TCPLink.cpp

@@ -1,8 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cTCPLink.h"
-#include "cSocket.h"
+#include "TCPLink.h"
 
 
 

source/OSSupport/TCPLink.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cSocket.h"
+#include "Socket.h"
 
 class cTCPLink																	//tolua_export
 {																				//tolua_export

source/OSSupport/Timer.cpp

@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cTimer.h"
+#include "Timer.h"
 
 
 

source/WorldStorage/WSSAnvil.cpp

@@ -15,7 +15,7 @@
 #include "../cItem.h"
 #include "../StringCompression.h"
 #include "../cEntity.h"
-#include "../cMakeDir.h"
+#include "../OSSupport/MakeDir.h"
 #include "FastNBT.h"
 
 

source/WorldStorage/WorldStorage.h

@@ -15,7 +15,7 @@
 #define WORLDSTORAGE_H_INCLUDED
 
 #include "../ChunkDef.h"
-#include "../cIsThread.h"
+#include "../OSSupport/IsThread.h"
 #include <json/json.h>
 
 

source/cAuthenticator.cpp

@@ -2,7 +2,7 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "cAuthenticator.h"
-#include "cBlockingTCPLink.h"
+#include "OSSupport/BlockingTCPLink.h"
 #include "cRoot.h"
 #include "cServer.h"
 

source/cAuthenticator.h

@@ -14,7 +14,7 @@
 #ifndef CAUTHENTICATOR_H_INCLUDED
 #define CAUTHENTICATOR_H_INCLUDED
 
-#include "cIsThread.h"
+#include "OSSupport/IsThread.h"
 
 
 

source/cChunkMap.cpp

@@ -4,7 +4,6 @@
 #include "cChunkMap.h"
 #include "cWorld.h"
 #include "cRoot.h"
-#include "cMakeDir.h"
 #include "cPlayer.h"
 #include "BlockID.h"
 #include "cItem.h"

source/cClientHandle.cpp

@@ -21,8 +21,8 @@
 #include "cPiston.h"
 #include "Mobs/Monster.h"
 #include "cChatColor.h"
-#include "cSocket.h"
-#include "cTimer.h"
+#include "OSSupport/Socket.h"
+#include "OSSupport/Timer.h"
 #include "items/Item.h"
 #include "blocks/Block.h"
 #include "ChunkDataSerializer.h"
@@ -31,10 +31,8 @@
 #include "Vector3f.h"
 #include "Vector3d.h"
 
-#include "cSleep.h"
 #include "cRoot.h"
 
-#include "cBlockingTCPLink.h"
 #include "cAuthenticator.h"
 #include "MersenneTwister.h"
 

source/cClientHandle.h

@@ -13,7 +13,7 @@
 
 #include "Defines.h"
 #include "Vector3d.h"
-#include "cSocketThreads.h"
+#include "OSSupport/SocketThreads.h"
 #include "ChunkDef.h"
 #include "ByteBuffer.h"
 

source/cHeartBeat.cpp

@@ -7,7 +7,6 @@
 
 #include "cRoot.h"
 #include "cServer.h"
-#include "cSleep.h"
 
 
 

source/cHeartBeat.h

@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include "cTCPLink.h"
+#include "OSSupport/TCPLink.h"
 
 
 

source/cLog.cpp

@@ -5,13 +5,12 @@
 
 #include <fstream>
 #include <ctime>
-#include "cMakeDir.h"
-
-#include "cIsThread.h"
+#include "OSSupport/MakeDir.h"
+#include "OSSupport/IsThread.h"
 
 #if defined(ANDROID_NDK)
-#include <android/log.h>
-#include "ToJava.h"
+	#include <android/log.h>
+	#include "ToJava.h"
 #endif
 
 

source/cPlayer.cpp

@@ -16,8 +16,8 @@
 #include "cItem.h"
 #include "cTracer.h"
 #include "cRoot.h"
-#include "cMakeDir.h"
-#include "cTimer.h"
+#include "OSSupport/MakeDir.h"
+#include "OSSupport/Timer.h"
 #include "MersenneTwister.h"
 
 #include "Vector3d.h"

source/cRedstoneSimulator.cpp

@@ -4,7 +4,6 @@
 #include "cPiston.h"
 #include "cWorld.h"
 #include "BlockID.h"
-#include "cCriticalSection.h"
 #include "cTorch.h"
 
 #include "cRedstone.h"

source/cServer.cpp

@@ -5,9 +5,9 @@
 
 #include "cServer.h"
 #include "cClientHandle.h"
-#include "cTimer.h"
+#include "OSSupport/Timer.h"
 #include "Mobs/Monster.h"
-#include "cSocket.h"
+#include "OSSupport/Socket.h"
 #include "cRoot.h"
 #include "cWorld.h"
 #include "ChunkDef.h"

source/cServer.h

@@ -11,7 +11,7 @@
 #ifndef CSERVER_H_INCLUDED
 #define CSERVER_H_INCLUDED
 
-#include "cSocketThreads.h"
+#include "OSSupport/SocketThreads.h"
 #include "CryptoPP/rsa.h"
 #include "CryptoPP/randpool.h"
 

source/cWebAdmin.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../WebServer/WebServer.h"
-#include "cSocket.h"
+#include "OSSupport/Socket.h"
 
 class cStringMap;
 

source/cWorld.cpp

@@ -38,7 +38,7 @@
 #include "Mobs/Ghast.h"
 #include "Mobs/Zombiepigman.h"
 
-#include "cMakeDir.h"
+#include "OSSupport/MakeDir.h"
 #include "MersenneTwister.h"
 #include "cTracer.h"
 #include "Generating/Trees.h"