From 9d5818916af39b32f64e20381a4530efa6247e38 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Fri, 28 Jul 2023 16:09:43 +0200 Subject: [PATCH 1/9] fix(nix): enable clang-format Signed-off-by: Sefa Eyeoglu --- nix/dev.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nix/dev.nix b/nix/dev.nix index 635c6bb41..e42ac5b4a 100644 --- a/nix/dev.nix +++ b/nix/dev.nix @@ -19,8 +19,7 @@ nil.enable = true; clang-format = { - enable = - false; # As most of the codebase is **not** formatted, we don't want clang-format yet + enable = true; types_or = ["c" "c++"]; }; }; From a545f67a211173ae0649e7dda59e1e0fecb2e160 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sat, 29 Jul 2023 11:00:33 +0200 Subject: [PATCH 2/9] fix: take JavaCheckResult by const reference Signed-off-by: Sefa Eyeoglu --- launcher/JavaCommon.cpp | 6 +++--- launcher/JavaCommon.h | 6 +++--- launcher/java/JavaVersion.cpp | 2 +- launcher/java/JavaVersion.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/launcher/JavaCommon.cpp b/launcher/JavaCommon.cpp index e29e22709..30a7dbacc 100644 --- a/launcher/JavaCommon.cpp +++ b/launcher/JavaCommon.cpp @@ -68,7 +68,7 @@ bool JavaCommon::checkJVMArgs(QString jvmargs, QWidget *parent) return true; } -void JavaCommon::javaWasOk(QWidget *parent, JavaCheckResult result) +void JavaCommon::javaWasOk(QWidget *parent, const JavaCheckResult &result) { QString text; text += QObject::tr("Java test succeeded!
Platform reported: %1
Java version " @@ -83,7 +83,7 @@ void JavaCommon::javaWasOk(QWidget *parent, JavaCheckResult result) CustomMessageBox::selectable(parent, QObject::tr("Java test success"), text, QMessageBox::Information)->show(); } -void JavaCommon::javaArgsWereBad(QWidget *parent, JavaCheckResult result) +void JavaCommon::javaArgsWereBad(QWidget *parent, const JavaCheckResult &result) { auto htmlError = result.errorLog; QString text; @@ -93,7 +93,7 @@ void JavaCommon::javaArgsWereBad(QWidget *parent, JavaCheckResult result) CustomMessageBox::selectable(parent, QObject::tr("Java test failure"), text, QMessageBox::Warning)->show(); } -void JavaCommon::javaBinaryWasBad(QWidget *parent, JavaCheckResult result) +void JavaCommon::javaBinaryWasBad(QWidget *parent, const JavaCheckResult &result) { QString text; text += QObject::tr( diff --git a/launcher/JavaCommon.h b/launcher/JavaCommon.h index 59cb7a67d..2ba64c0cd 100644 --- a/launcher/JavaCommon.h +++ b/launcher/JavaCommon.h @@ -11,11 +11,11 @@ namespace JavaCommon bool checkJVMArgs(QString args, QWidget *parent); // Show a dialog saying that the Java binary was usable - void javaWasOk(QWidget *parent, JavaCheckResult result); + void javaWasOk(QWidget *parent, const JavaCheckResult &result); // Show a dialog saying that the Java binary was not usable because of bad options - void javaArgsWereBad(QWidget *parent, JavaCheckResult result); + void javaArgsWereBad(QWidget *parent, const JavaCheckResult &result); // Show a dialog saying that the Java binary was not usable - void javaBinaryWasBad(QWidget *parent, JavaCheckResult result); + void javaBinaryWasBad(QWidget *parent, const JavaCheckResult &result); // Show a dialog if we couldn't find Java Checker void javaCheckNotFound(QWidget *parent); diff --git a/launcher/java/JavaVersion.cpp b/launcher/java/JavaVersion.cpp index 0e4fc1d3c..7124e22fb 100644 --- a/launcher/java/JavaVersion.cpp +++ b/launcher/java/JavaVersion.cpp @@ -43,7 +43,7 @@ JavaVersion::JavaVersion(const QString &rhs) operator=(rhs); } -QString JavaVersion::toString() +QString JavaVersion::toString() const { return m_string; } diff --git a/launcher/java/JavaVersion.h b/launcher/java/JavaVersion.h index 9bbf06425..c051a794a 100644 --- a/launcher/java/JavaVersion.h +++ b/launcher/java/JavaVersion.h @@ -25,7 +25,7 @@ public: bool requiresPermGen(); - QString toString(); + QString toString() const; int major() { From 76df836378aa5dd90b0d039358d9927628d48878 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sat, 29 Jul 2023 11:02:10 +0200 Subject: [PATCH 3/9] fix: simplify switch statement Signed-off-by: Sefa Eyeoglu --- launcher/minecraft/PackProfile.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/launcher/minecraft/PackProfile.cpp b/launcher/minecraft/PackProfile.cpp index e8fd21572..7cdd47ae6 100644 --- a/launcher/minecraft/PackProfile.cpp +++ b/launcher/minecraft/PackProfile.cpp @@ -591,10 +591,7 @@ QVariant PackProfile::data(const QModelIndex &index, int role) const } case Qt::DecorationRole: { - switch(column) - { - case NameColumn: - { + if (column == NameColumn) { auto severity = patch->getProblemSeverity(); switch (severity) { @@ -606,11 +603,7 @@ QVariant PackProfile::data(const QModelIndex &index, int role) const return QVariant(); } } - default: - { - return QVariant(); - } - } + return QVariant(); } } return QVariant(); From c07a8573590f9d0daf82bebe053411e0b9e6ad9f Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sat, 29 Jul 2023 11:05:40 +0200 Subject: [PATCH 4/9] fix: remove irregular enum initialization Signed-off-by: Sefa Eyeoglu --- launcher/minecraft/World.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launcher/minecraft/World.h b/launcher/minecraft/World.h index 10328cce8..dc3733d5f 100644 --- a/launcher/minecraft/World.h +++ b/launcher/minecraft/World.h @@ -28,7 +28,7 @@ struct GameType { enum { Unknown = -1, - Survival = 0, + Survival, Creative, Adventure, Spectator From 9f66f6495ad1f91d7cdb1677431069f27bc24f58 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sat, 29 Jul 2023 11:10:16 +0200 Subject: [PATCH 5/9] fix: fix undisciplined multiple inheritance Signed-off-by: Sefa Eyeoglu --- launcher/InstancePageProvider.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/launcher/InstancePageProvider.h b/launcher/InstancePageProvider.h index b4b6e739d..d25cd330e 100644 --- a/launcher/InstancePageProvider.h +++ b/launcher/InstancePageProvider.h @@ -16,9 +16,8 @@ #include "ui/pages/instance/OtherLogsPage.h" #include "ui/pages/instance/WorldListPage.h" #include "ui/pages/instance/ServersPage.h" -#include "ui/pages/instance/GameOptionsPage.h" -class InstancePageProvider : public QObject, public BasePageProvider +class InstancePageProvider : protected QObject, public BasePageProvider { Q_OBJECT public: From 076c189948b89787b34a2a4aded7a9c88f580ee1 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sat, 29 Jul 2023 11:30:33 +0200 Subject: [PATCH 6/9] fix: format all languages using clang-format Signed-off-by: Sefa Eyeoglu --- .clang-format | 9 +++++---- nix/dev.nix | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.clang-format b/.clang-format index 51ca0e1c1..4f99858ad 100644 --- a/.clang-format +++ b/.clang-format @@ -1,16 +1,17 @@ --- -Language: Cpp -BasedOnStyle: Chromium +BasedOnStyle: Chromium IndentWidth: 4 +--- +Language: Cpp AlignConsecutiveMacros: false AlignConsecutiveAssignments: false AllowShortIfStatementsOnASingleLine: false BraceWrapping: - AfterFunction: true + AfterFunction: true SplitEmptyFunction: false SplitEmptyRecord: false SplitEmptyNamespace: false BreakBeforeBraces: Custom BreakConstructorInitializers: BeforeComma -ColumnLimit: 140 +ColumnLimit: 140 Cpp11BracedListStyle: false diff --git a/nix/dev.nix b/nix/dev.nix index e42ac5b4a..c39e15653 100644 --- a/nix/dev.nix +++ b/nix/dev.nix @@ -20,7 +20,7 @@ clang-format = { enable = true; - types_or = ["c" "c++"]; + types_or = ["c" "c++" "java" "json" "objective-c"]; }; }; }; From 71fb38c91f16ce46a7103d8a606de2e0aeb04395 Mon Sep 17 00:00:00 2001 From: TheKodeToad Date: Sat, 29 Jul 2023 13:01:09 +0100 Subject: [PATCH 7/9] Fix alignment properties Signed-off-by: TheKodeToad --- .clang-format | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.clang-format b/.clang-format index 4f99858ad..83cfeb86d 100644 --- a/.clang-format +++ b/.clang-format @@ -3,8 +3,8 @@ BasedOnStyle: Chromium IndentWidth: 4 --- Language: Cpp -AlignConsecutiveMacros: false -AlignConsecutiveAssignments: false +AlignConsecutiveMacros: None +AlignConsecutiveAssignments: None AllowShortIfStatementsOnASingleLine: false BraceWrapping: AfterFunction: true From f256b836f4ea88e253d3a54e10faa124bc5c04f9 Mon Sep 17 00:00:00 2001 From: TheKodeToad Date: Sat, 29 Jul 2023 13:16:21 +0100 Subject: [PATCH 8/9] Make more options generic Signed-off-by: TheKodeToad --- .clang-format | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.clang-format b/.clang-format index 83cfeb86d..114bcba50 100644 --- a/.clang-format +++ b/.clang-format @@ -1,11 +1,12 @@ --- BasedOnStyle: Chromium IndentWidth: 4 +AllowShortIfStatementsOnASingleLine: false +ColumnLimit: 140 --- Language: Cpp AlignConsecutiveMacros: None AlignConsecutiveAssignments: None -AllowShortIfStatementsOnASingleLine: false BraceWrapping: AfterFunction: true SplitEmptyFunction: false @@ -13,5 +14,4 @@ BraceWrapping: SplitEmptyNamespace: false BreakBeforeBraces: Custom BreakConstructorInitializers: BeforeComma -ColumnLimit: 140 Cpp11BracedListStyle: false From ce2ca1381519a2e261d7f76dffa874d559d979c2 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Mon, 31 Jul 2023 15:37:35 +0200 Subject: [PATCH 9/9] fix: add missing headers Signed-off-by: Sefa Eyeoglu --- launcher/ProblemProvider.h | 3 +++ launcher/ui/instanceview/AccessibleInstanceView.h | 1 + 2 files changed, 4 insertions(+) diff --git a/launcher/ProblemProvider.h b/launcher/ProblemProvider.h index cd4745fa1..2d3b43380 100644 --- a/launcher/ProblemProvider.h +++ b/launcher/ProblemProvider.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + enum class ProblemSeverity { None, diff --git a/launcher/ui/instanceview/AccessibleInstanceView.h b/launcher/ui/instanceview/AccessibleInstanceView.h index 9bfd17453..eb4222f50 100644 --- a/launcher/ui/instanceview/AccessibleInstanceView.h +++ b/launcher/ui/instanceview/AccessibleInstanceView.h @@ -1,6 +1,7 @@ #pragma once #include +#include class QAccessibleInterface; QAccessibleInterface *groupViewAccessibleFactory(const QString &classname, QObject *object);