ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2024-06-28 20:30:05 +03:00
commit 72dd3dfba5
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
67 changed files with 97 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
launcher/Application.cpp
View File

@ -938,8 +938,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
[[fallthrough]];
default: {
qDebug() << "Exiting because update lockfile is present";
QMetaObject::invokeMethod(
this, []() { exit(1); }, Qt::QueuedConnection);
QMetaObject::invokeMethod(this, []() { exit(1); }, Qt::QueuedConnection);
return;
}
}
@ -971,8 +970,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
[[fallthrough]];
default: {
qDebug() << "Exiting because update lockfile is present";
QMetaObject::invokeMethod(
this, []() { exit(1); }, Qt::QueuedConnection);
QMetaObject::invokeMethod(this, []() { exit(1); }, Qt::QueuedConnection);
return;
}
}
@ -1666,8 +1664,7 @@ QString Application::getJarPath(QString jarFile)
#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
FS::PathCombine(m_rootPath, "share", BuildConfig.LAUNCHER_NAME),
#endif
FS::PathCombine(m_rootPath, "jars"),
FS::PathCombine(applicationDirPath(), "jars"),
FS::PathCombine(m_rootPath, "jars"), FS::PathCombine(applicationDirPath(), "jars"),
FS::PathCombine(applicationDirPath(), "..", "jars") // from inside build dir, for debuging
};
for (QString p : potentialPaths) {

2
launcher/BaseInstaller.h
View File

@ -29,7 +29,7 @@ class BaseVersion;
class BaseInstaller {
public:
BaseInstaller();
virtual ~BaseInstaller(){};
virtual ~BaseInstaller() {};
bool isApplied(MinecraftInstance* on);
virtual bool add(MinecraftInstance* to);

2
launcher/InstancePageProvider.h
View File

@ -22,7 +22,7 @@ class InstancePageProvider : protected QObject, public BasePageProvider {
public:
explicit InstancePageProvider(InstancePtr parent) { inst = parent; }
virtual ~InstancePageProvider(){};
virtual ~InstancePageProvider() {};
virtual QList<BasePage*> getPages() override
{
QList<BasePage*> values;

2
launcher/JavaCommon.h
View File

@ -24,7 +24,7 @@ class TestCheck : public QObject {
TestCheck(QWidget* parent, QString path, QString args, int minMem, int maxMem, int permGen)
: m_parent(parent), m_path(path), m_args(args), m_minMem(minMem), m_maxMem(maxMem), m_permGen(permGen)
{}
virtual ~TestCheck(){};
virtual ~TestCheck() {};
void run();

2
launcher/LaunchController.h
View File

@ -48,7 +48,7 @@ class LaunchController : public Task {
void executeTask() override;
LaunchController(QObject* parent = nullptr);
virtual ~LaunchController(){};
virtual ~LaunchController() {};
void setInstance(InstancePtr instance) { m_instance = instance; }

2
launcher/MMCZip.h
View File

@ -176,7 +176,7 @@ class ExportToZipTask : public Task {
QString destinationPrefix = "",
bool followSymlinks = false,
bool utf8Enabled = false)
: ExportToZipTask(outputPath, QDir(dir), files, destinationPrefix, followSymlinks, utf8Enabled){};
: ExportToZipTask(outputPath, QDir(dir), files, destinationPrefix, followSymlinks, utf8Enabled) {};
virtual ~ExportToZipTask() = default;

2
launcher/NullInstance.h
View File

@ -46,7 +46,7 @@ class NullInstance : public BaseInstance {
{
setVersionBroken(true);
}
virtual ~NullInstance(){};
virtual ~NullInstance() {};
void saveNow() override {}
void loadSpecificSettings() override { setSpecificSettingsLoaded(true); }
QString getStatusbarDescription() override { return tr("Unknown instance type"); };

2
launcher/VersionProxyModel.h
View File

@ -14,7 +14,7 @@ class VersionProxyModel : public QAbstractProxyModel {
public:
VersionProxyModel(QObject* parent = 0);
virtual ~VersionProxyModel(){};
virtual ~VersionProxyModel() {};
virtual int columnCount(const QModelIndex& parent = QModelIndex()) const override;
virtual int rowCount(const QModelIndex& parent = QModelIndex()) const override;

2
launcher/icons/IconList.h
View File

@ -52,7 +52,7 @@ class IconList : public QAbstractListModel {
Q_OBJECT
public:
explicit IconList(const QStringList& builtinPaths, QString path, QObject* parent = 0);
virtual ~IconList(){};
virtual ~IconList() {};
QIcon getIcon(const QString& key) const;
int getIconIndex(const QString& key) const;

4
launcher/java/JavaCheckerJob.h
View File

@ -26,8 +26,8 @@ using JavaCheckerJobPtr = shared_qobject_ptr<JavaCheckerJob>;
class JavaCheckerJob : public Task {
Q_OBJECT
public:
explicit JavaCheckerJob(QString job_name) : Task(), m_job_name(job_name){};
virtual ~JavaCheckerJob(){};
explicit JavaCheckerJob(QString job_name) : Task(), m_job_name(job_name) {};
virtual ~JavaCheckerJob() {};
bool addJavaCheckerAction(JavaCheckerPtr base)
{

6
launcher/java/JavaUtils.cpp
View File

@ -79,11 +79,9 @@ QProcessEnvironment CleanEnviroment()
QStringList stripped = {
#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
"LD_LIBRARY_PATH",
"LD_PRELOAD",
"LD_LIBRARY_PATH", "LD_PRELOAD",
#endif
"QT_PLUGIN_PATH",
"QT_FONTPATH"
"QT_PLUGIN_PATH", "QT_FONTPATH"
};
for (auto key : rawenv.keys()) {
auto value = rawenv.value(key);

6
launcher/launch/LaunchStep.h
View File

@ -25,7 +25,7 @@ class LaunchStep : public Task {
Q_OBJECT
public: /* methods */
explicit LaunchStep(LaunchTask* parent) : Task(nullptr), m_parent(parent) { bind(parent); };
virtual ~LaunchStep(){};
virtual ~LaunchStep() {};
private: /* methods */
void bind(LaunchTask* parent);
@ -37,9 +37,9 @@ class LaunchStep : public Task {
void progressReportingRequest();
public slots:
virtual void proceed(){};
virtual void proceed() {};
// called in the opposite order than the Task launch(), used to clean up or otherwise undo things after the launch ends
virtual void finalize(){};
virtual void finalize() {};
protected: /* data */
LaunchTask* m_parent;

2
launcher/launch/LaunchTask.h
View File

@ -55,7 +55,7 @@ class LaunchTask : public Task {
public: /* methods */
static shared_qobject_ptr<LaunchTask> create(InstancePtr inst);
virtual ~LaunchTask(){};
virtual ~LaunchTask() {};
void appendStep(shared_qobject_ptr<LaunchStep> step);
void prependStep(shared_qobject_ptr<LaunchStep> step);

4
launcher/launch/steps/CheckJava.h
View File

@ -22,8 +22,8 @@
class CheckJava : public LaunchStep {
Q_OBJECT
public:
explicit CheckJava(LaunchTask* parent) : LaunchStep(parent){};
virtual ~CheckJava(){};
explicit CheckJava(LaunchTask* parent) : LaunchStep(parent) {};
virtual ~CheckJava() {};
virtual void executeTask();
virtual bool canAbort() const { return false; }

2
launcher/launch/steps/LookupServerAddress.h
View File

@ -25,7 +25,7 @@ class LookupServerAddress : public LaunchStep {
Q_OBJECT
public:
explicit LookupServerAddress(LaunchTask* parent);
virtual ~LookupServerAddress(){};
virtual ~LookupServerAddress() {};
virtual void executeTask();
virtual bool abort();

2
launcher/launch/steps/PostLaunchCommand.h
View File

@ -22,7 +22,7 @@ class PostLaunchCommand : public LaunchStep {
Q_OBJECT
public:
explicit PostLaunchCommand(LaunchTask* parent);
virtual ~PostLaunchCommand(){};
virtual ~PostLaunchCommand() {};
virtual void executeTask();
virtual bool abort();

2
launcher/launch/steps/PreLaunchCommand.h
View File

@ -22,7 +22,7 @@ class PreLaunchCommand : public LaunchStep {
Q_OBJECT
public:
explicit PreLaunchCommand(LaunchTask* parent);
virtual ~PreLaunchCommand(){};
virtual ~PreLaunchCommand() {};
virtual void executeTask();
virtual bool abort();

4
launcher/launch/steps/QuitAfterGameStop.h
View File

@ -23,8 +23,8 @@
class QuitAfterGameStop : public LaunchStep {
Q_OBJECT
public:
explicit QuitAfterGameStop(LaunchTask* parent) : LaunchStep(parent){};
virtual ~QuitAfterGameStop(){};
explicit QuitAfterGameStop(LaunchTask* parent) : LaunchStep(parent) {};
virtual ~QuitAfterGameStop() {};
virtual void executeTask();
virtual bool canAbort() const { return false; }

2
launcher/launch/steps/TextPrint.h
View File

@ -28,7 +28,7 @@ class TextPrint : public LaunchStep {
public:
explicit TextPrint(LaunchTask* parent, const QStringList& lines, MessageLevel::Enum level);
explicit TextPrint(LaunchTask* parent, const QString& line, MessageLevel::Enum level);
virtual ~TextPrint(){};
virtual ~TextPrint() {};
virtual void executeTask();
virtual bool canAbort() const;

4
launcher/launch/steps/Update.h
View File

@ -25,8 +25,8 @@
class Update : public LaunchStep {
Q_OBJECT
public:
explicit Update(LaunchTask* parent, Net::Mode mode) : LaunchStep(parent), m_mode(mode){};
virtual ~Update(){};
explicit Update(LaunchTask* parent, Net::Mode mode) : LaunchStep(parent), m_mode(mode) {};
virtual ~Update() {};
void executeTask() override;
bool canAbort() const override;

4
launcher/meta/BaseEntity.cpp
View File

@ -26,8 +26,8 @@
class ParsingValidator : public Net::Validator {
public: /* con/des */
ParsingValidator(Meta::BaseEntity* entity) : m_entity(entity){};
virtual ~ParsingValidator(){};
ParsingValidator(Meta::BaseEntity* entity) : m_entity(entity) {};
virtual ~ParsingValidator() {};
public: /* methods */
bool init(QNetworkRequest&) override { return true; }

2
launcher/minecraft/MinecraftInstance.h
View File

@ -56,7 +56,7 @@ class MinecraftInstance : public BaseInstance {
Q_OBJECT
public:
MinecraftInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString& rootDir);
virtual ~MinecraftInstance(){};
virtual ~MinecraftInstance() {};
virtual void saveNow() override;
void loadSpecificSettings() override;

2
launcher/minecraft/MinecraftLoadAndCheck.h
View File

@ -31,7 +31,7 @@ class MinecraftLoadAndCheck : public Task {
Q_OBJECT
public:
explicit MinecraftLoadAndCheck(MinecraftInstance* inst, QObject* parent = 0);
virtual ~MinecraftLoadAndCheck(){};
virtual ~MinecraftLoadAndCheck() {};
void executeTask() override;
private slots:

2
launcher/minecraft/MinecraftUpdate.h
View File

@ -33,7 +33,7 @@ class MinecraftUpdate : public Task {
Q_OBJECT
public:
explicit MinecraftUpdate(MinecraftInstance* inst, QObject* parent = 0);
virtual ~MinecraftUpdate(){};
virtual ~MinecraftUpdate() {};
void executeTask() override;
bool canAbort() const override;

2
launcher/minecraft/auth/AuthStep.h
View File

@ -27,7 +27,7 @@ class AuthStep : public QObject {
public:
using Ptr = shared_qobject_ptr<AuthStep>;
explicit AuthStep(AccountData* data) : QObject(nullptr), m_data(data){};
explicit AuthStep(AccountData* data) : QObject(nullptr), m_data(data) {};
virtual ~AuthStep() noexcept = default;
virtual QString describe() = 0;

2
launcher/minecraft/launch/ClaimAccount.h
View File

@ -22,7 +22,7 @@ class ClaimAccount : public LaunchStep {
Q_OBJECT
public:
explicit ClaimAccount(LaunchTask* parent, AuthSessionPtr session);
virtual ~ClaimAccount(){};
virtual ~ClaimAccount() {};
void executeTask() override;
void finalize() override;

2
launcher/minecraft/launch/CreateGameFolders.h
View File

@ -24,7 +24,7 @@ class CreateGameFolders : public LaunchStep {
Q_OBJECT
public:
explicit CreateGameFolders(LaunchTask* parent);
virtual ~CreateGameFolders(){};
virtual ~CreateGameFolders() {};
virtual void executeTask();
virtual bool canAbort() const { return false; }

4
launcher/minecraft/launch/ExtractNatives.h
View File

@ -21,8 +21,8 @@
class ExtractNatives : public LaunchStep {
Q_OBJECT
public:
explicit ExtractNatives(LaunchTask* parent) : LaunchStep(parent){};
virtual ~ExtractNatives(){};
explicit ExtractNatives(LaunchTask* parent) : LaunchStep(parent) {};
virtual ~ExtractNatives() {};
void executeTask() override;
bool canAbort() const override { return false; }

2
launcher/minecraft/launch/LauncherPartLaunch.h
View File

@ -25,7 +25,7 @@ class LauncherPartLaunch : public LaunchStep {
Q_OBJECT
public:
explicit LauncherPartLaunch(LaunchTask* parent);
virtual ~LauncherPartLaunch(){};
virtual ~LauncherPartLaunch() {};
virtual void executeTask();
virtual bool abort();

4
launcher/minecraft/launch/ModMinecraftJar.h
View File

@ -21,8 +21,8 @@
class ModMinecraftJar : public LaunchStep {
Q_OBJECT
public:
explicit ModMinecraftJar(LaunchTask* parent) : LaunchStep(parent){};
virtual ~ModMinecraftJar(){};
explicit ModMinecraftJar(LaunchTask* parent) : LaunchStep(parent) {};
virtual ~ModMinecraftJar() {};
virtual void executeTask() override;
virtual bool canAbort() const override { return false; }

4
launcher/minecraft/launch/PrintInstanceInfo.h
View File

@ -25,8 +25,8 @@ class PrintInstanceInfo : public LaunchStep {
Q_OBJECT
public:
explicit PrintInstanceInfo(LaunchTask* parent, AuthSessionPtr session, MinecraftServerTargetPtr serverToJoin)
: LaunchStep(parent), m_session(session), m_serverToJoin(serverToJoin){};
virtual ~PrintInstanceInfo(){};
: LaunchStep(parent), m_session(session), m_serverToJoin(serverToJoin) {};
virtual ~PrintInstanceInfo() {};
virtual void executeTask();
virtual bool canAbort() const { return false; }

4
launcher/minecraft/launch/ReconstructAssets.h
View File

@ -21,8 +21,8 @@
class ReconstructAssets : public LaunchStep {
Q_OBJECT
public:
explicit ReconstructAssets(LaunchTask* parent) : LaunchStep(parent){};
virtual ~ReconstructAssets(){};
explicit ReconstructAssets(LaunchTask* parent) : LaunchStep(parent) {};
virtual ~ReconstructAssets() {};
void executeTask() override;
bool canAbort() const override { return false; }

4
launcher/minecraft/launch/ScanModFolders.h
View File

@ -21,8 +21,8 @@
class ScanModFolders : public LaunchStep {
Q_OBJECT
public:
explicit ScanModFolders(LaunchTask* parent) : LaunchStep(parent){};
virtual ~ScanModFolders(){};
explicit ScanModFolders(LaunchTask* parent) : LaunchStep(parent) {};
virtual ~ScanModFolders() {};
virtual void executeTask() override;
virtual bool canAbort() const override { return false; }

2
launcher/minecraft/launch/VerifyJavaInstall.h
View File

@ -42,7 +42,7 @@ class VerifyJavaInstall : public LaunchStep {
Q_OBJECT
public:
explicit VerifyJavaInstall(LaunchTask* parent) : LaunchStep(parent){};
explicit VerifyJavaInstall(LaunchTask* parent) : LaunchStep(parent) {};
~VerifyJavaInstall() override = default;
void executeTask() override;

3
launcher/minecraft/mod/ResourceFolderModel.cpp
View File

@ -282,8 +282,7 @@ void ResourceFolderModel::resolveResource(Resource* res)
connect(
task.get(), &Task::succeeded, this, [=] { onParseSucceeded(ticket, res->internal_id()); }, Qt::ConnectionType::QueuedConnection);
connect(
task.get(), &Task::failed, this, [=] { onParseFailed(ticket, res->internal_id()); }, Qt::ConnectionType::QueuedConnection);
connect(task.get(), &Task::failed, this, [=] { onParseFailed(ticket, res->internal_id()); }, Qt::ConnectionType::QueuedConnection);
connect(
task.get(), &Task::finished, this,
[=] {

2
launcher/minecraft/update/FMLLibrariesTask.h
View File

@ -9,7 +9,7 @@ class FMLLibrariesTask : public Task {
Q_OBJECT
public:
FMLLibrariesTask(MinecraftInstance* inst);
virtual ~FMLLibrariesTask(){};
virtual ~FMLLibrariesTask() {};
void executeTask() override;

2
launcher/minecraft/update/FoldersTask.h
View File

@ -7,7 +7,7 @@ class FoldersTask : public Task {
Q_OBJECT
public:
FoldersTask(MinecraftInstance* inst);
virtual ~FoldersTask(){};
virtual ~FoldersTask() {};
void executeTask() override;

2
launcher/minecraft/update/LibrariesTask.h
View File

@ -7,7 +7,7 @@ class LibrariesTask : public Task {
Q_OBJECT
public:
LibrariesTask(MinecraftInstance* inst);
virtual ~LibrariesTask(){};
virtual ~LibrariesTask() {};
void executeTask() override;

2
launcher/modplatform/CheckUpdateTask.h
View File

@ -17,7 +17,7 @@ class CheckUpdateTask : public Task {
std::list<Version>& mcVersions,
std::optional<ModPlatform::ModLoaderTypes> loaders,
std::shared_ptr<ModFolderModel> mods_folder)
: Task(nullptr), m_mods(mods), m_game_versions(mcVersions), m_loaders(loaders), m_mods_folder(mods_folder){};
: Task(nullptr), m_mods(mods), m_game_versions(mcVersions), m_loaders(loaders), m_mods_folder(mods_folder) {};
struct UpdatableMod {
QString name;

2
launcher/modplatform/legacy_ftb/PackFetchTask.h
View File

@ -13,7 +13,7 @@ class PackFetchTask : public QObject {
Q_OBJECT
public:
PackFetchTask(shared_qobject_ptr<QNetworkAccessManager> network) : QObject(nullptr), m_network(network){};
PackFetchTask(shared_qobject_ptr<QNetworkAccessManager> network) : QObject(nullptr), m_network(network) {};
virtual ~PackFetchTask() = default;
void fetch();

10
launcher/modplatform/modrinth/ModrinthPackIndex.cpp
View File

@ -131,8 +131,9 @@ void Modrinth::loadIndexedPackVersions(ModPlatform::IndexedPack& pack, QJsonArra
pack.versionsLoaded = true;
}
auto Modrinth::loadIndexedPackVersion(QJsonObject& obj, QString preferred_hash_type, QString preferred_file_name)
-> ModPlatform::IndexedVersion
auto Modrinth::loadIndexedPackVersion(QJsonObject& obj,
QString preferred_hash_type,
QString preferred_file_name) -> ModPlatform::IndexedVersion
{
ModPlatform::IndexedVersion file;
@ -246,8 +247,9 @@ auto Modrinth::loadIndexedPackVersion(QJsonObject& obj, QString preferred_hash_t
return {};
}
auto Modrinth::loadDependencyVersions([[maybe_unused]] const ModPlatform::Dependency& m, QJsonArray& arr, const BaseInstance* inst)
-> ModPlatform::IndexedVersion
auto Modrinth::loadDependencyVersions([[maybe_unused]] const ModPlatform::Dependency& m,
QJsonArray& arr,
const BaseInstance* inst) -> ModPlatform::IndexedVersion
{
auto profile = (dynamic_cast<const MinecraftInstance*>(inst))->getPackProfile();
QString mcVersion = profile->getComponentVersion("net.minecraft");

5
launcher/modplatform/packwiz/Packwiz.cpp
View File

@ -90,8 +90,9 @@ auto intEntry(toml::table table, QString entry_name) -> int
return node.value_or(0);
}
auto V1::createModFormat([[maybe_unused]] QDir& index_dir, ModPlatform::IndexedPack& mod_pack, ModPlatform::IndexedVersion& mod_version)
-> Mod
auto V1::createModFormat([[maybe_unused]] QDir& index_dir,
ModPlatform::IndexedPack& mod_pack,
ModPlatform::IndexedVersion& mod_version) -> Mod
{
Mod mod;

2
launcher/net/ByteArraySink.h
View File

@ -45,7 +45,7 @@ namespace Net {
*/
class ByteArraySink : public Sink {
public:
ByteArraySink(std::shared_ptr<QByteArray> output) : m_output(output){};
ByteArraySink(std::shared_ptr<QByteArray> output) : m_output(output) {};
virtual ~ByteArraySink() = default;

2
launcher/net/ChecksumValidator.h
View File

@ -44,7 +44,7 @@ namespace Net {
class ChecksumValidator : public Validator {
public:
ChecksumValidator(QCryptographicHash::Algorithm algorithm, QByteArray expected = QByteArray())
: m_checksum(algorithm), m_expected(expected){};
: m_checksum(algorithm), m_expected(expected) {};
virtual ~ChecksumValidator() = default;
public:

2
launcher/net/FileSink.h
View File

@ -42,7 +42,7 @@
namespace Net {
class FileSink : public Sink {
public:
FileSink(QString filename) : m_filename(filename){};
FileSink(QString filename) : m_filename(filename) {};
virtual ~FileSink() = default;
public:

2
launcher/net/StaticHeaderProxy.h
View File

@ -25,7 +25,7 @@ namespace Net {
class StaticHeaderProxy : public HeaderProxy {
public:
StaticHeaderProxy(QList<HeaderPair> hdrs = {}) : HeaderProxy(), m_hdrs(hdrs){};
StaticHeaderProxy(QList<HeaderPair> hdrs = {}) : HeaderProxy(), m_hdrs(hdrs) {};
virtual ~StaticHeaderProxy() = default;
public:

2
launcher/pathmatcher/FSTreeMatcher.h
View File

@ -6,7 +6,7 @@
class FSTreeMatcher : public IPathMatcher {
public:
virtual ~FSTreeMatcher(){};
virtual ~FSTreeMatcher() {};
FSTreeMatcher(SeparatorPrefixTree<'/'>& tree) : m_fsTree(tree) {}
bool matches(const QString& string) const override { return m_fsTree.covers(string); }

2
launcher/pathmatcher/MultiMatcher.h
View File

@ -4,7 +4,7 @@
class MultiMatcher : public IPathMatcher {
public:
virtual ~MultiMatcher(){};
virtual ~MultiMatcher() {};
MultiMatcher() {}
MultiMatcher& add(Ptr add)
{

2
launcher/pathmatcher/SimplePrefixMatcher.h
View File

@ -7,7 +7,7 @@
class SimplePrefixMatcher : public IPathMatcher {
public:
virtual ~SimplePrefixMatcher(){};
virtual ~SimplePrefixMatcher() {};
SimplePrefixMatcher(const QString& prefix)
{
m_prefix = prefix;

2
launcher/screenshots/ImgurAlbumCreation.h
View File

@ -49,7 +49,7 @@ class ImgurAlbumCreation : public Net::NetRequest {
class Sink : public Net::Sink {
public:
Sink(std::shared_ptr<Result> res) : m_result(res){};
Sink(std::shared_ptr<Result> res) : m_result(res) {};
virtual ~Sink() = default;
public:

2
launcher/screenshots/ImgurUpload.h
View File

@ -43,7 +43,7 @@ class ImgurUpload : public Net::NetRequest {
public:
class Sink : public Net::Sink {
public:
Sink(ScreenShot::Ptr shot) : m_shot(shot){};
Sink(ScreenShot::Ptr shot) : m_shot(shot) {};
virtual ~Sink() = default;
public:

2
launcher/tools/GenericProfiler.h
View File

@ -22,7 +22,7 @@
class GenericProfilerFactory : public BaseProfilerFactory {
public:
QString name() const override { return "Generic"; }
void registerSettings([[maybe_unused]] SettingsObjectPtr settings) override{};
void registerSettings([[maybe_unused]] SettingsObjectPtr settings) override {};
BaseExternalTool* createTool(InstancePtr instance, QObject* parent = 0) override;
bool check([[maybe_unused]] QString* error) override { return true; };
bool check([[maybe_unused]] const QString& path, [[maybe_unused]] QString* error) override { return true; };

10
launcher/ui/dialogs/ModUpdateDialog.cpp
View File

@ -92,17 +92,15 @@ void ModUpdateDialog::checkCandidates()
if (!m_modrinth_to_update.empty()) {
m_modrinth_check_task.reset(new ModrinthCheckUpdate(m_modrinth_to_update, versions, loaders, m_mod_model));
connect(m_modrinth_check_task.get(), &CheckUpdateTask::checkFailed, this, [this](Mod* mod, QString reason, QUrl recover_url) {
m_failed_check_update.append({ mod, reason, recover_url });
});
connect(m_modrinth_check_task.get(), &CheckUpdateTask::checkFailed, this,
[this](Mod* mod, QString reason, QUrl recover_url) { m_failed_check_update.append({ mod, reason, recover_url }); });
check_task.addTask(m_modrinth_check_task);
}
if (!m_flame_to_update.empty()) {
m_flame_check_task.reset(new FlameCheckUpdate(m_flame_to_update, versions, loaders, m_mod_model));
connect(m_flame_check_task.get(), &CheckUpdateTask::checkFailed, this, [this](Mod* mod, QString reason, QUrl recover_url) {
m_failed_check_update.append({ mod, reason, recover_url });
});
connect(m_flame_check_task.get(), &CheckUpdateTask::checkFailed, this,
[this](Mod* mod, QString reason, QUrl recover_url) { m_failed_check_update.append({ mod, reason, recover_url }); });
check_task.addTask(m_flame_check_task);
}

2
launcher/ui/dialogs/VersionSelectDialog.h
View File

@ -37,7 +37,7 @@ class VersionSelectDialog : public QDialog {
public:
explicit VersionSelectDialog(BaseVersionList* vlist, QString title, QWidget* parent = 0, bool cancelable = true);
virtual ~VersionSelectDialog(){};
virtual ~VersionSelectDialog() {};
int exec() override;

2
launcher/ui/dialogs/skins/SkinManageDialog.cpp
View File

@ -371,7 +371,7 @@ void SkinManageDialog::on_urlBtn_clicked()
class WaitTask : public Task {
public:
WaitTask() : m_loop(), m_done(false){};
WaitTask() : m_loop(), m_done(false) {};
virtual ~WaitTask() = default;
public slots:

2
launcher/ui/pages/BasePageContainer.h
View File

@ -4,7 +4,7 @@ class BasePage;
class BasePageContainer {
public:
virtual ~BasePageContainer(){};
virtual ~BasePageContainer() {};
virtual bool selectPage(QString pageId) = 0;
virtual BasePage* selectedPage() const = 0;
virtual BasePage* getPage(QString pageId) { return nullptr; };

6
launcher/ui/pages/instance/ManagedPackPage.h
View File

@ -50,7 +50,7 @@ class ManagedPackPage : public QWidget, public BasePage {
/** Gets the necessary information about the managed pack, such as
* available versions*/
virtual void parseManagedPack(){};
virtual void parseManagedPack() {};
/** URL of the managed pack.
* Not the version-specific one.
@ -64,8 +64,8 @@ class ManagedPackPage : public QWidget, public BasePage {
*/
virtual void suggestVersion();
virtual void update(){};
virtual void updateFromFile(){};
virtual void update() {};
virtual void updateFromFile() {};
protected slots:
/** Does the necessary UI changes for when something failed.

2
launcher/ui/pages/instance/ServersPage.cpp
View File

@ -168,7 +168,7 @@ class ServersModel : public QAbstractListModel {
m_saveTimer.setInterval(5000);
connect(&m_saveTimer, &QTimer::timeout, this, &ServersModel::save_internal);
}
virtual ~ServersModel(){};
virtual ~ServersModel() {};
void observe()
{

2
launcher/ui/pages/modplatform/ModPage.h
View File

@ -59,7 +59,7 @@ class ModPage : public ResourcePage {
protected:
ModPage(ModDownloadDialog* dialog, BaseInstance& instance);
virtual void prepareProviderCategories(){};
virtual void prepareProviderCategories() {};
protected slots:
virtual void filterMods();

2
launcher/ui/setupwizard/BaseWizardPage.h
View File

@ -6,7 +6,7 @@
class BaseWizardPage : public QWizardPage {
public:
explicit BaseWizardPage(QWidget* parent = Q_NULLPTR) : QWizardPage(parent) {}
virtual ~BaseWizardPage(){};
virtual ~BaseWizardPage() {};
virtual bool wantsRefreshButton() { return false; }
virtual void refresh() {}

2
launcher/ui/setupwizard/JavaWizardPage.h
View File

@ -9,7 +9,7 @@ class JavaWizardPage : public BaseWizardPage {
public:
explicit JavaWizardPage(QWidget* parent = Q_NULLPTR);
virtual ~JavaWizardPage(){};
virtual ~JavaWizardPage() {};
bool wantsRefreshButton() override;
void refresh() override;

2
launcher/ui/widgets/JavaSettingsWidget.h
View File

@ -25,7 +25,7 @@ class JavaSettingsWidget : public QWidget {
public:
explicit JavaSettingsWidget(QWidget* parent);
virtual ~JavaSettingsWidget(){};
virtual ~JavaSettingsWidget() {};
enum class JavaStatus { NotSet, Pending, Good, DoesNotExist, DoesNotStart, ReturnedInvalidData } javaStatus = JavaStatus::NotSet;

2
launcher/ui/widgets/LanguageSelectionWidget.h
View File

@ -27,7 +27,7 @@ class LanguageSelectionWidget : public QWidget {
Q_OBJECT
public:
explicit LanguageSelectionWidget(QWidget* parent = 0);
virtual ~LanguageSelectionWidget(){};
virtual ~LanguageSelectionWidget() {};
QString getSelectedLanguageKey() const;
void retranslate();

3
launcher/updater/prismupdater/PrismUpdater.cpp
View File

@ -469,8 +469,7 @@ PrismUpdaterApp::PrismUpdaterApp(int& argc, char** argv) : QApplication(argc, ar
target_dir = QDir(m_rootPath).absoluteFilePath("..");
}
QMetaObject::invokeMethod(
this, [this, target_dir]() { moveAndFinishUpdate(target_dir); }, Qt::QueuedConnection);
QMetaObject::invokeMethod(this, [this, target_dir]() { moveAndFinishUpdate(target_dir); }, Qt::QueuedConnection);
} else {
QMetaObject::invokeMethod(this, &PrismUpdaterApp::loadReleaseList, Qt::QueuedConnection);

5
libraries/murmur2/src/MurmurHash2.h
View File

@ -24,10 +24,7 @@ class Reader {
virtual void goToBeginning() = 0;
};
uint32_t hash(
Reader* file_stream,
std::size_t buffer_size = 4 * MiB,
std::function<bool(char)> filter_out = [](char) { return false; });
uint32_t hash(Reader* file_stream, std::size_t buffer_size = 4 * MiB, std::function<bool(char)> filter_out = [](char) { return false; });
struct IncrementalHashInfo {
uint32_t h;

2
nix/dev.nix
View File

@ -19,7 +19,7 @@
};
};
tools.clang-tools = lib.mkForce pkgs.clang-tools_16;
tools.clang-tools = lib.mkForce pkgs.clang-tools_18;
};
devShells.default = pkgs.mkShell {

5
tests/ResourceFolderModel_test.cpp
View File

@ -203,7 +203,10 @@ class ResourceFolderModelTest : public QObject {
QCOMPARE(model.size(), 0);
{ EXEC_UPDATE_TASK(model.installResource(folder_resource), QVERIFY) } {
{
EXEC_UPDATE_TASK(model.installResource(folder_resource), QVERIFY)
}
{
EXEC_UPDATE_TASK(model.installResource(file_mod), QVERIFY)
}