mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-01 05:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Whitespace cleanup desktop-widget

Browse source 
Not entirely script based because of the broken 'else if'.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2018-07-25 18:40:19 -07:00 • committed by Lubomir I. Ivanov
parent 00c0f94d8c
commit 0e6c3db24c
2 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
desktop-widgets/configuredivecomputerdialog.cpp
View file

@ -1,18 +1,18 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include "desktop-widgets/configuredivecomputerdialog.h" #include "desktop-widgets/configuredivecomputerdialog.h"
#include "core/qthelper.h"
#include "desktop-widgets/mainwindow.h"
#include "core/display.h" #include "core/display.h"
#include "core/qthelper.h"
#include "core/subsurface-qt/SettingsObjectWrapper.h" #include "core/subsurface-qt/SettingsObjectWrapper.h"
#include "desktop-widgets/mainwindow.h"
// For fill_computer_list, descriptorLookup // For fill_computer_list, descriptorLookup
#include "core/downloadfromdcthread.h" #include "core/downloadfromdcthread.h"
#include <QFileDialog> #include <QFileDialog>
#include <QMessageBox> #include <QMessageBox>
#include <QSettings>
#include <QNetworkReply> #include <QNetworkReply>
#include <QProgressDialog> #include <QProgressDialog>
#include <QSettings>
GasSpinBoxItemDelegate::GasSpinBoxItemDelegate(QObject *parent, column_type type) : QStyledItemDelegate(parent), type(type) GasSpinBoxItemDelegate::GasSpinBoxItemDelegate(QObject *parent, column_type type) : QStyledItemDelegate(parent), type(type)
{ {
@ -900,7 +900,8 @@ void ConfigureDiveComputerDialog::getDeviceData()
{ {
#ifdef BT_SUPPORT #ifdef BT_SUPPORT
QString device = ui.bluetoothMode && btDeviceSelectionDialog ? QString device = ui.bluetoothMode && btDeviceSelectionDialog ?
btDeviceSelectionDialog->getSelectedDeviceAddress() : ui.device->currentText(); btDeviceSelectionDialog->getSelectedDeviceAddress() :
ui.device->currentText();
#else #else
QString device = ui.device->currentText(); QString device = ui.device->currentText();
#endif #endif

16
desktop-widgets/downloadfromdivecomputer.cpp
View file

@ -1,19 +1,19 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include "desktop-widgets/downloadfromdivecomputer.h" #include "desktop-widgets/downloadfromdivecomputer.h"
#include "core/qthelper.h"
#include "desktop-widgets/mainwindow.h"
#include "desktop-widgets/divelistview.h"
#include "core/display.h" #include "core/display.h"
#include "core/qthelper.h"
#include "core/subsurface-qt/SettingsObjectWrapper.h"
#include "core/subsurface-string.h" #include "core/subsurface-string.h"
#include "core/uemis.h" #include "core/uemis.h"
#include "core/subsurface-qt/SettingsObjectWrapper.h" #include "desktop-widgets/divelistview.h"
#include "qt-models/models.h" #include "desktop-widgets/mainwindow.h"
#include "qt-models/diveimportedmodel.h" #include "qt-models/diveimportedmodel.h"
#include "qt-models/models.h"
#include <QTimer>
#include <QFileDialog> #include <QFileDialog>
#include <QMessageBox> #include <QMessageBox>
#include <QShortcut> #include <QShortcut>
#include <QTimer>
DownloadFromDCWidget::DownloadFromDCWidget(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f), DownloadFromDCWidget::DownloadFromDCWidget(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f),
downloading(false), downloading(false),
@ -334,7 +334,8 @@ void DownloadFromDCWidget::on_downloadCancelRetryButton_clicked()
// //
// We shouldn't do this for memory dumps. // We shouldn't do this for memory dumps.
if ((product == "OSTC 3" || product == "OSTC 3+" || product == "OSTC cR" || if ((product == "OSTC 3" || product == "OSTC 3+" || product == "OSTC cR" ||
product == "OSTC Sport" || product == "OSTC 4") && !data->saveDump()) { product == "OSTC Sport" || product == "OSTC 4") &&
!data->saveDump()) {
ostcFirmwareCheck = new OstcFirmwareCheck(product); ostcFirmwareCheck = new OstcFirmwareCheck(product);
} }
} }
@ -577,4 +578,3 @@ void DownloadFromDCWidget::fill_device_list(int dc_type)
if (deviceIndex >= 0) if (deviceIndex >= 0)
ui.device->setCurrentIndex(deviceIndex); ui.device->setCurrentIndex(deviceIndex);
} }