diff options
Diffstat (limited to 'logic')
120 files changed, 611 insertions, 318 deletions
diff --git a/logic/BaseInstaller.cpp b/logic/BaseInstaller.cpp index b2cdefbc..d8e83bb2 100644 --- a/logic/BaseInstaller.cpp +++ b/logic/BaseInstaller.cpp @@ -15,8 +15,8 @@ #include <QFile> -#include "logic/BaseInstaller.h" -#include "logic/minecraft/OneSixInstance.h" +#include "BaseInstaller.h" +#include "minecraft/OneSixInstance.h" BaseInstaller::BaseInstaller() { diff --git a/logic/BaseInstance.cpp b/logic/BaseInstance.cpp index 902c9e7e..69bc7597 100644 --- a/logic/BaseInstance.cpp +++ b/logic/BaseInstance.cpp @@ -18,14 +18,14 @@ #include <QFileInfo> #include <QDir> -#include "logic/settings/INISettingsObject.h" -#include "logic/settings/Setting.h" -#include "logic/settings/OverrideSetting.h" +#include "settings/INISettingsObject.h" +#include "settings/Setting.h" +#include "settings/OverrideSetting.h" #include "pathutils.h" #include <cmdutils.h> -#include "logic/minecraft/MinecraftVersionList.h" -#include "logic/icons/IconList.h" +#include "minecraft/MinecraftVersionList.h" +#include "icons/IconList.h" BaseInstance::BaseInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir) : QObject() diff --git a/logic/BaseInstance.h b/logic/BaseInstance.h index 3a4fa4a6..6a8ba11c 100644 --- a/logic/BaseInstance.h +++ b/logic/BaseInstance.h @@ -19,11 +19,11 @@ #include <QDateTime> #include <QSet> -#include "logic/settings/SettingsObject.h" +#include "settings/SettingsObject.h" -#include "logic/settings/INIFile.h" -#include "logic/BaseVersionList.h" -#include "logic/auth/MojangAccount.h" +#include "settings/INIFile.h" +#include "BaseVersionList.h" +#include "auth/MojangAccount.h" class QDir; class Task; @@ -186,7 +186,7 @@ protected slots: protected: QString m_rootDir; QString m_group; - std::shared_ptr<SettingsObject> m_settings; + SettingsObjectPtr m_settings; InstanceFlags m_flags; bool m_isRunning = false; }; diff --git a/logic/BaseProcess.cpp b/logic/BaseProcess.cpp index b0509d46..749efe0a 100644 --- a/logic/BaseProcess.cpp +++ b/logic/BaseProcess.cpp @@ -14,7 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "logic/BaseProcess.h" + +#include "BaseProcess.h" #include <QDebug> #include <QDir> #include <QEventLoop> diff --git a/logic/BaseVersionList.cpp b/logic/BaseVersionList.cpp index fe8af278..7752b14c 100644 --- a/logic/BaseVersionList.cpp +++ b/logic/BaseVersionList.cpp @@ -13,8 +13,8 @@ * limitations under the License. */ -#include "logic/BaseVersionList.h" -#include "logic/BaseVersion.h" +#include "BaseVersionList.h" +#include "BaseVersion.h" BaseVersionList::BaseVersionList(QObject *parent) : QAbstractListModel(parent) { diff --git a/logic/BaseVersionList.h b/logic/BaseVersionList.h index f8737b32..584d6ca7 100644 --- a/logic/BaseVersionList.h +++ b/logic/BaseVersionList.h @@ -19,7 +19,7 @@ #include <QVariant> #include <QAbstractListModel> -#include "logic/BaseVersion.h" +#include "BaseVersion.h" class Task; diff --git a/logic/CMakeLists.txt b/logic/CMakeLists.txt new file mode 100644 index 00000000..cf55695d --- /dev/null +++ b/logic/CMakeLists.txt @@ -0,0 +1,258 @@ +project(MultiMC-Logic) + +SET(LOGIC_SOURCES + # LOGIC - Base classes and infrastructure + BaseInstaller.h + BaseInstaller.cpp + BaseVersionList.h + BaseVersionList.cpp + InstanceList.h + InstanceList.cpp + BaseVersion.h + BaseProcess.h + BaseProcess.cpp + BaseInstance.h + BaseInstance.cpp + MMCError.h + + # WARNING: globals live here + Env.h + Env.cpp + + # JSON parsing helpers + MMCJson.h + MMCJson.cpp + + # RW lock protected map + RWStorage.h + + # A variable that has an implicit default value and keeps track of changes + DefaultVariable.h + + # a smart pointer wrapper intended for safer use with Qt signal/slot mechanisms + QObjectPtr.h + + # network stuffs + net/NetAction.h + net/MD5EtagDownload.h + net/MD5EtagDownload.cpp + net/ByteArrayDownload.h + net/ByteArrayDownload.cpp + net/CacheDownload.h + net/CacheDownload.cpp + net/NetJob.h + net/NetJob.cpp |