CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into fix/network_and_signals

Browse Source 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
This commit is contained in:
Rachel Powers
2023-05-12 01:13:17 -07:00
committed by GitHub
parent f27716656c c5aff7cc1e
commit 6b6d6a01dc
121 changed files with 4944 additions and 2471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
launcher/net/NetAction.h
View File

@ -1,7 +1,8 @@
// SPDX-License-Identifier: GPL-3.0-only
/*
* PolyMC - Minecraft Launcher
* Prism Launcher - Minecraft Launcher
* Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
* Copyright (C) 2023 Rachel Powers <508861+Ryex@users.noreply.github.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -44,7 +45,7 @@
class NetAction : public Task {
Q_OBJECT
protected:
explicit NetAction() : Task() {};
explicit NetAction() : Task(){};
public:
using Ptr = shared_qobject_ptr<NetAction>;
@ -80,7 +81,7 @@ class NetAction : public Task {
}
protected:
void executeTask() override {};
void executeTask() override{};
public:
shared_qobject_ptr<QNetworkAccessManager> m_network;