From b0c4fbc1bb002bab9e9c92ed974f6af791735bac Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 13 Jan 2018 21:19:08 +0100 Subject: [PATCH] Clang: reduce warnings - mark some things override - make conversion of 0 to flags explicit --- src/calamares/CalamaresWindow.h | 2 +- src/modules/netinstall/PackageModel.cpp | 2 +- src/modules/tracking/TrackingJobs.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/calamares/CalamaresWindow.h b/src/calamares/CalamaresWindow.h index 19aeaa59e..faca8974a 100644 --- a/src/calamares/CalamaresWindow.h +++ b/src/calamares/CalamaresWindow.h @@ -37,7 +37,7 @@ class CalamaresWindow : public QWidget Q_OBJECT public: CalamaresWindow( QWidget* parent = nullptr ); - virtual ~CalamaresWindow() {} + virtual ~CalamaresWindow() override {} public slots: /** diff --git a/src/modules/netinstall/PackageModel.cpp b/src/modules/netinstall/PackageModel.cpp index 6585abcee..3e721c017 100644 --- a/src/modules/netinstall/PackageModel.cpp +++ b/src/modules/netinstall/PackageModel.cpp @@ -144,7 +144,7 @@ Qt::ItemFlags PackageModel::flags( const QModelIndex& index ) const { if ( !index.isValid() ) - return 0; + return Qt::ItemFlags(); if ( index.column() == 0 ) return Qt::ItemIsUserCheckable | QAbstractItemModel::flags( index ); return QAbstractItemModel::flags( index ); diff --git a/src/modules/tracking/TrackingJobs.h b/src/modules/tracking/TrackingJobs.h index 2d90c2b15..4ad3652ca 100644 --- a/src/modules/tracking/TrackingJobs.h +++ b/src/modules/tracking/TrackingJobs.h @@ -30,7 +30,7 @@ class TrackingInstallJob : public Calamares::Job Q_OBJECT public: TrackingInstallJob( const QString& url ); - ~TrackingInstallJob(); + ~TrackingInstallJob() override; QString prettyName() const override; QString prettyDescription() const override;