Skip to content

Commit

Permalink
Merge pull request #1459 from Scrumplex/format
Browse files Browse the repository at this point in the history
  • Loading branch information
Scrumplex committed Aug 4, 2023
2 parents 50c7d39 + 1d638e0 commit ae793f6
Show file tree
Hide file tree
Showing 622 changed files with 16,261 additions and 16,761 deletions.
13 changes: 7 additions & 6 deletions .clang-format
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
2 changes: 1 addition & 1 deletion buildconfig/BuildConfig.cpp.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0-only
/*
* PolyMC - Minecraft Launcher
* Prism Launcher - Minecraft Launcher
* Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
*
* This program is free software: you can redistribute it and/or modify
Expand Down
6 changes: 3 additions & 3 deletions buildconfig/BuildConfig.h
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
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"
]
}

0 comments on commit ae793f6

Please sign in to comment.