Warnings-- (~T() override)

Change all the places that had
	virtual ~T() override
to the less redundant form without override.
This commit is contained in:
Adriaan de Groot 2020-09-22 22:49:30 +02:00
parent 2126be6d6d
commit 2878c474c5
55 changed files with 56 additions and 56 deletions

View File

@ -28,7 +28,7 @@ class CalamaresWindow : public QWidget
Q_OBJECT Q_OBJECT
public: public:
CalamaresWindow( QWidget* parent = nullptr ); CalamaresWindow( QWidget* parent = nullptr );
virtual ~CalamaresWindow() override {} ~CalamaresWindow() override {}
public slots: public slots:
/** /**

View File

@ -22,7 +22,7 @@ class ProgressTreeView : public QListView
Q_OBJECT Q_OBJECT
public: public:
explicit ProgressTreeView( QWidget* parent = nullptr ); explicit ProgressTreeView( QWidget* parent = nullptr );
virtual ~ProgressTreeView() override; ~ProgressTreeView() override;
/** /**
* @brief setModel assigns a model to this view. * @brief setModel assigns a model to this view.

View File

@ -140,7 +140,7 @@ public:
, m_delay( t ) , m_delay( t )
{ {
} }
virtual ~ExecViewJob() override; ~ExecViewJob() override;
QString prettyName() const override { return m_name; } QString prettyName() const override { return m_name; }

View File

@ -27,7 +27,7 @@ public:
bool runInChroot = false, bool runInChroot = false,
std::chrono::seconds secondsTimeout = std::chrono::seconds( 30 ), std::chrono::seconds secondsTimeout = std::chrono::seconds( 30 ),
QObject* parent = nullptr ); QObject* parent = nullptr );
virtual ~ProcessJob() override; ~ProcessJob() override;
QString prettyName() const override; QString prettyName() const override;
QString prettyStatusMessage() const override; QString prettyStatusMessage() const override;

View File

@ -484,7 +484,7 @@ public:
: Calamares::Job( parent ) : Calamares::Job( parent )
{ {
} }
virtual ~DummyJob() override; ~DummyJob() override;
QString prettyName() const override; QString prettyName() const override;
Calamares::JobResult exec() override; Calamares::JobResult exec() override;

View File

@ -34,7 +34,7 @@ class RequirementsChecker : public QObject
public: public:
RequirementsChecker( QVector< Module* > modules, RequirementsModel* model, QObject* parent = nullptr ); RequirementsChecker( QVector< Module* > modules, RequirementsModel* model, QObject* parent = nullptr );
virtual ~RequirementsChecker() override; ~RequirementsChecker() override;
public Q_SLOTS: public Q_SLOTS:
/// @brief Start checking all the requirements /// @brief Start checking all the requirements

View File

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

View File

@ -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() override; ~System() override;
static System* instance(); static System* instance();

View File

@ -212,7 +212,7 @@ signals:
private: private:
explicit ViewManager( QObject* parent = nullptr ); explicit ViewManager( QObject* parent = nullptr );
virtual ~ViewManager() override; ~ViewManager() override;
void insertViewStep( int before, ViewStep* step ); void insertViewStep( int before, ViewStep* step );
void updateButtonLabels(); void updateButtonLabels();

View File

@ -34,7 +34,7 @@ protected:
private: private:
explicit CppJobModule(); explicit CppJobModule();
virtual ~CppJobModule() override; ~CppJobModule() override;
QPluginLoader* m_loader; QPluginLoader* m_loader;
job_ptr m_job; job_ptr m_job;

View File

@ -37,7 +37,7 @@ class ModuleManager : public QObject
Q_OBJECT Q_OBJECT
public: public:
explicit ModuleManager( const QStringList& paths, QObject* parent = nullptr ); explicit ModuleManager( const QStringList& paths, QObject* parent = nullptr );
virtual ~ModuleManager() override; ~ModuleManager() override;
static ModuleManager* instance(); static ModuleManager* instance();

View File

@ -33,7 +33,7 @@ protected:
private: private:
explicit ProcessJobModule(); explicit ProcessJobModule();
virtual ~ProcessJobModule() override; ~ProcessJobModule() override;
QString m_command; QString m_command;
QString m_workingPath; QString m_workingPath;

View File

@ -30,7 +30,7 @@ protected:
private: private:
explicit PythonJobModule(); explicit PythonJobModule();
virtual ~PythonJobModule() override; ~PythonJobModule() override;
QString m_scriptFileName; QString m_scriptFileName;
QString m_workingPath; QString m_workingPath;

View File

@ -37,7 +37,7 @@ protected:
private: private:
explicit ViewModule(); explicit ViewModule();
virtual ~ViewModule() override; ~ViewModule() override;
QPluginLoader* m_loader; QPluginLoader* m_loader;
ViewStep* m_viewStep = nullptr; ViewStep* m_viewStep = nullptr;

View File

@ -29,7 +29,7 @@ public:
const QString& description, const QString& description,
const QString& details = QString(), const QString& details = QString(),
QObject* parent = nullptr ); QObject* parent = nullptr );
virtual ~BlankViewStep() override; ~BlankViewStep() override;
QString prettyName() const override; QString prettyName() const override;

View File

@ -50,7 +50,7 @@ public:
* @see Qml.h for available Calamares internals. * @see Qml.h for available Calamares internals.
*/ */
QmlViewStep( QObject* parent = nullptr ); QmlViewStep( QObject* parent = nullptr );
virtual ~QmlViewStep() override; ~QmlViewStep() override;
virtual QString prettyName() const override; virtual QString prettyName() const override;

View File

@ -91,7 +91,7 @@ class SlideshowQML : public Slideshow
Q_OBJECT Q_OBJECT
public: public:
SlideshowQML( QWidget* parent ); SlideshowQML( QWidget* parent );
virtual ~SlideshowQML() override; ~SlideshowQML() override;
QWidget* widget() override; QWidget* widget() override;
void changeSlideShowState( Action a ) override; void changeSlideShowState( Action a ) override;
@ -123,7 +123,7 @@ class SlideshowPictures : public Slideshow
Q_OBJECT Q_OBJECT
public: public:
SlideshowPictures( QWidget* parent ); SlideshowPictures( QWidget* parent );
virtual ~SlideshowPictures() override; ~SlideshowPictures() override;
QWidget* widget() override; QWidget* widget() override;
virtual void changeSlideShowState( Action a ) override; virtual void changeSlideShowState( Action a ) override;

View File

@ -41,7 +41,7 @@ class UIDLLEXPORT ViewStep : public QObject
Q_OBJECT Q_OBJECT
public: public:
explicit ViewStep( QObject* parent = nullptr ); explicit ViewStep( QObject* parent = nullptr );
virtual ~ViewStep() override; ~ViewStep() override;
/** @brief Human-readable name of the step /** @brief Human-readable name of the step
* *

View File

@ -32,7 +32,7 @@ class UIDLLEXPORT ClickableLabel : public QLabel
public: public:
explicit ClickableLabel( QWidget* parent = nullptr ); explicit ClickableLabel( QWidget* parent = nullptr );
explicit ClickableLabel( const QString& text, QWidget* parent = nullptr ); explicit ClickableLabel( const QString& text, QWidget* parent = nullptr );
virtual ~ClickableLabel() override; ~ClickableLabel() override;
signals: signals:
void clicked(); void clicked();

View File

@ -19,7 +19,7 @@ class FixedAspectRatioLabel : public QLabel
Q_OBJECT Q_OBJECT
public: public:
explicit FixedAspectRatioLabel( QWidget* parent = nullptr ); explicit FixedAspectRatioLabel( QWidget* parent = nullptr );
virtual ~FixedAspectRatioLabel() override; ~FixedAspectRatioLabel() override;
public slots: public slots:
void setPixmap( const QPixmap& pixmap ); void setPixmap( const QPixmap& pixmap );

View File

@ -26,7 +26,7 @@ class PLUGINDLLEXPORT ContextualProcessJob : public Calamares::CppJob
public: public:
explicit ContextualProcessJob( QObject* parent = nullptr ); explicit ContextualProcessJob( QObject* parent = nullptr );
virtual ~ContextualProcessJob() override; ~ContextualProcessJob() override;
QString prettyName() const override; QString prettyName() const override;

View File

@ -26,7 +26,7 @@ class PLUGINDLLEXPORT DracutLuksCfgJob : public Calamares::CppJob
public: public:
explicit DracutLuksCfgJob( QObject* parent = nullptr ); explicit DracutLuksCfgJob( QObject* parent = nullptr );
virtual ~DracutLuksCfgJob() override; ~DracutLuksCfgJob() override;
QString prettyName() const override; QString prettyName() const override;

View File

@ -26,7 +26,7 @@ class PLUGINDLLEXPORT DummyCppJob : public Calamares::CppJob
public: public:
explicit DummyCppJob( QObject* parent = nullptr ); explicit DummyCppJob( QObject* parent = nullptr );
virtual ~DummyCppJob() override; ~DummyCppJob() override;
QString prettyName() const override; QString prettyName() const override;

View File

@ -36,7 +36,7 @@ public:
static QString modeName( RestartMode m ); static QString modeName( RestartMode m );
explicit FinishedViewStep( QObject* parent = nullptr ); explicit FinishedViewStep( QObject* parent = nullptr );
virtual ~FinishedViewStep() override; ~FinishedViewStep() override;
QString prettyName() const override; QString prettyName() const override;

View File

@ -33,7 +33,7 @@ class PLUGINDLLEXPORT ResizeFSJob : public Calamares::CppJob
public: public:
explicit ResizeFSJob( QObject* parent = nullptr ); explicit ResizeFSJob( QObject* parent = nullptr );
virtual ~ResizeFSJob() override; ~ResizeFSJob() override;
QString prettyName() const override; QString prettyName() const override;

View File

@ -43,7 +43,7 @@ class PLUGINDLLEXPORT HostInfoJob : public Calamares::CppJob
public: public:
explicit HostInfoJob( QObject* parent = nullptr ); explicit HostInfoJob( QObject* parent = nullptr );
virtual ~HostInfoJob() override; ~HostInfoJob() override;
QString prettyName() const override; QString prettyName() const override;

View File

@ -23,7 +23,7 @@ class PLUGINDLLEXPORT InitcpioJob : public Calamares::CppJob
public: public:
explicit InitcpioJob( QObject* parent = nullptr ); explicit InitcpioJob( QObject* parent = nullptr );
virtual ~InitcpioJob() override; ~InitcpioJob() override;
QString prettyName() const override; QString prettyName() const override;

View File

@ -23,7 +23,7 @@ class PLUGINDLLEXPORT InitramfsJob : public Calamares::CppJob
public: public:
explicit InitramfsJob( QObject* parent = nullptr ); explicit InitramfsJob( QObject* parent = nullptr );
virtual ~InitramfsJob() override; ~InitramfsJob() override;
QString prettyName() const override; QString prettyName() const override;

View File

@ -26,7 +26,7 @@ class PLUGINDLLEXPORT InteractiveTerminalViewStep : public Calamares::ViewStep
public: public:
explicit InteractiveTerminalViewStep( QObject* parent = nullptr ); explicit InteractiveTerminalViewStep( QObject* parent = nullptr );
virtual ~InteractiveTerminalViewStep() override; ~InteractiveTerminalViewStep() override;
QString prettyName() const override; QString prettyName() const override;

View File

@ -25,7 +25,7 @@ class PLUGINDLLEXPORT KeyboardViewStep : public Calamares::ViewStep
public: public:
explicit KeyboardViewStep( QObject* parent = nullptr ); explicit KeyboardViewStep( QObject* parent = nullptr );
virtual ~KeyboardViewStep() override; ~KeyboardViewStep() override;
QString prettyName() const override; QString prettyName() const override;
QString prettyStatus() const override; QString prettyStatus() const override;

View File

@ -27,7 +27,7 @@ class PLUGINDLLEXPORT LicenseViewStep : public Calamares::ViewStep
public: public:
explicit LicenseViewStep( QObject* parent = nullptr ); explicit LicenseViewStep( QObject* parent = nullptr );
virtual ~LicenseViewStep() override; ~LicenseViewStep() override;
QString prettyName() const override; QString prettyName() const override;

View File

@ -24,7 +24,7 @@ class LicenseWidget : public QWidget
{ {
public: public:
LicenseWidget( LicenseEntry e, QWidget* parent = nullptr ); LicenseWidget( LicenseEntry e, QWidget* parent = nullptr );
virtual ~LicenseWidget() override; ~LicenseWidget() override;
void retranslateUi(); void retranslateUi();

View File

@ -27,7 +27,7 @@ class PLUGINDLLEXPORT LocaleViewStep : public Calamares::ViewStep
public: public:
explicit LocaleViewStep( QObject* parent = nullptr ); explicit LocaleViewStep( QObject* parent = nullptr );
virtual ~LocaleViewStep() override; ~LocaleViewStep() override;
QString prettyName() const override; QString prettyName() const override;
QString prettyStatus() const override; QString prettyStatus() const override;

View File

@ -25,7 +25,7 @@ class PLUGINDLLEXPORT LuksBootKeyFileJob : public Calamares::CppJob
Q_OBJECT Q_OBJECT
public: public:
explicit LuksBootKeyFileJob( QObject* parent = nullptr ); explicit LuksBootKeyFileJob( QObject* parent = nullptr );
virtual ~LuksBootKeyFileJob() override; ~LuksBootKeyFileJob() override;
QString prettyName() const override; QString prettyName() const override;

View File

@ -29,7 +29,7 @@ class PLUGINDLLEXPORT MachineIdJob : public Calamares::CppJob
public: public:
explicit MachineIdJob( QObject* parent = nullptr ); explicit MachineIdJob( QObject* parent = nullptr );
virtual ~MachineIdJob() override; ~MachineIdJob() override;
QString prettyName() const override; QString prettyName() const override;

View File

@ -28,7 +28,7 @@ class PLUGINDLLEXPORT NetInstallViewStep : public Calamares::ViewStep
public: public:
explicit NetInstallViewStep( QObject* parent = nullptr ); explicit NetInstallViewStep( QObject* parent = nullptr );
virtual ~NetInstallViewStep() override; ~NetInstallViewStep() override;
QString prettyName() const override; QString prettyName() const override;

View File

@ -22,7 +22,7 @@ class PLUGINDLLEXPORT NotesQmlViewStep : public Calamares::QmlViewStep
public: public:
NotesQmlViewStep( QObject* parent = nullptr ); NotesQmlViewStep( QObject* parent = nullptr );
virtual ~NotesQmlViewStep() override; ~NotesQmlViewStep() override;
QString prettyName() const override; QString prettyName() const override;

View File

@ -32,7 +32,7 @@ public:
CALAMARES_RETRANSLATE( m_ui->retranslateUi( this ); ) CALAMARES_RETRANSLATE( m_ui->retranslateUi( this ); )
} }
virtual ~OEMPage() override; ~OEMPage() override;
Ui_OEMPage* m_ui; Ui_OEMPage* m_ui;
}; };

View File

@ -25,7 +25,7 @@ class PLUGINDLLEXPORT OEMViewStep : public Calamares::ViewStep
public: public:
explicit OEMViewStep( QObject* parent = nullptr ); explicit OEMViewStep( QObject* parent = nullptr );
virtual ~OEMViewStep() override; ~OEMViewStep() override;
QString prettyName() const override; QString prettyName() const override;
QString prettyStatus() const override; QString prettyStatus() const override;

View File

@ -29,7 +29,7 @@ class PLUGINDLLEXPORT PackageChooserViewStep : public Calamares::ViewStep
public: public:
explicit PackageChooserViewStep( QObject* parent = nullptr ); explicit PackageChooserViewStep( QObject* parent = nullptr );
virtual ~PackageChooserViewStep() override; ~PackageChooserViewStep() override;
QString prettyName() const override; QString prettyName() const override;

View File

@ -88,7 +88,7 @@ class PackageListModel : public QAbstractListModel
public: public:
PackageListModel( PackageList&& items, QObject* parent ); PackageListModel( PackageList&& items, QObject* parent );
PackageListModel( QObject* parent ); PackageListModel( QObject* parent );
virtual ~PackageListModel() override; ~PackageListModel() override;
/** @brief Add a package @p to the model /** @brief Add a package @p to the model
* *

View File

@ -34,7 +34,7 @@ public:
}; };
explicit PartitionBarsView( QWidget* parent = nullptr ); explicit PartitionBarsView( QWidget* parent = nullptr );
virtual ~PartitionBarsView() override; ~PartitionBarsView() override;
void setNestedPartitionsMode( NestedPartitionsMode mode ); void setNestedPartitionsMode( NestedPartitionsMode mode );

View File

@ -28,7 +28,7 @@ class PartitionLabelsView : public QAbstractItemView
Q_OBJECT Q_OBJECT
public: public:
explicit PartitionLabelsView( QWidget* parent = nullptr ); explicit PartitionLabelsView( QWidget* parent = nullptr );
virtual ~PartitionLabelsView() override; ~PartitionLabelsView() override;
QSize minimumSizeHint() const override; QSize minimumSizeHint() const override;

View File

@ -40,7 +40,7 @@ class PLUGINDLLEXPORT PartitionViewStep : public Calamares::ViewStep
public: public:
explicit PartitionViewStep( QObject* parent = nullptr ); explicit PartitionViewStep( QObject* parent = nullptr );
virtual ~PartitionViewStep() override; ~PartitionViewStep() override;
QString prettyName() const override; QString prettyName() const override;
QWidget* createSummaryWidget() const override; QWidget* createSummaryWidget() const override;

View File

@ -27,7 +27,7 @@ class QueueRunner : public QObject
{ {
public: public:
QueueRunner( Calamares::JobQueue* queue ); QueueRunner( Calamares::JobQueue* queue );
virtual ~QueueRunner() override; ~QueueRunner() override;
/** /**
* Synchronously runs the queue. Returns true on success * Synchronously runs the queue. Returns true on success

View File

@ -21,7 +21,7 @@ class PlasmaLnfJob : public Calamares::Job
public: public:
explicit PlasmaLnfJob( const QString& lnfPath, const QString& id ); explicit PlasmaLnfJob( const QString& lnfPath, const QString& id );
virtual ~PlasmaLnfJob() override; ~PlasmaLnfJob() override;
QString prettyName() const override; QString prettyName() const override;
QString prettyStatusMessage() const override; QString prettyStatusMessage() const override;

View File

@ -26,7 +26,7 @@ class PLUGINDLLEXPORT PlasmaLnfViewStep : public Calamares::ViewStep
public: public:
explicit PlasmaLnfViewStep( QObject* parent = nullptr ); explicit PlasmaLnfViewStep( QObject* parent = nullptr );
virtual ~PlasmaLnfViewStep() override; ~PlasmaLnfViewStep() override;
QString prettyName() const override; QString prettyName() const override;

View File

@ -41,7 +41,7 @@ class PLUGINDLLEXPORT PreserveFiles : public Calamares::CppJob
public: public:
explicit PreserveFiles( QObject* parent = nullptr ); explicit PreserveFiles( QObject* parent = nullptr );
virtual ~PreserveFiles() override; ~PreserveFiles() override;
QString prettyName() const override; QString prettyName() const override;

View File

@ -23,7 +23,7 @@ class PLUGINDLLEXPORT RemoveUserJob : public Calamares::CppJob
public: public:
explicit RemoveUserJob( QObject* parent = nullptr ); explicit RemoveUserJob( QObject* parent = nullptr );
virtual ~RemoveUserJob() override; ~RemoveUserJob() override;
QString prettyName() const override; QString prettyName() const override;

View File

@ -27,7 +27,7 @@ class PLUGINDLLEXPORT ShellProcessJob : public Calamares::CppJob
public: public:
explicit ShellProcessJob( QObject* parent = nullptr ); explicit ShellProcessJob( QObject* parent = nullptr );
virtual ~ShellProcessJob() override; ~ShellProcessJob() override;
QString prettyName() const override; QString prettyName() const override;

View File

@ -25,7 +25,7 @@ class PLUGINDLLEXPORT SummaryViewStep : public Calamares::ViewStep
public: public:
explicit SummaryViewStep( QObject* parent = nullptr ); explicit SummaryViewStep( QObject* parent = nullptr );
virtual ~SummaryViewStep() override; ~SummaryViewStep() override;
QString prettyName() const override; QString prettyName() const override;

View File

@ -29,7 +29,7 @@ class PLUGINDLLEXPORT TrackingViewStep : public Calamares::ViewStep
public: public:
explicit TrackingViewStep( QObject* parent = nullptr ); explicit TrackingViewStep( QObject* parent = nullptr );
virtual ~TrackingViewStep() override; ~TrackingViewStep() override;
QString prettyName() const override; QString prettyName() const override;

View File

@ -27,7 +27,7 @@ class PLUGINDLLEXPORT UsersViewStep : public Calamares::ViewStep
public: public:
explicit UsersViewStep( QObject* parent = nullptr ); explicit UsersViewStep( QObject* parent = nullptr );
virtual ~UsersViewStep() override; ~UsersViewStep() override;
QString prettyName() const override; QString prettyName() const override;

View File

@ -41,7 +41,7 @@ class PLUGINDLLEXPORT WebViewStep : public Calamares::ViewStep
public: public:
explicit WebViewStep( QObject* parent = nullptr ); explicit WebViewStep( QObject* parent = nullptr );
virtual ~WebViewStep() override; ~WebViewStep() override;
QString prettyName() const override; QString prettyName() const override;

View File

@ -37,7 +37,7 @@ class PLUGINDLLEXPORT WelcomeViewStep : public Calamares::ViewStep
public: public:
explicit WelcomeViewStep( QObject* parent = nullptr ); explicit WelcomeViewStep( QObject* parent = nullptr );
virtual ~WelcomeViewStep() override; ~WelcomeViewStep() override;
QString prettyName() const override; QString prettyName() const override;