Fix NagUtils and hack GroupView to work

4 files changed, 3 insertions, 65 deletions

diff --git a/logic/InstanceList.cpp b/logic/InstanceList.cpp
index b6ac38a8..4e275254 100644
--- a/logic/InstanceList.cpp
+++ b/logic/InstanceList.cpp
@@ -36,7 +36,6 @@
 #include "OneSixInstance.h"
 #include "LegacyInstance.h"
 #include "logger/QsLog.h"
-#include "gui/groupview/GroupView.h"
 
 const static int GROUP_FILE_FORMAT_VERSION = 1;
 
@@ -99,8 +98,8 @@ QVariant InstanceList::data(const QModelIndex &index, int role) const
 		QString key = pdata->iconKey();
 		return ENV.icons()->getIcon(key);
 	}
-	// for now.
-	case GroupViewRoles::GroupRole:
+	// HACK: see GroupView.h in gui!
+	case GroupRole:
 	{
 		return pdata->group();
 	}
diff --git a/logic/InstanceList.h b/logic/InstanceList.h
index ac3dc848..9600ffe9 100644
--- a/logic/InstanceList.h
+++ b/logic/InstanceList.h
@@ -18,7 +18,6 @@
 #include <QObject>
 #include <QAbstractListModel>
 #include <QSet>
-#include <gui/groupview/GroupedProxyModel.h>
 
 #include "logic/BaseInstance.h"
 
@@ -47,6 +46,7 @@ public:
 
 	enum AdditionalRoles
 	{
+		GroupRole = Qt::UserRole,
 		InstancePointerRole = 0x34B1CB48, ///< Return pointer to real instance
 		InstanceIDRole = 0x34B1CB49 ///< Return id if the instance
 	};
diff --git a/logic/NagUtils.cpp b/logic/NagUtils.cpp
deleted file mode 100644
index c55e7817..00000000
--- a/logic/NagUtils.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "logic/NagUtils.h"
-#include "gui/dialogs/CustomMessageBox.h"
-
-namespace NagUtils
-{
-void checkJVMArgs(QString jvmargs, QWidget *parent)
-{
-	if (jvmargs.contains("-XX:PermSize=") || jvmargs.contains(QRegExp("-Xm[sx]")))
-	{
-		CustomMessageBox::selectable(
-			parent, QObject::tr("JVM arguments warning"),
-			QObject::tr("You tried to manually set a JVM memory option (using "
-						" \"-XX:PermSize\", \"-Xmx\" or \"-Xms\") - there"
-						" are dedicated boxes for these in the settings (Java"
-						" tab, in the Memory group at the top).\n"
-						"Your manual settings will be overridden by the"
-						" dedicated options.\n"
-						"This message will be displayed until you remove them"
-						" from the JVM arguments."),
-			QMessageBox::Warning)->exec();
-	}
-}
-}
diff --git a/logic/NagUtils.h b/logic/NagUtils.h
deleted file mode 100644
index d757703a..00000000
--- a/logic/NagUtils.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2013-2015 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QWidget>
-
-namespace NagUtils
-{
-void checkJVMArgs(QString args, QWidget *parent);
-}