From 6ee90074429a5a53910782c608762e52392a6c90 Mon Sep 17 00:00:00 2001
From: Rafael <Syping@users.noreply.github.com>
Date: Wed, 20 Apr 2016 12:50:48 +0200
Subject: [PATCH] switch from native environment value demand feature to qt
 demand feature

---
 AppEnv.cpp | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/AppEnv.cpp b/AppEnv.cpp
index e003552..06cf329 100755
--- a/AppEnv.cpp
+++ b/AppEnv.cpp
@@ -16,13 +16,13 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *****************************************************************************/
 
-#define _CRT_SECURE_NO_WARNINGS
 #include "config.h"
 #include "AppEnv.h"
 #include "StringParser.h"
 #include "StandardPaths.h"
 #include <QDir>
 #include <QDebug>
+#include <QtGlobal>
 #include <QSettings>
 #include <iostream>
 using namespace std;
@@ -37,18 +37,14 @@ AppEnv::AppEnv()
 QString AppEnv::getGameFolder(bool *ok)
 {
     QDir dir;
-    QString GTAV_FOLDER(getenv("GTAV_FOLDER"));
+    QString GTAV_FOLDER(qgetenv("GTAV_FOLDER"));
     if (GTAV_FOLDER != "")
     {
         dir.setPath(GTAV_FOLDER);
         if (dir.exists())
         {
             *ok = true;
-#ifdef GTA5SYNC_WIN
-            _putenv(QString("GTAV_FOLDER=" + dir.absolutePath()).toStdString().c_str());
-#else
-            setenv("GTAV_FOLDER", dir.absolutePath().toStdString().c_str(), 1);
-#endif
+            qputenv("GTAV_FOLDER", dir.absolutePath().toUtf8());
             return dir.absolutePath();
         }
     }
@@ -69,11 +65,7 @@ QString AppEnv::getGameFolder(bool *ok)
     if (dir.exists())
     {
         *ok = true;
-#ifdef GTA5SYNC_WIN
-        _putenv(QString("GTAV_FOLDER=" + dir.absolutePath()).toStdString().c_str());
-#else
-        setenv("GTAV_FOLDER", dir.absolutePath().toStdString().c_str(), 1);
-#endif
+        qputenv("GTAV_FOLDER", dir.absolutePath().toUtf8());
         return dir.absolutePath();
     }
 
@@ -81,11 +73,7 @@ QString AppEnv::getGameFolder(bool *ok)
     if (dir.exists())
     {
         *ok = true;
-#ifdef GTA5SYNC_WIN
-        _putenv(QString("GTAV_FOLDER=" + dir.absolutePath()).toStdString().c_str());
-#else
-        setenv("GTAV_FOLDER", dir.absolutePath().toStdString().c_str(), 1);
-#endif
+        qputenv("GTAV_FOLDER", dir.absolutePath().toUtf8());
         return dir.absolutePath();
     }
 
@@ -99,11 +87,7 @@ bool AppEnv::setGameFolder(QString gameFolder)
     dir.setPath(gameFolder);
     if (dir.exists())
     {
-#ifdef GTA5SYNC_WIN
-        _putenv(QString("GTAV_FOLDER=" + dir.absolutePath()).toStdString().c_str());
-#else
-        setenv("GTAV_FOLDER", dir.absolutePath().toStdString().c_str(), 1);
-#endif
+        qputenv("GTAV_FOLDER", dir.absolutePath().toUtf8());
         return true;
     }
     return false;