Warnings-- (~T() override)

Consistently use
	~T() override;
in class declarations (so no virtual in front, and avoid
warnings due to the missing override in back).
main
Adriaan de Groot 5 years ago
parent 7d5a209dd0
commit 2126be6d6d

@ -30,7 +30,7 @@ class CalamaresApplication : public QApplication
Q_OBJECT Q_OBJECT
public: public:
CalamaresApplication( int& argc, char* argv[] ); CalamaresApplication( int& argc, char* argv[] );
virtual ~CalamaresApplication(); ~CalamaresApplication() override;
/** /**
* @brief init handles the first part of Calamares application startup. * @brief init handles the first part of Calamares application startup.

@ -28,7 +28,7 @@ class DLLEXPORT CppJob : public Job
Q_OBJECT Q_OBJECT
public: public:
explicit CppJob( QObject* parent = nullptr ); explicit CppJob( QObject* parent = nullptr );
virtual ~CppJob(); ~CppJob() override;
void setModuleInstanceKey( const Calamares::ModuleSystem::InstanceKey& instanceKey ); void setModuleInstanceKey( const Calamares::ModuleSystem::InstanceKey& instanceKey );
Calamares::ModuleSystem::InstanceKey moduleInstanceKey() const { return m_instanceKey; } Calamares::ModuleSystem::InstanceKey moduleInstanceKey() const { return m_instanceKey; }

@ -86,7 +86,7 @@ class DLLEXPORT Job : public QObject
Q_OBJECT Q_OBJECT
public: public:
explicit Job( QObject* parent = nullptr ); explicit Job( QObject* parent = nullptr );
virtual ~Job(); ~Job() override;
/** @brief The job's (relative) weight. /** @brief The job's (relative) weight.
* *

@ -53,7 +53,7 @@ public:
{ {
} }
virtual ~JobThread() override; ~JobThread() override;
void finalize() void finalize()
{ {

@ -25,7 +25,7 @@ class DLLEXPORT JobQueue : public QObject
Q_OBJECT Q_OBJECT
public: public:
explicit JobQueue( QObject* parent = nullptr ); explicit JobQueue( QObject* parent = nullptr );
virtual ~JobQueue(); ~JobQueue() override;
static JobQueue* instance(); static JobQueue* instance();

@ -48,7 +48,7 @@ public:
static Helper* instance(); static Helper* instance();
private: private:
virtual ~Helper(); ~Helper() override;
explicit Helper(); explicit Helper();
boost::python::object m_mainModule; boost::python::object m_mainModule;

@ -36,7 +36,7 @@ public:
}; };
LabelModel( const QStringList& locales, QObject* parent = nullptr ); LabelModel( const QStringList& locales, QObject* parent = nullptr );
virtual ~LabelModel() override; ~LabelModel() override;
int rowCount( const QModelIndex& parent ) const override; int rowCount( const QModelIndex& parent ) const override;

@ -94,7 +94,7 @@ public:
}; };
RegionsModel( QObject* parent = nullptr ); RegionsModel( QObject* parent = nullptr );
virtual ~RegionsModel() override; ~RegionsModel() override;
int rowCount( const QModelIndex& parent ) const override; int rowCount( const QModelIndex& parent ) const override;
QVariant data( const QModelIndex& index, int role ) const override; QVariant data( const QModelIndex& index, int role ) const override;
@ -126,7 +126,7 @@ public:
}; };
ZonesModel( QObject* parent = nullptr ); ZonesModel( QObject* parent = nullptr );
virtual ~ZonesModel() override; ~ZonesModel() override;
int rowCount( const QModelIndex& parent ) const override; int rowCount( const QModelIndex& parent ) const override;
QVariant data( const QModelIndex& index, int role ) const override; QVariant data( const QModelIndex& index, int role ) const override;

@ -99,7 +99,7 @@ public:
* to keep the reference. * to keep the reference.
*/ */
static Manager& instance(); static Manager& instance();
virtual ~Manager(); virtual ~Manager() override;
/** @brief Checks if the given @p url returns data. /** @brief Checks if the given @p url returns data.
* *

@ -126,7 +126,7 @@ public:
* @param parent the QObject parent. * @param parent the QObject parent.
*/ */
explicit System( bool doChroot, QObject* parent = nullptr ); explicit System( bool doChroot, QObject* parent = nullptr );
virtual ~System(); virtual ~System() override;
static System* instance(); static System* instance();

@ -88,7 +88,7 @@ public:
Q_PLUGIN_METADATA( IID CalamaresPluginFactory_iid ) \ Q_PLUGIN_METADATA( IID CalamaresPluginFactory_iid ) \
public: \ public: \
explicit name(); \ explicit name(); \
~name(); \ ~name() override; \
}; };
#define CALAMARES_PLUGIN_FACTORY_DEFINITION( name, pluginRegistrations ) \ #define CALAMARES_PLUGIN_FACTORY_DEFINITION( name, pluginRegistrations ) \
K_PLUGIN_FACTORY_DEFINITION_WITH_BASEFACTORY( name, CalamaresPluginFactory, pluginRegistrations ) K_PLUGIN_FACTORY_DEFINITION_WITH_BASEFACTORY( name, CalamaresPluginFactory, pluginRegistrations )

@ -52,7 +52,7 @@ public:
: QObject( parent ) : QObject( parent )
{ {
} }
virtual ~Slideshow(); ~Slideshow() override;
/// @brief Is the slideshow being shown **right now**? /// @brief Is the slideshow being shown **right now**?
bool isActive() const { return m_state == Start; } bool isActive() const { return m_state == Start; }

@ -38,7 +38,7 @@ class UIDLLEXPORT PrettyRadioButton : public QWidget
Q_OBJECT Q_OBJECT
public: public:
explicit PrettyRadioButton( QWidget* parent = nullptr ); explicit PrettyRadioButton( QWidget* parent = nullptr );
virtual ~PrettyRadioButton() {} ~PrettyRadioButton() override {}
/// @brief Passes @p text on to the ClickableLabel /// @brief Passes @p text on to the ClickableLabel
void setText( const QString& text ); void setText( const QString& text );

@ -35,7 +35,7 @@ class LayoutItem : public QListWidgetItem
public: public:
QString data; QString data;
virtual ~LayoutItem(); ~LayoutItem() override;
}; };
LayoutItem::~LayoutItem() {} LayoutItem::~LayoutItem() {}

@ -34,7 +34,7 @@ class KeyboardPage : public QWidget
Q_OBJECT Q_OBJECT
public: public:
explicit KeyboardPage( QWidget* parent = nullptr ); explicit KeyboardPage( QWidget* parent = nullptr );
virtual ~KeyboardPage(); ~KeyboardPage() override;
void init(); void init();

@ -71,8 +71,8 @@ private:
QString fromUnicodeString( QString raw ); QString fromUnicodeString( QString raw );
protected: protected:
void paintEvent( QPaintEvent* event ); void paintEvent( QPaintEvent* event ) override;
void resizeEvent( QResizeEvent* event ); void resizeEvent( QResizeEvent* event ) override;
}; };
#endif // KEYBOARDPREVIEW_H #endif // KEYBOARDPREVIEW_H

@ -52,7 +52,7 @@ class Config : public QObject
public: public:
Config( QObject* parent = nullptr ); Config( QObject* parent = nullptr );
~Config(); ~Config() override;
void setConfigurationMap( const QVariantMap& ); void setConfigurationMap( const QVariantMap& );
void finalizeGlobalStorage() const; void finalizeGlobalStorage() const;

@ -32,7 +32,7 @@ class LocalePage : public QWidget
Q_OBJECT Q_OBJECT
public: public:
explicit LocalePage( class Config* config, QWidget* parent = nullptr ); explicit LocalePage( class Config* config, QWidget* parent = nullptr );
virtual ~LocalePage(); ~LocalePage() override;
void onActivate(); void onActivate();

@ -66,8 +66,8 @@ private:
const CalamaresUtils::Locale::ZonesModel* m_zonesData; const CalamaresUtils::Locale::ZonesModel* m_zonesData;
const TimeZoneData* m_currentLocation = nullptr; // Not owned by me const TimeZoneData* m_currentLocation = nullptr; // Not owned by me
void paintEvent( QPaintEvent* event ); void paintEvent( QPaintEvent* event ) override;
void mousePressEvent( QMouseEvent* event ); void mousePressEvent( QMouseEvent* event ) override;
}; };
#endif // TIMEZONEWIDGET_H #endif // TIMEZONEWIDGET_H

@ -28,7 +28,7 @@ class Config : public QObject
public: public:
Config( QObject* parent = nullptr ); Config( QObject* parent = nullptr );
virtual ~Config(); ~Config() override;
enum class Status enum class Status
{ {

@ -35,7 +35,7 @@ class NetInstallPage : public QWidget
Q_OBJECT Q_OBJECT
public: public:
NetInstallPage( Config* config, QWidget* parent = nullptr ); NetInstallPage( Config* config, QWidget* parent = nullptr );
virtual ~NetInstallPage(); ~NetInstallPage() override;
/** @brief Sets the page title /** @brief Sets the page title
* *

@ -36,7 +36,7 @@ class TrackingStyleConfig : public QObject
public: public:
TrackingStyleConfig( QObject* parent ); TrackingStyleConfig( QObject* parent );
virtual ~TrackingStyleConfig(); ~TrackingStyleConfig() override;
void setConfigurationMap( const QVariantMap& ); void setConfigurationMap( const QVariantMap& );

@ -104,7 +104,7 @@ public:
using PasswordStatus = QPair< PasswordValidity, QString >; using PasswordStatus = QPair< PasswordValidity, QString >;
Config( QObject* parent = nullptr ); Config( QObject* parent = nullptr );
~Config(); ~Config() override;
void setConfigurationMap( const QVariantMap& ); void setConfigurationMap( const QVariantMap& );

@ -32,7 +32,7 @@ class UsersPage : public QWidget
Q_OBJECT Q_OBJECT
public: public:
explicit UsersPage( Config* config, QWidget* parent = nullptr ); explicit UsersPage( Config* config, QWidget* parent = nullptr );
virtual ~UsersPage(); ~UsersPage() override;
void onActivate(); void onActivate();

@ -32,7 +32,7 @@ class CheckerContainer : public QWidget
Q_OBJECT Q_OBJECT
public: public:
explicit CheckerContainer( const Calamares::RequirementsModel& model, QWidget* parent = nullptr ); explicit CheckerContainer( const Calamares::RequirementsModel& model, QWidget* parent = nullptr );
virtual ~CheckerContainer(); ~CheckerContainer() override;
bool verdict() const; bool verdict() const;

@ -87,7 +87,7 @@ public:
* or UB happens. * or UB happens.
*/ */
ResultsListDialog( const Calamares::RequirementsModel& model, QWidget* parent ); ResultsListDialog( const Calamares::RequirementsModel& model, QWidget* parent );
virtual ~ResultsListDialog(); ~ResultsListDialog() override;
private: private:
QLabel* m_title; QLabel* m_title;

Loading…
Cancel
Save