Reorganize xrGameSpy headers.

nitrocaster · nitrocaster · commit e4e9ce365366 · 2016-01-28T02:29:10.000+03:00
diff --git a/src/xrGame/account_manager.h b/src/xrGame/account_manager.h
@@ -3,9 +3,8 @@
 
 #include "Common/Noncopyable.hpp"
 #include "mixed_delegate.h"
-#include "xrGameSpy/GameSpy_FuncDefs.h"
-
 #include "queued_async_method.h"
+#include "xrGameSpy/xrGameSpy.h"
 
 class CGameSpy_GP;
 
diff --git a/src/xrGame/login_manager.h b/src/xrGame/login_manager.h
@@ -4,10 +4,8 @@
 
 #include "Common/Noncopyable.hpp"
 #include "mixed_delegate.h"
-#include "xrGameSpy/GameSpy/GP/gp.h"
+#include "xrGameSpy/xrGameSpy.h"
 #include "account_manager.h"
-
-#include "login_manager.h"
 #include "queued_async_method.h"
 
 class CGameSpy_Full;
diff --git a/src/xrGameSpy/GameSpy_ATLAS.cpp b/src/xrGameSpy/GameSpy_ATLAS.cpp
@@ -1,7 +1,5 @@
 #include "stdafx.h"
 #include "GameSpy_ATLAS.h"
-#include "xrGameSpy_MainDefs.h"
-#include "GameSpy/GP/gp.h"
 
 CGameSpy_ATLAS::CGameSpy_ATLAS	()
 {
diff --git a/src/xrGameSpy/GameSpy_ATLAS.h b/src/xrGameSpy/GameSpy_ATLAS.h
@@ -3,7 +3,6 @@
 
 #include "xrCore/xrCore.h"
 #include "xrGameSpy/xrGameSpy.h"
-#include "xrGameSpy/GameSpy_FuncDefs.h"
 
 class XRGAMESPY_API CGameSpy_ATLAS
 {
diff --git a/src/xrGameSpy/GameSpy_Available.cpp b/src/xrGameSpy/GameSpy_Available.cpp
@@ -1,7 +1,5 @@
 #include "StdAfx.h"
 #include "GameSpy_Available.h"
-#include "GameSpy_FuncDefs.h"
-#include "xrGameSpy_MainDefs.h"
 
 bool	CGameSpy_Available::CheckAvailableServices		(shared_str& resultstr)
 {
diff --git a/src/xrGameSpy/GameSpy_Browser.cpp b/src/xrGameSpy/GameSpy_Browser.cpp
@@ -1,11 +1,8 @@
 #include "StdAfx.h"
-#include "xrServerEntities/gametype_chooser.h"
 #include "GameSpy_Browser.h"
-#include "GameSpy_Available.h"
+#include "xrServerEntities/gametype_chooser.h"
 #include "GameSpy_Keys.h"
-#include "GameSpy_QR2.h"
 #include "Common/object_broker.h"
-#include "xrGameSpy_MainDefs.h"
 
 #define GAMETYPE_NAME_KEY						100
 #define	DEDICATED_KEY							101
diff --git a/src/xrGameSpy/GameSpy_Browser.h b/src/xrGameSpy/GameSpy_Browser.h
@@ -2,7 +2,6 @@
 
 #include "xrCore/xrCore.h"
 #include "xrGameSpy/xrGameSpy.h"
-#include "xrGameSpy/GameSpy_FuncDefs.h"
 
 class CServerList;
 class CGameSpy_QR2;
diff --git a/src/xrGameSpy/GameSpy_Full.cpp b/src/xrGameSpy/GameSpy_Full.cpp
@@ -8,7 +8,6 @@
 #include "GameSpy_SAKE.h"
 #include "GameSpy_ATLAS.h"
 #include "Common/object_broker.h"
-#include "xrGameSpy_MainDefs.h"
 
 CGameSpy_Full::CGameSpy_Full()	
 {
diff --git a/src/xrGameSpy/GameSpy_Full.h b/src/xrGameSpy/GameSpy_Full.h
@@ -2,7 +2,6 @@
 
 #include "xrCore/xrCore.h"
 #include "xrGameSpy/xrGameSpy.h"
-#include "xrGameSpy/GameSpy_FuncDefs.h"
 
 class CGameSpy_Available;
 class CGameSpy_Patching;
diff --git a/src/xrGameSpy/GameSpy_FuncDefs.h b/src/xrGameSpy/GameSpy_FuncDefs.h
diff --git a/src/xrGameSpy/GameSpy_GCD_Client.cpp b/src/xrGameSpy/GameSpy_GCD_Client.cpp
@@ -1,6 +1,5 @@
 #include "StdAfx.h"
 #include "GameSpy_GCD_Client.h"
-#include "xrGameSpy_MainDefs.h"
 
 void CGameSpy_GCD_Client::CreateRespond(char *cdkey, char* RespondStr, char* ChallengeStr, u8 Reauth)
 {
diff --git a/src/xrGameSpy/GameSpy_GCD_Client.h b/src/xrGameSpy/GameSpy_GCD_Client.h
@@ -2,7 +2,6 @@
 
 #include "xrCore/xrCore.h"
 #include "xrGameSpy/xrGameSpy.h"
-#include "xrGameSpy/GameSpy_FuncDefs.h"
 
 class XRGAMESPY_API CGameSpy_GCD_Client
 {
diff --git a/src/xrGameSpy/GameSpy_GCD_Server.cpp b/src/xrGameSpy/GameSpy_GCD_Server.cpp
@@ -1,7 +1,5 @@
 #include "StdAfx.h"
 #include "GameSpy_GCD_Server.h"
-#include "GameSpy_FuncDefs.h"
-#include "xrGameSpy_MainDefs.h"
 
 bool	CGameSpy_GCD_Server::Init()
 {
diff --git a/src/xrGameSpy/GameSpy_GCD_Server.h b/src/xrGameSpy/GameSpy_GCD_Server.h
@@ -2,7 +2,6 @@
 
 #include "xrCore/xrCore.h"
 #include "xrGameSpy/xrGameSpy.h"
-#include "xrGameSpy/GameSpy_FuncDefs.h"
 
 #define	GAMESPY_MAXCHALLANGESIZE	32
 
diff --git a/src/xrGameSpy/GameSpy_GP.cpp b/src/xrGameSpy/GameSpy_GP.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "GameSpy_GP.h"
-#include "xrGameSpy_MainDefs.h"
 
 shared_str CGameSpy_GP::TryToTranslate(GPResult const & res)
 {
diff --git a/src/xrGameSpy/GameSpy_GP.h b/src/xrGameSpy/GameSpy_GP.h
@@ -3,8 +3,6 @@
 
 #include "xrCore/xrCore.h"
 #include "xrGameSpy/xrGameSpy.h"
-#include "xrGameSpy/GameSpy_FuncDefs.h"
-#include "xrGameSpy/GameSpy/GP/gp.h"
 
 class XRGAMESPY_API CGameSpy_GP
 {
diff --git a/src/xrGameSpy/GameSpy_HTTP.h b/src/xrGameSpy/GameSpy_HTTP.h
@@ -2,8 +2,6 @@
 
 #include "xrCore/xrCore.h"
 #include "xrGameSpy/xrGameSpy.h"
-#include "xrGameSpy/GameSpy_FuncDefs.h"
-#include "xrCore/fastdelegate.h"
 
 class XRGAMESPY_API CGameSpy_HTTP
 {
diff --git a/src/xrGameSpy/GameSpy_Patching.cpp b/src/xrGameSpy/GameSpy_Patching.cpp
@@ -1,7 +1,5 @@
 #include "StdAfx.h"
 #include "GameSpy_Patching.h"
-#include "xrGameSpy_MainDefs.h"
-#include "xrGameSpy.h"
 
 static char const * QueryPatchVersionString(char* dest, u32 dest_size)
 {
diff --git a/src/xrGameSpy/GameSpy_Patching.h b/src/xrGameSpy/GameSpy_Patching.h
@@ -2,7 +2,6 @@
 
 #include "xrCore/xrCore.h"
 #include "xrGameSpy/xrGameSpy.h"
-#include "xrGameSpy/GameSpy_FuncDefs.h"
 
 class XRGAMESPY_API CGameSpy_Patching
 {
diff --git a/src/xrGameSpy/GameSpy_QR2.cpp b/src/xrGameSpy/GameSpy_QR2.cpp
@@ -1,6 +1,5 @@
 #include "StdAfx.h"
 #include "GameSpy_QR2.h"
-#include "xrGameSpy_MainDefs.h"
 #include "GameSpy_Keys.h"
 
 namespace
diff --git a/src/xrGameSpy/GameSpy_QR2.h b/src/xrGameSpy/GameSpy_QR2.h
@@ -2,7 +2,6 @@
 
 #include "xrCore/xrCore.h"
 #include "xrGameSpy/xrGameSpy.h"
-#include "xrGameSpy/GameSpy_FuncDefs.h"
 
 class xrGameSpyServer;
 
diff --git a/src/xrGameSpy/GameSpy_SAKE.cpp b/src/xrGameSpy/GameSpy_SAKE.cpp
@@ -1,7 +1,5 @@
 #include "stdafx.h"
-#include "GameSpy_Full.h"
 #include "GameSpy_SAKE.h"
-#include "xrGameSpy_MainDefs.h"
 
 shared_str const CGameSpy_SAKE::TryToTranslate(SAKERequestResult const & request_result)
 {
diff --git a/src/xrGameSpy/GameSpy_SAKE.h b/src/xrGameSpy/GameSpy_SAKE.h
@@ -3,7 +3,6 @@
 
 #include "xrCore/xrCore.h"
 #include "xrGameSpy/xrGameSpy.h"
-#include "xrGameSpy/GameSpy_FuncDefs.h"
 
 namespace gamespy_sake
 {
diff --git a/src/xrGameSpy/xrGameSpy.h b/src/xrGameSpy/xrGameSpy.h
@@ -7,6 +7,19 @@
 #define XRGAMESPY_API XR_IMPORT
 #endif
 
+#include "xrGameSpy/GameSpy/Common/gsCommon.h"
+#include "xrGameSpy/GameSpy/Common/gsAvailable.h"
+#include "xrGameSpy/GameSpy/ghttp/ghttp.h"
+#include "xrGameSpy/GameSpy/qr2/qr2.h"
+#include "xrGameSpy/GameSpy/gcdkey/gcdkeyc.h"
+#include "xrGameSpy/GameSpy/gcdkey/gcdkeys.h"
+#include "xrGameSpy/GameSpy/serverbrowsing/sb_serverbrowsing.h"
+#include "xrGameSpy/GameSpy/pt/pt.h"
+#include "xrGameSpy/GameSpy/gp/gp.h"
+#include "xrGameSpy/GameSpy/sake/sake.h"
+#include "xrGameSpy/GameSpy/sc/sc.h"
+#undef max
+
 #include "xrGameSpy/xrGameSpy_MainDefs.h"
 #include "xrGameSpy/GameSpy_Available.h"
 #include "xrGameSpy/GameSpy_Browser.h"
diff --git a/src/xrGameSpy/xrGameSpy.vcxproj b/src/xrGameSpy/xrGameSpy.vcxproj
@@ -971,7 +971,6 @@
     <ClInclude Include="GameSpy_Available.h" />
     <ClInclude Include="GameSpy_Browser.h" />
     <ClInclude Include="GameSpy_Full.h" />
-    <ClInclude Include="GameSpy_FuncDefs.h" />
     <ClInclude Include="GameSpy_GCD_Client.h" />
     <ClInclude Include="GameSpy_GCD_Server.h" />
     <ClInclude Include="GameSpy_GP.h" />
diff --git a/src/xrGameSpy/xrGameSpy.vcxproj.filters b/src/xrGameSpy/xrGameSpy.vcxproj.filters
@@ -629,9 +629,6 @@
     <ClInclude Include="GameSpy_Full.h">
       <Filter>Wrapper</Filter>
     </ClInclude>
-    <ClInclude Include="GameSpy_FuncDefs.h">
-      <Filter>Wrapper</Filter>
-    </ClInclude>
     <ClInclude Include="GameSpy_GCD_Client.h">
       <Filter>Wrapper</Filter>
     </ClInclude>

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`#include "stdafx.h"`
`2`	`2`	`#include "GameSpy_ATLAS.h"`
`3`		`-#include "xrGameSpy_MainDefs.h"`
`4`		`-#include "GameSpy/GP/gp.h"`
`5`	`3`
`6`	`4`	`CGameSpy_ATLAS::CGameSpy_ATLAS ()`
`7`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`
`4`	`4`	`#include "xrCore/xrCore.h"`
`5`	`5`	`#include "xrGameSpy/xrGameSpy.h"`
`6`		`-#include "xrGameSpy/GameSpy_FuncDefs.h"`
`7`	`6`
`8`	`7`	`class XRGAMESPY_API CGameSpy_ATLAS`
`9`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`#include "StdAfx.h"`
`2`	`2`	`#include "GameSpy_Available.h"`
`3`		`-#include "GameSpy_FuncDefs.h"`
`4`		`-#include "xrGameSpy_MainDefs.h"`
`5`	`3`
`6`	`4`	`bool CGameSpy_Available::CheckAvailableServices (shared_str& resultstr)`
`7`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`#include "GameSpy_SAKE.h"`
`9`	`9`	`#include "GameSpy_ATLAS.h"`
`10`	`10`	`#include "Common/object_broker.h"`
`11`		`-#include "xrGameSpy_MainDefs.h"`
`12`	`11`
`13`	`12`	`CGameSpy_Full::CGameSpy_Full()`
`14`	`13`	`{`