aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRachel Powers <508861+Ryex@users.noreply.github.com>2023-05-15 16:40:56 -0700
committerRachel Powers <508861+Ryex@users.noreply.github.com>2023-05-15 16:40:56 -0700
commit649753e97e4609deee09a1c8beeba3027d66e4d0 (patch)
tree686371d6d0e9acc446ce835fb99bb000fe456294
parentfc656b6927914d64077e23690859996447908c57 (diff)
downloadPrismLauncher-649753e97e4609deee09a1c8beeba3027d66e4d0.tar.gz
PrismLauncher-649753e97e4609deee09a1c8beeba3027d66e4d0.tar.bz2
PrismLauncher-649753e97e4609deee09a1c8beeba3027d66e4d0.zip
cleanup: remove unneeded headers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
-rw-r--r--launcher/minecraft/mod/tasks/LocalResourceParse.cpp2
-rw-r--r--launcher/ui/MainWindow.cpp1
-rw-r--r--launcher/ui/dialogs/NewInstanceDialog.h58
-rw-r--r--launcher/ui/pages/modplatform/ImportPage.cpp3
4 files changed, 30 insertions, 34 deletions
diff --git a/launcher/minecraft/mod/tasks/LocalResourceParse.cpp b/launcher/minecraft/mod/tasks/LocalResourceParse.cpp
index ef052afc..fa7d7f4a 100644
--- a/launcher/minecraft/mod/tasks/LocalResourceParse.cpp
+++ b/launcher/minecraft/mod/tasks/LocalResourceParse.cpp
@@ -44,7 +44,7 @@ static const QMap<PackedResourceType, QString> s_packed_type_names = {
namespace ResourceUtils {
PackedResourceType identify(QFileInfo file){
if (file.exists() && file.isFile()) {
- if (ModUtils::validate(file)) {
+ if (ModUtils::validate(file)) { // Mods can also contain resource and data packs
qDebug() << file.fileName() << "is a mod";
return PackedResourceType::Mod;
} else if (ResourcePackUtils::validate(file)) {
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 7e46cc41..31a75e5b 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -86,7 +86,6 @@
#include <net/NetJob.h>
#include <net/Download.h>
#include <news/NewsChecker.h>
-#include <qurl.h>
#include <tools/BaseProfiler.h>
#include <updater/ExternalUpdater.h>
#include <DesktopServices.h>
diff --git a/launcher/ui/dialogs/NewInstanceDialog.h b/launcher/ui/dialogs/NewInstanceDialog.h
index 368ad0df..6a6ad89e 100644
--- a/launcher/ui/dialogs/NewInstanceDialog.h
+++ b/launcher/ui/dialogs/NewInstanceDialog.h
@@ -37,11 +37,10 @@
#include <QDialog>
-#include "ui/pages/BasePageProvider.h"
#include "InstanceTask.h"
+#include "ui/pages/BasePageProvider.h"
-namespace Ui
-{
+namespace Ui {
class NewInstanceDialog;
}
@@ -50,48 +49,47 @@ class QDialogButtonBox;
class ImportPage;
class FlamePage;
-class NewInstanceDialog : public QDialog, public BasePageProvider
-{
+class NewInstanceDialog : public QDialog, public BasePageProvider {
Q_OBJECT
-public:
- explicit NewInstanceDialog(const QString& initialGroup,
- const QString& url = QString(),
- const QMap<QString, QString>& extra_info = {},
- QWidget* parent = 0);
- ~NewInstanceDialog();
+ public:
+ explicit NewInstanceDialog(const QString& initialGroup,
+ const QString& url = QString(),
+ const QMap<QString, QString>& extra_info = {},
+ QWidget* parent = 0);
+ ~NewInstanceDialog();
- void updateDialogState();
+ void updateDialogState();
- void setSuggestedPack(const QString& name = QString(), InstanceTask* task = nullptr);
- void setSuggestedPack(const QString& name, QString version, InstanceTask* task = nullptr);
- void setSuggestedIconFromFile(const QString& path, const QString& name);
- void setSuggestedIcon(const QString& key);
+ void setSuggestedPack(const QString& name = QString(), InstanceTask* task = nullptr);
+ void setSuggestedPack(const QString& name, QString version, InstanceTask* task = nullptr);
+ void setSuggestedIconFromFile(const QString& path, const QString& name);
+ void setSuggestedIcon(const QString& key);
- InstanceTask* extractTask();
+ InstanceTask* extractTask();
- QString dialogTitle() override;
- QList<BasePage*> getPages() override;
+ QString dialogTitle() override;
+ QList<BasePage*> getPages() override;
- QString instName() const;
- QString instGroup() const;
- QString iconKey() const;
+ QString instName() const;
+ QString instGroup() const;
+ QString iconKey() const;
-public slots:
+ public slots:
void accept() override;
void reject() override;
-private slots:
+ private slots:
void on_iconButton_clicked();
- void on_instNameTextBox_textChanged(const QString &arg1);
+ void on_instNameTextBox_textChanged(const QString& arg1);
-private:
- Ui::NewInstanceDialog *ui = nullptr;
- PageContainer * m_container = nullptr;
- QDialogButtonBox * m_buttons = nullptr;
+ private:
+ Ui::NewInstanceDialog* ui = nullptr;
+ PageContainer* m_container = nullptr;
+ QDialogButtonBox* m_buttons = nullptr;
QString InstIconKey;
- ImportPage *importPage = nullptr;
+ ImportPage* importPage = nullptr;
std::unique_ptr<InstanceTask> creationTask;
bool importIcon = false;
diff --git a/launcher/ui/pages/modplatform/ImportPage.cpp b/launcher/ui/pages/modplatform/ImportPage.cpp
index 038b2a84..1e540cf2 100644
--- a/launcher/ui/pages/modplatform/ImportPage.cpp
+++ b/launcher/ui/pages/modplatform/ImportPage.cpp
@@ -35,8 +35,7 @@
*/
#include "ImportPage.h"
-#include <qdebug.h>
-#include <qmap.h>
+
#include "ui/dialogs/ProgressDialog.h"
#include "ui_ImportPage.h"