summaryrefslogtreecommitdiffstats
path: root/main.cpp
diff options
context:
space:
mode:
authorAndrew <forkk@forkk.net>2013-02-26 16:47:39 -0600
committerAndrew <forkk@forkk.net>2013-02-26 16:47:39 -0600
commit36396f7c6aca9fcc61c8620e10c31ed2c8999ebd (patch)
treeb5ef84aa020df1018821d66afe69ef6a53aadece /main.cpp
parentbd64cda6726e088ebc860c3fc3ee220ed00121bd (diff)
downloadMultiMC-36396f7c6aca9fcc61c8620e10c31ed2c8999ebd.tar
MultiMC-36396f7c6aca9fcc61c8620e10c31ed2c8999ebd.tar.gz
MultiMC-36396f7c6aca9fcc61c8620e10c31ed2c8999ebd.tar.lz
MultiMC-36396f7c6aca9fcc61c8620e10c31ed2c8999ebd.tar.xz
MultiMC-36396f7c6aca9fcc61c8620e10c31ed2c8999ebd.zip
Massive re-organization.
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/main.cpp b/main.cpp
index 2969ca6f..465ee3c7 100644
--- a/main.cpp
+++ b/main.cpp
@@ -26,13 +26,13 @@
#include "gui/taskdialog.h"
#include "gui/consolewindow.h"
-#include "data/appsettings.h"
+#include "appsettings.h"
#include "instancelist.h"
-#include "data/loginresponse.h"
-#include "tasks/logintask.h"
-#include "data/minecraftprocess.h"
+#include "loginresponse.h"
+#include "logintask.h"
+#include "minecraftprocess.h"
-#include "data/plugin/pluginmanager.h"
+#include "pluginmanager.h"
#include "pathutils.h"
#include "cmdutils.h"
@@ -85,7 +85,7 @@ private slots:
{
// TODO: console
console = new ConsoleWindow();
- proc = new MinecraftProcess(instance, response.username(), response.sessionID(), console);
+ proc = new MinecraftProcess(instance, response.username(), response.sessionID());
//if (instance->getShowConsole())
console->show();
connect(proc, SIGNAL(ended()), SLOT(onTerminated()));