Browse Source

QDesktopServices::storageLocation() moved to QStandardParths::writableLocation()

QGC4.4
Bryant Mairs 11 years ago
parent
commit
385d436235
  1. 4
      src/ui/PX4FirmwareUpgrader.cc
  2. 4
      src/ui/map3D/ImageryParamDialog.cc
  3. 2
      src/ui/map3D/Pixhawk3DWidget.cc

4
src/ui/PX4FirmwareUpgrader.cc

@ -1,5 +1,5 @@
#include <QFileDialog> #include <QFileDialog>
#include <QDesktopServices> #include <QStandardPaths>
#include <QSettings> #include <QSettings>
#include "PX4FirmwareUpgrader.h" #include "PX4FirmwareUpgrader.h"
@ -28,7 +28,7 @@ void PX4FirmwareUpgrader::selectFirmwareFile()
{ {
QSettings settings; QSettings settings;
QString path = settings.value("PX4_FIRMWARE_PATH", QString path = settings.value("PX4_FIRMWARE_PATH",
QDesktopServices::storageLocation(QDesktopServices::DesktopLocation)).toString(); QStandardPaths::writableLocation(QStandardPaths::DesktopLocation)).toString();
const QString widgetFileExtension(".px4"); const QString widgetFileExtension(".px4");
QString fileName = QFileDialog::getOpenFileName(this, tr("Specify File Name"), QString fileName = QFileDialog::getOpenFileName(this, tr("Specify File Name"),
path, path,

4
src/ui/map3D/ImageryParamDialog.cc

@ -1,6 +1,6 @@
#include "ImageryParamDialog.h" #include "ImageryParamDialog.h"
#include <QDesktopServices> #include <QStandardPaths>
#include <QFileDialog> #include <QFileDialog>
#include <QFormLayout> #include <QFormLayout>
#include <QGroupBox> #include <QGroupBox>
@ -79,7 +79,7 @@ void
ImageryParamDialog::selectPath(void) ImageryParamDialog::selectPath(void)
{ {
QString filename = QFileDialog::getExistingDirectory(this, "Imagery path", QString filename = QFileDialog::getExistingDirectory(this, "Imagery path",
QDesktopServices::storageLocation(QDesktopServices::DesktopLocation)); QStandardPaths::writableLocation(QStandardPaths::DesktopLocation));
if (filename.isNull()) if (filename.isNull())
{ {
return; return;

2
src/ui/map3D/Pixhawk3DWidget.cc

@ -595,7 +595,7 @@ void
Pixhawk3DWidget::loadTerrainModel(void) Pixhawk3DWidget::loadTerrainModel(void)
{ {
QString filename = QFileDialog::getOpenFileName(this, "Load Terrain Model", QString filename = QFileDialog::getOpenFileName(this, "Load Terrain Model",
QDesktopServices::storageLocation(QDesktopServices::DesktopLocation), QStandardPaths::writableLocation(QStandardPaths::DesktopLocation),
tr("Collada (*.dae)")); tr("Collada (*.dae)"));
if (filename.isNull()) if (filename.isNull())

Loading…
Cancel
Save