diff --git a/launcher/include/launchercore.h b/launcher/include/launchercore.h index 087461f..23d9600 100755 --- a/launcher/include/launchercore.h +++ b/launcher/include/launchercore.h @@ -103,19 +103,10 @@ public: */ void launchGame(Profile &settings, const LoginAuth &auth); - /* - * This just wraps it in wine if needed. - */ - void launchExecutable(const Profile &settings, QProcess *process, const QStringList &args, bool isGame, bool needsRegistrySetup); - - void addRegistryKey(const Profile &settings, QString key, QString value, QString data); - void buildRequest(const Profile &settings, QNetworkRequest &request); void setSSL(QNetworkRequest &request); void setupIgnoreSSL(QNetworkReply *reply); - void readInitialInformation(); - Q_INVOKABLE GameInstaller *createInstaller(Profile *profile); Q_INVOKABLE CompatibilityToolInstaller *createCompatInstaller(); @@ -151,6 +142,15 @@ signals: void autoLoginProfileChanged(); private: + /* + * This just wraps it in wine if needed. + */ + void launchExecutable(const Profile &settings, QProcess *process, const QStringList &args, bool isGame, bool needsRegistrySetup); + + void addRegistryKey(const Profile &settings, QString key, QString value, QString data); + + void readInitialInformation(); + QCoro::Task<> beginLogin(LoginInformation &info); /* diff --git a/launcher/include/steamapi.h b/launcher/include/steamapi.h index f6087ca..a6647c4 100644 --- a/launcher/include/steamapi.h +++ b/launcher/include/steamapi.h @@ -10,7 +10,7 @@ class LauncherCore; class SteamAPI : public QObject { public: - explicit SteamAPI(LauncherCore &core, QObject *parent = nullptr); + explicit SteamAPI(QObject *parent = nullptr); ~SteamAPI() override; void setLauncherMode(bool isLauncher); diff --git a/launcher/src/launchercore.cpp b/launcher/src/launchercore.cpp index 4dfbaec..d5598ef 100755 --- a/launcher/src/launchercore.cpp +++ b/launcher/src/launchercore.cpp @@ -681,7 +681,7 @@ void LauncherCore::clearAvatarCache() void LauncherCore::initializeSteam() { m_isSteam = true; - m_steamApi = new SteamAPI(*this, this); + m_steamApi = new SteamAPI(this); m_steamApi->setLauncherMode(true); } diff --git a/launcher/src/steamapi.cpp b/launcher/src/steamapi.cpp index 7a21530..65c568b 100644 --- a/launcher/src/steamapi.cpp +++ b/launcher/src/steamapi.cpp @@ -10,7 +10,7 @@ #include "astra_log.h" #include "launchercore.h" -SteamAPI::SteamAPI(LauncherCore &core, QObject *parent) +SteamAPI::SteamAPI(QObject *parent) : QObject(parent) { #ifdef ENABLE_STEAM