Renamed CHECK_DEFAULT to CHECK and old CHECK_* to TS_*

12 files changed, 33 insertions, 33 deletions

diff --git a/sigmod/Ability.cpp b/sigmod/Ability.cpp
index 5e02df3f..6a0bbf55 100644
--- a/sigmod/Ability.cpp
+++ b/sigmod/Ability.cpp
@@ -101,12 +101,12 @@ GETTER(Ability, Sigcore::Script, battleScript)
 GETTER(Ability, Sigcore::Script, worldScript)
 GETTER(Ability, Sigcore::Script, priorityScript)
 
-CHECK_DEFAULT(Ability, QString&, name)
-CHECK_DEFAULT(Ability, int, priority)
-CHECK_DEFAULT(Ability, QString&, description)
-CHECK_DEFAULT(Ability, Sigcore::Script&, battleScript)
-CHECK_DEFAULT(Ability, Sigcore::Script&, worldScript)
-CHECK_DEFAULT(Ability, Sigcore::Script&, priorityScript)
+CHECK(Ability, QString&, name)
+CHECK(Ability, int, priority)
+CHECK(Ability, QString&, description)
+CHECK(Ability, Sigcore::Script&, battleScript)
+CHECK(Ability, Sigcore::Script&, worldScript)
+CHECK(Ability, Sigcore::Script&, priorityScript)
 
 Sigmod::Ability& Sigmod::Ability::operator=(const Ability& rhs)
 {
diff --git a/sigmod/Badge.cpp b/sigmod/Badge.cpp
index 0815cddb..23214bc9 100644
--- a/sigmod/Badge.cpp
+++ b/sigmod/Badge.cpp
@@ -118,7 +118,7 @@ GETTER(Badge, int, badge)
 GETTER(Badge, int, obey)
 GETTER_ARRAY_OFF(Badge, Sigcore::Fraction, stat, multiplier, Stat, stat, ST_Attack)
 
-CHECK_DEFAULT(Badge, QString&, name)
+CHECK(Badge, QString&, name)
 CHECK_INDEX(Badge, int, face, sigmod(), sprite)
 CHECK_INDEX(Badge, int, badge, sigmod(), sprite)
 CHECK_BEGIN(Badge, int, obey)
diff --git a/sigmod/CoinList.cpp b/sigmod/CoinList.cpp
index 92a8a16f..bc3a6fcb 100644
--- a/sigmod/CoinList.cpp
+++ b/sigmod/CoinList.cpp
@@ -108,8 +108,8 @@ SETTER(CoinList, Sigcore::Script&, Script, script)
 GETTER(CoinList, QString, name)
 GETTER(CoinList, Sigcore::Script, script)
 
-CHECK_DEFAULT(CoinList, QString&, name)
-CHECK_DEFAULT(CoinList, Sigcore::Script&, script)
+CHECK(CoinList, QString&, name)
+CHECK(CoinList, Sigcore::Script&, script)
 
 const Sigmod::CoinListItem* Sigmod::CoinList::item(const int index) const
 {
diff --git a/sigmod/CoinListItem.cpp b/sigmod/CoinListItem.cpp
index 642fb013..f12bfc75 100644
--- a/sigmod/CoinListItem.cpp
+++ b/sigmod/CoinListItem.cpp
@@ -89,7 +89,7 @@ GETTER(CoinListItem, Sigmod::CoinListItem::Type, type)
 GETTER(CoinListItem, int, object)
 GETTER(CoinListItem, int, cost)
 
-CHECK_DEFAULT(CoinListItem, Type, type)
+CHECK(CoinListItem, Type, type)
 CHECK_BEGIN(CoinListItem, int, object)
     switch (m_type)
     {
diff --git a/sigmod/EggGroup.cpp b/sigmod/EggGroup.cpp
index c3eed032..b829ea81 100644
--- a/sigmod/EggGroup.cpp
+++ b/sigmod/EggGroup.cpp
@@ -76,7 +76,7 @@ SETTER(EggGroup, QString&, Name, name)
 
 GETTER(EggGroup, QString, name)
 
-CHECK_DEFAULT(EggGroup, QString&, name)
+CHECK(EggGroup, QString&, name)
 
 Sigmod::EggGroup& Sigmod::EggGroup::operator=(const EggGroup& rhs)
 {
diff --git a/sigmod/GlobalScript.cpp b/sigmod/GlobalScript.cpp
index 2b99f82a..a7d9efcf 100644
--- a/sigmod/GlobalScript.cpp
+++ b/sigmod/GlobalScript.cpp
@@ -81,8 +81,8 @@ SETTER(GlobalScript, Sigcore::Script&, Script, script)
 GETTER(GlobalScript, QString, name)
 GETTER(GlobalScript, Sigcore::Script, script)
 
-CHECK_DEFAULT(GlobalScript, QString&, name)
-CHECK_DEFAULT(GlobalScript, Sigcore::Script&, script)
+CHECK(GlobalScript, QString&, name)
+CHECK(GlobalScript, Sigcore::Script&, script)
 
 Sigmod::GlobalScript& Sigmod::GlobalScript::operator=(const GlobalScript& rhs)
 {
diff --git a/sigmod/Item.cpp b/sigmod/Item.cpp
index 98a2e274..4f426bfe 100644
--- a/sigmod/Item.cpp
+++ b/sigmod/Item.cpp
@@ -121,8 +121,8 @@ GETTER(Item, int, weight)
 GETTER(Item, QString, description)
 GETTER(Item, Sigcore::Script, script)
 
-CHECK_DEFAULT(Item, QString&, name)
-CHECK_DEFAULT(Item, bool, sellable)
+CHECK(Item, QString&, name)
+CHECK(Item, bool, sellable)
 CHECK_INDEX(Item, int, type, sigmod(), type)
 CHECK_BEGIN(Item, int, price)
     TBOUNDS(price, 1, sigmod()->rules()->maxMoney())
@@ -135,8 +135,8 @@ CHECK_BEGIN(Item, int, weight)
     if (type)
         TBOUNDS(weight, 0, type->maxWeight())
 CHECK_END()
-CHECK_DEFAULT(Item, QString&, description)
-CHECK_DEFAULT(Item, Sigcore::Script&, script)
+CHECK(Item, QString&, description)
+CHECK(Item, Sigcore::Script&, script)
 
 Sigmod::Item& Sigmod::Item::operator=(const Item& rhs)
 {
diff --git a/sigmod/ItemType.cpp b/sigmod/ItemType.cpp
index 35585659..a1b26266 100644
--- a/sigmod/ItemType.cpp
+++ b/sigmod/ItemType.cpp
@@ -102,7 +102,7 @@ GETTER(ItemType, int, player)
 GETTER(ItemType, int, maxWeight)
 GETTER(ItemType, Sigmod::ItemType::Count, count)
 
-CHECK_DEFAULT(ItemType, QString&, name)
+CHECK(ItemType, QString&, name)
 CHECK_BEGIN(ItemType, int, computer)
     TBOUNDS(computer, -1, INT_MAX)
 CHECK_END()
@@ -112,7 +112,7 @@ CHECK_END()
 CHECK_BEGIN(ItemType, int, maxWeight)
     TBOUNDS(maxWeight, -1, (sigmod()->rules()->maxTotalWeight() == -1) ? INT_MAX : sigmod()->rules()->maxTotalWeight())
 CHECK_END()
-CHECK_DEFAULT(ItemType, Count, count)
+CHECK(ItemType, Count, count)
 
 Sigmod::ItemType& Sigmod::ItemType::operator=(const ItemType& rhs)
 {
diff --git a/sigmod/Macros.h b/sigmod/Macros.h
index acd71516..4be4f84c 100644
--- a/sigmod/Macros.h
+++ b/sigmod/Macros.h
@@ -100,19 +100,19 @@
         checking##Checker.insert(object->value())
 #define TEST_SUB_END() }
 
-#define CHECK(variable) \
+#define TS(variable) \
     if (variable##Check(variable) && (m_##variable != variable)) \
     { \
         m_##variable = variable; \
         emit(changed()); \
     }
-#define CHECK_ARRAY(variable, index, value) \
+#define TS_ARRAY(variable, index, value) \
     if (variable##Check(index, value) && (m_##variable[index] != value)) \
     { \
         m_##variable[index] = value; \
         emit(changed()); \
     }
-#define CHECK_ARRAY_OFF(variable, index, offset, value) \
+#define TS_ARRAY_OFF(variable, index, offset, value) \
     if (variable##Check(index, value) && (m_##variable[index] != value)) \
     { \
         m_##variable[index - offset] = value; \
@@ -145,17 +145,17 @@
 #define SETTER(class, type, capital, variable) \
 void Sigmod::class::set##capital(const type variable) \
 { \
-    CHECK(variable); \
+    TS(variable); \
 }
 #define SETTER_ARRAY(class, type, capital, variable, valueName, indexType, indexName) \
 void Sigmod::class::set##capital(const indexType indexName, const type valueName) \
 { \
-    CHECK_ARRAY(variable, indexName, valueName); \
+    TS_ARRAY(variable, indexName, valueName); \
 }
 #define SETTER_ARRAY_OFF(class, type, capital, variable, valueName, indexType, indexName, offset) \
 void Sigmod::class::set##capital(const indexType indexName, const type valueName) \
 { \
-    CHECK_ARRAY_OFF(variable, indexName, offset, valueName); \
+    TS_ARRAY_OFF(variable, indexName, offset, valueName); \
 }
 
 #define GETTER(class, type, variable) \
@@ -187,7 +187,7 @@ bool Sigmod::class::variable##Check(const indexType indexName, const type valueN
 #define CHECK_END() \
     return true; \
 }
-#define CHECK_DEFAULT(class, type, variable) \
+#define CHECK(class, type, variable) \
 CHECK_BEGIN(class, type, variable) \
     Q_UNUSED(variable) \
 CHECK_END()
diff --git a/sigmod/Map.cpp b/sigmod/Map.cpp
index 0ab6e0ab..0f5ad1d9 100644
--- a/sigmod/Map.cpp
+++ b/sigmod/Map.cpp
@@ -157,7 +157,7 @@ GETTER(Map, Sigmod::Map::Type, type)
 GETTER(Map, int, width)
 GETTER(Map, int, height)
 
-CHECK_DEFAULT(Map, QString&, name)
+CHECK(Map, QString&, name)
 CHECK_BEGIN(Map, int, flyWarp)
     if ((flyWarp != -1) && !warpById(flyWarp))
     {
@@ -165,7 +165,7 @@ CHECK_BEGIN(Map, int, flyWarp)
         return false;
     }
 CHECK_END()
-CHECK_DEFAULT(Map, Type, type)
+CHECK(Map, Type, type)
 CHECK_BEGIN(Map, int, width)
     TBOUNDS(width, 1, INT_MAX)
 CHECK_END()
diff --git a/sigmod/MapEffect.cpp b/sigmod/MapEffect.cpp
index 7b992892..4a16bc06 100644
--- a/sigmod/MapEffect.cpp
+++ b/sigmod/MapEffect.cpp
@@ -57,8 +57,8 @@ void Sigmod::MapEffect::validate()
     TEST_BEGIN();
     if (m_name.isEmpty())
         emit(error("Name is empty"));
-    TEST(setCoordinate, coordinate);
-    TEST(setSkin, skin);
+    TEST(coordinate);
+    TEST(skin);
     TEST_END();
 }
 
diff --git a/sigmod/MapTile.cpp b/sigmod/MapTile.cpp
index d09f03db..9c1affa0 100644
--- a/sigmod/MapTile.cpp
+++ b/sigmod/MapTile.cpp
@@ -91,10 +91,10 @@ GETTER(MapTile, int, zIndex)
 CHECK_INDEX(MapTile, int, tile, sigmod(), tile)
 CHECK_BEGIN(MapTile, QPoint&, position)
     const Map* map = qobject_cast<const Map*>(parent());
-    TBOUNDS_MOD(position, 0, map->width(), position.x())
-    TBOUNDS_MOD(position, 0, map->height(), position.y())
+    TBOUNDS_MOD(position_x, 0, map->width(), position.x())
+    TBOUNDS_MOD(position_y, 0, map->height(), position.y())
 CHECK_END()
-CHECK_DEFAULT(MapTile, int, zIndex)
+CHECK(MapTile, int, zIndex)
 
 Sigmod::MapTile& Sigmod::MapTile::operator=(const MapTile& rhs)
 {