summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-08-04 12:21:51 +0200
committerPetr Mrázek <peterix@gmail.com>2013-08-04 12:21:51 +0200
commit935ad6b02c47a74d94dc5afd5ca2795cbd9f7c75 (patch)
tree5e53702d007fde3cefc2e9c68e4f3abf29a79d1d /gui
parent0adf1828b047699b9d15e2abf08a1ae0b89da73b (diff)
downloadMultiMC-935ad6b02c47a74d94dc5afd5ca2795cbd9f7c75.tar
MultiMC-935ad6b02c47a74d94dc5afd5ca2795cbd9f7c75.tar.gz
MultiMC-935ad6b02c47a74d94dc5afd5ca2795cbd9f7c75.tar.lz
MultiMC-935ad6b02c47a74d94dc5afd5ca2795cbd9f7c75.tar.xz
MultiMC-935ad6b02c47a74d94dc5afd5ca2795cbd9f7c75.zip
Fix KDE includes problem
Diffstat (limited to 'gui')
-rw-r--r--gui/instancemodel.h2
-rw-r--r--gui/mainwindow.cpp17
2 files changed, 4 insertions, 15 deletions
diff --git a/gui/instancemodel.h b/gui/instancemodel.h
index 3938da45..fe05744f 100644
--- a/gui/instancemodel.h
+++ b/gui/instancemodel.h
@@ -1,7 +1,7 @@
#pragma once
#include <QAbstractListModel>
-#include "kcategorizedsortfilterproxymodel.h"
+#include "categorizedsortfilterproxymodel.h"
#include "lists/InstanceList.h"
#include <QIcon>
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index c4e8dc03..d3dee254 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -45,8 +45,8 @@
#include "gui/legacymodeditdialog.h"
#include "gui/instancesettings.h"
-#include "kcategorizedview.h"
-#include "kcategorydrawer.h"
+#include "categorizedview.h"
+#include "categorydrawer.h"
#include "lists/InstanceList.h"
#include "AppSettings.h"
@@ -84,12 +84,6 @@ MainWindow::MainWindow ( QWidget *parent ) :
// Create the widget
view = new KCategorizedView ( ui->centralWidget );
drawer = new KCategoryDrawer ( view );
- /*
- QPalette pal = view->palette();
- pal.setBrush(QPalette::Base, QBrush(QPixmap(QString::fromUtf8(":/backgrounds/kitteh"))));
- view->setPalette(pal);
- */
-
view->setStyleSheet(
"QListView\
{\
@@ -137,13 +131,8 @@ MainWindow::MainWindow ( QWidget *parent ) :
connect(view, SIGNAL(clicked(const QModelIndex &)),
this, SLOT(instanceChanged(const QModelIndex &)));
- // Load the instances.
+ // Load the instances. FIXME: this is not the place I'd say.
instList.loadList();
- // just a test
- /*
- instList.at(0)->setGroup("TEST GROUP");
- instList.at(0)->setName("TEST ITEM");
- */
//FIXME: WTF
if (!MinecraftVersionList::getMainList().isLoaded())