aboutsummaryrefslogtreecommitdiff
path: root/gui/MainWindow.h
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-02-08 22:18:32 +0100
committerPetr Mrázek <peterix@gmail.com>2014-02-08 22:18:32 +0100
commitaf33b966848687048f0a9e409444bc1b1f7d12df (patch)
treec978a58fddbcf1e6566f309f67579264ffdd4168 /gui/MainWindow.h
parent53069205faf4063e838bab4beea5089d6ec2a0af (diff)
parentaa41b891f06a629099d108ab1f4df94d1bbc828c (diff)
downloadPrismLauncher-af33b966848687048f0a9e409444bc1b1f7d12df.tar.gz
PrismLauncher-af33b966848687048f0a9e409444bc1b1f7d12df.tar.bz2
PrismLauncher-af33b966848687048f0a9e409444bc1b1f7d12df.zip
Merge branch 'feature_groupview' into integration_derpstances_groupview
Diffstat (limited to 'gui/MainWindow.h')
-rw-r--r--gui/MainWindow.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/gui/MainWindow.h b/gui/MainWindow.h
index eeba2c26..4d9e165d 100644
--- a/gui/MainWindow.h
+++ b/gui/MainWindow.h
@@ -27,9 +27,6 @@
class QToolButton;
class LabeledToolButton;
class QLabel;
-class InstanceProxyModel;
-class KCategorizedView;
-class KCategoryDrawer;
class MinecraftProcess;
class ConsoleWindow;
@@ -185,8 +182,7 @@ protected:
private:
Ui::MainWindow *ui;
- KCategoryDrawer *drawer;
- KCategorizedView *view;
+ class GroupView *view;
InstanceProxyModel *proxymodel;
MinecraftProcess *proc;
ConsoleWindow *console;