From 9df8d91bdc12ab2e65569e26dc7c57246e384a8f Mon Sep 17 00:00:00 2001
From: Arisotura <thetotalworm@gmail.com>
Date: Tue, 19 May 2020 21:34:24 +0200
Subject: keep the ugliness confined in Platform.cpp

---
 src/frontend/qt_sdl/main.cpp | 47 ++------------------------------------------
 1 file changed, 2 insertions(+), 45 deletions(-)

(limited to 'src/frontend/qt_sdl/main.cpp')

diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp
index 8fe776e..a68f933 100644
--- a/src/frontend/qt_sdl/main.cpp
+++ b/src/frontend/qt_sdl/main.cpp
@@ -54,8 +54,6 @@
 
 // TODO: uniform variable spelling
 
-char* EmuDirectory;
-
 bool RunningSomething;
 
 MainWindow* mainWindow;
@@ -865,11 +863,6 @@ void MainWindow::onInputConfigFinished(int res)
 }
 
 
-// FIXME!!!!
-#if (!defined(__WIN32__) && !defined(UNIX_PORTABLE))
-#include <glib.h>
-#endif
-
 int main(int argc, char** argv)
 {
     srand(time(NULL));
@@ -877,43 +870,7 @@ int main(int argc, char** argv)
     printf("melonDS " MELONDS_VERSION "\n");
     printf(MELONDS_URL "\n");
 
-#if defined(__WIN32__) || defined(UNIX_PORTABLE)
-    if (argc > 0 && strlen(argv[0]) > 0)
-    {
-        int len = strlen(argv[0]);
-        while (len > 0)
-        {
-            if (argv[0][len] == '/') break;
-            if (argv[0][len] == '\\') break;
-            len--;
-        }
-        if (len > 0)
-        {
-            EmuDirectory = new char[len+1];
-            strncpy(EmuDirectory, argv[0], len);
-            EmuDirectory[len] = '\0';
-        }
-        else
-        {
-            EmuDirectory = new char[2];
-            strcpy(EmuDirectory, ".");
-        }
-    }
-    else
-    {
-        EmuDirectory = new char[2];
-        strcpy(EmuDirectory, ".");
-    }
-#else
-	const char* confdir = g_get_user_config_dir();
-	const char* confname = "/melonDS";
-	int cdlen = strlen(confdir);
-	int cnlen = strlen(confname);
-	EmuDirectory = new char[cdlen + cnlen + 1];
-	strncpy(&EmuDirectory[0], confdir, cdlen);
-	strncpy(&EmuDirectory[cdlen], confname, cnlen);
-	EmuDirectory[cdlen+cnlen] = '\0';
-#endif
+    Platform::Init(argc, argv);
 
     QApplication melon(argc, argv);
 
@@ -1060,7 +1017,7 @@ int main(int argc, char** argv)
     Config::Save();
 
     SDL_Quit();
-    delete[] EmuDirectory;
+    Platform::DeInit();
     return ret;
 }
 
-- 
cgit v1.2.3