Removed DECLARE_TYPEOF2; replaced with double-parenthesized macro calls. (GCC doesn't accept the other way in all cases.. I don't know whether MSW accepts this way.) Fixed a few resource names.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@209 0fc631ac-6414-0410-93d0-97cfa31319b6

src/data/action/symbol.cpp

@@ -9,8 +9,8 @@
 #include <data/action/symbol.hpp>
 #include <data/action/symbol_part.hpp>
 
-DECLARE_TYPEOF_COLLECTION2(pair<SymbolPartP,SymbolPartCombine>);
-DECLARE_TYPEOF_COLLECTION2(pair<SymbolPartP,size_t           >);
+DECLARE_TYPEOF_COLLECTION((pair<SymbolPartP,SymbolPartCombine>));
+DECLARE_TYPEOF_COLLECTION((pair<SymbolPartP,size_t           >));
 DECLARE_TYPEOF_COLLECTION(SymbolPartP);
 DECLARE_TYPEOF_COLLECTION(ControlPointP);
 

src/data/card.cpp

@@ -13,7 +13,7 @@
 #include <util/reflect.hpp>
 
 DECLARE_TYPEOF_COLLECTION(FieldP);
-DECLARE_TYPEOF_NO_REV2(IndexMap<FieldP,ValueP>);
+DECLARE_TYPEOF_NO_REV((IndexMap<FieldP,ValueP>));
 
 // ----------------------------------------------------------------------------- : Card
 

src/data/field/choice.cpp

@@ -10,7 +10,7 @@
 #include <util/io/package.hpp>
 
 DECLARE_TYPEOF_COLLECTION(ChoiceField::ChoiceP);
-DECLARE_TYPEOF2(map<String,ScriptableImage>);
+DECLARE_TYPEOF((map<String,ScriptableImage>));
 
 // ----------------------------------------------------------------------------- : ChoiceField
 

src/data/format/image_to_symbol.cpp

@@ -99,7 +99,7 @@ bool is_mse1_symbol(const Image& img) {
 			int r = *d++;
 			int g = *d++;
 			int b = *d++;
-			delta += abs(r - b) + abs(r - g) + abs(b - g);
+			delta += fabs(r - b) + fabs(r - g) + fabs(b - g);
 		}
 	}
 	if (delta > 5000) return false; // not black & white enough
@@ -357,7 +357,7 @@ void straighten(SymbolPart& part) {
 		Vector2D bb = next.delta_before.normalized();
 		// if the area beneath the polygon formed by the handles is small
 		// then it is a straight line
-		double cpDot = abs(aa.cross(ab)) + abs(bb.cross(ab));
+		double cpDot = fabs(aa.cross(ab)) + fabs(bb.cross(ab));
 		if (cpDot < treshold) {
 			cur.segment_after = next.segment_before = SEGMENT_LINE;
 			cur.delta_after = next.delta_before = Vector2D();

src/data/keyword.cpp

@@ -10,7 +10,7 @@
 #include <util/tagged_string.hpp>
 
 class KeywordTrie;
-DECLARE_TYPEOF2(map<Char, KeywordTrie*>);
+DECLARE_TYPEOF((map<Char, KeywordTrie*>));
 
 // ----------------------------------------------------------------------------- : Reflection
 

src/data/set.cpp

@@ -19,7 +19,7 @@
 #include <wx/sstream.h>
 
 DECLARE_TYPEOF_COLLECTION(CardP);
-DECLARE_TYPEOF_NO_REV2(IndexMap<FieldP,ValueP>);
+DECLARE_TYPEOF_NO_REV((IndexMap<FieldP,ValueP>));
 
 // ----------------------------------------------------------------------------- : Set