diff options
author | Ben Boeckel <MathStuf@gmail.com> | 2009-02-23 17:47:46 -0500 |
---|---|---|
committer | Ben Boeckel <MathStuf@gmail.com> | 2009-02-23 17:47:46 -0500 |
commit | 96f796df64c4c94d067386e1abe44a5ab98ab71a (patch) | |
tree | fa194140f031d81b406ae4a77d56e0869e7a853b /sigscript | |
parent | c96216fb11f0ff1efbdc6cf7ff6b4e3d1fd2b9c6 (diff) | |
download | sigen-96f796df64c4c94d067386e1abe44a5ab98ab71a.tar.gz sigen-96f796df64c4c94d067386e1abe44a5ab98ab71a.tar.xz sigen-96f796df64c4c94d067386e1abe44a5ab98ab71a.zip |
Fixed sigscript includes (forward declare where possible)
Diffstat (limited to 'sigscript')
63 files changed, 357 insertions, 137 deletions
diff --git a/sigscript/AbilityWrapper.cpp b/sigscript/AbilityWrapper.cpp index 6627f5f7..65b69661 100644 --- a/sigscript/AbilityWrapper.cpp +++ b/sigscript/AbilityWrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,6 +21,9 @@ // Sigscript includes #include "SigmodWrapper.h" +// Sigmod includes +#include <sigmod/Ability.h> + Sigscript::AbilityWrapper* Sigscript::AbilityWrapper::create(const Sigmod::Ability* ability, SigmodWrapper* parent) { Signature sig = Signature(parent, Subsignature(ability->className(), ability->id())); diff --git a/sigscript/AbilityWrapper.h b/sigscript/AbilityWrapper.h index 14993072..cc7d04ce 100644 --- a/sigscript/AbilityWrapper.h +++ b/sigscript/AbilityWrapper.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,8 +21,14 @@ // Sigscript includes #include "ObjectWrapper.h" -// Sigmod includes -#include "../sigmod/Ability.h" +// Sigcore includes +#include <sigcore/Script.h> + +// Forward declarations +namespace Sigmod +{ +class Ability; +} namespace Sigscript { diff --git a/sigscript/AuthorWrapper.cpp b/sigscript/AuthorWrapper.cpp index 22f08b5c..d26eec96 100644 --- a/sigscript/AuthorWrapper.cpp +++ b/sigscript/AuthorWrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,6 +21,9 @@ // Sigscript includes #include "SigmodWrapper.h" +// Sigmod includes +#include <sigmod/Author.h> + Sigscript::AuthorWrapper* Sigscript::AuthorWrapper::create(const Sigmod::Author* author, SigmodWrapper* parent) { Signature sig = Signature(parent, Subsignature(author->className(), author->id())); diff --git a/sigscript/AuthorWrapper.h b/sigscript/AuthorWrapper.h index 94488ef2..aa3e74b9 100644 --- a/sigscript/AuthorWrapper.h +++ b/sigscript/AuthorWrapper.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,8 +21,11 @@ // Sigscript includes #include "ObjectWrapper.h" -// Sigmod includes -#include "../sigmod/Author.h" +// Forward declarations +namespace Sigmod +{ +class Author; +} namespace Sigscript { diff --git a/sigscript/BadgeWrapper.cpp b/sigscript/BadgeWrapper.cpp index ea3f27c4..f57df46e 100644 --- a/sigscript/BadgeWrapper.cpp +++ b/sigscript/BadgeWrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,6 +21,9 @@ // Sigscript includes #include "SigmodWrapper.h" +// Sigmod includes +#include <sigmod/Badge.h> + Sigscript::BadgeWrapper* Sigscript::BadgeWrapper::create(const Sigmod::Badge* badge, SigmodWrapper* parent) { Signature sig = Signature(parent, Subsignature(badge->className(), badge->id())); diff --git a/sigscript/BadgeWrapper.h b/sigscript/BadgeWrapper.h index 29535678..95856c08 100644 --- a/sigscript/BadgeWrapper.h +++ b/sigscript/BadgeWrapper.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,7 +22,16 @@ #include "ObjectWrapper.h" // Sigmod includes -#include "../sigmod/Badge.h" +#include <sigmod/Stat.h> + +// Sigcore includes +#include <sigcore/Fraction.h> + +// Forward declarations +namespace Sigmod +{ +class Badge; +} namespace Sigscript { diff --git a/sigscript/CoinListItemWrapper.h b/sigscript/CoinListItemWrapper.h index ccaeae8a..a77d7d2f 100644 --- a/sigscript/CoinListItemWrapper.h +++ b/sigscript/CoinListItemWrapper.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ #include "ObjectWrapper.h" // Sigmod includes -#include "../sigmod/CoinListItem.h" +#include <sigmod/CoinListItem.h> namespace Sigscript { diff --git a/sigscript/CoinListWrapper.cpp b/sigscript/CoinListWrapper.cpp index bc525784..eafe7108 100644 --- a/sigscript/CoinListWrapper.cpp +++ b/sigscript/CoinListWrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,6 +22,9 @@ #include "CoinListItemWrapper.h" #include "SigmodWrapper.h" +// Sigmod includes +#include <sigmod/CoinList.h> + Sigscript::CoinListWrapper* Sigscript::CoinListWrapper::create(const Sigmod::CoinList* coinList, SigmodWrapper* parent) { Signature sig = Signature(parent, Subsignature(coinList->className(), coinList->id())); diff --git a/sigscript/CoinListWrapper.h b/sigscript/CoinListWrapper.h index f5946f37..6665054f 100644 --- a/sigscript/CoinListWrapper.h +++ b/sigscript/CoinListWrapper.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,12 +21,17 @@ // Sigscript includes #include "ObjectWrapper.h" -// Sigmod includes -#include "../sigmod/CoinList.h" +// Sigcore includes +#include <sigcore/Script.h> + +// Forward declarations +namespace Sigmod +{ +class CoinList; +} namespace Sigscript { -// Forward declarations class CoinListItemWrapper; class SigmodWrapper; diff --git a/sigscript/Config.h b/sigscript/Config.h index d102777e..f222bc02 100644 --- a/sigscript/Config.h +++ b/sigscript/Config.h @@ -30,12 +30,6 @@ #include <QtCore/QStringList> #include <QtCore/QVariant> -// Forward declarations -namespace Sigmod -{ -class Sigmod; -} - namespace Sigscript { class SIGSCRIPT_EXPORT Config : public QObject diff --git a/sigscript/EggGroupWrapper.cpp b/sigscript/EggGroupWrapper.cpp index 0c18289b..4e19c7ed 100644 --- a/sigscript/EggGroupWrapper.cpp +++ b/sigscript/EggGroupWrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,6 +21,9 @@ // Sigscript includes #include "SigmodWrapper.h" +// Sigmod includes +#include <sigmod/EggGroup.h> + Sigscript::EggGroupWrapper* Sigscript::EggGroupWrapper::create(const Sigmod::EggGroup* eggGroup, SigmodWrapper* parent) { Signature sig = Signature(parent, Subsignature(eggGroup->className(), eggGroup->id())); diff --git a/sigscript/EggGroupWrapper.h b/sigscript/EggGroupWrapper.h index e7a6cd70..dfacd9f4 100644 --- a/sigscript/EggGroupWrapper.h +++ b/sigscript/EggGroupWrapper.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,8 +21,11 @@ // Sigscript includes #include "ObjectWrapper.h" -// Sigmod includes -#include "../sigmod/EggGroup.h" +// Forward declarations +namespace Sigmod +{ +class EggGroup; +} namespace Sigscript { diff --git a/sigscript/GlobalScriptWrapper.cpp b/sigscript/GlobalScriptWrapper.cpp index 212baffa..00144cff 100644 --- a/sigscript/GlobalScriptWrapper.cpp +++ b/sigscript/GlobalScriptWrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,6 +21,9 @@ // Sigscript includes #include "SigmodWrapper.h" +// Sigmod includes +#include <sigmod/GlobalScript.h> + Sigscript::GlobalScriptWrapper* Sigscript::GlobalScriptWrapper::create(const Sigmod::GlobalScript* globalScript, SigmodWrapper* parent) { Signature sig = Signature(parent, Subsignature(globalScript->className(), globalScript->id())); diff --git a/sigscript/GlobalScriptWrapper.h b/sigscript/GlobalScriptWrapper.h index 29447750..55df12e7 100644 --- a/sigscript/GlobalScriptWrapper.h +++ b/sigscript/GlobalScriptWrapper.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,8 +21,14 @@ // Sigscript includes #include "ObjectWrapper.h" -// Sigmod includes -#include "../sigmod/GlobalScript.h" +// Sigcore includes +#include <sigcore/Script.h> + +// Forward declarations +namespace Sigmod +{ +class GlobalScript; +} namespace Sigscript { diff --git a/sigscript/ItemTypeWrapper.h b/sigscript/ItemTypeWrapper.h index 790a00fd..50322aa2 100644 --- a/sigscript/ItemTypeWrapper.h +++ b/sigscript/ItemTypeWrapper.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ #include "ObjectWrapper.h" // Sigmod includes -#include "../sigmod/ItemType.h" +#include <sigmod/ItemType.h> namespace Sigscript { diff --git a/sigscript/ItemWrapper.cpp b/sigscript/ItemWrapper.cpp index 22706474..72c711db 100644 --- a/sigscript/ItemWrapper.cpp +++ b/sigscript/ItemWrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,6 +21,9 @@ // Sigscript includes #include "SigmodWrapper.h" +// Sigmod includes +#include <sigmod/Item.h> + Sigscript::ItemWrapper* Sigscript::ItemWrapper::create(const Sigmod::Item* item, SigmodWrapper* parent) { Signature sig = Signature(parent, Subsignature(item->className(), item->id())); diff --git a/sigscript/ItemWrapper.h b/sigscript/ItemWrapper.h index 4d9e30f6..a5c59f0d 100644 --- a/sigscript/ItemWrapper.h +++ b/sigscript/ItemWrapper.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,12 +21,17 @@ // Sigscript includes #include "ObjectWrapper.h" -// Sigmod includes -#include "../sigmod/Item.h" +// Sigcore includes +#include <sigcore/Script.h> + +// Forward declarations +namespace Sigmod +{ +class Item; +} namespace Sigscript { -// Forward declarations class ItemTypeWrapper; class SIGSCRIPT_EXPORT ItemWrapper : public ObjectWrapper diff --git a/sigscript/MapEffectWrapper.cpp b/sigscript/MapEffectWrapper.cpp index da10d478..6b3c0d0d 100644 --- a/sigscript/MapEffectWrapper.cpp +++ b/sigscript/MapEffectWrapper.cpp @@ -22,6 +22,9 @@ #include "MapWrapper.h" #include "SigmodWrapper.h" +// Sigmod includes +#include <sigmod/MapEffect.h> + Sigscript::MapEffectWrapper* Sigscript::MapEffectWrapper::create(const Sigmod::MapEffect* effect, MapWrapper* parent) { Signature sig = Signature(parent, Subsignature(effect->className(), effect->id())); diff --git a/sigscript/MapEffectWrapper.h b/sigscript/MapEffectWrapper.h index f99ed73e..3f344fe7 100644 --- a/sigscript/MapEffectWrapper.h +++ b/sigscript/MapEffectWrapper.h @@ -21,12 +21,17 @@ // Sigscript includes #include "ObjectWrapper.h" -// Sigmod includes -#include "../sigmod/MapEffect.h" +// Sigcore includes +#include <sigcore/Script.h> + +// Forward declarations +namespace Sigmod +{ +class MapEffect; +} namespace Sigscript { -// Forward declarations class MapWrapper; class SkinWrapper; diff --git a/sigscript/MapTileWrapper.cpp b/sigscript/MapTileWrapper.cpp index 2faef412..0e7959e7 100644 --- a/sigscript/MapTileWrapper.cpp +++ b/sigscript/MapTileWrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,6 +22,9 @@ #include "MapWrapper.h" #include "SigmodWrapper.h" +// Sigmod includes +#include <sigmod/MapTile.h> + Sigscript::MapTileWrapper* Sigscript::MapTileWrapper::create(const Sigmod::MapTile* tile, MapWrapper* parent) { Signature sig = Signature(parent, Subsignature(tile->className(), tile->id())); diff --git a/sigscript/MapTileWrapper.h b/sigscript/MapTileWrapper.h index 26dbcf09..4db99f13 100644 --- a/sigscript/MapTileWrapper.h +++ b/sigscript/MapTileWrapper.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,12 +21,14 @@ // Sigscript includes #include "ObjectWrapper.h" -// Sigmod includes -#include "../sigmod/MapTile.h" +// Forward declarations +namespace Sigmod +{ +class MapTile; +} namespace Sigscript { -// Forward declarations class MapWrapper; class TileWrapper; diff --git a/sigscript/MapTrainerTeamMemberWrapper.cpp b/sigscript/MapTrainerTeamMemberWrapper.cpp index d7b97cc4..0ccb7ad2 100644 --- a/sigscript/MapTrainerTeamMemberWrapper.cpp +++ b/sigscript/MapTrainerTeamMemberWrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,6 +22,9 @@ #include "MapTrainerWrapper.h" #include "SigmodWrapper.h" +// Sigmod includes +#include <sigmod/MapTrainerTeamMember.h> + Sigscript::MapTrainerTeamMemberWrapper* Sigscript::MapTrainerTeamMemberWrapper::create(const Sigmod::MapTrainerTeamMember* teamMember, MapTrainerWrapper* parent) { Signature sig = Signature(parent, Subsignature(teamMember->className(), teamMember->id())); diff --git a/sigscript/MapTrainerTeamMemberWrapper.h b/sigscript/MapTrainerTeamMemberWrapper.h index e7c33235..37e1d928 100644 --- a/sigscript/MapTrainerTeamMemberWrapper.h +++ b/sigscript/MapTrainerTeamMemberWrapper.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,12 +21,14 @@ // Sigscript includes #include "ObjectWrapper.h" -// Sigmod includes -#include "../sigmod/MapTrainerTeamMember.h" +// Forward declarations +namespace Sigmod +{ +class MapTrainerTeamMember; +} namespace Sigscript { -// Forward declarations class AbilityWrapper; class ItemWrapper; class MapTrainerWrapper; diff --git a/sigscript/MapTrainerWrapper.cpp b/sigscript/MapTrainerWrapper.cpp index 3f8b590c..082daf75 100644 --- a/sigscript/MapTrainerWrapper.cpp +++ b/sigscript/MapTrainerWrapper.cpp @@ -23,6 +23,9 @@ #include "MapTrainerTeamMemberWrapper.h" #include "SigmodWrapper.h" +// Sigmod includes +#include <sigmod/MapTrainer.h> + Sigscript::MapTrainerWrapper* Sigscript::MapTrainerWrapper::create(const Sigmod::MapTrainer* trainer, MapWrapper* parent) { Signature sig = Signature(parent, Subsignature(trainer->className(), trainer->id())); diff --git a/sigscript/MapTrainerWrapper.h b/sigscript/MapTrainerWrapper.h index 74a608d5..084a6eaa 100644 --- a/sigscript/MapTrainerWrapper.h +++ b/sigscript/MapTrainerWrapper.h @@ -21,12 +21,17 @@ // Sigscript includes #include "ObjectWrapper.h" -// Sigmod includes -#include "../sigmod/MapTrainer.h" +// Sigcore includes +#include <sigcore/Script.h> + +// Forward declarations +namespace Sigmod +{ +class MapTrainer; +} namespace Sigscript { -// Forward declarations class MapWrapper; class MapTrainerTeamMemberWrapper; class TrainerWrapper; diff --git a/sigscript/MapWarpWrapper.h b/sigscript/MapWarpWrapper.h index 14c5cb81..69fa6021 100644 --- a/sigscript/MapWarpWrapper.h +++ b/sigscript/MapWarpWrapper.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,11 +22,11 @@ #include "ObjectWrapper.h" // Sigmod includes -#include "../sigmod/MapWarp.h" +#include <sigmod/MapWarp.h> namespace Sigscript { -// Forward declartions +// Forward declarations class MapWrapper; class SIGSCRIPT_EXPORT MapWarpWrapper : public ObjectWrapper diff --git a/sigscript/MapWildListEncounterWrapper.cpp b/sigscript/MapWildListEncounterWrapper.cpp index b6d6daf4..315346f7 100644 --- a/sigscript/MapWildListEncounterWrapper.cpp +++ b/sigscript/MapWildListEncounterWrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,6 +22,9 @@ #include "MapWildListWrapper.h" #include "SigmodWrapper.h" +// Sigmod includes +#include <sigmod/MapWildListEncounter.h> + Sigscript::MapWildListEncounterWrapper* Sigscript::MapWildListEncounterWrapper::create(const Sigmod::MapWildListEncounter* encounter, MapWildListWrapper* parent) { Signature sig = Signature(parent, Subsignature(encounter->className(), encounter->id())); diff --git a/sigscript/MapWildListEncounterWrapper.h b/sigscript/MapWildListEncounterWrapper.h index bcb35978..3b00c1ec 100644 --- a/sigscript/MapWildListEncounterWrapper.h +++ b/sigscript/MapWildListEncounterWrapper.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,12 +21,14 @@ // Sigscript includes #include "ObjectWrapper.h" -// Sigmod includes -#include "../sigmod/MapWildListEncounter.h" +// Forward declarations +namespace Sigmod +{ +class MapWildListEncounter; +} namespace Sigscript { -// Forward declarations class MapWildListWrapper; class SpeciesWrapper; diff --git a/sigscript/MapWildListWrapper.cpp b/sigscript/MapWildListWrapper.cpp index d49c8f2c..bb7505f6 100644 --- a/sigscript/MapWildListWrapper.cpp +++ b/sigscript/MapWildListWrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,6 +22,9 @@ #include "MapWrapper.h" #include "MapWildListEncounterWrapper.h" +// Sigmod includes +#include <sigmod/MapWildList.h> + Sigscript::MapWildListWrapper* Sigscript::MapWildListWrapper::create(const Sigmod::MapWildList* wildList, MapWrapper* parent) { Signature sig = Signature(parent, Subsignature(wildList->className(), wildList->id())); diff --git a/sigscript/MapWildListWrapper.h b/sigscript/MapWildListWrapper.h index b76cde82..0de4e34b 100644 --- a/sigscript/MapWildListWrapper.h +++ b/sigscript/MapWildListWrapper.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,14 +22,16 @@ #include "ObjectWrapper.h" // Sigcore includes -#include "../sigcore/Hat.h" +#include <sigcore/Hat.h> -// Sigmod includes -#include "../sigmod/MapWildList.h" +// Forward declarations +namespace Sigmod +{ +class MapWildList; +} namespace Sigscript { -// Forward declarations class MapWrapper; class MapWildListEncounterWrapper; diff --git a/sigscript/MapWrapper.cpp b/sigscript/MapWrapper.cpp index 00200272..b406871e 100644 --- a/sigscript/MapWrapper.cpp +++ b/sigscript/MapWrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,6 +26,11 @@ #include "MapWildListWrapper.h" #include "SigmodWrapper.h" +// Sigmod includes +#include <sigmod/MapEffect.h> +#include <sigmod/MapTrainer.h> +#include <sigmod/MapWildList.h> + Sigscript::MapWrapper* Sigscript::MapWrapper::create(const Sigmod::Map* map, SigmodWrapper* parent) { Signature sig = Signature(parent, Subsignature(map->className(), map->id())); diff --git a/sigscript/MapWrapper.h b/sigscript/MapWrapper.h index fa5e23a9..559c4c81 100644 --- a/sigscript/MapWrapper.h +++ b/sigscript/MapWrapper.h @@ -22,7 +22,7 @@ #include "ObjectWrapper.h" // Sigmod includes -#include "../sigmod/Map.h" +#include <sigmod/Map.h> namespace Sigscript { diff --git a/sigscript/MoveWrapper.cpp b/sigscript/MoveWrapper.cpp index 17c3b4f2..9025903c 100644 --- a/sigscript/MoveWrapper.cpp +++ b/sigscript/MoveWrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,6 +21,9 @@ // Sigscript includes #include "SigmodWrapper.h" +// Sigmod includes +#include <sigmod/Move.h> + Sigscript::MoveWrapper* Sigscript::MoveWrapper::create(const Sigmod::Move* move, SigmodWrapper* parent) { Signature sig = Signature(parent, Subsignature(move->className(), move->id())); diff --git a/sigscript/MoveWrapper.h b/sigscript/MoveWrapper.h index 8c961187..09704002 100644 --- a/sigscript/MoveWrapper.h +++ b/sigscript/MoveWrapper.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,12 +21,18 @@ // Sigscript includes #include "ObjectWrapper.h" -// Sigmod includes -#include "../sigmod/Move.h" +// Sigcore includes +#include <sigcore/Fraction.h> +#include <sigcore/Script.h> + +// Forward declarations +namespace Sigmod +{ +class Move; +} namespace Sigscript { -// Forward declarations class TypeWrapper; class SIGSCRIPT_EXPORT MoveWrapper : public ObjectWrapper diff --git a/sigscript/NatureWrapper.cpp b/sigscript/NatureWrapper.cpp index e6af8718..57b0635a 100644 --- a/sigscript/NatureWrapper.cpp +++ b/sigscript/NatureWrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,6 +21,9 @@ // Sigscript includes #include "SigmodWrapper.h" +// Sigmod includes +#include <sigmod/Nature.h> + Sigscript::NatureWrapper* Sigscript::NatureWrapper::create(const Sigmod::Nature* nature, SigmodWrapper* parent) { Signature sig = Signature(parent, Subsignature(nature->className(), nature->id())); diff --git a/sigscript/NatureWrapper.h b/sigscript/NatureWrapper.h index 5cac992d..280dc491 100644 --- a/sigscript/NatureWrapper.h +++ b/sigscript/NatureWrapper.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,8 +21,17 @@ // Sigscript includes #include "ObjectWrapper.h" +// Sigcore includes +#include <sigcore/Fraction.h> + // Sigmod includes -#include "../sigmod/Nature.h" +#include <sigmod/Stat.h> + +// Forward declarations +namespace Sigmod +{ +class Nature; +} namespace Sigscript { diff --git a/sigscript/ObjectWrapper.cpp b/sigscript/ObjectWrapper.cpp index b91827de..fe656874 100644 --- a/sigscript/ObjectWrapper.cpp +++ b/sigscript/ObjectWrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,6 +21,10 @@ // Sigscript includes #include "SigmodWrapper.h" +// Sigmod includes +#include <sigmod/Object.h> +#include <sigmod/Sigmod.h> + QMap<Sigscript::ObjectWrapper::Signature, Sigscript::ObjectWrapper*> Sigscript::ObjectWrapper::m_instances; Sigscript::ObjectWrapper::ObjectWrapper(const Sigmod::Object* object, ObjectWrapper* parent) : diff --git a/sigscript/ObjectWrapper.h b/sigscript/ObjectWrapper.h index 4e9f4050..bff2ef86 100644 --- a/sigscript/ObjectWrapper.h +++ b/sigscript/ObjectWrapper.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,18 +21,19 @@ // Sigscript includes #include "Config.h" -// Sigmod includes -#include "../sigmod/Object.h" -#include "../sigmod/Sigmod.h" - // Qt includes #include <QtCore/QMap> #include <QtCore/QObject> #include <QtCore/QPair> +// Forward declarations +namespace Sigmod +{ +class Object; +} + namespace Sigscript { -// Forward declarations class SigmodWrapper; class SIGSCRIPT_EXPORT ObjectWrapper : public Config diff --git a/sigscript/RulesWrapper.cpp b/sigscript/RulesWrapper.cpp index 0eae7b5c..bd979667 100644 --- a/sigscript/RulesWrapper.cpp +++ b/sigscript/RulesWrapper.cpp @@ -21,6 +21,9 @@ // Sigscript includes #include "SigmodWrapper.h" +// Sigmod includes +#include <sigmod/Rules.h> + Sigscript::RulesWrapper* Sigscript::RulesWrapper::create(const Sigmod::Rules* rules, SigmodWrapper* parent) { Signature sig = Signature(parent, Subsignature(rules->className(), rules->id())); diff --git a/sigscript/RulesWrapper.h b/sigscript/RulesWrapper.h index 1aa1a186..45a0d7a5 100644 --- a/sigscript/RulesWrapper.h +++ b/sigscript/RulesWrapper.h @@ -21,8 +21,11 @@ // Sigscript includes #include "ObjectWrapper.h" -// Sigmod includes -#include "../sigmod/Rules.h" +// Forward declarations +namespace Sigmod +{ +class Rules; +} namespace Sigscript { diff --git a/sigscript/SigmodWrapper.cpp b/sigscript/SigmodWrapper.cpp index 9290a728..39e51f17 100644 --- a/sigscript/SigmodWrapper.cpp +++ b/sigscript/SigmodWrapper.cpp @@ -44,6 +44,26 @@ #include "TypeWrapper.h" #include "WeatherWrapper.h" +// Sigmod includes +#include <sigmod/Ability.h> +#include <sigmod/Author.h> +#include <sigmod/Badge.h> +#include <sigmod/CoinList.h> +#include <sigmod/EggGroup.h> +#include <sigmod/GlobalScript.h> +#include <sigmod/Item.h> +#include <sigmod/Move.h> +#include <sigmod/Nature.h> +#include <sigmod/Sigmod.h> +#include <sigmod/Store.h> +#include <sigmod/Skin.h> +#include <sigmod/Sprite.h> +#include <sigmod/Status.h> +#include <sigmod/Tile.h> +#include <sigmod/Time.h> +#include <sigmod/Type.h> +#include <sigmod/Weather.h> + Sigscript::SigmodWrapper::SigmodWrapper(const Sigmod::Sigmod* sigmod) : ObjectWrapper(sigmod, NULL), m_sigmod(sigmod) diff --git a/sigscript/SigmodWrapper.h b/sigscript/SigmodWrapper.h index 26762bf3..48515286 100644 --- a/sigscript/SigmodWrapper.h +++ b/sigscript/SigmodWrapper.h @@ -22,16 +22,21 @@ #include "ObjectWrapper.h" // Sigcore includes -#include "../sigcore/Hat.h" +#include <sigcore/Hat.h> +#include <sigcore/Script.h> // Sigmod includes -#include "../sigmod/Direction.h" -#include "../sigmod/Sigmod.h" -#include "../sigmod/Stat.h" +#include <sigmod/Direction.h> +#include <sigmod/Stat.h> + +// Forward declarations +namespace Sigmod +{ +class Sigmod; +} namespace Sigscript { -// Forward declarations class AbilityWrapper; class AuthorWrapper; class BadgeWrapper; diff --git a/sigscript/SkinWrapper.cpp b/sigscript/SkinWrapper.cpp index bcdd3351..2f821b9f 100644 --- a/sigscript/SkinWrapper.cpp +++ b/sigscript/SkinWrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,6 +21,9 @@ // Sigmod scripting #include "SigmodWrapper.h" +// Sigmod includes +#include <sigmod/Skin.h> + Sigscript::SkinWrapper* Sigscript::SkinWrapper::create(const Sigmod::Skin* skin, SigmodWrapper* parent) { Signature sig = Signature(parent, Subsignature(skin->className(), skin->id())); diff --git a/sigscript/SkinWrapper.h b/sigscript/SkinWrapper.h index 8639db92..72efbb47 100644 --- a/sigscript/SkinWrapper.h +++ b/sigscript/SkinWrapper.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,8 +21,14 @@ // Sigscript includes #include "ObjectWrapper.h" -// Sigmod includes -#include "../sigmod/Skin.h" +// Sigcore includes +#include <sigcore/Script.h> + +// Forward declarations +namespace Sigmod +{ +class Skin; +} namespace Sigscript { diff --git a/sigscript/SoundWrapper.h b/sigscript/SoundWrapper.h index 92594405..54b22535 100644 --- a/sigscript/SoundWrapper.h +++ b/sigscript/SoundWrapper.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ #include "ObjectWrapper.h" // Sigmod includes -#include "../sigmod/Sound.h" +#include <sigmod/Sound.h> // Forward declarations namespace Phonon diff --git a/sigscript/SpeciesMoveWrapper.cpp b/sigscript/SpeciesMoveWrapper.cpp index 3fc24a1b..e503a9c7 100644 --- a/sigscript/SpeciesMoveWrapper.cpp +++ b/sigscript/SpeciesMoveWrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,6 +22,9 @@ #include "SigmodWrapper.h" #include "SpeciesWrapper.h" +// Sigmod includes +#include <sigmod/SpeciesMove.h> + Sigscript::SpeciesMoveWrapper* Sigscript::SpeciesMoveWrapper::create(const Sigmod::SpeciesMove* move, SpeciesWrapper* parent) { Signature sig = Signature(parent, Subsignature(move->className(), move->id())); diff --git a/sigscript/SpeciesMoveWrapper.h b/sigscript/SpeciesMoveWrapper.h index c5ab76b5..77cdc73c 100644 --- a/sigscript/SpeciesMoveWrapper.h +++ b/sigscript/SpeciesMoveWrapper.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,12 +22,14 @@ #include "MoveWrapper.h" #include "ObjectWrapper.h" -// Sigmod includes -#include "../sigmod/SpeciesMove.h" +// Forward declarations +namespace Sigmod +{ +class SpeciesMove; +} namespace Sigscript { -// Forward declarations class SpeciesWrapper; class SIGSCRIPT_EXPORT SpeciesMoveWrapper : public ObjectWrapper diff --git a/sigscript/SpeciesWrapper.h b/sigscript/SpeciesWrapper.h index 47034298..f314436a 100644 --- a/sigscript/SpeciesWrapper.h +++ b/sigscript/SpeciesWrapper.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,10 +22,10 @@ #include "ObjectWrapper.h" // Sigcore includes -#include "../sigcore/Hat.h" +#include <sigcore/Hat.h> // Sigmod includes -#include "../sigmod/Species.h" +#include <sigmod/Species.h> namespace Sigscript { diff --git a/sigscript/SpriteWrapper.cpp b/sigscript/SpriteWrapper.cpp index 7cb2074b..c0f9f0f9 100644 --- a/sigscript/SpriteWrapper.cpp +++ b/sigscript/SpriteWrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,6 +21,9 @@ // Sigscript includes #include "SigmodWrapper.h" +// Sigmod includes +#include <sigmod/Sprite.h> + Sigscript::SpriteWrapper* Sigscript::SpriteWrapper::create(const Sigmod::Sprite* sprite, SigmodWrapper* parent) { Signature sig = Signature(parent, Subsignature(sprite->className(), sprite->id())); diff --git a/sigscript/SpriteWrapper.h b/sigscript/SpriteWrapper.h index e09bbef9..fa224ac2 100644 --- a/sigscript/SpriteWrapper.h +++ b/sigscript/SpriteWrapper.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,12 +21,15 @@ // Sigscript includes #include "ObjectWrapper.h" -// Sigmod includes -#include "../sigmod/Sprite.h" - // Qt includes #include <QtGui/QPixmap> +// Forward declarations +namespace Sigmod +{ +class Sprite; +} + namespace Sigscript { class SIGSCRIPT_EXPORT SpriteWrapper : public ObjectWrapper diff --git a/sigscript/StatusWrapper.cpp b/sigscript/StatusWrapper.cpp index 7625af77..92f4ca60 100644 --- a/sigscript/StatusWrapper.cpp +++ b/sigscript/StatusWrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,6 +21,9 @@ // Sigscript includes #include "SigmodWrapper.h" +// Sigmod includes +#include <sigmod/Status.h> + Sigscript::StatusWrapper* Sigscript::StatusWrapper::create(const Sigmod::Status* status, SigmodWrapper* parent) { Signature sig = Signature(parent, Subsignature(status->className(), status->id())); diff --git a/sigscript/StatusWrapper.h b/sigscript/StatusWrapper.h index 3a6857d5..61956234 100644 --- a/sigscript/StatusWrapper.h +++ b/sigscript/StatusWrapper.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,8 +21,14 @@ // Sigscript includes #include "ObjectWrapper.h" -// Sigmod includes -#include "../sigmod/Status.h" +// Sigcore includes +#include <sigcore/Script.h> + +// Forward declarations +namespace Sigmod +{ +class Status; +} namespace Sigscript { diff --git a/sigscript/StoreWrapper.cpp b/sigscript/StoreWrapper.cpp index f3e4f708..85d6b580 100644 --- a/sigscript/StoreWrapper.cpp +++ b/sigscript/StoreWrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,6 +21,9 @@ // Sigscript includes #include "SigmodWrapper.h" +// Sigmod includes +#include <sigmod/Store.h> + Sigscript::StoreWrapper* Sigscript::StoreWrapper::create(const Sigmod::Store* store, SigmodWrapper* parent) { Signature sig = Signature(parent, Subsignature(store->className(), store->id())); diff --git a/sigscript/StoreWrapper.h b/sigscript/StoreWrapper.h index eeb312b4..f0683d4b 100644 --- a/sigscript/StoreWrapper.h +++ b/sigscript/StoreWrapper.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,12 +21,14 @@ // Sigscript includes #include "ObjectWrapper.h" -// Sigmod includes -#include "../sigmod/Store.h" +// Forward declarations +namespace Sigmod +{ +class Store; +} namespace Sigscript { -// Forward declarations class ItemWrapper; class SIGSCRIPT_EXPORT StoreWrapper : public ObjectWrapper diff --git a/sigscript/TileWrapper.cpp b/sigscript/TileWrapper.cpp index 5d7b5a55..b131d6b1 100644 --- a/sigscript/TileWrapper.cpp +++ b/sigscript/TileWrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,6 +21,9 @@ // Sigscript includes #include "SigmodWrapper.h" +// Sigmod includes +#include <sigmod/Tile.h> + Sigscript::TileWrapper* Sigscript::TileWrapper::create(const Sigmod::Tile* tile, SigmodWrapper* parent) { Signature sig = Signature(parent, Subsignature(tile->className(), tile->id())); diff --git a/sigscript/TileWrapper.h b/sigscript/TileWrapper.h index a3b90cd6..882148f4 100644 --- a/sigscript/TileWrapper.h +++ b/sigscript/TileWrapper.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,8 +21,14 @@ // Sigscript includes #include "ObjectWrapper.h" -// Sigmod includes -#include "../sigmod/Tile.h" +// Sigcore includes +#include <sigcore/Script.h> + +// Forward declarations +namespace Sigmod +{ +class Tile; +} namespace Sigscript { diff --git a/sigscript/TimeWrapper.cpp b/sigscript/TimeWrapper.cpp index f3599a2c..c034e4e5 100644 --- a/sigscript/TimeWrapper.cpp +++ b/sigscript/TimeWrapper.cpp @@ -21,6 +21,9 @@ // Sigscript includes #include "SigmodWrapper.h" +// Sigmod includes +#include <sigmod/Time.h> + Sigscript::TimeWrapper* Sigscript::TimeWrapper::create(const Sigmod::Time* time, SigmodWrapper* parent) { Signature sig = Signature(parent, Subsignature(time->className(), time->id())); diff --git a/sigscript/TimeWrapper.h b/sigscript/TimeWrapper.h index 564b68e9..b65b937f 100644 --- a/sigscript/TimeWrapper.h +++ b/sigscript/TimeWrapper.h @@ -21,8 +21,14 @@ // Sigscript includes #include "ObjectWrapper.h" -// Sigmod includes -#include "../sigmod/Time.h" +// Sigcore includes +#include <sigcore/Script.h> + +// Forward declarations +namespace Sigmod +{ +class Time; +} namespace Sigscript { diff --git a/sigscript/TrainerWrapper.h b/sigscript/TrainerWrapper.h index 5e0b7662..f87eb1b0 100644 --- a/sigscript/TrainerWrapper.h +++ b/sigscript/TrainerWrapper.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ #include "ObjectWrapper.h" // Sigmod includes -#include "../sigmod/Trainer.h" +#include <sigmod/Trainer.h> namespace Sigscript { diff --git a/sigscript/TypeWrapper.cpp b/sigscript/TypeWrapper.cpp index f2731cb5..a0d0899e 100644 --- a/sigscript/TypeWrapper.cpp +++ b/sigscript/TypeWrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,6 +21,9 @@ // Sigscript includes #include "SigmodWrapper.h" +// Sigmod includes +#include <sigmod/Type.h> + Sigscript::TypeWrapper* Sigscript::TypeWrapper::create(const Sigmod::Type* type, SigmodWrapper* parent) { Signature sig = Signature(parent, Subsignature(type->className(), type->id())); diff --git a/sigscript/TypeWrapper.h b/sigscript/TypeWrapper.h index f95f9c56..c65f3333 100644 --- a/sigscript/TypeWrapper.h +++ b/sigscript/TypeWrapper.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,8 +21,14 @@ // Sigscript includes #include "ObjectWrapper.h" -// Sigmod includes -#include "../sigmod/Type.h" +// Sigcore includes +#include <sigcore/Fraction.h> + +// Forward declarations +namespace Sigmod +{ +class Type; +} namespace Sigscript { diff --git a/sigscript/WeatherWrapper.cpp b/sigscript/WeatherWrapper.cpp index 637437e8..f6c25fe4 100644 --- a/sigscript/WeatherWrapper.cpp +++ b/sigscript/WeatherWrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,6 +21,9 @@ // Sigscript includes #include "SigmodWrapper.h" +// Sigmod includes +#include <sigmod/Weather.h> + Sigscript::WeatherWrapper* Sigscript::WeatherWrapper::create(const Sigmod::Weather* weather, SigmodWrapper* parent) { Signature sig = Signature(parent, Subsignature(weather->className(), weather->id())); diff --git a/sigscript/WeatherWrapper.h b/sigscript/WeatherWrapper.h index 40ac5b59..2fd9a571 100644 --- a/sigscript/WeatherWrapper.h +++ b/sigscript/WeatherWrapper.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,8 +21,14 @@ // Sigscript includes #include "ObjectWrapper.h" -// Sigmod includes -#include "../sigmod/Weather.h" +// Sigcore includes +#include <sigcore/Script.h> + +// Forward declarations +namespace Sigmod +{ +class Weather; +} namespace Sigscript { |