Fixed some more compiler warnings

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

src/data/action/symbol.cpp

@@ -77,8 +77,8 @@ void SymbolPartMatrixAction::transform(const Vector2D& mx, const Vector2D& my) {
 
 SymbolPartRotateAction::SymbolPartRotateAction(const set<SymbolPartP>& parts, const Vector2D& center)
 	: SymbolPartMatrixAction(parts, center)
-	, constrain(false)
 	, angle(0)
+	, constrain(false)
 {}
 
 String SymbolPartRotateAction::getName(bool to_undo) const {
@@ -154,8 +154,8 @@ void SymbolPartShearAction::shearBy(const Vector2D& shear) {
 
 SymbolPartScaleAction::SymbolPartScaleAction(const set<SymbolPartP>& parts, int scaleX, int scaleY)
 	: parts(parts)
-	, constrain(false)
 	, scaleX(scaleX), scaleY(scaleY)
+	, constrain(false)
 {
 	// Find min and max coordinates
 	oldMin          =  Vector2D::infinity();

src/data/action/symbol_part.cpp

@@ -76,9 +76,9 @@ void ControlPointMoveAction::move (const Vector2D& deltaDelta) {
 
 HandleMoveAction::HandleMoveAction(const SelectedHandle& handle)
 	: handle(handle)
-	, constrain(false)
 	, old_handle(handle.getHandle())
 	, old_other (handle.getOther())
+	, constrain(false)
 {}
 
 String HandleMoveAction::getName(bool to_undo) const {
@@ -196,11 +196,11 @@ void CurveDragAction::move(const Vector2D& delta, double t) {
 // ----------------------------------------------------------------------------- : Add control point
 
 ControlPointAddAction::ControlPointAddAction(const SymbolPartP& part, UInt insert_after, double t)
-	: point1(part->getPoint(insert_after))
-	, point2(part->getPoint(insert_after + 1))
-	, part(part)
-	, insert_after(insert_after)
+	: part(part)
 	, new_point(new ControlPoint())
+	, insert_after(insert_after)
+	, point1(part->getPoint(insert_after))
+	, point2(part->getPoint(insert_after + 1))
 {
 	// calculate new point
 	if (point1.other.segment_after == SEGMENT_CURVE) {

src/data/action/value.cpp

@@ -19,7 +19,7 @@
 // ----------------------------------------------------------------------------- : ValueAction
 
 String ValueAction::getName(bool to_undo) const {
-	return String::Format(_ACTION_("change"), valueP->fieldP->name);
+	return format_string(_ACTION_("change"), valueP->fieldP->name);
 }
 
 // ----------------------------------------------------------------------------- : Simple
@@ -61,8 +61,10 @@ ValueAction* value_action(const SymbolValueP& value, const FileName&
 // ----------------------------------------------------------------------------- : Text
 
 TextValueAction::TextValueAction(const TextValueP& value, size_t start, size_t end, size_t new_end, const Defaultable<String>& new_value, const String& name)
-	: ValueAction(value), new_value(new_value), name(name)
+	: ValueAction(value)
 	, selection_start(start), selection_end(end), new_selection_end(new_end)
+	, new_value(new_value)
+	, name(name)
 {}
 
 String TextValueAction::getName(bool to_undo) const { return name; }

src/data/field.cpp

@@ -26,8 +26,8 @@ Field::Field()
 	, identifying      (false)
 	, card_list_column (100)
 	, card_list_width  (100)
-	, card_list_allow  (true)
 	, card_list_visible(false)
+	, card_list_allow  (true)
 	, card_list_align  (ALIGN_LEFT)
 	, tab_index        (0)
 {}
@@ -79,8 +79,8 @@ shared_ptr<Field> read_new<Field>(Reader& reader) {
 Style::Style(const FieldP& field)
 	: fieldP(field)
 	, z_index(0)
-	, left(0), width (0)
-	, top (0), height(0)
+	, left(0),  top(0)
+	, width(0), height(0)
 	, visible(true)
 {}
 

src/data/field/color.cpp

@@ -14,8 +14,8 @@ DECLARE_TYPEOF_COLLECTION(ColorField::ChoiceP);
 // ----------------------------------------------------------------------------- : ColorField
 
 ColorField::ColorField()
-	: default_name(_("Default"))
-	, allow_custom(true)
+	: allow_custom(true)
+	, default_name(_("Default"))
 {}
 
 IMPLEMENT_FIELD_TYPE(Color)

src/data/statistics.cpp

@@ -52,8 +52,8 @@ StatsCategory::StatsCategory(const StatsDimensionP& dim)
 	, name         (dim->name)
 	, description  (dim->description)
 	, icon_filename(dim->icon_filename)
-	, type(GRAPH_TYPE_BAR)
 	, dimensions(1, dim)
+	, type(GRAPH_TYPE_BAR)
 {}
 
 IMPLEMENT_REFLECTION_ENUM(GraphType) {

src/gui/util.cpp

@@ -114,7 +114,7 @@ wxIcon load_resource_icon(const String& name) {
 	#if defined(__WXMSW__)
 		return wxIcon(_("icon/") + name);
 	#else
-		return wxIcon(load_resource_image(_("icon/") + name));
+		return wxIcon(_("icon/") + name + _(".ico"), wxBITMAP_TYPE_ICO);
 	#endif
 }
 

src/main.cpp

@@ -41,7 +41,12 @@ IMPLEMENT_APP(MSE)
 
 bool MSE::OnInit() {
 	try {
-		SetAppName(_("Magic Set Editor"));
+		#ifdef __WXMSW__
+			SetAppName(_("Magic Set Editor"));
+		#else
+			// Platform friendly appname
+			SetAppName(_("magicseteditor"));
+		#endif
 		wxInitAllImageHandlers();
 		wxFileSystem::AddHandler(new wxInternetFSHandler); // needed for update checker
 		init_file_formats();

src/script/script_manager.hpp

@@ -28,7 +28,7 @@ DECLARE_POINTER_TYPE(Card);
 class SetScriptContext {
   public:
 	SetScriptContext(Set& set);
-	~SetScriptContext();
+	virtual ~SetScriptContext();
 	
 	/// Get a context to use for the set, for a given stylesheet
 	Context& getContext(const StyleSheetP&);

src/util/io/package.cpp

@@ -22,8 +22,8 @@ IMPLEMENT_DYNAMIC_ARG(Package*, writing_package,   nullptr);
 IMPLEMENT_DYNAMIC_ARG(Package*, clipboard_package, nullptr);
 
 Package::Package()
-	: zipStream (nullptr)
-	, fileStream(nullptr)
+	: fileStream(nullptr)
+	, zipStream (nullptr)
 {}
 
 Package::~Package() {
@@ -446,4 +446,4 @@ void Packaged::saveAs(const String& package) {
 void Packaged::validate(Version) {
 	// a default for the short name
 	if (short_name.empty()) short_name = name();
-}
+}

src/util/io/reader.cpp

@@ -14,19 +14,18 @@
 // ----------------------------------------------------------------------------- : Reader
 
 Reader::Reader(const InputStreamP& input, const String& filename)
-	: input(input), filename(filename), line_number(0)
-	, indent(0), expected_indent(0), just_opened(false)
-	, stream(*input)
+	: indent(0), expected_indent(0), just_opened(false)
+	, filename(filename), line_number(0)
+	, input(input), stream(*input)
 {
 	moveNext();
 	handleAppVersion();
 }
 
 Reader::Reader(const String& filename)
-	: input(packages.openFileFromPackage(filename))
+	: indent(0), expected_indent(0), just_opened(false)
 	, filename(filename), line_number(0)
-	, indent(0), expected_indent(0), just_opened(false)
-	, stream(*input)
+	, input(packages.openFileFromPackage(filename)), stream(*input)
 {
 	moveNext();
 	handleAppVersion();

src/util/io/writer.cpp

@@ -15,10 +15,8 @@
 // ----------------------------------------------------------------------------- : Writer
 
 Writer::Writer(const OutputStreamP& output)
-	: output(output)
-	, stream(*output)
-	, indentation(0)
-	, just_opened(false)
+	: indentation(0), just_opened(false)
+	, output(output), stream(*output)
 {
 	stream.WriteString(BYTE_ORDER_MARK);
 	handleAppVersion();
@@ -132,4 +130,4 @@ template <> void Writer::handle(const FileName& value) {
 			writing_package()->referenceFile(value);
 		}
 	}
-}
+}

src/util/platform.hpp

@@ -4,8 +4,8 @@
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
-#ifndef HEADER_UTIL_PREC
-#define HEADER_UTIL_PREC
+#ifndef HEADER_UTIL_PLATFORM
+#define HEADER_UTIL_PLATFORM
 
 /** @file util/platform.hpp
  *
@@ -23,7 +23,7 @@
 
 #ifdef __linux__
 	
-	inline void wxMkDir(const String& str) {
+	inline void wxMkDir(const String& dir) {
 		wxMkDir(wxConvLocal.cWX2MB(dir), 0777);
 	}