Fix NagUtils and hack GroupView to work

CMakeLists.txt

@@ -408,8 +408,8 @@ SET(MULTIMC_SOURCES
 	logic/minecraft/VersionFilterData.cpp
 
 	# Annoying nag screen logic
-	logic/NagUtils.h
-	logic/NagUtils.cpp
+	gui/NagUtils.h
+	gui/NagUtils.cpp
 
 	# Player skin utilities
 	logic/SkinUtils.h

gui/MainWindow.cpp

@@ -382,7 +382,7 @@ namespace Ui {
 #include "logic/BaseProcess.h"
 #include "logic/OneSixUpdate.h"
 #include "logic/java/JavaUtils.h"
-#include "logic/NagUtils.h"
+#include "gui/NagUtils.h"
 #include "logic/SkinUtils.h"
 
 #include "logic/LegacyInstance.h"

gui/NagUtils.cpp

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "logic/NagUtils.h"
+#include "gui/NagUtils.h"
 #include "gui/dialogs/CustomMessageBox.h"
 
 namespace NagUtils

gui/pages/InstanceSettingsPage.cpp

@@ -6,7 +6,7 @@
 #include <QMessageBox>
 
 #include "gui/dialogs/VersionSelectDialog.h"
-#include "logic/NagUtils.h"
+#include "gui/NagUtils.h"
 #include "logic/java/JavaVersionList.h"
 #include "MultiMC.h"
 
@@ -148,7 +148,7 @@ void InstanceSettingsPage::loadSettings()
 	bool overrideJava = m_settings->get("OverrideJava").toBool();
 	bool overrideLocation = m_settings->get("OverrideJavaLocation").toBool() || overrideJava;
 	bool overrideArgs = m_settings->get("OverrideJavaArgs").toBool() || overrideJava;
-	
+
 	ui->javaSettingsGroupBox->setChecked(overrideLocation);
 	ui->javaPathTextBox->setText(m_settings->get("JavaPath").toString());
 

gui/pages/global/JavaPage.cpp

@@ -22,7 +22,7 @@
 
 #include <pathutils.h>
 
-#include "logic/NagUtils.h"
+#include "gui/NagUtils.h"
 
 #include "gui/Platform.h"
 #include "gui/dialogs/VersionSelectDialog.h"
@@ -39,11 +39,11 @@ JavaPage::JavaPage(QWidget *parent) : QWidget(parent), ui(new Ui::JavaPage)
 {
 	ui->setupUi(this);
 	ui->tabWidget->tabBar()->hide();
-	
+
 	auto resizer = new ColumnResizer(this);
 	resizer->addWidgetsFromLayout(ui->javaSettingsGroupBox->layout(), 0);
 	resizer->addWidgetsFromLayout(ui->customCommandsGroupBox->layout(), 0);
-	
+
 	loadSettings();
 }
 

gui/pages/global/MinecraftPage.cpp

@@ -26,7 +26,7 @@
 #include "gui/dialogs/VersionSelectDialog.h"
 #include "gui/dialogs/CustomMessageBox.h"
 
-#include "logic/NagUtils.h"
+#include "gui/NagUtils.h"
 
 #include "logic/java/JavaUtils.h"
 #include "logic/java/JavaVersionList.h"

gui/pages/global/MultiMCPage.cpp

@@ -28,7 +28,7 @@
 #include "gui/dialogs/CustomMessageBox.h"
 #include <gui/ColumnResizer.h>
 
-#include "logic/NagUtils.h"
+#include "gui/NagUtils.h"
 
 #include "logic/java/JavaUtils.h"
 #include "logic/java/JavaVersionList.h"

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

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