From e74c0fcc7c2fa4dfa557d83c586e19e2139963b4 Mon Sep 17 00:00:00 2001 From: "wrenczes@gmail.com" Date: Sun, 24 Oct 2010 06:55:40 +0000 Subject: [PATCH] Moved a few more common shared includes into the precompiled header. --- projects/mtg/include/PrecompiledHeader.h | 4 ++++ projects/mtg/src/CardPrimitive.cpp | 2 -- projects/mtg/src/ExtraCost.cpp | 1 - projects/mtg/src/GameOptions.cpp | 5 ----- projects/mtg/src/GameStateDeckViewer.cpp | 1 - projects/mtg/src/GameStateStory.cpp | 1 - projects/mtg/src/Logger.cpp | 1 - projects/mtg/src/MTGCard.cpp | 3 --- projects/mtg/src/MTGCardInstance.cpp | 2 +- projects/mtg/src/MTGDeck.cpp | 4 ---- projects/mtg/src/OptionItem.cpp | 3 --- projects/mtg/src/StoryFlow.cpp | 1 - projects/mtg/src/Subtypes.cpp | 2 -- projects/mtg/src/Translate.cpp | 2 -- projects/mtg/src/WCachedResource.cpp | 3 --- projects/mtg/src/WDataSrc.cpp | 1 - projects/mtg/src/WFilter.cpp | 2 -- projects/mtg/src/WGui.cpp | 2 -- projects/mtg/src/WResourceManager.cpp | 3 --- 19 files changed, 5 insertions(+), 38 deletions(-) diff --git a/projects/mtg/include/PrecompiledHeader.h b/projects/mtg/include/PrecompiledHeader.h index c50178d7a..330cbac45 100644 --- a/projects/mtg/include/PrecompiledHeader.h +++ b/projects/mtg/include/PrecompiledHeader.h @@ -1,6 +1,8 @@ #ifndef PRECOMPILEDHEADER_H #define PRECOMPILEDHEADER_H +#include +#include #include #include #include @@ -13,4 +15,6 @@ #include +#include "JGE.h" + #endif //PRECOMPILEDHEADER_H \ No newline at end of file diff --git a/projects/mtg/src/CardPrimitive.cpp b/projects/mtg/src/CardPrimitive.cpp index f66993a7e..954af41b0 100644 --- a/projects/mtg/src/CardPrimitive.cpp +++ b/projects/mtg/src/CardPrimitive.cpp @@ -2,8 +2,6 @@ #include "CardPrimitive.h" -#include - #include "MTGDeck.h" #include "Subtypes.h" #include "Translate.h" diff --git a/projects/mtg/src/ExtraCost.cpp b/projects/mtg/src/ExtraCost.cpp index 65824e518..eaaf42ab0 100644 --- 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 ExtraCost::ExtraCost(const std::string& inCostRenderString, TargetChooser *_tc) : tc(_tc), source(NULL), target(NULL), mCostRenderString(inCostRenderString) diff --git a/projects/mtg/src/GameOptions.cpp b/projects/mtg/src/GameOptions.cpp index f3d20aa1e..ecc603582 100644 --- a/projects/mtg/src/GameOptions.cpp +++ b/projects/mtg/src/GameOptions.cpp @@ -7,11 +7,6 @@ #include "OptionItem.h" #include "StyleManager.h" -#include - -#include -#include - const string Options::optionNames[] = { //Global options "Profile", diff --git a/projects/mtg/src/GameStateDeckViewer.cpp b/projects/mtg/src/GameStateDeckViewer.cpp index 061309bb6..960ba04d9 100644 --- a/projects/mtg/src/GameStateDeckViewer.cpp +++ b/projects/mtg/src/GameStateDeckViewer.cpp @@ -6,7 +6,6 @@ #include "PrecompiledHeader.h" #include -#include #include "DeckManager.h" #include "GameStateDuel.h" diff --git a/projects/mtg/src/GameStateStory.cpp b/projects/mtg/src/GameStateStory.cpp index d816df1c5..2815699cc 100644 --- a/projects/mtg/src/GameStateStory.cpp +++ b/projects/mtg/src/GameStateStory.cpp @@ -5,7 +5,6 @@ #include "SimpleMenu.h" #include "GameApp.h" #include -#include GameStateStory::GameStateStory(GameApp* parent): GameState(parent) { flow = NULL; diff --git a/projects/mtg/src/Logger.cpp b/projects/mtg/src/Logger.cpp index f765c868a..e33b13826 100644 --- a/projects/mtg/src/Logger.cpp +++ b/projects/mtg/src/Logger.cpp @@ -3,7 +3,6 @@ #include "Logger.h" #ifdef DOLOG -#include using namespace std; #if defined (WIN32) diff --git a/projects/mtg/src/MTGCard.cpp b/projects/mtg/src/MTGCard.cpp index 3858e56b6..b68259e01 100644 --- a/projects/mtg/src/MTGCard.cpp +++ b/projects/mtg/src/MTGCard.cpp @@ -5,9 +5,6 @@ #include "PrecompiledHeader.h" -#include -#include - #include "MTGDeck.h" #include "MTGCard.h" #include "CardPrimitive.h" diff --git a/projects/mtg/src/MTGCardInstance.cpp b/projects/mtg/src/MTGCardInstance.cpp index d95344c61..9d5c7f146 100644 --- 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 + using namespace std; MTGCardInstance MTGCardInstance::AnyCard = MTGCardInstance(); diff --git a/projects/mtg/src/MTGDeck.cpp b/projects/mtg/src/MTGDeck.cpp index debf51bf7..c553212ee 100644 --- a/projects/mtg/src/MTGDeck.cpp +++ b/projects/mtg/src/MTGDeck.cpp @@ -1,8 +1,5 @@ #include "PrecompiledHeader.h" -#include -#include - #include "MTGDeck.h" #include "utils.h" #include "Subtypes.h" @@ -13,7 +10,6 @@ #include "MTGPack.h" #include "utils.h" -#include #if defined (WIN32) || defined (LINUX) #include diff --git a/projects/mtg/src/OptionItem.cpp b/projects/mtg/src/OptionItem.cpp index 482e682cb..8cc67a31a 100644 --- a/projects/mtg/src/OptionItem.cpp +++ b/projects/mtg/src/OptionItem.cpp @@ -1,15 +1,12 @@ #include "PrecompiledHeader.h" #include "OptionItem.h" -#include #include "PlayerData.h" #include "Translate.h" #include "Subtypes.h" #include "TranslateKeys.h" #include "StyleManager.h" #include -#include -#include //OptionItem OptionItem::OptionItem( int _id, string _displayValue): WGuiItem(_displayValue) { diff --git a/projects/mtg/src/StoryFlow.cpp b/projects/mtg/src/StoryFlow.cpp index b51a083c2..b7b6f126a 100644 --- 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 #include diff --git a/projects/mtg/src/Subtypes.cpp b/projects/mtg/src/Subtypes.cpp index 8a622cba5..684729111 100644 --- a/projects/mtg/src/Subtypes.cpp +++ b/projects/mtg/src/Subtypes.cpp @@ -1,8 +1,6 @@ #include "PrecompiledHeader.h" #include "Subtypes.h" -#include -#include Subtypes * Subtypes::subtypesList = NEW Subtypes(); diff --git a/projects/mtg/src/Translate.cpp b/projects/mtg/src/Translate.cpp index 1d4e8d2dc..3b462435f 100644 --- a/projects/mtg/src/Translate.cpp +++ b/projects/mtg/src/Translate.cpp @@ -2,8 +2,6 @@ #include "Translate.h" #include "GameOptions.h" -#include -#include Translator * Translator::mInstance = NULL; diff --git a/projects/mtg/src/WCachedResource.cpp b/projects/mtg/src/WCachedResource.cpp index f85b4ba38..7dc02f411 100644 --- a/projects/mtg/src/WCachedResource.cpp +++ b/projects/mtg/src/WCachedResource.cpp @@ -1,9 +1,6 @@ #include "PrecompiledHeader.h" #include "utils.h" -#include -#include -#include #include #include "GameOptions.h" #include "WResourceManager.h" diff --git a/projects/mtg/src/WDataSrc.cpp b/projects/mtg/src/WDataSrc.cpp index f1ce549c6..eba91a8b2 100644 --- 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 //WSyncable bool WSyncable::Hook(WSyncable* s){ diff --git a/projects/mtg/src/WFilter.cpp b/projects/mtg/src/WFilter.cpp index d15c1ac99..5f6b64a18 100644 --- 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 - //WCFilterFactory WCFilterFactory* WCFilterFactory::me = NULL; diff --git a/projects/mtg/src/WGui.cpp b/projects/mtg/src/WGui.cpp index 738b9886e..85da54fe4 100644 --- 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 -#include #include //WGuiBase diff --git a/projects/mtg/src/WResourceManager.cpp b/projects/mtg/src/WResourceManager.cpp index 4b709d0f3..2c4f4a1ed 100644 --- a/projects/mtg/src/WResourceManager.cpp +++ b/projects/mtg/src/WResourceManager.cpp @@ -1,8 +1,5 @@ #include "PrecompiledHeader.h" -#include -#include -#include #include #include "utils.h"