summaryrefslogtreecommitdiffstats
path: root/gui
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 /gui
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 'gui')
-rw-r--r--gui/mainwindow.cpp6
-rw-r--r--gui/mainwindow.h2
-rw-r--r--gui/settingsdialog.cpp2
-rw-r--r--gui/taskdialog.cpp2
4 files changed, 6 insertions, 6 deletions
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 447a6619..6866da28 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -41,10 +41,10 @@
#include "gui/aboutdialog.h"
#include "instancelist.h"
-#include "data/appsettings.h"
-#include "data/version.h"
+#include "appsettings.h"
+#include "version.h"
-#include "tasks/logintask.h"
+#include "logintask.h"
// Opens the given file in the default application.
// TODO: Move this somewhere.
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index a57b8db4..5ea575a6 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -19,7 +19,7 @@
#include <QMainWindow>
#include "instancelist.h"
-#include "data/loginresponse.h"
+#include "loginresponse.h"
namespace Ui
{
diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp
index 7c8eacd1..38844509 100644
--- a/gui/settingsdialog.cpp
+++ b/gui/settingsdialog.cpp
@@ -16,7 +16,7 @@
#include "settingsdialog.h"
#include "ui_settingsdialog.h"
-#include "data/appsettings.h"
+#include "appsettings.h"
#include <QFileDialog>
#include <QMessageBox>
diff --git a/gui/taskdialog.cpp b/gui/taskdialog.cpp
index a8738fe3..9b1ddf23 100644
--- a/gui/taskdialog.cpp
+++ b/gui/taskdialog.cpp
@@ -18,7 +18,7 @@
#include <QKeyEvent>
-#include "tasks/task.h"
+#include "task.h"
TaskDialog::TaskDialog(QWidget *parent) :
QDialog(parent),