summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--api/logic/java/JavaUtils.cpp2
-rw-r--r--api/logic/meta/JsonFormat.cpp2
-rw-r--r--application/pages/global/ExternalToolsPage.cpp1
3 files changed, 1 insertions, 4 deletions
diff --git a/api/logic/java/JavaUtils.cpp b/api/logic/java/JavaUtils.cpp
index deea5953..0c2e72d7 100644
--- a/api/logic/java/JavaUtils.cpp
+++ b/api/logic/java/JavaUtils.cpp
@@ -94,7 +94,7 @@ QList<JavaInstallPtr> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QString
// Iterate until RegEnumKeyEx fails
if (numSubKeys > 0)
{
- for (int i = 0; i < numSubKeys; i++)
+ for (DWORD i = 0; i < numSubKeys; i++)
{
subKeyNameSize = 255;
retCode = RegEnumKeyEx(jreKey, i, subKeyName, &subKeyNameSize, NULL, NULL, NULL,
diff --git a/api/logic/meta/JsonFormat.cpp b/api/logic/meta/JsonFormat.cpp
index fda1cf97..fb78941f 100644
--- a/api/logic/meta/JsonFormat.cpp
+++ b/api/logic/meta/JsonFormat.cpp
@@ -28,8 +28,6 @@ using namespace Json;
namespace Meta
{
-static const int currentFormatVersion = 0;
-
// Index
static BaseEntity::Ptr parseIndexInternal(const QJsonObject &obj)
{
diff --git a/application/pages/global/ExternalToolsPage.cpp b/application/pages/global/ExternalToolsPage.cpp
index 71de159a..b446fc06 100644
--- a/application/pages/global/ExternalToolsPage.cpp
+++ b/application/pages/global/ExternalToolsPage.cpp
@@ -161,7 +161,6 @@ void ExternalToolsPage::on_mceditPathBtn_clicked()
do
{
#ifdef Q_OS_OSX
-#warning stuff
raw_dir = QFileDialog::getOpenFileName(this, tr("MCEdit Application"), raw_dir);
#else
raw_dir = QFileDialog::getExistingDirectory(this, tr("MCEdit Folder"), raw_dir);