From 3acd1ab7ffe1c2b13db1191a63930a61a9d51a2a Mon Sep 17 00:00:00 2001 From: Bryant Mairs Date: Thu, 26 Jun 2014 21:33:00 -0700 Subject: [PATCH] QDesktopServices no longer provides system paths, switched to QStandardPaths. --- src/comm/MAVLinkProtocol.cc | 6 +++--- src/ui/HUD.cc | 6 +++--- src/ui/MAVLinkSettingsWidget.cc | 4 ++-- src/ui/MainWindow.cc | 2 +- src/ui/QGCDataPlot2D.cc | 10 +++++----- src/ui/QGCMAVLinkLogPlayer.cc | 4 ++-- src/ui/QGCStatusBar.cc | 2 +- src/ui/designer/QGCToolWidget.cc | 6 +++--- src/ui/linechart/LinechartWidget.cc | 6 +++--- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/comm/MAVLinkProtocol.cc b/src/comm/MAVLinkProtocol.cc index 66ba6dc..35b7218 100644 --- a/src/comm/MAVLinkProtocol.cc +++ b/src/comm/MAVLinkProtocol.cc @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include @@ -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"; } } diff --git a/src/ui/HUD.cc b/src/ui/HUD.cc index 2c13dc5..5d92a9f 100644 --- a/src/ui/HUD.cc +++ b/src/ui/HUD.cc @@ -32,7 +32,7 @@ This file is part of the QGROUNDCONTROL project #include #include #include -#include +#include #include #include #include @@ -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; diff --git a/src/ui/MAVLinkSettingsWidget.cc b/src/ui/MAVLinkSettingsWidget.cc index a630c92..2e9aaa2 100644 --- a/src/ui/MAVLinkSettingsWidget.cc +++ b/src/ui/MAVLinkSettingsWidget.cc @@ -30,7 +30,7 @@ This file is part of the QGROUNDCONTROL project #include #include #include -#include +#include #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")) { diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc index d38db5f..073dcaf 100644 --- a/src/ui/MainWindow.cc +++ b/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) diff --git a/src/ui/QGCDataPlot2D.cc b/src/ui/QGCDataPlot2D.cc index b8c15d1..4dd2787 100644 --- a/src/ui/QGCDataPlot2D.cc +++ b/src/ui/QGCDataPlot2D.cc @@ -36,7 +36,7 @@ This file is part of the QGROUNDCONTROL project #include #include #include -#include +#include #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)"); // } diff --git a/src/ui/QGCMAVLinkLogPlayer.cc b/src/ui/QGCMAVLinkLogPlayer.cc index 54ec4ae..7826d0e 100644 --- a/src/ui/QGCMAVLinkLogPlayer.cc +++ b/src/ui/QGCMAVLinkLogPlayer.cc @@ -1,6 +1,6 @@ #include #include -#include +#include #include #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); diff --git a/src/ui/QGCStatusBar.cc b/src/ui/QGCStatusBar.cc index aecee8d..937d6fc 100644 --- a/src/ui/QGCStatusBar.cc +++ b/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"); diff --git a/src/ui/designer/QGCToolWidget.cc b/src/ui/designer/QGCToolWidget.cc index 69dc906..5618437 100644 --- a/src/ui/designer/QGCToolWidget.cc +++ b/src/ui/designer/QGCToolWidget.cc @@ -8,7 +8,7 @@ #include #include #include -#include +#include #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); } diff --git a/src/ui/linechart/LinechartWidget.cc b/src/ui/linechart/LinechartWidget.cc index 7e4521d..9ef311e 100644 --- a/src/ui/linechart/LinechartWidget.cc +++ b/src/ui/linechart/LinechartWidget.cc @@ -43,7 +43,7 @@ This file is part of the PIXHAWK project #include #include #include -#include +#include #include #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;