[FIX] Include guard stripped of __

[FIX] KDE includes put before Qt includes

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@263 6ecfd1a5-f3ed-3746-8530-beee90d26b22

41 files changed, 82 insertions, 82 deletions

diff --git a/sigmod/Ability.h b/sigmod/Ability.h
index 0e3ae7a8..058cd9f4 100644
--- a/sigmod/Ability.h
+++ b/sigmod/Ability.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_ABILITY__
-#define __SIGMOD_ABILITY__
+#ifndef SIGMOD_ABILITY
+#define SIGMOD_ABILITY
 
 // Sigmod includes
 #include "Object.h"
diff --git a/sigmod/Author.h b/sigmod/Author.h
index d5384ddb..413fece6 100644
--- a/sigmod/Author.h
+++ b/sigmod/Author.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_AUTHOR__
-#define __SIGMOD_AUTHOR__
+#ifndef SIGMOD_AUTHOR
+#define SIGMOD_AUTHOR
 
 // Sigmod includes
 #include "Object.h"
diff --git a/sigmod/Badge.h b/sigmod/Badge.h
index 42a9d8a2..8c96bc85 100644
--- a/sigmod/Badge.h
+++ b/sigmod/Badge.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_BADGE__
-#define __SIGMOD_BADGE__
+#ifndef SIGMOD_BADGE
+#define SIGMOD_BADGE
 
 // Sigmod includes
 #include "Fraction.h"
diff --git a/sigmod/CoinList.h b/sigmod/CoinList.h
index 0cda0700..0f02fc0d 100644
--- a/sigmod/CoinList.h
+++ b/sigmod/CoinList.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_COINLIST__
-#define __SIGMOD_COINLIST__
+#ifndef SIGMOD_COINLIST
+#define SIGMOD_COINLIST
 
 // Sigmod includes
 #include "Object.h"
diff --git a/sigmod/CoinListObject.h b/sigmod/CoinListObject.h
index d824a0ff..8071e9fe 100644
--- a/sigmod/CoinListObject.h
+++ b/sigmod/CoinListObject.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_COINLISTOBJECT__
-#define __SIGMOD_COINLISTOBJECT__
+#ifndef SIGMOD_COINLISTOBJECT
+#define SIGMOD_COINLISTOBJECT
 
 // Sigmod includes
 #include "Object.h"
diff --git a/sigmod/EggGroup.h b/sigmod/EggGroup.h
index e1377683..82cba66e 100644
--- a/sigmod/EggGroup.h
+++ b/sigmod/EggGroup.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_EGGGROUP__
-#define __SIGMOD_EGGGROUP__
+#ifndef SIGMOD_EGGGROUP
+#define SIGMOD_EGGGROUP
 
 // Sigmod includes
 #include "Object.h"
diff --git a/sigmod/Fraction.h b/sigmod/Fraction.h
index 7e58c2b3..b2315fc3 100644
--- a/sigmod/Fraction.h
+++ b/sigmod/Fraction.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_FRACTION__
-#define __SIGMOD_FRACTION__
+#ifndef SIGMOD_FRACTION
+#define SIGMOD_FRACTION
 
 // Sigmod includes
 #include "Global.h"
diff --git a/sigmod/Global.h b/sigmod/Global.h
index 5802f86b..7cb4a9ed 100644
--- a/sigmod/Global.h
+++ b/sigmod/Global.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_GLOBAL__
-#define __SIGMOD_GLOBAL__
+#ifndef SIGMOD_GLOBAL
+#define SIGMOD_GLOBAL
 
 // Qt includes
 #include <QtCore/QMetaType>
diff --git a/sigmod/GlobalScript.h b/sigmod/GlobalScript.h
index 0e8855e8..26fa995c 100644
--- a/sigmod/GlobalScript.h
+++ b/sigmod/GlobalScript.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_GLOBALSCRIPT__
-#define __SIGMOD_GLOBALSCRIPT__
+#ifndef SIGMOD_GLOBALSCRIPT
+#define SIGMOD_GLOBALSCRIPT
 
 // Sigmod includes
 #include "Object.h"
diff --git a/sigmod/Hat.h b/sigmod/Hat.h
index 3acf4d58..c9ae94f0 100644
--- a/sigmod/Hat.h
+++ b/sigmod/Hat.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_HAT__
-#define __SIGMOD_HAT__
+#ifndef SIGMOD_HAT
+#define SIGMOD_HAT
 
 // Sigmod includes
 #include "Global.h"
diff --git a/sigmod/Item.h b/sigmod/Item.h
index b05b1b25..64ae01aa 100644
--- a/sigmod/Item.h
+++ b/sigmod/Item.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_ITEM__
-#define __SIGMOD_ITEM__
+#ifndef SIGMOD_ITEM
+#define SIGMOD_ITEM
 
 // Sigmod includes
 #include "Object.h"
diff --git a/sigmod/ItemType.h b/sigmod/ItemType.h
index 386ca209..a1644215 100644
--- a/sigmod/ItemType.h
+++ b/sigmod/ItemType.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_ITEMTYPE__
-#define __SIGMOD_ITEMTYPE__
+#ifndef SIGMOD_ITEMTYPE
+#define SIGMOD_ITEMTYPE
 
 // Sigmod includes
 #include "Object.h"
diff --git a/sigmod/Macros.h b/sigmod/Macros.h
index 50c1085c..6d61526a 100644
--- a/sigmod/Macros.h
+++ b/sigmod/Macros.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_MACROS__
-#define __SIGMOD_MACROS__
+#ifndef SIGMOD_MACROS
+#define SIGMOD_MACROS
 
 #ifdef MAKE_SIGMOD_LIB
 
diff --git a/sigmod/Map.h b/sigmod/Map.h
index 345a00fb..030ce05d 100644
--- a/sigmod/Map.h
+++ b/sigmod/Map.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_MAP__
-#define __SIGMOD_MAP__
+#ifndef SIGMOD_MAP
+#define SIGMOD_MAP
 
 // Sigmod includes
 #include "Matrix.h"
diff --git a/sigmod/MapEffect.h b/sigmod/MapEffect.h
index 3af1e0ef..39726d19 100644
--- a/sigmod/MapEffect.h
+++ b/sigmod/MapEffect.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_MAPEFFECT__
-#define __SIGMOD_MAPEFFECT__
+#ifndef SIGMOD_MAPEFFECT
+#define SIGMOD_MAPEFFECT
 
 // Sigmod includes
 #include "Object.h"
diff --git a/sigmod/MapTrainer.h b/sigmod/MapTrainer.h
index 2d8686bb..7c45b39a 100644
--- a/sigmod/MapTrainer.h
+++ b/sigmod/MapTrainer.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_MAPTRAINER__
-#define __SIGMOD_MAPTRAINER__
+#ifndef SIGMOD_MAPTRAINER
+#define SIGMOD_MAPTRAINER
 
 // Sigmod includes
 #include "Object.h"
diff --git a/sigmod/MapTrainerTeamMember.h b/sigmod/MapTrainerTeamMember.h
index d1e5836c..36394258 100644
--- a/sigmod/MapTrainerTeamMember.h
+++ b/sigmod/MapTrainerTeamMember.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_MAPTRAINERTEAMMEMBER__
-#define __SIGMOD_MAPTRAINERTEAMMEMBER__
+#ifndef SIGMOD_MAPTRAINERTEAMMEMBER
+#define SIGMOD_MAPTRAINERTEAMMEMBER
 
 // Sigmod includes
 #include "Object.h"
diff --git a/sigmod/MapWarp.h b/sigmod/MapWarp.h
index 44502a3e..d0ffb778 100644
--- a/sigmod/MapWarp.h
+++ b/sigmod/MapWarp.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_MAPWARP__
-#define __SIGMOD_MAPWARP__
+#ifndef SIGMOD_MAPWARP
+#define SIGMOD_MAPWARP
 
 // Sigmod includes
 #include "Object.h"
diff --git a/sigmod/MapWildList.h b/sigmod/MapWildList.h
index 87d69895..01ad6e03 100644
--- a/sigmod/MapWildList.h
+++ b/sigmod/MapWildList.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_MAPWILDLIST__
-#define __SIGMOD_MAPWILDLIST__
+#ifndef SIGMOD_MAPWILDLIST
+#define SIGMOD_MAPWILDLIST
 
 // Sigmod includes
 #include "Object.h"
diff --git a/sigmod/MapWildListEncounter.h b/sigmod/MapWildListEncounter.h
index dfa3d4ce..45932f80 100644
--- a/sigmod/MapWildListEncounter.h
+++ b/sigmod/MapWildListEncounter.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_MAPWILDLISTENCOUNTER__
-#define __SIGMOD_MAPWILDLISTENCOUNTER__
+#ifndef SIGMOD_MAPWILDLISTENCOUNTER
+#define SIGMOD_MAPWILDLISTENCOUNTER
 
 // Sigmod includes
 #include "Object.h"
diff --git a/sigmod/Matrix.h b/sigmod/Matrix.h
index bd98353d..37c9b58d 100644
--- a/sigmod/Matrix.h
+++ b/sigmod/Matrix.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_MATRIX__
-#define __SIGMOD_MATRIX__
+#ifndef SIGMOD_MATRIX
+#define SIGMOD_MATRIX
 
 // Sigmod includes
 #include "Global.h"
diff --git a/sigmod/Move.h b/sigmod/Move.h
index 1fd23516..2c8082b0 100644
--- a/sigmod/Move.h
+++ b/sigmod/Move.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_MOVE__
-#define __SIGMOD_MOVE__
+#ifndef SIGMOD_MOVE
+#define SIGMOD_MOVE
 
 // Sigmod includes
 #include "Fraction.h"
diff --git a/sigmod/Nature.h b/sigmod/Nature.h
index 67d82c91..8b0bed04 100644
--- a/sigmod/Nature.h
+++ b/sigmod/Nature.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_NATURE__
-#define __SIGMOD_NATURE__
+#ifndef SIGMOD_NATURE
+#define SIGMOD_NATURE
 
 // Sigmod includes
 #include "Fraction.h"
diff --git a/sigmod/Object.h b/sigmod/Object.h
index 28496a00..2d44c82f 100644
--- a/sigmod/Object.h
+++ b/sigmod/Object.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_OBJECT__
-#define __SIGMOD_OBJECT__
+#ifndef SIGMOD_OBJECT
+#define SIGMOD_OBJECT
 
 // Sigmod includes
 #include "Fraction.h"
diff --git a/sigmod/Rules.h b/sigmod/Rules.h
index 02fbbadf..0373264c 100644
--- a/sigmod/Rules.h
+++ b/sigmod/Rules.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_RULES__
-#define __SIGMOD_RULES__
+#ifndef SIGMOD_RULES
+#define SIGMOD_RULES
 
 // Sigmod includes
 #include "Object.h"
diff --git a/sigmod/Script.h b/sigmod/Script.h
index bf9312ce..5fe87ad9 100644
--- a/sigmod/Script.h
+++ b/sigmod/Script.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_SCRIPT__
-#define __SIGMOD_SCRIPT__
+#ifndef SIGMOD_SCRIPT
+#define SIGMOD_SCRIPT
 
 // Sigmod includes
 #include "Global.h"
diff --git a/sigmod/Sigmod.h b/sigmod/Sigmod.h
index ac5b96ed..cdd3f6f6 100644
--- a/sigmod/Sigmod.h
+++ b/sigmod/Sigmod.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_SIGMOD__
-#define __SIGMOD_SIGMOD__
+#ifndef SIGMOD_SIGMOD
+#define SIGMOD_SIGMOD
 
 // Sigmod includes
 #include "Fraction.h"
diff --git a/sigmod/Skin.h b/sigmod/Skin.h
index a911fb15..a27a9b83 100644
--- a/sigmod/Skin.h
+++ b/sigmod/Skin.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_SKIN__
-#define __SIGMOD_SKIN__
+#ifndef SIGMOD_SKIN
+#define SIGMOD_SKIN
 
 // Sigmod includes
 #include "Object.h"
diff --git a/sigmod/Sound.h b/sigmod/Sound.h
index 789718b3..6040a6fb 100644
--- a/sigmod/Sound.h
+++ b/sigmod/Sound.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_SOUND__
-#define __SIGMOD_SOUND__
+#ifndef SIGMOD_SOUND
+#define SIGMOD_SOUND
 
 // Sigmod includes
 #include "Object.h"
diff --git a/sigmod/Species.h b/sigmod/Species.h
index 7ea1bf1b..3dc79472 100644
--- a/sigmod/Species.h
+++ b/sigmod/Species.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_SPECIES__
-#define __SIGMOD_SPECIES__
+#ifndef SIGMOD_SPECIES
+#define SIGMOD_SPECIES
 
 // Sigmod includes
 #include "Fraction.h"
diff --git a/sigmod/SpeciesAbility.h b/sigmod/SpeciesAbility.h
index 7c17a525..895016d0 100644
--- a/sigmod/SpeciesAbility.h
+++ b/sigmod/SpeciesAbility.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_SPECIESABILITY__
-#define __SIGMOD_SPECIESABILITY__
+#ifndef SIGMOD_SPECIESABILITY
+#define SIGMOD_SPECIESABILITY
 
 // Sigmod includes
 #include "Object.h"
diff --git a/sigmod/SpeciesItem.h b/sigmod/SpeciesItem.h
index 680d95de..a7e1faf0 100644
--- a/sigmod/SpeciesItem.h
+++ b/sigmod/SpeciesItem.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_SPECIESITEM__
-#define __SIGMOD_SPECIESITEM__
+#ifndef SIGMOD_SPECIESITEM
+#define SIGMOD_SPECIESITEM
 
 // Sigmod includes
 #include "Object.h"
diff --git a/sigmod/SpeciesMove.h b/sigmod/SpeciesMove.h
index 2d479d69..930bbdbc 100644
--- a/sigmod/SpeciesMove.h
+++ b/sigmod/SpeciesMove.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_SPECIESMOVE__
-#define __SIGMOD_SPECIESMOVE__
+#ifndef SIGMOD_SPECIESMOVE
+#define SIGMOD_SPECIESMOVE
 
 // Sigmod includes
 #include "Object.h"
diff --git a/sigmod/Sprite.h b/sigmod/Sprite.h
index 014ca8eb..b11f33fd 100644
--- a/sigmod/Sprite.h
+++ b/sigmod/Sprite.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_SPRITE__
-#define __SIGMOD_SPRITE__
+#ifndef SIGMOD_SPRITE
+#define SIGMOD_SPRITE
 
 // Sigmod includes
 #include "Object.h"
diff --git a/sigmod/Status.h b/sigmod/Status.h
index e6c96f02..47a611fa 100644
--- a/sigmod/Status.h
+++ b/sigmod/Status.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_STATUS__
-#define __SIGMOD_STATUS__
+#ifndef SIGMOD_STATUS
+#define SIGMOD_STATUS
 
 // Sigmod includes
 #include "Object.h"
diff --git a/sigmod/Store.h b/sigmod/Store.h
index 881ce304..5b399fcb 100644
--- a/sigmod/Store.h
+++ b/sigmod/Store.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_STORE__
-#define __SIGMOD_STORE__
+#ifndef SIGMOD_STORE
+#define SIGMOD_STORE
 
 // Sigmod includes
 #include "Object.h"
diff --git a/sigmod/Tile.h b/sigmod/Tile.h
index 2475bd68..9b444707 100644
--- a/sigmod/Tile.h
+++ b/sigmod/Tile.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_TILE__
-#define __SIGMOD_TILE__
+#ifndef SIGMOD_TILE
+#define SIGMOD_TILE
 
 // Sigmod includes
 #include "Object.h"
diff --git a/sigmod/Time.h b/sigmod/Time.h
index 015fd8d1..db361397 100644
--- a/sigmod/Time.h
+++ b/sigmod/Time.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_TIME__
-#define __SIGMOD_TIME__
+#ifndef SIGMOD_TIME
+#define SIGMOD_TIME
 
 // Sigmod includes
 #include "Object.h"
diff --git a/sigmod/Trainer.h b/sigmod/Trainer.h
index 224743dd..ab2c8a96 100644
--- a/sigmod/Trainer.h
+++ b/sigmod/Trainer.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_TRAINER__
-#define __SIGMOD_TRAINER__
+#ifndef SIGMOD_TRAINER
+#define SIGMOD_TRAINER
 
 // Sigmod includes
 #include "Object.h"
diff --git a/sigmod/Type.h b/sigmod/Type.h
index a6c57d73..7cd2e813 100644
--- a/sigmod/Type.h
+++ b/sigmod/Type.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_TYPE__
-#define __SIGMOD_TYPE__
+#ifndef SIGMOD_TYPE
+#define SIGMOD_TYPE
 
 // Sigmod includes
 #include "Fraction.h"
diff --git a/sigmod/Weather.h b/sigmod/Weather.h
index a5a4e6b0..3ae60f69 100644
--- a/sigmod/Weather.h
+++ b/sigmod/Weather.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SIGMOD_WEATHER__
-#define __SIGMOD_WEATHER__
+#ifndef SIGMOD_WEATHER
+#define SIGMOD_WEATHER
 
 // Sigmod includes
 #include "Object.h"