QDesktopServices no longer provides system paths, switched to QStandardPaths.

src/comm/MAVLinkProtocol.cc

@@ -15,7 +15,7 @@
 #include <QApplication>
 #include <QMessageBox>
 #include <QSettings>
-#include <QDesktopServices>
+#include <QStandardPaths>
 #include <QtEndian>
 #include <QMetaType>
 
@@ -101,7 +101,7 @@ void MAVLinkProtocol::loadSettings()
     }
     else if (m_logfile == NULL)
     {
-        m_logfile = new QFile(QDesktopServices::storageLocation(QDesktopServices::HomeLocation) + "/qgroundcontrol_packetlog.mavlink");
+        m_logfile = new QFile(QStandardPaths::writableLocation(QStandardPaths::HomeLocation) + "/qgroundcontrol_packetlog.mavlink");
     }
     // Enable logging
     enableLogging(settings.value("LOGGING_ENABLED", m_loggingEnabled).toBool());
@@ -205,7 +205,7 @@ QString MAVLinkProtocol::getLogfileName()
     }
     else
     {
-        return QDesktopServices::storageLocation(QDesktopServices::HomeLocation) + "/qgroundcontrol_packetlog.mavlink";
+        return QStandardPaths::writableLocation(QStandardPaths::HomeLocation) + "/qgroundcontrol_packetlog.mavlink";
     }
 }
 

src/ui/HUD.cc

@@ -32,7 +32,7 @@ This file is part of the QGROUNDCONTROL project
 #include <QShowEvent>
 #include <QContextMenuEvent>
 #include <QMenu>
-#include <QDesktopServices>
+#include <QStandardPaths>
 #include <QFileDialog>
 #include <QPaintEvent>
 #include <QDebug>
@@ -1313,7 +1313,7 @@ void HUD::saveImage()
 
 void HUD::selectOfflineDirectory()
 {
-    QString fileName = QFileDialog::getExistingDirectory(this, tr("Select image directory"), QDesktopServices::storageLocation(QDesktopServices::DesktopLocation));
+    QString fileName = QFileDialog::getExistingDirectory(this, tr("Select image directory"), QStandardPaths::writableLocation(QStandardPaths::DesktopLocation));
     if (fileName != "") {
         offlineDirectory = fileName;
     }
@@ -1392,7 +1392,7 @@ void HUD::saveImages(bool save)
         QFileDialog dialog(this);
         dialog.setFileMode(QFileDialog::DirectoryOnly);
 
-        imageLogDirectory = QFileDialog::getExistingDirectory(this, tr("Select image log directory"), QDesktopServices::storageLocation(QDesktopServices::DesktopLocation));
+        imageLogDirectory = QFileDialog::getExistingDirectory(this, tr("Select image log directory"), QStandardPaths::writableLocation(QStandardPaths::DesktopLocation));
 
         qDebug() << "Logging to:" << imageLogDirectory;
 

src/ui/MAVLinkSettingsWidget.cc

@@ -30,7 +30,7 @@ This file is part of the QGROUNDCONTROL project
 #include <QFileInfo>
 #include <QFileDialog>
 #include <QMessageBox>
-#include <QDesktopServices>
+#include <QStandardPaths>
 
 #include "MAVLinkSettingsWidget.h"
 #include "LinkManager.h"
@@ -154,7 +154,7 @@ void MAVLinkSettingsWidget::updateLogfileName(const QString& fileName)
 
 void MAVLinkSettingsWidget::chooseLogfileName()
 {
-    QString fileName = QFileDialog::getSaveFileName(this, tr("Specify MAVLink log file name"), QDesktopServices::storageLocation(QDesktopServices::DesktopLocation), tr("MAVLink Logfile (*.mavlink);;"));
+    QString fileName = QFileDialog::getSaveFileName(this, tr("Specify MAVLink log file name"), QStandardPaths::writableLocation(QStandardPaths::DesktopLocation), tr("MAVLink Logfile (*.mavlink);;"));
 
     if (!fileName.endsWith(".mavlink"))
     {

src/ui/MainWindow.cc

@@ -970,7 +970,7 @@ void MainWindow::createCustomWidget()
 void MainWindow::loadCustomWidget()
 {
     QString widgetFileExtension(".qgw");
-    QString fileName = QFileDialog::getOpenFileName(this, tr("Specify Widget File Name"), QDesktopServices::storageLocation(QDesktopServices::DesktopLocation), tr("QGroundControl Widget (*%1);;").arg(widgetFileExtension));
+    QString fileName = QFileDialog::getOpenFileName(this, tr("Specify Widget File Name"), QStandardPaths::writableLocation(QStandardPaths::DesktopLocation), tr("QGroundControl Widget (*%1);;").arg(widgetFileExtension));
     if (fileName != "") loadCustomWidget(fileName);
 }
 void MainWindow::loadCustomWidget(const QString& fileName, int view)

src/ui/QGCDataPlot2D.cc

@@ -36,7 +36,7 @@ This file is part of the QGROUNDCONTROL project
 #include <QHBoxLayout>
 #include <QSvgGenerator>
 #include <QPrinter>
-#include <QDesktopServices>
+#include <QStandardPaths>
 #include "QGCDataPlot2D.h"
 #include "ui_QGCDataPlot2D.h"
 #include "MG.h"
@@ -118,7 +118,7 @@ void QGCDataPlot2D::savePlot()
 {
     QString fileName = "plot.svg";
     fileName = QFileDialog::getSaveFileName(
-                   this, "Export File Name", QDesktopServices::storageLocation(QDesktopServices::DesktopLocation),
+                   this, "Export File Name", QStandardPaths::writableLocation(QStandardPaths::DesktopLocation),
                    "PDF Documents (*.pdf);;SVG Images (*.svg)");
     if (fileName.isEmpty())
         return;
@@ -138,7 +138,7 @@ void QGCDataPlot2D::savePlot()
         // Abort if cancelled
         if(msgBox.exec() == QMessageBox::Cancel) return;
         fileName = QFileDialog::getSaveFileName(
-                       this, "Export File Name", QDesktopServices::storageLocation(QDesktopServices::DesktopLocation),
+                       this, "Export File Name", QStandardPaths::writableLocation(QStandardPaths::DesktopLocation),
                        "PDF Documents (*.pdf);;SVG Images (*.svg)");
         if (fileName.isEmpty())
             return; //Abort if cancelled
@@ -694,7 +694,7 @@ void QGCDataPlot2D::saveCsvLog()
 {
     QString fileName = "export.csv";
     fileName = QFileDialog::getSaveFileName(
-                   this, "Export CSV File Name", QDesktopServices::storageLocation(QDesktopServices::DesktopLocation),
+                   this, "Export CSV File Name", QStandardPaths::writableLocation(QStandardPaths::DesktopLocation),
                    "CSV file (*.csv);;Text file (*.txt)");
     if (fileName.isEmpty())
         return; //User cancelled
@@ -720,7 +720,7 @@ void QGCDataPlot2D::saveCsvLog()
     //        msgBox.setDefaultButton(QMessageBox::Ok);
     //        if(msgBox.exec() == QMessageBox::Cancel) break;
     //        fileName = QFileDialog::getSaveFileName(
-    //                this, "Export CSV File Name", QDesktopServices::storageLocation(QDesktopServices::DesktopLocation),
+    //                this, "Export CSV File Name", QStandardPaths::writableLocation(QStandardPaths::DesktopLocation),
     //            "CSV file (*.csv);;Text file (*.txt)");
     //    }
 

src/ui/QGCMAVLinkLogPlayer.cc

@@ -1,6 +1,6 @@
 #include <QFileDialog>
 #include <QMessageBox>
-#include <QDesktopServices>
+#include <QStandardPaths>
 #include <QtEndian>
 
 #include "MainWindow.h"
@@ -22,7 +22,7 @@ QGCMAVLinkLogPlayer::QGCMAVLinkLogPlayer(MAVLinkProtocol* mavlink, QWidget *pare
     binaryBaudRate(defaultBinaryBaudRate),
     isPlaying(false),
     currPacketCount(0),
-    lastLogDirectory(QDesktopServices::storageLocation(QDesktopServices::DesktopLocation)),
+    lastLogDirectory(QStandardPaths::writableLocation(QStandardPaths::DesktopLocation)),
     ui(new Ui::QGCMAVLinkLogPlayer)
 {
     ui->setupUi(this);

src/ui/QGCStatusBar.cc

@@ -33,7 +33,7 @@ QGCStatusBar::QGCStatusBar(QWidget *parent) :
     toggleLoggingButton(NULL),
     player(NULL),
     changed(true),
-    lastLogDirectory(QDesktopServices::storageLocation(QDesktopServices::DesktopLocation))
+    lastLogDirectory(QStandardPaths::writableLocation(QStandardPaths::DesktopLocation))
 {
     setObjectName("QGC_STATUSBAR");
 

src/ui/designer/QGCToolWidget.cc

@@ -8,7 +8,7 @@
 #include <QContextMenuEvent>
 #include <QSettings>
 #include <QFileDialog>
-#include <QDesktopServices>
+#include <QStandardPaths>
 
 #include "QGCParamSlider.h"
 #include "QGCComboBox.h"
@@ -571,7 +571,7 @@ void QGCToolWidget::widgetRemoved()
 void QGCToolWidget::exportWidget()
 {
     const QString widgetFileExtension(".qgw");
-    QString fileName = QFileDialog::getSaveFileName(this, tr("Specify File Name"), QDesktopServices::storageLocation(QDesktopServices::DesktopLocation), tr("QGroundControl Widget (*%1);;").arg(widgetFileExtension));
+    QString fileName = QFileDialog::getSaveFileName(this, tr("Specify File Name"), QStandardPaths::writableLocation(QStandardPaths::DesktopLocation), tr("QGroundControl Widget (*%1);;").arg(widgetFileExtension));
     if (!fileName.endsWith(widgetFileExtension))
     {
         fileName = fileName.append(widgetFileExtension);
@@ -583,7 +583,7 @@ void QGCToolWidget::exportWidget()
 void QGCToolWidget::importWidget()
 {
     const QString widgetFileExtension(".qgw");
-    QString fileName = QFileDialog::getOpenFileName(this, tr("Specify File Name"), QDesktopServices::storageLocation(QDesktopServices::DesktopLocation), tr("QGroundControl Widget (*%1);;").arg(widgetFileExtension));
+    QString fileName = QFileDialog::getOpenFileName(this, tr("Specify File Name"), QStandardPaths::writableLocation(QStandardPaths::DesktopLocation), tr("QGroundControl Widget (*%1);;").arg(widgetFileExtension));
     loadSettings(fileName);
 }
 

src/ui/linechart/LinechartWidget.cc

@@ -43,7 +43,7 @@ This file is part of the PIXHAWK project
 #include <QColor>
 #include <QPalette>
 #include <QFileDialog>
-#include <QDesktopServices>
+#include <QStandardPaths>
 #include <QMessageBox>
 
 #include "LinechartWidget.h"
@@ -454,7 +454,7 @@ void LinechartWidget::startLogging()
     // Let user select the log file name
     //QDate date(QDate::currentDate());
     // QString("./pixhawk-log-" + date.toString("yyyy-MM-dd") + "-" + QString::number(logindex) + ".log")
-    QString fileName = QFileDialog::getSaveFileName(this, tr("Specify log file name"), QDesktopServices::storageLocation(QDesktopServices::DesktopLocation), tr("Logfile (*.log);;"));
+    QString fileName = QFileDialog::getSaveFileName(this, tr("Specify log file name"), QStandardPaths::writableLocation(QStandardPaths::DesktopLocation), tr("Logfile (*.log);;"));
 
     while (!(fileName.endsWith(".log")) && !abort && fileName != "") {
         QMessageBox msgBox;
@@ -468,7 +468,7 @@ void LinechartWidget::startLogging()
             abort = true;
             break;
         }
-        fileName = QFileDialog::getSaveFileName(this, tr("Specify log file name"), QDesktopServices::storageLocation(QDesktopServices::DesktopLocation), tr("Logfile (*.log);;"));
+        fileName = QFileDialog::getSaveFileName(this, tr("Specify log file name"), QStandardPaths::writableLocation(QStandardPaths::DesktopLocation), tr("Logfile (*.log);;"));
     }
 
     qDebug() << "SAVE FILE" << fileName;