summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2020-10-25 14:27:39 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2020-10-26 19:27:03 -0700
commitf871b8dfac8d8afffdeed0efa64e74c29299b193 (patch)
tree4952f4cd5219986eb6d419325c2532bd20c1c33b
parent484a50b6a817df60ab1650cf0739ade3a4928353 (diff)
downloadsubsurface-f871b8dfac8d8afffdeed0efa64e74c29299b193.tar.gz
cleanup: fix deprecated QFlags use
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--desktop-widgets/about.cpp2
-rw-r--r--desktop-widgets/about.h2
-rw-r--r--desktop-widgets/diveplanner.cpp6
-rw-r--r--desktop-widgets/diveplanner.h4
-rw-r--r--desktop-widgets/downloadfromdivecomputer.cpp2
-rw-r--r--desktop-widgets/downloadfromdivecomputer.h2
-rw-r--r--desktop-widgets/printdialog.cpp4
-rw-r--r--desktop-widgets/printdialog.h2
-rw-r--r--desktop-widgets/starwidget.cpp2
-rw-r--r--desktop-widgets/starwidget.h2
-rw-r--r--desktop-widgets/subsurfacewebservices.cpp4
-rw-r--r--desktop-widgets/subsurfacewebservices.h4
12 files changed, 18 insertions, 18 deletions
diff --git a/desktop-widgets/about.cpp b/desktop-widgets/about.cpp
index 41084ec94..9ceed2177 100644
--- a/desktop-widgets/about.cpp
+++ b/desktop-widgets/about.cpp
@@ -5,7 +5,7 @@
#include <QUrl>
#include <QShortcut>
-SubsurfaceAbout::SubsurfaceAbout(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f)
+SubsurfaceAbout::SubsurfaceAbout(QWidget *parent) : QDialog(parent, QFlag(0))
{
ui.setupUi(this);
diff --git a/desktop-widgets/about.h b/desktop-widgets/about.h
index 7a6930698..45f04637e 100644
--- a/desktop-widgets/about.h
+++ b/desktop-widgets/about.h
@@ -9,7 +9,7 @@ class SubsurfaceAbout : public QDialog {
Q_OBJECT
public:
- explicit SubsurfaceAbout(QWidget *parent = 0, Qt::WindowFlags f = 0);
+ explicit SubsurfaceAbout(QWidget *parent = 0);
private
slots:
void on_licenseButton_clicked();
diff --git a/desktop-widgets/diveplanner.cpp b/desktop-widgets/diveplanner.cpp
index 00aaffdac..3e63e5ffe 100644
--- a/desktop-widgets/diveplanner.cpp
+++ b/desktop-widgets/diveplanner.cpp
@@ -107,7 +107,7 @@ void DiveHandler::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
emit released();
}
-DivePlannerWidget::DivePlannerWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, f)
+DivePlannerWidget::DivePlannerWidget(QWidget *parent) : QWidget(parent, QFlag(0))
{
DivePlannerPointsModel *plannerModel = DivePlannerPointsModel::instance();
CylindersModel *cylinders = DivePlannerPointsModel::instance()->cylindersModel();
@@ -214,7 +214,7 @@ void DivePlannerWidget::setSalinity(int salinity)
break;
}
}
-
+
if (!mapped) {
/* Assign to last element "custom" in combo box */
ui.waterType->setItemData(ui.waterType->count()-1, salinity);
@@ -425,7 +425,7 @@ void DivePlannerWidget::printDecoPlan()
MainWindow::instance()->printPlan();
}
-PlannerSettingsWidget::PlannerSettingsWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, f)
+PlannerSettingsWidget::PlannerSettingsWidget(QWidget *parent) : QWidget(parent, QFlag(0))
{
ui.setupUi(this);
diff --git a/desktop-widgets/diveplanner.h b/desktop-widgets/diveplanner.h
index 11da67b7d..af38f83af 100644
--- a/desktop-widgets/diveplanner.h
+++ b/desktop-widgets/diveplanner.h
@@ -43,7 +43,7 @@ private:
class DivePlannerWidget : public QWidget {
Q_OBJECT
public:
- explicit DivePlannerWidget(QWidget *parent = 0, Qt::WindowFlags f = 0);
+ explicit DivePlannerWidget(QWidget *parent = 0);
void setReplanButton(bool replan);
public
slots:
@@ -67,7 +67,7 @@ private:
class PlannerSettingsWidget : public QWidget {
Q_OBJECT
public:
- explicit PlannerSettingsWidget(QWidget *parent = 0, Qt::WindowFlags f = 0);
+ explicit PlannerSettingsWidget(QWidget *parent = 0);
~PlannerSettingsWidget();
public
slots:
diff --git a/desktop-widgets/downloadfromdivecomputer.cpp b/desktop-widgets/downloadfromdivecomputer.cpp
index 3c84683af..6b6e9f5f1 100644
--- a/desktop-widgets/downloadfromdivecomputer.cpp
+++ b/desktop-widgets/downloadfromdivecomputer.cpp
@@ -19,7 +19,7 @@
#include <QTimer>
#include <QUndoStack>
-DownloadFromDCWidget::DownloadFromDCWidget(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f),
+DownloadFromDCWidget::DownloadFromDCWidget(QWidget *parent) : QDialog(parent, QFlag(0)),
downloading(false),
previousLast(0),
timer(new QTimer(this)),
diff --git a/desktop-widgets/downloadfromdivecomputer.h b/desktop-widgets/downloadfromdivecomputer.h
index f49a45f45..40f6b41e1 100644
--- a/desktop-widgets/downloadfromdivecomputer.h
+++ b/desktop-widgets/downloadfromdivecomputer.h
@@ -25,7 +25,7 @@ class BTDiscovery;
class DownloadFromDCWidget : public QDialog {
Q_OBJECT
public:
- explicit DownloadFromDCWidget(QWidget *parent = 0, Qt::WindowFlags f = 0);
+ explicit DownloadFromDCWidget(QWidget *parent = 0);
void reject();
enum states {
diff --git a/desktop-widgets/printdialog.cpp b/desktop-widgets/printdialog.cpp
index 339914b6a..7ef7d03ec 100644
--- a/desktop-widgets/printdialog.cpp
+++ b/desktop-widgets/printdialog.cpp
@@ -17,8 +17,8 @@
template_options::color_palette_struct ssrf_colors, almond_colors, blueshades_colors, custom_colors;
-PrintDialog::PrintDialog(QWidget *parent, Qt::WindowFlags f) :
- QDialog(parent, f),
+PrintDialog::PrintDialog(QWidget *parent) :
+ QDialog(parent, QFlag(0)),
printer(NULL),
qprinter(NULL)
{
diff --git a/desktop-widgets/printdialog.h b/desktop-widgets/printdialog.h
index f03abaff2..19473544d 100644
--- a/desktop-widgets/printdialog.h
+++ b/desktop-widgets/printdialog.h
@@ -18,7 +18,7 @@ class PrintDialog : public QDialog {
Q_OBJECT
public:
- explicit PrintDialog(QWidget *parent = 0, Qt::WindowFlags f = 0);
+ explicit PrintDialog(QWidget *parent = 0);
~PrintDialog();
private:
diff --git a/desktop-widgets/starwidget.cpp b/desktop-widgets/starwidget.cpp
index 8748d929b..a12a1e32b 100644
--- a/desktop-widgets/starwidget.cpp
+++ b/desktop-widgets/starwidget.cpp
@@ -108,7 +108,7 @@ static QImage grayImage(const QImage &coloredImg)
return img;
}
-StarWidget::StarWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, f),
+StarWidget::StarWidget(QWidget *parent) : QWidget(parent, QFlag(0)),
current(0),
readOnly(false)
{
diff --git a/desktop-widgets/starwidget.h b/desktop-widgets/starwidget.h
index daa4ffbf5..e972d6a88 100644
--- a/desktop-widgets/starwidget.h
+++ b/desktop-widgets/starwidget.h
@@ -11,7 +11,7 @@ enum StarConfig {
class StarWidget : public QWidget {
Q_OBJECT
public:
- explicit StarWidget(QWidget *parent = 0, Qt::WindowFlags f = 0);
+ explicit StarWidget(QWidget *parent = 0);
int currentStars() const;
QSize sizeHint() const override;
diff --git a/desktop-widgets/subsurfacewebservices.cpp b/desktop-widgets/subsurfacewebservices.cpp
index 0ca2974b6..af171e3ba 100644
--- a/desktop-widgets/subsurfacewebservices.cpp
+++ b/desktop-widgets/subsurfacewebservices.cpp
@@ -39,7 +39,7 @@
#define PATH_MAX 4096
#endif
-WebServices::WebServices(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f), reply(0)
+WebServices::WebServices(QWidget *parent) : QDialog(parent, QFlag(0)), reply(0)
{
ui.setupUi(this);
connect(ui.buttonBox, SIGNAL(clicked(QAbstractButton *)), this, SLOT(buttonClicked(QAbstractButton *)));
@@ -252,7 +252,7 @@ void DivelogsDeWebServices::prepareDivesForUpload(bool selected)
exec();
}
-DivelogsDeWebServices::DivelogsDeWebServices(QWidget *parent, Qt::WindowFlags f) : WebServices(parent, f),
+DivelogsDeWebServices::DivelogsDeWebServices(QWidget *parent) : WebServices(parent),
uploadMode(false)
{
// should DivelogDE user and pass be stored in the prefs struct or something?
diff --git a/desktop-widgets/subsurfacewebservices.h b/desktop-widgets/subsurfacewebservices.h
index e9b593005..f9bedefa1 100644
--- a/desktop-widgets/subsurfacewebservices.h
+++ b/desktop-widgets/subsurfacewebservices.h
@@ -16,7 +16,7 @@ class QHttpMultiPart;
class WebServices : public QDialog {
Q_OBJECT
public:
- explicit WebServices(QWidget *parent = 0, Qt::WindowFlags f = 0);
+ explicit WebServices(QWidget *parent = 0);
void hidePassword();
void hideUpload();
void hideDownload();
@@ -66,7 +66,7 @@ slots:
void uploadStatus(const QString &text);
private:
- explicit DivelogsDeWebServices(QWidget *parent = 0, Qt::WindowFlags f = 0);
+ explicit DivelogsDeWebServices(QWidget *parent = 0);
void setStatusText(int status);
void download_dialog_traverse_xml(xmlNodePtr node, unsigned int *download_status);
unsigned int download_dialog_parse_response(const QByteArray &length);