]> git.localhorst.tv Git - l2e.git/commitdiff
added forwarding headers
authorDaniel Karbach <daniel.karbach@localhorst.tv>
Sat, 29 Sep 2012 17:18:44 +0000 (19:18 +0200)
committerDaniel Karbach <daniel.karbach@localhorst.tv>
Sat, 29 Sep 2012 17:18:44 +0000 (19:18 +0200)
33 files changed:
src/app/Application.h
src/app/State.h
src/app/fwd.h [new file with mode: 0644]
src/battle/AttackChoice.h
src/battle/BattleState.h
src/battle/Hero.h
src/battle/HeroTag.h
src/battle/Monster.h
src/battle/NumberAnimation.h
src/battle/Resources.h
src/battle/SmallHeroTag.h
src/battle/TargetSelection.h
src/battle/fwd.h [new file with mode: 0644]
src/battle/states/RunState.h
src/battle/states/SelectAttackType.h
src/battle/states/SelectIkari.h
src/battle/states/SelectItem.h
src/battle/states/SelectMoveAction.h
src/battle/states/SelectSpell.h
src/battle/states/SelectTarget.h
src/battle/states/SwapHeroes.h
src/common/Inventory.h
src/common/Item.h
src/common/fwd.h [new file with mode: 0644]
src/geometry/fwd.h [new file with mode: 0644]
src/graphics/Animation.h
src/graphics/Menu.h
src/graphics/fwd.h [new file with mode: 0644]
src/loader/Caster.h
src/loader/Interpreter.h
src/loader/ParsedSource.h
src/loader/Parser.h
src/loader/fwd.h [new file with mode: 0644]

index cf1261b28f1a8c8799c3ce8aa2a5217af9ef3ab2..b7b0001f7bbbf874a193f7a8dbaeb0e2cd50a07a 100644 (file)
@@ -8,6 +8,7 @@
 #ifndef APP_APPLICATION_H_
 #define APP_APPLICATION_H_
 
+#include "fwd.h"
 #include "Input.h"
 #include "Timer.h"
 #include "../sdl/InitScreen.h"
@@ -19,8 +20,6 @@
 
 namespace app {
 
-class State;
-
 class Application {
 
 public:
index c74043bf6b7bacc1e2d2f336ed99a42115f261fd..958e423c508b1dffd4d2a6562bb4ba90051894c1 100644 (file)
@@ -8,15 +8,13 @@
 #ifndef APP_APPLICATIONSTATE_H_
 #define APP_APPLICATIONSTATE_H_
 
+#include "fwd.h"
 #include "Timer.h"
 
 #include <SDL.h>
 
 namespace app {
 
-class Application;
-class Input;
-
 class State {
 
 public:
diff --git a/src/app/fwd.h b/src/app/fwd.h
new file mode 100644 (file)
index 0000000..7249010
--- /dev/null
@@ -0,0 +1,26 @@
+/*
+ * fwd.h
+ *
+ *  Created on: Sep 29, 2012
+ *      Author: holy
+ */
+
+#ifndef APP_FWD_H_
+#define APP_FWD_H_
+
+namespace app {
+
+class Application;
+class Arguments;
+class Input;
+class State;
+template<class Time>
+struct TimerData;
+template<class Time>
+class Timer;
+template<class Time>
+class Timers;
+
+}
+
+#endif /* APP_FWD_H_ */
index 8cba2353a164bccfd155672dd9c9fc5df291aa0c..d332b267f70a6facf473ad1d47bbc516e8071d7b 100644 (file)
@@ -9,12 +9,7 @@
 #define BATTLE_ATTACKCHOICE_H_
 
 #include "TargetSelection.h"
-
-namespace common {
-       class Ikari;
-       class Item;
-       class Spell;
-}
+#include "../common/fwd.h"
 
 namespace battle {
 
index 806b4af59154525475ce3765532dc9600e2c3c6b..fbaa1d0169f79107b954ba3ece200ca18018454f 100644 (file)
@@ -8,6 +8,7 @@
 #ifndef BATTLE_BATTLESTATE_H_
 #define BATTLE_BATTLESTATE_H_
 
+#include "fwd.h"
 #include "AttackTypeMenu.h"
 #include "Hero.h"
 #include "HeroTag.h"
 #include "MoveMenu.h"
 #include "Resources.h"
 #include "SmallHeroTag.h"
+#include "../app/fwd.h"
 #include "../app/State.h"
+#include "../common/fwd.h"
 #include "../geometry/Vector.h"
 #include "../graphics/Animation.h"
+#include "../graphics/fwd.h"
 #include "../graphics/Menu.h"
 
 #include <cassert>
 #include <vector>
 #include <SDL.h>
 
-namespace app { class Input; }
-namespace common {
-       class Inventory;
-       class Item;
-       class Spell;
-}
-namespace graphics {
-       class Font;
-       class Frame;
-       class Gauge;
-       class Sprite;
-}
-
 namespace battle {
 
-class AttackChoice;
-class PartyLayout;
-class Stats;
-
 class BattleState
 : public app::State {
 
index c15c2dcbc08bf4d25cc73f7b0734b54ef4463760..385962faeb0a7e7642e8e08c7d063a81227c0839 100644 (file)
@@ -8,27 +8,20 @@
 #ifndef BATTLE_HERO_H_
 #define BATTLE_HERO_H_
 
+#include "fwd.h"
 #include "AttackChoice.h"
 #include "Stats.h"
+#include "../common/fwd.h"
 #include "../geometry/Vector.h"
 #include "../graphics/Animation.h"
+#include "../graphics/fwd.h"
 #include "../graphics/Menu.h"
 
 #include <vector>
 #include <SDL.h>
 
-namespace common {
-       class Item;
-       class Spell;
-}
-namespace graphics {
-       class Sprite;
-}
-
 namespace battle {
 
-class Resources;
-
 class Hero {
 
 public:
index 8750081148cb8c94b58c845d411cf6cfd462947a..9ce1963cb854209d8ef177a9080deb5dbdada9c6 100644 (file)
@@ -8,22 +8,15 @@
 #ifndef BATTLE_HEROTAG_H_
 #define BATTLE_HEROTAG_H_
 
+#include "fwd.h"
 #include "Hero.h"
 #include "../geometry/Vector.h"
+#include "../graphics/fwd.h"
 
 #include <SDL.h>
 
-namespace graphics {
-       class Font;
-       class Frame;
-       class Gauge;
-       class Sprite;
-}
-
 namespace battle {
 
-class BattleState;
-
 class HeroTag {
 
 public:
index e368dcc0e78a218b61dab47ccb2961b3146373b7..3497c04b4ddd184617604fb9f584c045e84e84b4 100644 (file)
 
 #include "AttackChoice.h"
 #include "Stats.h"
+#include "../common/fwd.h"
 #include "../geometry/Vector.h"
 #include "../graphics/Animation.h"
+#include "../graphics/fwd.h"
 
 #include <SDL.h>
 
-namespace common { class Item; }
-namespace graphics {
-       class Sprite;
-}
-
 namespace battle {
 
 class Monster {
index f7530562f048233788f7572ba6ae1c92bbebf51a..c198cd8f4c1c1cb3ca75a45f55c123e3b2855484 100644 (file)
@@ -8,14 +8,9 @@
 #ifndef BATTLE_NUMBERANIMATION_H_
 #define BATTLE_NUMBERANIMATION_H_
 
-#include "../graphics/Animation.h"
-
+#include "../app/fwd.h"
 #include "../geometry/Vector.h"
-
-namespace app {
-       class Application;
-       class State;
-}
+#include "../graphics/Animation.h"
 
 namespace battle {
 
index 9654fdc841d9c987569be411e17f0719cb0634bb..5ef036fd715010553e3e4e7090a0f44c3b67a5ce 100644 (file)
@@ -8,24 +8,13 @@
 #ifndef BATTLE_RESOURCES_H_
 #define BATTLE_RESOURCES_H_
 
+#include "../common/fwd.h"
 #include "../graphics/Color.h"
+#include "../graphics/fwd.h"
 #include "../graphics/Menu.h"
 
 #include <SDL.h>
 
-namespace common {
-       class Inventory;
-       class Item;
-       class Spell;
-}
-namespace graphics {
-       class Animation;
-       class Font;
-       class Frame;
-       class Gauge;
-       class Sprite;
-}
-
 namespace battle {
 
 struct Resources {
index c17d540c0609d98dc0d793113cc043ec0c6ddede..62ada00b1526f9b17200a553a7649ea4b8a157ce 100644 (file)
@@ -8,20 +8,14 @@
 #ifndef BATTLE_SMALLHEROTAG_H_
 #define BATTLE_SMALLHEROTAG_H_
 
+#include "fwd.h"
 #include "../geometry/Vector.h"
+#include "../graphics/fwd.h"
 
 #include <SDL.h>
 
-namespace graphics {
-       class Font;
-       class Frame;
-       class Gauge;
-}
-
 namespace battle {
 
-class BattleState;
-
 class SmallHeroTag {
 
 public:
index fd1d041c90fe604ea01b229be51036353a21da7d..06d6f44198cda86c59341b314d4034a824cddd8a 100644 (file)
@@ -8,14 +8,13 @@
 #ifndef BATTLE_TARGETSELECTION_H_
 #define BATTLE_TARGETSELECTION_H_
 
-#include <vector>
+#include "fwd.h"
+#include "../common/fwd.h"
 
-namespace common { class TargetingMode; }
+#include <vector>
 
 namespace battle {
 
-class BattleState;
-
 class TargetSelection {
 
 public:
diff --git a/src/battle/fwd.h b/src/battle/fwd.h
new file mode 100644 (file)
index 0000000..5e629f3
--- /dev/null
@@ -0,0 +1,38 @@
+/*
+ * fwd.h
+ *
+ *  Created on: Sep 29, 2012
+ *      Author: holy
+ */
+
+#ifndef BATTLE_FWD_H_
+#define BATTLE_FWD_H_
+
+namespace battle {
+
+class AttackChoice;
+class AttackTypeMenu;
+class BattleState;
+class Hero;
+class HeroTag;
+class Monster;
+class MoveMenu;
+class NumberAnimation;
+class PartyLayout;
+class PerformAttacks;
+struct Resources;
+class RunState;
+class SelectAttackType;
+class SelectIkari;
+class SelectItem;
+class SelectMoveAction;
+class SelectSpell;
+class SelectTarget;
+class SmallHeroTag;
+class Stats;
+class SwapHeroes;
+class TargetSelection;
+
+}
+
+#endif /* BATTLE_FWD_H_ */
index 61c52709848959b42661f279cdce685254f66559..7af5461020c1439fa10ccc6f578404730144f0db 100644 (file)
@@ -8,14 +8,12 @@
 #ifndef BATTLE_RUNSTATE_H_
 #define BATTLE_RUNSTATE_H_
 
+#include "../fwd.h"
 #include "../../app/State.h"
-
 #include "../../geometry/Vector.h"
 
 namespace battle {
 
-class BattleState;
-
 class RunState
 : public app::State {
 
index 56799409e4ff3b686f8da1601c10f699b5b0e689..17298b2244a5f33c030a4d09fbf927dca252ef9d 100644 (file)
@@ -8,14 +8,12 @@
 #ifndef BATTLE_SELECTATTACKTYPE_H_
 #define BATTLE_SELECTATTACKTYPE_H_
 
+#include "../fwd.h"
 #include "../../app/State.h"
 #include "../../geometry/Vector.h"
 
 namespace battle {
 
-class AttackTypeMenu;
-class BattleState;
-
 class SelectAttackType
 : public app::State {
 
index 02b0e25ff8302a5a5d5f5f872d719c909cc5f647..8e565c4e0abbc3d39317a4e4a2df4f0926ed7d81 100644 (file)
@@ -8,15 +8,12 @@
 #ifndef BATTLE_SELECTIKARI_H_
 #define BATTLE_SELECTIKARI_H_
 
+#include "../fwd.h"
 #include "../../app/State.h"
-
 #include "../../geometry/Vector.h"
 
 namespace battle {
 
-class BattleState;
-class SelectAttackType;
-
 // TODO: looks like item, spell, and ikari select can be merged into one class
 class SelectIkari
 : public app::State {
index a4540bb62ced2721cf4bc13a8599195a18042661..3d03d2f3ea15387f96740ed7a1efe764fb73ed69 100644 (file)
@@ -8,15 +8,12 @@
 #ifndef BATTLE_SELECTITEM_H_
 #define BATTLE_SELECTITEM_H_
 
+#include "../fwd.h"
 #include "../../app/State.h"
-
 #include "../../geometry/Vector.h"
 
 namespace battle {
 
-class BattleState;
-class SelectAttackType;
-
 class SelectItem
 : public app::State {
 
index 4f88c4fd3e7db4e5a2498accc91bcde15408ab53..8a2846898219fa49b518917d7b7da4f1bbf4dab7 100644 (file)
@@ -8,14 +8,12 @@
 #ifndef BATTLE_SELECTMOVEACTION_H_
 #define BATTLE_SELECTMOVEACTION_H_
 
+#include "../fwd.h"
 #include "../../app/State.h"
 #include "../../geometry/Vector.h"
 
 namespace battle {
 
-class BattleState;
-class MoveMenu;
-
 class SelectMoveAction
 : public app::State {
 
index 5251a9d2c2e51b33404db017e5cc6e53c27223d5..38d2c39e6ab3afc869a2a7575ec92aacb200130e 100644 (file)
@@ -8,15 +8,12 @@
 #ifndef BATTLE_SELECTSPELL_H_
 #define BATTLE_SELECTSPELL_H_
 
+#include "../fwd.h"
 #include "../../app/State.h"
-
 #include "../../geometry/Vector.h"
 
 namespace battle {
 
-class BattleState;
-class SelectAttackType;
-
 class SelectSpell
 : public app::State {
 
index b4eb312810223a73efd54798dbc38e14a4a2dd6c..9bd51f5872aa6bb991aafcf4e1828d3e6bed4224 100644 (file)
@@ -8,18 +8,13 @@
 #ifndef BATTLE_SELECTTARGET_H_
 #define BATTLE_SELECTTARGET_H_
 
+#include "../fwd.h"
 #include "../../app/State.h"
-
 #include "../../geometry/Vector.h"
-
-namespace graphics { class Sprite; }
+#include "../../graphics/fwd.h"
 
 namespace battle {
 
-class BattleState;
-class TargetSelection;
-class SelectAttackType;
-
 class SelectTarget
 : public app::State {
 
index 109a1f015ba3caa47e67addee8e825d62fce6c86..8ad92981c6eeae5952563d8c6272b45addbba943 100644 (file)
@@ -8,15 +8,12 @@
 #ifndef BATTLE_SWAPHEROES_H_
 #define BATTLE_SWAPHEROES_H_
 
+#include "../fwd.h"
 #include "../../app/State.h"
-
 #include "../../geometry/Vector.h"
 
 namespace battle {
 
-class BattleState;
-class SelectMoveAction;
-
 class SwapHeroes
 : public app::State {
 
index 2443078c708389bf72fc004d150b4a85fea53ce6..f60b9abecb49e71817e5c3fe7a4b74fe3d011f3d 100644 (file)
@@ -8,12 +8,12 @@
 #ifndef COMMON_INVENTORY_H_
 #define COMMON_INVENTORY_H_
 
+#include "fwd.h"
+
 #include <SDL.h>
 
 namespace common {
 
-class Item;
-
 class Inventory {
 
 public:
index 1af15f3de365fc289d5e74a62ac14b0908b63b94..eb60891636e9cb22acd87d5867b372d17afc0db8 100644 (file)
@@ -8,20 +8,15 @@
 #ifndef COMMON_ITEM_H_
 #define COMMON_ITEM_H_
 
+#include "fwd.h"
 #include "HeroGroup.h"
 #include "TargetingMode.h"
+#include "../graphics/fwd.h"
 
 #include <SDL.h>
 
-namespace graphics {
-       class Animation;
-       class Sprite;
-}
-
 namespace common {
 
-class Ikari;
-
 class Item {
 
 public:
diff --git a/src/common/fwd.h b/src/common/fwd.h
new file mode 100644 (file)
index 0000000..6238cbf
--- /dev/null
@@ -0,0 +1,22 @@
+/*
+ * fwd.h
+ *
+ *  Created on: Sep 29, 2012
+ *      Author: holy
+ */
+
+#ifndef COMMON_FWD_H_
+#define COMMON_FWD_H_
+
+namespace common {
+
+class HeroGroup;
+class Ikari;
+class Inventory;
+class Item;
+class Spell;
+class TargetingMode;
+
+}
+
+#endif /* COMMON_FWD_H_ */
diff --git a/src/geometry/fwd.h b/src/geometry/fwd.h
new file mode 100644 (file)
index 0000000..e727f65
--- /dev/null
@@ -0,0 +1,18 @@
+/*
+ * fwd.h
+ *
+ *  Created on: Sep 29, 2012
+ *      Author: holy
+ */
+
+#ifndef GEOMERTY_FWD_H_
+#define GEOMERTY_FWD_H_
+
+namespace geometry {
+
+template<class Scalar>
+class Vector;
+
+}
+
+#endif /* GEOMERTY_FWD_H_ */
index 29948feb3bac68579ef66ecdd20cd8dc81855d4a..cfdb14639b2468f9267de38ea3f74fbac431cc6c 100644 (file)
 #include "../app/Application.h"
 #include "../app/State.h"
 #include "../app/Timer.h"
+#include "../loader/fwd.h"
 #include "../geometry/Vector.h"
 
 #include <memory>
 #include <SDL.h>
 
-namespace loader {
-       class TypeDescription;
-}
-
 namespace graphics {
 
 class Animation {
index e9627389e958323b7012f83e5e639df67640c23a..b581fe25283ffcee693407cd523e3f72d7bee704 100644 (file)
@@ -9,6 +9,7 @@
 #define GRAPHICS_MENU_H_
 
 #include "Font.h"
+#include "fwd.h"
 #include "Sprite.h"
 #include "../geometry/Vector.h"
 
@@ -17,8 +18,6 @@
 
 namespace graphics {
 
-class Sprite;
-
 struct MenuProperties {
        const Font *font;
        const Font *disabledFont;
diff --git a/src/graphics/fwd.h b/src/graphics/fwd.h
new file mode 100644 (file)
index 0000000..e6cf864
--- /dev/null
@@ -0,0 +1,28 @@
+/*
+ * fwd.h
+ *
+ *  Created on: Sep 29, 2012
+ *      Author: holy
+ */
+
+#ifndef GRAPHICS_FWD_H_
+#define GRAPHICS_FWD_H_
+
+namespace graphics {
+
+class Animation;
+class AnimationRunner;
+class Color;
+class ComplexAnimation;
+class Font;
+class Frame;
+class Gauge;
+template<class T>
+class Menu;
+struct MenuProperties;
+class SimpleAnimation;
+class Sprite;
+
+}
+
+#endif /* GRAPHICS_FWD_H_ */
index 2718fc08f8327bcf7c9966ae145e0acefdc8a6b1..72a92aa6bd2340773da9683fa9097e158d9fbbcf 100644 (file)
@@ -9,21 +9,11 @@
 #define LOADER_CASTER_H_
 
 #include "Interpreter.h"
+#include "../battle/fwd.h"
+#include "../common/fwd.h"
 
 #include <string>
 
-namespace battle {
-       class Hero;
-       class Monster;
-       class PartyLayout;
-       class Resources;
-}
-
-namespace common {
-       class Item;
-       class Spell;
-}
-
 namespace loader {
 
 class Caster {
index bfe18c2a301bf79f3b8a751940ee4fb9be77b76c..9e90bcc4e98fd51d9f7b05594308b689a6df3d01 100644 (file)
@@ -8,11 +8,15 @@
 #ifndef LOADER_INTERPRETER_H_
 #define LOADER_INTERPRETER_H_
 
+#include "fwd.h"
 #include "ParsedSource.h"
 #include "TypeDescription.h"
+#include "../battle/fwd.h"
+#include "../common/fwd.h"
 #include "../geometry/Vector.h"
 #include "../graphics/Color.h"
 #include "../graphics/ComplexAnimation.h"
+#include "../graphics/fwd.h"
 
 #include <map>
 #include <set>
 #include <vector>
 #include <SDL.h>
 
-namespace battle {
-       class Hero;
-       class Monster;
-       class PartyLayout;
-       struct Resources;
-       class Stats;
-}
-
-namespace common {
-       class Ikari;
-       class Item;
-       class Spell;
-       class TargetingMode;
-}
-
-namespace graphics {
-       class Animation;
-       class Font;
-       class Frame;
-       class Gauge;
-       struct MenuProperties;
-       class SimpleAnimation;
-       class Sprite;
-}
-
 namespace loader {
 
-class Definition;
-class Literal;
-class PropertyList;
-class Value;
-
 class Interpreter {
 
 public:
index 5012729b93344e0f521b9fd79b1bf1803b384260..64baaaa4d3cb99cec172e65acbdcb14f7e69fd72 100644 (file)
@@ -8,6 +8,8 @@
 #ifndef LOADER_PARSEDSOURCE_H_
 #define LOADER_PARSEDSOURCE_H_
 
+#include "fwd.h"
+
 #include <iosfwd>
 #include <map>
 #include <set>
@@ -16,9 +18,6 @@
 
 namespace loader {
 
-class PropertyList;
-class Value;
-
 class Literal {
 
 public:
index fd8f2cfad52fd3d536fc1b013268d60e72de4f1d..392e9b74de5504bc8a8fae64b1b548a117087bd2 100644 (file)
@@ -8,6 +8,7 @@
 #ifndef LOADER_PARSER_H_
 #define LOADER_PARSER_H_
 
+#include "fwd.h"
 #include "ParsedSource.h"
 #include "Tokenizer.h"
 
 
 namespace loader {
 
-class Declaration;
-class Definition;
-class Literal;
-class PropertyList;
-
 class Parser {
 
 public:
diff --git a/src/loader/fwd.h b/src/loader/fwd.h
new file mode 100644 (file)
index 0000000..cdb2eaf
--- /dev/null
@@ -0,0 +1,28 @@
+/*
+ * fwd.h
+ *
+ *  Created on: Sep 29, 2012
+ *      Author: holy
+ */
+
+#ifndef LOADER_FWD_H_
+#define LOADER_FWD_H_
+
+namespace loader {
+
+class Caster;
+class Declaration;
+class Definition;
+class FieldDescription;
+class Interpreter;
+class Literal;
+class ParsedSource;
+class Parser;
+class PropertyList;
+class Tokenizer;
+class TypeDescription;
+class Value;
+
+}
+
+#endif /* LOADER_FWD_H_ */