Fix NagUtils and hack GroupView to work
This commit is contained in:
parent
aa70ed2244
commit
382ae78a0b
@ -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
|
||||
|
@ -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"
|
||||
|
@ -13,7 +13,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include "logic/NagUtils.h"
|
||||
#include "gui/NagUtils.h"
|
||||
#include "gui/dialogs/CustomMessageBox.h"
|
||||
|
||||
namespace NagUtils
|
@ -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"
|
||||
|
||||
|
@ -22,7 +22,7 @@
|
||||
|
||||
#include <pathutils.h>
|
||||
|
||||
#include "logic/NagUtils.h"
|
||||
#include "gui/NagUtils.h"
|
||||
|
||||
#include "gui/Platform.h"
|
||||
#include "gui/dialogs/VersionSelectDialog.h"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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();
|
||||
}
|
||||
|
@ -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
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user