Changeset 17724 in vbox

Timestamp:

Mar 12, 2009 9:32:18 AM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: make sure the path exists

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxGlobal.h (modified) (2 diffs)
• src/VBoxExportApplianceWzd.cpp (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h

@@ -36 +36 @@
 #include <QProcess>
 #include <QHash>
-#include <QDesktopServices>
-#include <QDir>
 
 class QAction;
@@ -733 +731 @@
     }
 
-    static inline QString documentsPath()
-    {
-        QString path;
-#if QT_VERSION < 0x040400
-        path = QDir::homePath();
-#else
-        path = QDesktopServices::storageLocation (QDesktopServices::DocumentsLocation);
-#endif
-        return QDir::cleanPath (path);
-    }
+    static QString documentsPath();
 
 signals:

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

@@ -26 +26 @@
 #include "VBoxProblemReporter.h"
 
+/* Qt includes */
+#include <QDir>
+
 class VMListWidgetItems: public QListWidgetItem
 {

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

@@ -50 +50 @@
 #include <QPainter>
 #include <QTimer>
+#include <QDir>
 
 #include <math.h>
@@ -4845 +4846 @@
 }
 
+/* static */
+QString VBoxGlobal::documentsPath()
+{
+    QString path;
+#if QT_VERSION < 0x040400
+    path = QDir::homePath();
+#else
+    path = QDesktopServices::storageLocation (QDesktopServices::DocumentsLocation);
+#endif
+
+    /* Make sure the path exists */
+    QDir dir (path);
+    while (!dir.exists())
+        dir.cdUp();
+
+    return QDir::cleanPath (dir.canonicalPath());
+}
+
 // Public slots
 ////////////////////////////////////////////////////////////////////////////////