From bd4ee9320dc584f9a6336f7a7ee1c85c801c8e1a Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 26 Sep 2017 11:51:11 +0200 Subject: [PATCH] Clang: warnings--, drop unused WindowFlags parameter --- src/libcalamaresui/widgets/ClickableLabel.cpp | 8 ++++---- src/libcalamaresui/widgets/ClickableLabel.h | 4 ++-- src/modules/locale/timezonewidget/timezonewidget.cpp | 2 +- src/modules/locale/timezonewidget/timezonewidget.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/libcalamaresui/widgets/ClickableLabel.cpp b/src/libcalamaresui/widgets/ClickableLabel.cpp index d363737fe..543ab8354 100644 --- a/src/libcalamaresui/widgets/ClickableLabel.cpp +++ b/src/libcalamaresui/widgets/ClickableLabel.cpp @@ -21,13 +21,13 @@ #include -ClickableLabel::ClickableLabel( QWidget* parent, Qt::WindowFlags f ) - : QLabel( parent, f ) +ClickableLabel::ClickableLabel( QWidget* parent ) + : QLabel( parent ) {} -ClickableLabel::ClickableLabel( const QString& text, QWidget* parent, Qt::WindowFlags f ) - : QLabel( text, parent, f ) +ClickableLabel::ClickableLabel( const QString& text, QWidget* parent ) + : QLabel( text, parent ) {} diff --git a/src/libcalamaresui/widgets/ClickableLabel.h b/src/libcalamaresui/widgets/ClickableLabel.h index 42af076f5..378ffda77 100644 --- a/src/libcalamaresui/widgets/ClickableLabel.h +++ b/src/libcalamaresui/widgets/ClickableLabel.h @@ -27,8 +27,8 @@ class ClickableLabel : public QLabel { Q_OBJECT public: - explicit ClickableLabel( QWidget* parent = nullptr, Qt::WindowFlags f = 0 ); - explicit ClickableLabel( const QString& text, QWidget* parent = nullptr, Qt::WindowFlags f = 0 ); + explicit ClickableLabel( QWidget* parent = nullptr ); + explicit ClickableLabel( const QString& text, QWidget* parent = nullptr ); virtual ~ClickableLabel() override; signals: diff --git a/src/modules/locale/timezonewidget/timezonewidget.cpp b/src/modules/locale/timezonewidget/timezonewidget.cpp index b8713e107..332ca8060 100644 --- a/src/modules/locale/timezonewidget/timezonewidget.cpp +++ b/src/modules/locale/timezonewidget/timezonewidget.cpp @@ -107,7 +107,7 @@ QPoint TimeZoneWidget::getLocationPosition(double longitude, double latitude) { if (y >= height) y -= height; - return QPoint((int)x, (int)y); + return QPoint( int(x), int(y) ); } diff --git a/src/modules/locale/timezonewidget/timezonewidget.h b/src/modules/locale/timezonewidget/timezonewidget.h index 27256fabe..623ddf4b7 100644 --- a/src/modules/locale/timezonewidget/timezonewidget.h +++ b/src/modules/locale/timezonewidget/timezonewidget.h @@ -48,7 +48,7 @@ class TimeZoneWidget : public QWidget { Q_OBJECT public: - explicit TimeZoneWidget(QWidget* parent = 0); + explicit TimeZoneWidget(QWidget* parent = nullptr); LocaleGlobal::Location getCurrentLocation() { return currentLocation; } void setCurrentLocation(QString region, QString zone);