summaryrefslogtreecommitdiffstats
path: root/logic
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-05-11 16:43:20 +0200
committerPetr Mrázek <peterix@gmail.com>2014-06-09 01:38:30 +0200
commite993adaf44ca3ef7f23cb26539ca741e58e8fac0 (patch)
treece14ff6f6df4783f4fb7b1666fdf84bcfec3177f /logic
parentad1f2c530cc4f402d65d46f644a181e1126ddbf5 (diff)
downloadMultiMC-e993adaf44ca3ef7f23cb26539ca741e58e8fac0.tar
MultiMC-e993adaf44ca3ef7f23cb26539ca741e58e8fac0.tar.gz
MultiMC-e993adaf44ca3ef7f23cb26539ca741e58e8fac0.tar.lz
MultiMC-e993adaf44ca3ef7f23cb26539ca741e58e8fac0.tar.xz
MultiMC-e993adaf44ca3ef7f23cb26539ca741e58e8fac0.zip
Disable window titles and isons again, windows build fixes
Diffstat (limited to 'logic')
-rw-r--r--logic/MMCJson.cpp1
-rw-r--r--logic/OneSixUpdate.cpp6
-rw-r--r--logic/minecraft/VersionFinal.cpp2
3 files changed, 5 insertions, 4 deletions
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;