Reorganize logic code.

logic/BaseInstaller.cpp

@@ -13,15 +13,10 @@
  * limitations under the License.
  */
 
-#include "BaseInstaller.h"
-
 #include <QFile>
 
-#include "VersionFinal.h"
-#include "OneSixLibrary.h"
-#include "OneSixInstance.h"
-
-#include "cmdutils.h"
+#include "logic/BaseInstaller.h"
+#include "logic/OneSixInstance.h"
 
 BaseInstaller::BaseInstaller()
 {

logic/BaseInstance.cpp

@@ -27,7 +27,7 @@
 
 #include "pathutils.h"
 #include <cmdutils.h>
-#include "lists/MinecraftVersionList.h"
+#include "logic/minecraft/MinecraftVersionList.h"
 #include "logic/icons/IconList.h"
 
 BaseInstance::BaseInstance(BaseInstancePrivate *d_in, const QString &rootDir,

logic/BaseInstance.h

@@ -22,7 +22,7 @@
 #include <settingsobject.h>
 
 #include "inifile.h"
-#include "lists/BaseVersionList.h"
+#include "logic/BaseVersionList.h"
 #include "logic/auth/MojangAccount.h"
 
 class QDialog;

logic/BaseVersionList.cpp

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "logic/lists/BaseVersionList.h"
+#include "logic/BaseVersionList.h"
 #include "logic/BaseVersion.h"
 
 BaseVersionList::BaseVersionList(QObject *parent) : QAbstractListModel(parent)

logic/InstanceFactory.cpp

@@ -13,27 +13,26 @@
  * limitations under the License.
  */
 
-#include "InstanceFactory.h"
-
 #include <QDir>
 #include <QFileInfo>
-
-#include "BaseInstance.h"
-#include "LegacyInstance.h"
-#include "LegacyFTBInstance.h"
-#include "OneSixInstance.h"
-#include "OneSixFTBInstance.h"
-#include "OneSixInstance.h"
-#include "BaseVersion.h"
-#include "MinecraftVersion.h"
-
-#include "inifile.h"
+#include <inifile.h>
 #include <inisettingsobject.h>
 #include <setting.h>
 
-#include "pathutils.h"
+#include <pathutils.h>
 #include "logger/QsLog.h"
 
+#include "logic/InstanceFactory.h"
+
+#include "logic/BaseInstance.h"
+#include "logic/LegacyInstance.h"
+#include "logic/LegacyFTBInstance.h"
+#include "logic/OneSixInstance.h"
+#include "logic/OneSixFTBInstance.h"
+#include "logic/OneSixInstance.h"
+#include "logic/BaseVersion.h"
+#include "logic/minecraft/MinecraftVersion.h"
+
 InstanceFactory InstanceFactory::loader;
 
 InstanceFactory::InstanceFactory() : QObject(NULL)

logic/InstanceLauncher.cpp

@@ -22,7 +22,7 @@
 #include "gui/dialogs/ProgressDialog.h"
 
 #include "logic/MinecraftProcess.h"
-#include "logic/lists/InstanceList.h"
+#include "logic/InstanceList.h"
 
 InstanceLauncher::InstanceLauncher(QString instId) : QObject(), instId(instId)
 {

logic/InstanceList.cpp

@@ -27,13 +27,13 @@
 #include <pathutils.h>
 
 #include "MultiMC.h"
-#include "logic/lists/InstanceList.h"
+#include "logic/InstanceList.h"
 #include "logic/icons/IconList.h"
-#include "logic/lists/MinecraftVersionList.h"
+#include "logic/minecraft/MinecraftVersionList.h"
 #include "logic/BaseInstance.h"
 #include "logic/InstanceFactory.h"
 #include "logger/QsLog.h"
-#include <gui/groupview/GroupView.h>
+#include "gui/groupview/GroupView.h"
 
 const static int GROUP_FILE_FORMAT_VERSION = 1;
 

logic/LegacyUpdate.cpp

@@ -13,20 +13,24 @@
  * limitations under the License.
  */
 
-#include "LegacyUpdate.h"
-#include "lists/LwjglVersionList.h"
-#include "lists/MinecraftVersionList.h"
-#include "BaseInstance.h"
-#include "LegacyInstance.h"
-#include "MultiMC.h"
-#include "ModList.h"
+#include <QStringList>
+
 #include <pathutils.h>
 #include <quazip.h>
 #include <quazipfile.h>
 #include <JlCompress.h>
+
+#include "logic/LegacyUpdate.h"
+#include "logic/LwjglVersionList.h"
+#include "logic/minecraft/MinecraftVersionList.h"
+#include "logic/BaseInstance.h"
+#include "logic/LegacyInstance.h"
+#include "MultiMC.h"
+#include "logic/ModList.h"
+
 #include "logger/QsLog.h"
 #include "logic/net/URLConstants.h"
-#include <QStringList>
+
 
 LegacyUpdate::LegacyUpdate(BaseInstance *inst, QObject *parent) : Task(parent), m_inst(inst)
 {

logic/OneSixFTBInstance.cpp

@@ -1,12 +1,12 @@
 #include "OneSixFTBInstance.h"
 
-#include "VersionFinal.h"
-#include "OneSixLibrary.h"
+#include "logic/minecraft/VersionFinal.h"
+#include "logic/minecraft/OneSixLibrary.h"
+#include "logic/minecraft/OneSixVersionBuilder.h"
 #include "tasks/SequentialTask.h"
 #include "forge/ForgeInstaller.h"
 #include "forge/ForgeVersionList.h"
 #include "OneSixInstance_p.h"
-#include "OneSixVersionBuilder.h"
 #include "MultiMC.h"
 #include "pathutils.h"
 

logic/OneSixInstance.cpp

@@ -13,21 +13,22 @@
  * limitations under the License.
  */
 
-#include "OneSixInstance.h"
-
 #include <QIcon>
-
-#include "OneSixInstance_p.h"
-#include "OneSixUpdate.h"
-#include "VersionFinal.h"
-#include "pathutils.h"
+#include <pathutils.h>
 #include "logger/QsLog.h"
-#include "assets/AssetsUtils.h"
 #include "MultiMC.h"
+#include "MMCError.h"
+
+#include "logic/OneSixInstance.h"
+
+#include "logic/OneSixInstance_p.h"
+#include "logic/OneSixUpdate.h"
+#include "logic/minecraft/VersionFinal.h"
+
+#include "logic/assets/AssetsUtils.h"
 #include "icons/IconList.h"
-#include "MinecraftProcess.h"
+#include "logic/MinecraftProcess.h"
 #include "gui/dialogs/InstanceEditDialog.h"
-#include <MMCError.h>
 
 OneSixInstance::OneSixInstance(const QString &rootDir, SettingsObject *settings,
 							   QObject *parent)

logic/OneSixInstance.h

@@ -17,8 +17,8 @@
 
 #include "BaseInstance.h"
 
-#include "VersionFinal.h"
-#include "ModList.h"
+#include "logic/minecraft/VersionFinal.h"
+#include "logic/ModList.h"
 
 class OneSixInstance : public BaseInstance
 {

logic/OneSixInstance_p.h

@@ -15,9 +15,10 @@
 
 #pragma once
 
-#include "BaseInstance_p.h"
-#include "VersionFinal.h"
-#include "ModList.h"
+#include "logic/BaseInstance_p.h"
+
+class ModList;
+class VersionFinal;
 
 class OneSixInstancePrivate : public BaseInstancePrivate
 {

logic/OneSixUpdate.cpp

@@ -22,19 +22,18 @@
 #include <QFileInfo>
 #include <QTextStream>
 #include <QDataStream>
-
-#include "BaseInstance.h"
-#include "lists/MinecraftVersionList.h"
-#include "VersionFinal.h"
-#include "OneSixLibrary.h"
-#include "OneSixInstance.h"
-#include "logic/forge/ForgeMirrors.h"
-#include "net/URLConstants.h"
-#include "assets/AssetsUtils.h"
-
-#include "pathutils.h"
+#include <pathutils.h>
 #include <JlCompress.h>
 
+#include "logic/BaseInstance.h"
+#include "logic/minecraft/MinecraftVersionList.h"
+#include "logic/minecraft/VersionFinal.h"
+#include "logic/minecraft/OneSixLibrary.h"
+#include "logic/OneSixInstance.h"
+#include "logic/forge/ForgeMirrors.h"
+#include "logic/net/URLConstants.h"
+#include "logic/assets/AssetsUtils.h"
+
 OneSixUpdate::OneSixUpdate(OneSixInstance *inst, QObject *parent)
 	: Task(parent), m_inst(inst)
 {

logic/forge/ForgeInstaller.cpp

@@ -14,8 +14,8 @@
  */
 
 #include "ForgeInstaller.h"
-#include "logic/VersionFinal.h"
-#include "logic/OneSixLibrary.h"
+#include "logic/minecraft/VersionFinal.h"
+#include "logic/minecraft/OneSixLibrary.h"
 #include "logic/net/HttpMetaCache.h"
 #include "logic/tasks/Task.h"
 #include "logic/OneSixInstance.h"

logic/forge/ForgeVersionList.h

@@ -20,7 +20,7 @@
 #include <QUrl>
 #include <QNetworkReply>
 
-#include "logic/lists/BaseVersionList.h"
+#include "logic/BaseVersionList.h"
 #include "logic/tasks/Task.h"
 #include "logic/net/NetJob.h"
 #include "logic/forge/ForgeVersion.h"

logic/java/JavaUtils.cpp

@@ -16,7 +16,6 @@
 #include <QStringList>
 #include <QString>
 #include <QDir>
-#include <QMessageBox>
 #include <QStringList>
 
 #include <setting.h>
@@ -24,11 +23,10 @@
 
 #include "MultiMC.h"
 
-#include "JavaUtils.h"
 #include "logger/QsLog.h"
-#include "gui/dialogs/VersionSelectDialog.h"
-#include "JavaCheckerJob.h"
-#include "lists/JavaVersionList.h"
+#include "logic/java/JavaUtils.h"
+#include "logic/java/JavaCheckerJob.h"
+#include "logic/java/JavaVersionList.h"
 
 JavaUtils::JavaUtils()
 {

logic/java/JavaUtils.h

@@ -21,7 +21,7 @@
 #include <osutils.h>
 #include "JavaCheckerJob.h"
 #include "JavaChecker.h"
-#include "lists/JavaVersionList.h"
+#include "JavaVersionList.h"
 
 #if WINDOWS
 #include <windows.h>

logic/java/JavaVersionList.cpp

@@ -13,16 +13,16 @@
  * limitations under the License.
  */
 
-#include "JavaVersionList.h"
-#include "MultiMC.h"
-
 #include <QtNetwork>
 #include <QtXml>
 #include <QRegExp>
 
+#include "MultiMC.h"
 #include "logger/QsLog.h"
-#include "logic/JavaCheckerJob.h"
-#include "logic/JavaUtils.h"
+
+#include "logic/java/JavaVersionList.h"
+#include "logic/java/JavaCheckerJob.h"
+#include "logic/java/JavaUtils.h"
 
 JavaVersionList::JavaVersionList(QObject *parent) : BaseVersionList(parent)
 {

logic/java/JavaVersionList.h

@@ -18,9 +18,9 @@
 #include <QObject>
 #include <QAbstractListModel>
 
-#include "BaseVersionList.h"
+#include "logic/BaseVersionList.h"
 #include "logic/tasks/Task.h"
-#include "logic/JavaCheckerJob.h"
+#include "logic/java/JavaCheckerJob.h"
 
 class JavaListLoadTask;
 

logic/liteloader/LiteLoaderInstaller.cpp

@@ -20,8 +20,8 @@
 
 #include "logger/QsLog.h"
 
-#include "logic/VersionFinal.h"
-#include "logic/OneSixLibrary.h"
+#include "logic/minecraft/VersionFinal.h"
+#include "logic/minecraft/OneSixLibrary.h"
 #include "logic/OneSixInstance.h"
 #include "MultiMC.h"
 #include "logic/liteloader/LiteLoaderVersionList.h"

logic/liteloader/LiteLoaderVersionList.h

@@ -19,9 +19,9 @@
 
 #include <QString>
 #include <QStringList>
-#include "logic/lists/BaseVersionList.h"
-#include "logic/tasks/Task.h"
 #include "logic/BaseVersion.h"
+#include "logic/BaseVersionList.h"
+#include "logic/tasks/Task.h"
 #include "logic/net/NetJob.h"
 
 class LLListLoadTask;

logic/minecraft/MinecraftVersion.h

@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "BaseVersion.h"
+#include "logic/BaseVersion.h"
 #include <QStringList>
 #include <QSet>
 

logic/minecraft/MinecraftVersionList.h

@@ -19,9 +19,9 @@
 #include <QList>
 #include <QSet>
 
-#include "BaseVersionList.h"
+#include "logic/BaseVersionList.h"
 #include "logic/tasks/Task.h"
-#include "logic/MinecraftVersion.h"
+#include "logic/minecraft/MinecraftVersion.h"
 
 class MCVListLoadTask;
 class QNetworkReply;

logic/minecraft/OneSixLibrary.h

@@ -23,7 +23,7 @@
 #include <memory>
 
 #include "logic/net/URLConstants.h"
-#include "OpSys.h"
+#include "logic/minecraft/OpSys.h"
 
 class Rule;
 

logic/minecraft/OneSixRule.h

@@ -17,7 +17,7 @@
 
 #include <QString>
 
-#include "logic/OneSixLibrary.h"
+#include "logic/minecraft/OneSixLibrary.h"
 
 enum RuleAction
 {

logic/minecraft/OneSixVersionBuilder.cpp

@@ -13,8 +13,6 @@
  * limitations under the License.
  */
 
-#include "OneSixVersionBuilder.h"
-
 #include <QList>
 #include <QJsonObject>
 #include <QJsonArray>
@@ -25,13 +23,16 @@
 #include <QObject>
 #include <QDir>
 #include <QDebug>
+#include <modutils.h>
+
+#include "logic/minecraft/OneSixVersionBuilder.h"
+#include "logic/minecraft/VersionFinal.h"
+#include "logic/minecraft/OneSixRule.h"
+#include "logic/minecraft/VersionFile.h"
+
+#include "logic/OneSixInstance.h"
+#include "logic/MMCJson.h"
 
-#include "VersionFinal.h"
-#include "OneSixInstance.h"
-#include "OneSixRule.h"
-#include "VersionFile.h"
-#include "MMCJson.h"
-#include "modutils.h"
 #include "logger/QsLog.h"
 
 OneSixVersionBuilder::OneSixVersionBuilder()

logic/minecraft/VersionFile.cpp

@@ -1,13 +1,13 @@
 #include <QJsonArray>
 #include <QJsonDocument>
-
 #include <modutils.h>
 
 #include "logger/QsLog.h"
-#include "logic/VersionFile.h"
-#include "logic/OneSixLibrary.h"
-#include "logic/VersionFinal.h"
-#include "MMCJson.h"
+
+#include "logic/minecraft/VersionFile.h"
+#include "logic/minecraft/OneSixLibrary.h"
+#include "logic/minecraft/VersionFinal.h"
+#include "logic/MMCJson.h"
 
 using namespace MMCJson;
 

logic/minecraft/VersionFile.h

@@ -3,8 +3,8 @@
 #include <QString>
 #include <QStringList>
 #include <memory>
-#include "logic/OpSys.h"
-#include "logic/OneSixRule.h"
+#include "logic/minecraft/OpSys.h"
+#include "logic/minecraft/OneSixRule.h"
 #include "MMCError.h"
 
 class VersionFinal;

logic/minecraft/VersionFinal.cpp

@@ -13,17 +13,15 @@
  * limitations under the License.
  */
 
-#include "VersionFinal.h"
-
 #include <QDebug>
 #include <QFile>
 #include <QDir>
-
-#include "OneSixVersionBuilder.h"
-#include "OneSixInstance.h"
-#include "VersionFilterData.h"
 #include <pathutils.h>
 
+#include "logic/minecraft/VersionFinal.h"
+#include "logic/minecraft/OneSixVersionBuilder.h"
+#include "logic/OneSixInstance.h"
+
 VersionFinal::VersionFinal(OneSixInstance *instance, QObject *parent)
 	: QAbstractListModel(parent), m_instance(instance)
 {