Moved a few more common shared includes into the precompiled header.

2010-10-24 06:55:40 +00:00
parent 8f7e4850ba
commit e74c0fcc7c
19 changed files with 5 additions and 38 deletions
--- a/projects/mtg/include/PrecompiledHeader.h
+++ b/projects/mtg/include/PrecompiledHeader.h
@@ -1,6 +1,8 @@
 #ifndef PRECOMPILEDHEADER_H
 #define PRECOMPILEDHEADER_H

+#include <algorithm>
+#include <fstream>
 #include <iostream>
 #include <list>
 #include <map>
@@ -13,4 +15,6 @@

 #include <assert.h>

+#include "JGE.h"
+
 #endif //PRECOMPILEDHEADER_H
--- a/projects/mtg/src/CardPrimitive.cpp
+++ b/projects/mtg/src/CardPrimitive.cpp
@@ -2,8 +2,6 @@

 #include "CardPrimitive.h"

-#include <stdlib.h>
-
 #include "MTGDeck.h"
 #include "Subtypes.h"
 #include "Translate.h"
--- a/projects/mtg/src/ExtraCost.cpp
+++ b/projects/mtg/src/ExtraCost.cpp
@@ -6,7 +6,6 @@
 #include "Translate.h"
 #include "Player.h"
 #include "Counters.h"
-#include <JGE.h>

 ExtraCost::ExtraCost(const std::string& inCostRenderString, TargetChooser *_tc)
  : tc(_tc), source(NULL), target(NULL), mCostRenderString(inCostRenderString)
--- a/projects/mtg/src/GameOptions.cpp
+++ b/projects/mtg/src/GameOptions.cpp
@@ -7,11 +7,6 @@
 #include "OptionItem.h"
 #include "StyleManager.h"

-#include <fstream>
-
-#include <stdlib.h>
-#include <JGE.h>
-
 const string Options::optionNames[] = {
 //Global options
  "Profile",
--- a/projects/mtg/src/GameStateDeckViewer.cpp
+++ b/projects/mtg/src/GameStateDeckViewer.cpp
@@ -6,7 +6,6 @@
 #include "PrecompiledHeader.h"

 #include <math.h>
-#include <JGE.h>

 #include "DeckManager.h"
 #include "GameStateDuel.h"
--- a/projects/mtg/src/GameStateStory.cpp
+++ b/projects/mtg/src/GameStateStory.cpp
@@ -5,7 +5,6 @@
 #include "SimpleMenu.h"
 #include "GameApp.h"
 #include <dirent.h>
-#include <fstream>

 GameStateStory::GameStateStory(GameApp* parent): GameState(parent) {
 	flow = NULL;
--- a/projects/mtg/src/Logger.cpp
+++ b/projects/mtg/src/Logger.cpp
@@ -3,7 +3,6 @@
 #include "Logger.h"
 #ifdef DOLOG

-#include <fstream>
 using namespace std;

 #if defined (WIN32)
--- a/projects/mtg/src/MTGCard.cpp
+++ b/projects/mtg/src/MTGCard.cpp
@@ -5,9 +5,6 @@

 #include "PrecompiledHeader.h"

-#include <string>
-#include <stdlib.h>
-
 #include "MTGDeck.h"
 #include "MTGCard.h"
 #include "CardPrimitive.h"
--- a/projects/mtg/src/MTGCardInstance.cpp
+++ b/projects/mtg/src/MTGCardInstance.cpp
@@ -11,7 +11,7 @@
 #include "CardDescriptor.h"
 #include "Counters.h"
 #include "Subtypes.h"
-#include <algorithm>
+
 using namespace std;

 MTGCardInstance MTGCardInstance::AnyCard = MTGCardInstance();
--- a/projects/mtg/src/MTGDeck.cpp
+++ b/projects/mtg/src/MTGDeck.cpp
@@ -1,8 +1,5 @@
 #include "PrecompiledHeader.h"

-#include <algorithm>
-#include <sstream>
-
 #include "MTGDeck.h"
 #include "utils.h"
 #include "Subtypes.h"
@@ -13,7 +10,6 @@
 #include "MTGPack.h"
 #include "utils.h"

-#include <JGE.h>

 #if defined (WIN32) || defined (LINUX)
 #include <time.h>
--- a/projects/mtg/src/OptionItem.cpp
+++ b/projects/mtg/src/OptionItem.cpp
@@ -1,15 +1,12 @@
 #include "PrecompiledHeader.h"

 #include "OptionItem.h"
-#include <JGE.h>
 #include "PlayerData.h"
 #include "Translate.h"
 #include "Subtypes.h"
 #include "TranslateKeys.h"
 #include "StyleManager.h"
 #include <dirent.h>
-#include <stdlib.h>
-#include <algorithm>

 //OptionItem
 OptionItem::OptionItem( int _id,  string _displayValue): WGuiItem(_displayValue) {
--- a/projects/mtg/src/StoryFlow.cpp
+++ b/projects/mtg/src/StoryFlow.cpp
@@ -9,7 +9,6 @@
 #include "PlayerData.h"
 #include "MTGDeck.h"
 #include "WFont.h"
-#include <JGE.h>
 #include <JFileSystem.h>


--- a/projects/mtg/src/Subtypes.cpp
+++ b/projects/mtg/src/Subtypes.cpp
@@ -1,8 +1,6 @@
 #include "PrecompiledHeader.h"

 #include "Subtypes.h"
-#include <JGE.h>
-#include <algorithm>

 Subtypes * Subtypes::subtypesList = NEW Subtypes();

--- a/projects/mtg/src/Translate.cpp
+++ b/projects/mtg/src/Translate.cpp
@@ -2,8 +2,6 @@

 #include "Translate.h"
 #include "GameOptions.h"
-#include <JGE.h>
-#include <fstream>

 Translator *  Translator::mInstance = NULL;

--- a/projects/mtg/src/WCachedResource.cpp
+++ b/projects/mtg/src/WCachedResource.cpp
@@ -1,9 +1,6 @@
 #include "PrecompiledHeader.h"

 #include "utils.h"
-#include <fstream>
-#include <stdlib.h>
-#include <JGE.h>
 #include <JFileSystem.h>
 #include "GameOptions.h"
 #include "WResourceManager.h"
--- a/projects/mtg/src/WDataSrc.cpp
+++ b/projects/mtg/src/WDataSrc.cpp
@@ -5,7 +5,6 @@
 #include "Translate.h"
 #include "PriceList.h"
 #include "Subtypes.h"
-#include <algorithm>

 //WSyncable
 bool WSyncable::Hook(WSyncable* s){
--- a/projects/mtg/src/WFilter.cpp
+++ b/projects/mtg/src/WFilter.cpp
@@ -3,8 +3,6 @@
 #include "OptionItem.h"
 #include "PlayerData.h"
 #include "Translate.h"
-#include <algorithm>
-

 //WCFilterFactory
 WCFilterFactory* WCFilterFactory::me = NULL;
--- a/projects/mtg/src/WGui.cpp
+++ b/projects/mtg/src/WGui.cpp
@@ -5,8 +5,6 @@
 #include "Translate.h"
 #include "Subtypes.h"
 #include "TranslateKeys.h"
-#include <sstream>
-#include <algorithm>
 #include <hge/hgedistort.h>

 //WGuiBase
--- a/projects/mtg/src/WResourceManager.cpp
+++ b/projects/mtg/src/WResourceManager.cpp
@@ -1,8 +1,5 @@
 #include "PrecompiledHeader.h"

-#include <fstream>
-#include <stdlib.h>
-#include <JGE.h>
 #include <JFileSystem.h>

 #include "utils.h"