style: run-run clang-format on launcher/*
Signed-off-by: Edgars Cīrulis <e.cirulis@proton.me>
This commit is contained in:
@@ -108,7 +108,6 @@
|
||||
#include "icons/IconList.h"
|
||||
#include "net/HttpMetaCache.h"
|
||||
|
||||
|
||||
#include "updater/ExternalUpdater.h"
|
||||
|
||||
#include "tools/JProfiler.h"
|
||||
|
||||
@@ -21,11 +21,11 @@ class QSortFilterProxyModel;
|
||||
|
||||
/* A macro to define useful functions to handle Resource* -> T* more easily on derived classes */
|
||||
#define RESOURCE_HELPERS(T) \
|
||||
T& at(int index) \
|
||||
T& at(int index) \
|
||||
{ \
|
||||
return *static_cast<T*>(m_resources[index].get()); \
|
||||
} \
|
||||
const T& at(int index) const \
|
||||
const T& at(int index) const \
|
||||
{ \
|
||||
return *static_cast<const T*>(m_resources.at(index).get()); \
|
||||
} \
|
||||
|
||||
@@ -31,7 +31,8 @@ static const QMap<QString, IndexedVersionType::VersionType> s_indexed_version_ty
|
||||
{ "alpha", IndexedVersionType::VersionType::Alpha }
|
||||
};
|
||||
|
||||
static const QList<ModLoaderType> loaderList = { NeoForge, Forge, Cauldron, LiteLoader, Quilt, Fabric, Babric, BTA, LegacyFabric, Ornithe, Rift };
|
||||
static const QList<ModLoaderType> loaderList = { NeoForge, Forge, Cauldron, LiteLoader, Quilt, Fabric,
|
||||
Babric, BTA, LegacyFabric, Ornithe, Rift };
|
||||
|
||||
QList<ModLoaderType> modLoaderTypesToList(ModLoaderTypes flags)
|
||||
{
|
||||
|
||||
@@ -33,7 +33,7 @@ enum class ResourceType { Mod, ResourcePack, ShaderPack, Modpack, DataPack, Worl
|
||||
|
||||
namespace ResourceTypeUtils {
|
||||
static const std::set<ResourceType> VALID_RESOURCES = { ResourceType::DataPack, ResourceType::ResourcePack, ResourceType::TexturePack,
|
||||
ResourceType::ShaderPack, ResourceType::World, ResourceType::Mod };
|
||||
ResourceType::ShaderPack, ResourceType::World, ResourceType::Mod };
|
||||
QString getName(ResourceType type);
|
||||
} // namespace ResourceTypeUtils
|
||||
} // namespace ModPlatform
|
||||
@@ -160,10 +160,7 @@ class FlameAPI : public ResourceAPI {
|
||||
void loadExtraPackInfo(ModPlatform::IndexedPack& m, [[maybe_unused]] QJsonObject&) const override { FlameMod::loadBody(m); }
|
||||
|
||||
private:
|
||||
std::optional<QString> getInfoURL(QString const& id) const override
|
||||
{
|
||||
return QString(BuildConfig.FLAME_BASE_URL + "/mods/%1").arg(id);
|
||||
}
|
||||
std::optional<QString> getInfoURL(QString const& id) const override { return QString(BuildConfig.FLAME_BASE_URL + "/mods/%1").arg(id); }
|
||||
std::optional<QString> getDependencyURL(DependencySearchArgs const& args) const override
|
||||
{
|
||||
auto addonId = args.dependency.addonId.toString();
|
||||
|
||||
@@ -45,7 +45,8 @@ class ModrinthAPI : public ResourceAPI {
|
||||
{
|
||||
QStringList l;
|
||||
for (auto loader : { ModPlatform::NeoForge, ModPlatform::Forge, ModPlatform::Fabric, ModPlatform::Quilt, ModPlatform::LiteLoader,
|
||||
ModPlatform::DataPack, ModPlatform::Babric, ModPlatform::BTA, ModPlatform::LegacyFabric, ModPlatform::Ornithe, ModPlatform::Rift }) {
|
||||
ModPlatform::DataPack, ModPlatform::Babric, ModPlatform::BTA, ModPlatform::LegacyFabric, ModPlatform::Ornithe,
|
||||
ModPlatform::Rift }) {
|
||||
if (types & loader) {
|
||||
l << getModLoaderAsString(loader);
|
||||
}
|
||||
@@ -204,7 +205,8 @@ class ModrinthAPI : public ResourceAPI {
|
||||
static inline auto validateModLoaders(ModPlatform::ModLoaderTypes loaders) -> bool
|
||||
{
|
||||
return loaders & (ModPlatform::NeoForge | ModPlatform::Forge | ModPlatform::Fabric | ModPlatform::Quilt | ModPlatform::LiteLoader |
|
||||
ModPlatform::DataPack | ModPlatform::Babric | ModPlatform::BTA | ModPlatform::LegacyFabric | ModPlatform::Ornithe | ModPlatform::Rift);
|
||||
ModPlatform::DataPack | ModPlatform::Babric | ModPlatform::BTA | ModPlatform::LegacyFabric |
|
||||
ModPlatform::Ornithe | ModPlatform::Rift);
|
||||
}
|
||||
|
||||
std::optional<QString> getDependencyURL(DependencySearchArgs const& args) const override
|
||||
|
||||
@@ -42,5 +42,5 @@ class ThemeWizardPage : public BaseWizardPage {
|
||||
void retranslate() override { widget.retranslateUi(); }
|
||||
|
||||
private:
|
||||
AppearanceWidget widget{true};
|
||||
AppearanceWidget widget{ true };
|
||||
};
|
||||
|
||||
@@ -180,12 +180,9 @@ void ThemeManager::initializeWidgets()
|
||||
}
|
||||
|
||||
#ifndef Q_OS_MACOS
|
||||
void ThemeManager::setTitlebarColorOnMac(WId windowId, QColor color)
|
||||
{}
|
||||
void ThemeManager::setTitlebarColorOfAllWindowsOnMac(QColor color)
|
||||
{}
|
||||
void ThemeManager::stopSettingNewWindowColorsOnMac()
|
||||
{}
|
||||
void ThemeManager::setTitlebarColorOnMac(WId windowId, QColor color) {}
|
||||
void ThemeManager::setTitlebarColorOfAllWindowsOnMac(QColor color) {}
|
||||
void ThemeManager::stopSettingNewWindowColorsOnMac() {}
|
||||
#endif
|
||||
|
||||
QList<IconTheme*> ThemeManager::getValidIconThemes()
|
||||
|
||||
@@ -27,12 +27,10 @@
|
||||
#include "ui/themes/CatPack.h"
|
||||
#include "ui/themes/ITheme.h"
|
||||
|
||||
inline auto themeDebugLog()
|
||||
{
|
||||
inline auto themeDebugLog() {
|
||||
return qDebug() << "[Theme]";
|
||||
}
|
||||
inline auto themeWarningLog()
|
||||
{
|
||||
inline auto themeWarningLog() {
|
||||
return qWarning() << "[Theme]";
|
||||
}
|
||||
|
||||
@@ -65,9 +63,9 @@ class ThemeManager {
|
||||
private:
|
||||
std::map<QString, std::unique_ptr<ITheme>> m_themes;
|
||||
std::map<QString, IconTheme> m_icons;
|
||||
QDir m_iconThemeFolder{ "iconthemes" };
|
||||
QDir m_applicationThemeFolder{ "themes" };
|
||||
QDir m_catPacksFolder{ "catpacks" };
|
||||
QDir m_iconThemeFolder{"iconthemes"};
|
||||
QDir m_applicationThemeFolder{"themes"};
|
||||
QDir m_catPacksFolder{"catpacks"};
|
||||
std::map<QString, std::unique_ptr<CatPack>> m_catPacks;
|
||||
QPalette m_defaultPalette;
|
||||
QString m_defaultStyle;
|
||||
@@ -93,6 +91,6 @@ class ThemeManager {
|
||||
NSObject* m_windowTitlebarObserver = nullptr;
|
||||
#endif
|
||||
|
||||
const QStringList builtinIcons{ "pe_colored", "pe_light", "pe_dark", "pe_blue", "breeze_light", "breeze_dark",
|
||||
"OSX", "iOS", "flat", "flat_white", "multimc" };
|
||||
const QStringList builtinIcons{"pe_colored", "pe_light", "pe_dark", "pe_blue", "breeze_light", "breeze_dark",
|
||||
"OSX", "iOS", "flat", "flat_white", "multimc"};
|
||||
};
|
||||
|
||||
@@ -227,7 +227,8 @@ void InfoFrame::updateWithResourcePack(ResourcePack& resource_pack)
|
||||
setImage(resource_pack.image({ 64, 64 }));
|
||||
}
|
||||
|
||||
void InfoFrame::updateWithDataPack(DataPack& data_pack) {
|
||||
void InfoFrame::updateWithDataPack(DataPack& data_pack)
|
||||
{
|
||||
setName(renderColorCodes(data_pack.name()));
|
||||
setDescription(renderColorCodes(data_pack.description()));
|
||||
setImage(data_pack.image({ 64, 64 }));
|
||||
|
||||
@@ -292,7 +292,8 @@ void JavaSettingsWidget::updateThresholds()
|
||||
const QString warningColour(QStringLiteral("<span style='color:#f5c211'>%1</span>"));
|
||||
|
||||
if (maxMem >= sysMiB) {
|
||||
m_ui->labelMaxMemNotice->setText(QString("<span style='color:red'>%1</span>").arg(tr("Your maximum memory allocation exceeds your system memory capacity.")));
|
||||
m_ui->labelMaxMemNotice->setText(
|
||||
QString("<span style='color:red'>%1</span>").arg(tr("Your maximum memory allocation exceeds your system memory capacity.")));
|
||||
m_ui->labelMaxMemNotice->show();
|
||||
} else if (maxMem > (sysMiB * 0.9)) {
|
||||
m_ui->labelMaxMemNotice->setText(warningColour.arg(tr("Your maximum memory allocation is close to your system memory capacity.")));
|
||||
|
||||
Reference in New Issue
Block a user