From 9ef7dbaa10da5ccf5ed0fe686fd3e08fe13074a6 Mon Sep 17 00:00:00 2001
From: John Parent <john.parent@kitware.com>
Date: Fri, 15 Nov 2024 20:05:10 -0500
Subject: [PATCH] Cleanup

Signed-off-by: John Parent <john.parent@kitware.com>
---
 gpt4all-updater/CMakeLists.txt     | 3 ++-
 gpt4all-updater/include/Resource.h | 5 +++--
 gpt4all-updater/src/Resource.cxx   | 9 +++++----
 gpt4all-updater/src/State.cxx      | 3 ++-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/gpt4all-updater/CMakeLists.txt b/gpt4all-updater/CMakeLists.txt
index 4db1b466..8beec847 100644
--- a/gpt4all-updater/CMakeLists.txt
+++ b/gpt4all-updater/CMakeLists.txt
@@ -42,6 +42,7 @@ endif()
 
 if(NOT BUILD_OFFLINE_UPDATER)
     configure_file(src/Download.cxx.in ${CMAKE_BINARY_DIR}/Download.cxx @ONLY)
+    set(ONLINE_SOURCES ${CMAKE_BINARY_DIR}/Download.cxx)
 endif()
 
 find_package(Qt6 REQUIRED COMPONENTS Core Network)
@@ -51,7 +52,6 @@ set(auto_updater_sources
     src/CommandFactory.cxx
     src/CommandLine.cxx
     src/Downgrade.cxx
-    ${CMAKE_BINARY_DIR}/Download.cxx
     src/Manifest.cxx
     src/Modify.cxx
     src/Package.cxx
@@ -60,6 +60,7 @@ set(auto_updater_sources
     src/Update.cxx
     src/utils.cxx
     src/main.cxx
+    ${ONLINE_SOURCES}
     ${ASSEMBLER_SOURCES}
     ${RC_FILES}
 )
diff --git a/gpt4all-updater/include/Resource.h b/gpt4all-updater/include/Resource.h
index b9711924..49cc37b7 100644
--- a/gpt4all-updater/include/Resource.h
+++ b/gpt4all-updater/include/Resource.h
@@ -4,6 +4,7 @@
 #include <windows.h>
 
 #include <QCoreApplication>
+#include <QFile>
 
 namespace gpt4all {
 namespace resource {
@@ -12,7 +13,7 @@ namespace resource {
 class WinInstallerResources : public QObject
 {
 public:
-    static int extractAndInstall();
-}
+    static int extractAndInstall(QFile *installerPath);
+};
 }
 }
\ No newline at end of file
diff --git a/gpt4all-updater/src/Resource.cxx b/gpt4all-updater/src/Resource.cxx
index 8c4a233b..dd781f0a 100644
--- a/gpt4all-updater/src/Resource.cxx
+++ b/gpt4all-updater/src/Resource.cxx
@@ -1,6 +1,7 @@
 #include "Resource.h"
 
-using namespace gpt4all::resource
+using namespace Qt::Literals::StringLiterals;
+using namespace gpt4all::resource;
 
 
 int WinInstallerResources::extractAndInstall(QFile *installerPath)
@@ -27,9 +28,9 @@ int WinInstallerResources::extractAndInstall(QFile *installerPath)
         const QString error
             = u"ERROR: Could not open temp file: %1 %2"_s.arg(installerPath->fileName());
         qWarning() << error;
-        return nullptr;
+        return -1;
     }
     const char* installerdat = (const char*)resource;
-    installerPath.write(installerdat);
-    installerPath.close();
+    installerPath->write(installerdat);
+    installerPath->close();
 }
\ No newline at end of file
diff --git a/gpt4all-updater/src/State.cxx b/gpt4all-updater/src/State.cxx
index da359079..d37a8ee9 100644
--- a/gpt4all-updater/src/State.cxx
+++ b/gpt4all-updater/src/State.cxx
@@ -6,6 +6,7 @@
     #include "Embedded.h"
 #endif
 
+#include <QStandardPaths>
 
 using namespace gpt4all::state;
 
@@ -21,7 +22,7 @@ void Gpt4AllState::driveOffline()
     // if(this->checkForExistingInstall())
     //     this->removeCurrentInstallation();
 #if defined(Q_OS_WINDOWS)
-    this->installer = new QString(QDir::tempPath() + "gpt4all-installer.exe");
+    this->installer = new QFile(QDir::tempPath() + "gpt4all-installer.exe");
     gpt4all::resource::WinInstallerResources::extractAndInstall(installer);
 #elif defined(Q_OS_DARWIN)
     QString installer(QDir::tempPath() + "gpt4all-installer.dmg");