Changeset 58863 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Nov 25, 2015 3:09:04 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Qt5 migration (part 15): QDesktopServices API changes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (11 diffs)
• selector/UISelectorWindow.cpp (modified) (4 diffs)

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

@@ -25 +25 @@
 # include <QTranslator>
 # include <QDesktopWidget>
+# if QT_VERSION >= 0x050000
+#  include <QStandardPaths>
+# endif /* QT_VERSION >= 0x050000 */
 # include <QDesktopServices>
 # include <QMutex>
@@ -35 +38 @@
 # include <QLocale>
 # include <QSpinBox>
-
 # ifdef Q_WS_WIN
 #  include <QEventLoop>
 # endif /* Q_WS_WIN */
-
 # ifdef Q_WS_X11
 #  include <QTextBrowser>
@@ -45 +46 @@
 #  include <QX11Info>
 # endif /* Q_WS_X11 */
-
 # ifdef VBOX_GUI_WITH_PIDFILE
 #  include <QTextStream>
@@ -74 +74 @@
 # include "UIIconPool.h"
 # include "UIVirtualBoxEventHandler.h"
-
 # ifdef Q_WS_X11
 #  include "UIHostComboEditor.h"
@@ -82 +81 @@
 #  endif /* VBOX_OSE */
 # endif /* Q_WS_X11 */
-
 # ifdef Q_WS_MAC
 #  include "VBoxUtils-darwin.h"
@@ -88 +86 @@
 #  include "UIMachineWindowSeamless.h"
 # endif /* Q_WS_MAC */
-
 # ifdef VBOX_WITH_VIDEOHWACCEL
 #  include "VBoxFBOverlay.h"
@@ -126 +123 @@
 #  include <iprt/mem.h>
 # endif /* Q_WS_X11 */
-
 # include <VBox/sup.h>
 # include <VBox/com/Guid.h>
 
+/* External includes: */
 # ifdef Q_WS_WIN
 #  include "shlobj.h"
@@ -143 +140 @@
 #endif /* VBOX_WITH_XPCOM */
 
+/* Qt includes: */
 #include <QLibraryInfo>
 #include <QProgressDialog>
@@ -148 +146 @@
 #include <QStyleOptionSpinBox>
 
+/* Other VBox includes: */
 #include <VBox/VBoxOGL.h>
 #include <VBox/vd.h>
-
 #include <iprt/ctype.h>
 #include <iprt/err.h>
 #include <iprt/file.h>
 
+/* External includes: */
+# include <math.h>
 #ifdef Q_WS_MAC
 # include <sys/utsname.h>
 #endif /* Q_WS_MAC */
-
-/* External includes: */
-# include <math.h>
-
 #ifdef Q_WS_X11
 # undef BOOL /* typedef CARD8 BOOL in Xmd.h conflicts with #define BOOL PRBool
@@ -171 +167 @@
 # include <X11/Xatom.h>
 # include <X11/extensions/Xinerama.h>
-
 # define BOOL PRBool
 #endif /* Q_WS_X11 */
@@ -3643 +3638 @@
 QString VBoxGlobal::documentsPath()
 {
+#if QT_VERSION >= 0x050000
+    QString path = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
+#else /* QT_VERSION < 0x050000 */
     QString path = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation);
+#endif /* QT_VERSION < 0x050000 */
     QDir dir(path);
     if (dir.exists())

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -21 +21 @@
 
 /* Qt includes: */
-# include <QDesktopServices>
 # include <QMenuBar>
 # include <QStatusBar>
@@ -28 +27 @@
 # include <QToolButton>
 # include <QTimer>
-
-/* Local includes: */
+# if QT_VERSION >= 0x050000
+#  include <QStandardPaths>
+# else /* QT_VERSION < 0x050000 */
+#  include <QDesktopServices>
+# endif /* QT_VERSION < 0x050000 */
+
+/* GUI includes: */
 # include "QISplitter.h"
 # include "QIFileDialog.h"
@@ -61 +65 @@
 # include "UIExtraDataManager.h"
 # include "VBoxGlobal.h"
-
 # ifdef Q_WS_MAC
 #  include "VBoxUtils.h"
@@ -968 +971 @@
         const CMachine &machine = pItem->machine();
         UIDesktopServices::createMachineShortcut(machine.GetSettingsFilePath(),
+#if QT_VERSION >= 0x050000
+                                                 QStandardPaths::writableLocation(QStandardPaths::DesktopLocation),
+#else /* QT_VERSION < 0x050000 */
                                                  QDesktopServices::storageLocation(QDesktopServices::DesktopLocation),
+#endif /* QT_VERSION < 0x050000 */
                                                  machine.GetName(), machine.GetId());
     }