summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJamie Mansfield <jmansfield@cadixdev.org>2020-10-13 21:15:00 +0100
committerJamie Mansfield <jmansfield@cadixdev.org>2020-11-13 16:38:18 +0000
commitedfea9894ea3f6d4d244de5ba5ce015c1ccd7f39 (patch)
treef7939bfa85f06bb2e23392508648cd45b447b45c
parentfd1a8f039ad28263e8e8dd1fc6848f9809084283 (diff)
downloadMultiMC-edfea9894ea3f6d4d244de5ba5ce015c1ccd7f39.tar
MultiMC-edfea9894ea3f6d4d244de5ba5ce015c1ccd7f39.tar.gz
MultiMC-edfea9894ea3f6d4d244de5ba5ce015c1ccd7f39.tar.lz
MultiMC-edfea9894ea3f6d4d244de5ba5ce015c1ccd7f39.tar.xz
MultiMC-edfea9894ea3f6d4d244de5ba5ce015c1ccd7f39.zip
NOISSUE Cleanup Technic support
-rw-r--r--api/logic/modplatform/technic/SingleZipPackInstallTask.cpp1
-rw-r--r--api/logic/modplatform/technic/SingleZipPackInstallTask.h6
-rw-r--r--api/logic/modplatform/technic/SolderPackInstallTask.cpp1
-rw-r--r--api/logic/modplatform/technic/SolderPackInstallTask.h2
-rw-r--r--api/logic/modplatform/technic/TechnicPackProcessor.cpp2
-rw-r--r--api/logic/modplatform/technic/TechnicPackProcessor.h2
-rw-r--r--application/pages/modplatform/technic/TechnicData.h1
-rw-r--r--application/pages/modplatform/technic/TechnicModel.cpp1
-rw-r--r--application/pages/modplatform/technic/TechnicPage.cpp1
9 files changed, 0 insertions, 17 deletions
diff --git a/api/logic/modplatform/technic/SingleZipPackInstallTask.cpp b/api/logic/modplatform/technic/SingleZipPackInstallTask.cpp
index ca0de008..7901db04 100644
--- a/api/logic/modplatform/technic/SingleZipPackInstallTask.cpp
+++ b/api/logic/modplatform/technic/SingleZipPackInstallTask.cpp
@@ -13,7 +13,6 @@
* limitations under the License.
*/
-
#include "SingleZipPackInstallTask.h"
#include "Env.h"
diff --git a/api/logic/modplatform/technic/SingleZipPackInstallTask.h b/api/logic/modplatform/technic/SingleZipPackInstallTask.h
index 929476bb..99534130 100644
--- a/api/logic/modplatform/technic/SingleZipPackInstallTask.h
+++ b/api/logic/modplatform/technic/SingleZipPackInstallTask.h
@@ -13,12 +13,8 @@
* limitations under the License.
*/
-
#pragma once
-#ifndef TECHNIC_SINGLEZIPPACKINSTALLTASK_H
-#define TECHNIC_SINGLEZIPPACKINSTALLTASK_H
-
#include "InstanceTask.h"
#include "net/NetJob.h"
#include "multimc_logic_export.h"
@@ -60,5 +56,3 @@ private:
};
} // namespace Technic
-
-#endif // TECHNIC_SINGLEZIPPACKINSTALLTASK_H
diff --git a/api/logic/modplatform/technic/SolderPackInstallTask.cpp b/api/logic/modplatform/technic/SolderPackInstallTask.cpp
index abdc0c0c..54ae6dff 100644
--- a/api/logic/modplatform/technic/SolderPackInstallTask.cpp
+++ b/api/logic/modplatform/technic/SolderPackInstallTask.cpp
@@ -13,7 +13,6 @@
* limitations under the License.
*/
-
#include "SolderPackInstallTask.h"
#include <FileSystem.h>
diff --git a/api/logic/modplatform/technic/SolderPackInstallTask.h b/api/logic/modplatform/technic/SolderPackInstallTask.h
index d3a1d0fd..c3e3f6d9 100644
--- a/api/logic/modplatform/technic/SolderPackInstallTask.h
+++ b/api/logic/modplatform/technic/SolderPackInstallTask.h
@@ -13,7 +13,6 @@
* limitations under the License.
*/
-
#pragma once
#include <InstanceTask.h>
@@ -22,7 +21,6 @@
#include <QUrl>
-
namespace Technic
{
class MULTIMC_LOGIC_EXPORT SolderPackInstallTask : public InstanceTask
diff --git a/api/logic/modplatform/technic/TechnicPackProcessor.cpp b/api/logic/modplatform/technic/TechnicPackProcessor.cpp
index f986a529..4a8191eb 100644
--- a/api/logic/modplatform/technic/TechnicPackProcessor.cpp
+++ b/api/logic/modplatform/technic/TechnicPackProcessor.cpp
@@ -13,7 +13,6 @@
* limitations under the License.
*/
-
#include "TechnicPackProcessor.h"
#include <FileSystem.h>
@@ -27,7 +26,6 @@
#include <memory>
-
void Technic::TechnicPackProcessor::run(SettingsObjectPtr globalSettings, const QString &instName, const QString &instIcon, const QString &stagingPath, const QString &minecraftVersion, const bool isSolder)
{
QString minecraftPath = FS::PathCombine(stagingPath, ".minecraft");
diff --git a/api/logic/modplatform/technic/TechnicPackProcessor.h b/api/logic/modplatform/technic/TechnicPackProcessor.h
index 49d046a5..f0edb17a 100644
--- a/api/logic/modplatform/technic/TechnicPackProcessor.h
+++ b/api/logic/modplatform/technic/TechnicPackProcessor.h
@@ -13,13 +13,11 @@
* limitations under the License.
*/
-
#pragma once
#include <QString>
#include "settings/SettingsObject.h"
-
namespace Technic
{
// not exporting it, only used in SingleZipPackInstallTask, InstanceImportTask and SolderPackInstallTask
diff --git a/application/pages/modplatform/technic/TechnicData.h b/application/pages/modplatform/technic/TechnicData.h
index 5c746619..e23cb7f6 100644
--- a/application/pages/modplatform/technic/TechnicData.h
+++ b/application/pages/modplatform/technic/TechnicData.h
@@ -18,7 +18,6 @@
#include <QList>
#include <QString>
-
namespace Technic {
struct Modpack {
QString slug;
diff --git a/application/pages/modplatform/technic/TechnicModel.cpp b/application/pages/modplatform/technic/TechnicModel.cpp
index bdc411c3..e1294554 100644
--- a/application/pages/modplatform/technic/TechnicModel.cpp
+++ b/application/pages/modplatform/technic/TechnicModel.cpp
@@ -20,7 +20,6 @@
#include <QIcon>
-
Technic::ListModel::ListModel(QObject *parent) : QAbstractListModel(parent)
{
}
diff --git a/application/pages/modplatform/technic/TechnicPage.cpp b/application/pages/modplatform/technic/TechnicPage.cpp
index 75efd3ed..584e9c27 100644
--- a/application/pages/modplatform/technic/TechnicPage.cpp
+++ b/application/pages/modplatform/technic/TechnicPage.cpp
@@ -13,7 +13,6 @@
* limitations under the License.
*/
-
#include "TechnicPage.h"
#include "ui_TechnicPage.h"