From e993adaf44ca3ef7f23cb26539ca741e58e8fac0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Sun, 11 May 2014 16:43:20 +0200
Subject: Disable window titles and isons again, windows build fixes

---
 depends/launcher/org/multimc/onesix/OneSixLauncher.java | 3 ++-
 logic/MMCJson.cpp                                       | 1 +
 logic/OneSixUpdate.cpp                                  | 6 +++---
 logic/minecraft/VersionFinal.cpp                        | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/depends/launcher/org/multimc/onesix/OneSixLauncher.java b/depends/launcher/org/multimc/onesix/OneSixLauncher.java
index 5bfe7e9a..b9eb4d66 100644
--- a/depends/launcher/org/multimc/onesix/OneSixLauncher.java
+++ b/depends/launcher/org/multimc/onesix/OneSixLauncher.java
@@ -218,6 +218,7 @@ public class OneSixLauncher implements Launcher
 			e.printStackTrace(System.err);
 			return -1;
 		}
+		/*
 		final java.nio.ByteBuffer[] icons = IconLoader.load("icon.png");
 		new Thread() {
 			public void run() {
@@ -263,7 +264,7 @@ public class OneSixLauncher implements Launcher
 			}
 		}
 		.start();
-		
+		*/
 		// init params for the main method to chomp on.
 		String[] paramsArray = mcparams.toArray(new String[mcparams.size()]);
 		try
diff --git a/logic/MMCJson.cpp b/logic/MMCJson.cpp
index f7b4b6b0..8de88b6b 100644
--- a/logic/MMCJson.cpp
+++ b/logic/MMCJson.cpp
@@ -1,5 +1,6 @@
 #include "MMCJson.h"
 #include <QString>
+#include <QStringList>
 #include <math.h>
 
 bool MMCJson::ensureBoolean(const QJsonValue val, const QString what)
diff --git a/logic/OneSixUpdate.cpp b/logic/OneSixUpdate.cpp
index 2a7bb5b6..4b37f9aa 100644
--- a/logic/OneSixUpdate.cpp
+++ b/logic/OneSixUpdate.cpp
@@ -298,8 +298,8 @@ void OneSixUpdate::jarlibFinished()
 
 		QString fullJarPath = entry->getFullPath();
 		QString fullStrippedJarPath = entryStripped->getFullPath();
-
-		if (entry->md5sum != jarHashOnEntry || !QFileInfo::exists(fullStrippedJarPath))
+		QFileInfo finfo(fullStrippedJarPath);
+		if (entry->md5sum != jarHashOnEntry || !finfo.exists())
 		{
 			stripJar(fullJarPath, fullStrippedJarPath);
 		}
@@ -500,4 +500,4 @@ void OneSixUpdate::fmllibsFailed()
 {
 	emitFailed("Game update failed: it was impossible to fetch the required FML libraries.");
 	return;
-}
\ No newline at end of file
+}
diff --git a/logic/minecraft/VersionFinal.cpp b/logic/minecraft/VersionFinal.cpp
index cc61da71..c834bebc 100644
--- a/logic/minecraft/VersionFinal.cpp
+++ b/logic/minecraft/VersionFinal.cpp
@@ -68,7 +68,7 @@ bool VersionFinal::preremove(VersionPatchPtr patch)
 	{
 		QString fullpath =PathCombine(m_instance->jarModsDir(), jarmod->name);
 		QFileInfo finfo (fullpath);
-		if(finfo.exists(fullpath))
+		if(finfo.exists())
 			ok &= QFile::remove(fullpath);
 	}
 	return ok;
-- 
cgit v1.2.3