From: James Turner <jmt@Bishop.local>
Date: Wed, 19 Jun 2013 23:20:12 +0000 (+0100)
Subject: Kill off platformDesktopPath entirely
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=145148944f71b4ce195773bd37ae684eeee9a664;p=flightgear.git

Kill off platformDesktopPath entirely
---

diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx
index 1f78d4504..2a084dad6 100644
--- a/src/GUI/gui_funcs.cxx
+++ b/src/GUI/gui_funcs.cxx
@@ -52,7 +52,6 @@
 #include <Cockpit/panel.hxx>
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
-#include <Main/fg_init.hxx> // for platformDesktopPath
 #include <Main/fg_os.hxx>
 #include <Viewer/renderer.hxx>
 #include <Viewer/viewmgr.hxx>
@@ -481,7 +480,7 @@ namespace
 
             string dir = fgGetString("/sim/paths/screenshot-dir");
             if (dir.empty())
-              dir = platformDesktopPath().str();
+                dir = SGPath::desktop().str();
 
             _path.set(dir + '/');
             if (_path.create_dir( 0755 )) {
diff --git a/src/Main/fg_init.hxx b/src/Main/fg_init.hxx
index 6341f4352..2d81cc82b 100644
--- a/src/Main/fg_init.hxx
+++ b/src/Main/fg_init.hxx
@@ -46,9 +46,6 @@ void fgOutputSettings();
 // Initialize the localization
 SGPropertyNode *fgInitLocale(const char *language);
 
-/// retrieve the user's desktop directory path
-SGPath platformDesktopPath();
-
 // Init navaids and waypoints
 bool fgInitNav ();