Changeset 3861 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 26, 2007 9:15:14 AM (18 years ago)

Author:

vboxsync

Message:

use generic functions for determining paths instead of home-brewn solutions

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxGlobal.cpp (modified) (2 diffs)
• VBoxProblemReporter.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -64 +64 @@
 #define BOOL PRBool
 #endif
+
+#include <iprt/param.h>
+#include <iprt/path.h>
 
 #if defined (VBOX_GUI_DEBUG)
@@ -1998 +2001 @@
     QString selectedLangId = gVBoxBuiltInLangName;
 
-    QString nlsPath = qApp->applicationDirPath() + gVBoxLangSubDir;
+    char szNlsPath[RTPATH_MAX];
+    int rc;
+
+    RTPathAppPrivateNoArch(szNlsPath, sizeof(szNlsPath));
+    Assert(RT_SUCCESS(rc));
+
+    QString nlsPath = QString(szNlsPath) + gVBoxLangSubDir;
     QDir nlsDir (nlsPath);
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxProblemReporter.cpp

@@ -40 +40 @@
 
 #include <iprt/err.h>
+#include <iprt/param.h>
+#include <iprt/path.h>
 
 #if defined (Q_WS_WIN32)
@@ -1761 +1763 @@
               HH_DISPLAY_TOPIC, NULL);
 #elif defined (Q_WS_X11)
-    QString fullProgPath = qApp->applicationDirPath();
+    char szDocsPath[RTPATH_MAX];
+    int rc;
+
+    RTPathAppDocs(szDocsPath, sizeof(szDocsPath));
+    Assert(RT_SUCCESS(rc));
+
+    QString fullProgPath = QString(szDocsPath);
     QProcess kchmViewer (fullProgPath + "/kchmviewer");
     kchmViewer.addArgument (fullProgPath + "/VirtualBox.chm");