Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reformat codebase #1459

Merged
merged 11 commits into from
Aug 4, 2023
Merged

Reformat codebase #1459

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9d58189
fix(nix): enable clang-format
Scrumplex Jul 28, 2023
a545f67
fix: take JavaCheckResult by const reference
Scrumplex Jul 29, 2023
76df836
fix: simplify switch statement
Scrumplex Jul 29, 2023
c07a857
fix: remove irregular enum initialization
Scrumplex Jul 29, 2023
9f66f64
fix: fix undisciplined multiple inheritance
Scrumplex Jul 29, 2023
076c189
fix: format all languages using clang-format
Scrumplex Jul 29, 2023
71fb38c
Fix alignment properties
TheKodeToad Jul 29, 2023
f256b83
Make more options generic
TheKodeToad Jul 29, 2023
ce2ca13
fix: add missing headers
Scrumplex Jul 31, 2023
1d468ac
chore: reformat
Scrumplex Aug 2, 2023
1d638e0
chore: update license headers
Scrumplex Aug 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 7 additions & 6 deletions .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
---
Language: Cpp
BasedOnStyle: Chromium
BasedOnStyle: Chromium
IndentWidth: 4
AlignConsecutiveMacros: false
AlignConsecutiveAssignments: false
AllowShortIfStatementsOnASingleLine: false
ColumnLimit: 140
---
Language: Cpp
AlignConsecutiveMacros: None
AlignConsecutiveAssignments: None
BraceWrapping:
AfterFunction: true
AfterFunction: true
SplitEmptyFunction: false
SplitEmptyRecord: false
SplitEmptyNamespace: false
BreakBeforeBraces: Custom
BreakConstructorInitializers: BeforeComma
ColumnLimit: 140
Cpp11BracedListStyle: false
6 changes: 3 additions & 3 deletions buildconfig/BuildConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
*/

#pragma once
#include <QString>
#include <QList>
#include <QString>

/**
* \brief The Config class holds all the build-time information passed from the build system.
Expand Down Expand Up @@ -145,7 +145,7 @@ class Config {
QString AUTH_BASE = "https://authserver.mojang.com/";
QString IMGUR_BASE_URL = "https://api.imgur.com/3/";
QString FMLLIBS_BASE_URL = "https://files.prismlauncher.org/fmllibs/"; // FIXME: move into CMakeLists
QString TRANSLATIONS_BASE_URL = "https://i18n.prismlauncher.org/"; // FIXME: move into CMakeLists
QString TRANSLATIONS_BASE_URL = "https://i18n.prismlauncher.org/"; // FIXME: move into CMakeLists

QString MODPACKSCH_API_BASE_URL = "https://api.modpacks.ch/";

Expand All @@ -162,7 +162,7 @@ class Config {

QString MODRINTH_STAGING_URL = "https://staging-api.modrinth.com/v2";
QString MODRINTH_PROD_URL = "https://api.modrinth.com/v2";
QStringList MODRINTH_MRPACK_HOSTS{"cdn.modrinth.com", "github.com", "raw.githubusercontent.com", "gitlab.com"};
QStringList MODRINTH_MRPACK_HOSTS{ "cdn.modrinth.com", "github.com", "raw.githubusercontent.com", "gitlab.com" };

QString FLAME_BASE_URL = "https://api.curseforge.com/v1";

Expand Down
40 changes: 20 additions & 20 deletions flatpak/libdecor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{
"name": "libdecor",
"buildsystem": "meson",
"config-opts": [
"-Ddemo=false"
],
"sources": [
{
"type": "git",
"url": "https://gitlab.freedesktop.org/libdecor/libdecor.git",
"commit": "73260393a97291c887e1074ab7f318e031be0ac6"
},
{
"type": "patch",
"path": "patches/weird_libdecor.patch"
}
],
"cleanup": [
"/include",
"/lib/pkgconfig"
]
"name": "libdecor",
"buildsystem": "meson",
"config-opts": [
"-Ddemo=false"
],
"sources": [
{
"type": "git",
"url": "https://gitlab.freedesktop.org/libdecor/libdecor.git",
"commit": "73260393a97291c887e1074ab7f318e031be0ac6"
},
{
"type": "patch",
"path": "patches/weird_libdecor.patch"
}
],
"cleanup": [
"/include",
"/lib/pkgconfig"
]
}