Fixed some more compiler warnings

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

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);
 	}