From 2878c474c5909c2d04d4e6a8003d09f7ef9e8520 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 22 Sep 2020 22:49:30 +0200 Subject: [PATCH] Warnings-- (~T() override) Change all the places that had virtual ~T() override to the less redundant form without override. --- src/calamares/CalamaresWindow.h | 2 +- src/calamares/progresstree/ProgressTreeView.h | 2 +- src/calamares/testmain.cpp | 2 +- src/libcalamares/ProcessJob.h | 2 +- src/libcalamares/Tests.cpp | 2 +- src/libcalamares/modulesystem/RequirementsChecker.h | 2 +- src/libcalamares/network/Manager.h | 2 +- src/libcalamares/utils/CalamaresUtilsSystem.h | 2 +- src/libcalamaresui/ViewManager.h | 2 +- src/libcalamaresui/modulesystem/CppJobModule.h | 2 +- src/libcalamaresui/modulesystem/ModuleManager.h | 2 +- src/libcalamaresui/modulesystem/ProcessJobModule.h | 2 +- src/libcalamaresui/modulesystem/PythonJobModule.h | 2 +- src/libcalamaresui/modulesystem/ViewModule.h | 2 +- src/libcalamaresui/viewpages/BlankViewStep.h | 2 +- src/libcalamaresui/viewpages/QmlViewStep.h | 2 +- src/libcalamaresui/viewpages/Slideshow.h | 4 ++-- src/libcalamaresui/viewpages/ViewStep.h | 2 +- src/libcalamaresui/widgets/ClickableLabel.h | 2 +- src/libcalamaresui/widgets/FixedAspectRatioLabel.h | 2 +- src/modules/contextualprocess/ContextualProcessJob.h | 2 +- src/modules/dracutlukscfg/DracutLuksCfgJob.h | 2 +- src/modules/dummycpp/DummyCppJob.h | 2 +- src/modules/finished/FinishedViewStep.h | 2 +- src/modules/fsresizer/ResizeFSJob.h | 2 +- src/modules/hostinfo/HostInfoJob.h | 2 +- src/modules/initcpio/InitcpioJob.h | 2 +- src/modules/initramfs/InitramfsJob.h | 2 +- src/modules/interactiveterminal/InteractiveTerminalViewStep.h | 2 +- src/modules/keyboard/KeyboardViewStep.h | 2 +- src/modules/license/LicenseViewStep.h | 2 +- src/modules/license/LicenseWidget.h | 2 +- src/modules/locale/LocaleViewStep.h | 2 +- src/modules/luksbootkeyfile/LuksBootKeyFileJob.h | 2 +- src/modules/machineid/MachineIdJob.h | 2 +- src/modules/netinstall/NetInstallViewStep.h | 2 +- src/modules/notesqml/NotesQmlViewStep.h | 2 +- src/modules/oemid/OEMViewStep.cpp | 2 +- src/modules/oemid/OEMViewStep.h | 2 +- src/modules/packagechooser/PackageChooserViewStep.h | 2 +- src/modules/packagechooser/PackageModel.h | 2 +- src/modules/partition/gui/PartitionBarsView.h | 2 +- src/modules/partition/gui/PartitionLabelsView.h | 2 +- src/modules/partition/gui/PartitionViewStep.h | 2 +- src/modules/partition/tests/PartitionJobTests.h | 2 +- src/modules/plasmalnf/PlasmaLnfJob.h | 2 +- src/modules/plasmalnf/PlasmaLnfViewStep.h | 2 +- src/modules/preservefiles/PreserveFiles.h | 2 +- src/modules/removeuser/RemoveUserJob.h | 2 +- src/modules/shellprocess/ShellProcessJob.h | 2 +- src/modules/summary/SummaryViewStep.h | 2 +- src/modules/tracking/TrackingViewStep.h | 2 +- src/modules/users/UsersViewStep.h | 2 +- src/modules/webview/WebViewStep.h | 2 +- src/modules/welcome/WelcomeViewStep.h | 2 +- 55 files changed, 56 insertions(+), 56 deletions(-) diff --git a/src/calamares/CalamaresWindow.h b/src/calamares/CalamaresWindow.h index b6e63aa6b..009425aae 100644 --- a/src/calamares/CalamaresWindow.h +++ b/src/calamares/CalamaresWindow.h @@ -28,7 +28,7 @@ class CalamaresWindow : public QWidget Q_OBJECT public: CalamaresWindow( QWidget* parent = nullptr ); - virtual ~CalamaresWindow() override {} + ~CalamaresWindow() override {} public slots: /** diff --git a/src/calamares/progresstree/ProgressTreeView.h b/src/calamares/progresstree/ProgressTreeView.h index 98bbe10b4..5c416dfd6 100644 --- a/src/calamares/progresstree/ProgressTreeView.h +++ b/src/calamares/progresstree/ProgressTreeView.h @@ -22,7 +22,7 @@ class ProgressTreeView : public QListView Q_OBJECT public: explicit ProgressTreeView( QWidget* parent = nullptr ); - virtual ~ProgressTreeView() override; + ~ProgressTreeView() override; /** * @brief setModel assigns a model to this view. diff --git a/src/calamares/testmain.cpp b/src/calamares/testmain.cpp index c9d6f7195..e038b5a2f 100644 --- a/src/calamares/testmain.cpp +++ b/src/calamares/testmain.cpp @@ -140,7 +140,7 @@ public: , m_delay( t ) { } - virtual ~ExecViewJob() override; + ~ExecViewJob() override; QString prettyName() const override { return m_name; } diff --git a/src/libcalamares/ProcessJob.h b/src/libcalamares/ProcessJob.h index 126eab1f9..ab47f30dd 100644 --- a/src/libcalamares/ProcessJob.h +++ b/src/libcalamares/ProcessJob.h @@ -27,7 +27,7 @@ public: bool runInChroot = false, std::chrono::seconds secondsTimeout = std::chrono::seconds( 30 ), QObject* parent = nullptr ); - virtual ~ProcessJob() override; + ~ProcessJob() override; QString prettyName() const override; QString prettyStatusMessage() const override; diff --git a/src/libcalamares/Tests.cpp b/src/libcalamares/Tests.cpp index b5183bf8c..bde7ac0d3 100644 --- a/src/libcalamares/Tests.cpp +++ b/src/libcalamares/Tests.cpp @@ -484,7 +484,7 @@ public: : Calamares::Job( parent ) { } - virtual ~DummyJob() override; + ~DummyJob() override; QString prettyName() const override; Calamares::JobResult exec() override; diff --git a/src/libcalamares/modulesystem/RequirementsChecker.h b/src/libcalamares/modulesystem/RequirementsChecker.h index 3577b5397..b933a29a8 100644 --- a/src/libcalamares/modulesystem/RequirementsChecker.h +++ b/src/libcalamares/modulesystem/RequirementsChecker.h @@ -34,7 +34,7 @@ class RequirementsChecker : public QObject public: RequirementsChecker( QVector< Module* > modules, RequirementsModel* model, QObject* parent = nullptr ); - virtual ~RequirementsChecker() override; + ~RequirementsChecker() override; public Q_SLOTS: /// @brief Start checking all the requirements diff --git a/src/libcalamares/network/Manager.h b/src/libcalamares/network/Manager.h index 930638198..a038dceae 100644 --- a/src/libcalamares/network/Manager.h +++ b/src/libcalamares/network/Manager.h @@ -99,7 +99,7 @@ public: * to keep the reference. */ static Manager& instance(); - virtual ~Manager() override; + ~Manager() override; /** @brief Checks if the given @p url returns data. * diff --git a/src/libcalamares/utils/CalamaresUtilsSystem.h b/src/libcalamares/utils/CalamaresUtilsSystem.h index 7d60a3577..afdd4ec34 100644 --- a/src/libcalamares/utils/CalamaresUtilsSystem.h +++ b/src/libcalamares/utils/CalamaresUtilsSystem.h @@ -126,7 +126,7 @@ public: * @param parent the QObject parent. */ explicit System( bool doChroot, QObject* parent = nullptr ); - virtual ~System() override; + ~System() override; static System* instance(); diff --git a/src/libcalamaresui/ViewManager.h b/src/libcalamaresui/ViewManager.h index 947503eaa..165358b76 100644 --- a/src/libcalamaresui/ViewManager.h +++ b/src/libcalamaresui/ViewManager.h @@ -212,7 +212,7 @@ signals: private: explicit ViewManager( QObject* parent = nullptr ); - virtual ~ViewManager() override; + ~ViewManager() override; void insertViewStep( int before, ViewStep* step ); void updateButtonLabels(); diff --git a/src/libcalamaresui/modulesystem/CppJobModule.h b/src/libcalamaresui/modulesystem/CppJobModule.h index 288f674f4..b999fd0a3 100644 --- a/src/libcalamaresui/modulesystem/CppJobModule.h +++ b/src/libcalamaresui/modulesystem/CppJobModule.h @@ -34,7 +34,7 @@ protected: private: explicit CppJobModule(); - virtual ~CppJobModule() override; + ~CppJobModule() override; QPluginLoader* m_loader; job_ptr m_job; diff --git a/src/libcalamaresui/modulesystem/ModuleManager.h b/src/libcalamaresui/modulesystem/ModuleManager.h index d2beedf2e..7f7ead05e 100644 --- a/src/libcalamaresui/modulesystem/ModuleManager.h +++ b/src/libcalamaresui/modulesystem/ModuleManager.h @@ -37,7 +37,7 @@ class ModuleManager : public QObject Q_OBJECT public: explicit ModuleManager( const QStringList& paths, QObject* parent = nullptr ); - virtual ~ModuleManager() override; + ~ModuleManager() override; static ModuleManager* instance(); diff --git a/src/libcalamaresui/modulesystem/ProcessJobModule.h b/src/libcalamaresui/modulesystem/ProcessJobModule.h index 0e00f5545..645127d47 100644 --- a/src/libcalamaresui/modulesystem/ProcessJobModule.h +++ b/src/libcalamaresui/modulesystem/ProcessJobModule.h @@ -33,7 +33,7 @@ protected: private: explicit ProcessJobModule(); - virtual ~ProcessJobModule() override; + ~ProcessJobModule() override; QString m_command; QString m_workingPath; diff --git a/src/libcalamaresui/modulesystem/PythonJobModule.h b/src/libcalamaresui/modulesystem/PythonJobModule.h index 37634d6be..4424cc7d4 100644 --- a/src/libcalamaresui/modulesystem/PythonJobModule.h +++ b/src/libcalamaresui/modulesystem/PythonJobModule.h @@ -30,7 +30,7 @@ protected: private: explicit PythonJobModule(); - virtual ~PythonJobModule() override; + ~PythonJobModule() override; QString m_scriptFileName; QString m_workingPath; diff --git a/src/libcalamaresui/modulesystem/ViewModule.h b/src/libcalamaresui/modulesystem/ViewModule.h index 8e5eb44b4..217611b03 100644 --- a/src/libcalamaresui/modulesystem/ViewModule.h +++ b/src/libcalamaresui/modulesystem/ViewModule.h @@ -37,7 +37,7 @@ protected: private: explicit ViewModule(); - virtual ~ViewModule() override; + ~ViewModule() override; QPluginLoader* m_loader; ViewStep* m_viewStep = nullptr; diff --git a/src/libcalamaresui/viewpages/BlankViewStep.h b/src/libcalamaresui/viewpages/BlankViewStep.h index 793241647..1845fcda9 100644 --- a/src/libcalamaresui/viewpages/BlankViewStep.h +++ b/src/libcalamaresui/viewpages/BlankViewStep.h @@ -29,7 +29,7 @@ public: const QString& description, const QString& details = QString(), QObject* parent = nullptr ); - virtual ~BlankViewStep() override; + ~BlankViewStep() override; QString prettyName() const override; diff --git a/src/libcalamaresui/viewpages/QmlViewStep.h b/src/libcalamaresui/viewpages/QmlViewStep.h index 7f04bea81..9817851b6 100644 --- a/src/libcalamaresui/viewpages/QmlViewStep.h +++ b/src/libcalamaresui/viewpages/QmlViewStep.h @@ -50,7 +50,7 @@ public: * @see Qml.h for available Calamares internals. */ QmlViewStep( QObject* parent = nullptr ); - virtual ~QmlViewStep() override; + ~QmlViewStep() override; virtual QString prettyName() const override; diff --git a/src/libcalamaresui/viewpages/Slideshow.h b/src/libcalamaresui/viewpages/Slideshow.h index 9796ceea7..41dacd46e 100644 --- a/src/libcalamaresui/viewpages/Slideshow.h +++ b/src/libcalamaresui/viewpages/Slideshow.h @@ -91,7 +91,7 @@ class SlideshowQML : public Slideshow Q_OBJECT public: SlideshowQML( QWidget* parent ); - virtual ~SlideshowQML() override; + ~SlideshowQML() override; QWidget* widget() override; void changeSlideShowState( Action a ) override; @@ -123,7 +123,7 @@ class SlideshowPictures : public Slideshow Q_OBJECT public: SlideshowPictures( QWidget* parent ); - virtual ~SlideshowPictures() override; + ~SlideshowPictures() override; QWidget* widget() override; virtual void changeSlideShowState( Action a ) override; diff --git a/src/libcalamaresui/viewpages/ViewStep.h b/src/libcalamaresui/viewpages/ViewStep.h index 156975fc5..c20a9d396 100644 --- a/src/libcalamaresui/viewpages/ViewStep.h +++ b/src/libcalamaresui/viewpages/ViewStep.h @@ -41,7 +41,7 @@ class UIDLLEXPORT ViewStep : public QObject Q_OBJECT public: explicit ViewStep( QObject* parent = nullptr ); - virtual ~ViewStep() override; + ~ViewStep() override; /** @brief Human-readable name of the step * diff --git a/src/libcalamaresui/widgets/ClickableLabel.h b/src/libcalamaresui/widgets/ClickableLabel.h index 83ddb3d86..8c5561677 100644 --- a/src/libcalamaresui/widgets/ClickableLabel.h +++ b/src/libcalamaresui/widgets/ClickableLabel.h @@ -32,7 +32,7 @@ class UIDLLEXPORT ClickableLabel : public QLabel public: explicit ClickableLabel( QWidget* parent = nullptr ); explicit ClickableLabel( const QString& text, QWidget* parent = nullptr ); - virtual ~ClickableLabel() override; + ~ClickableLabel() override; signals: void clicked(); diff --git a/src/libcalamaresui/widgets/FixedAspectRatioLabel.h b/src/libcalamaresui/widgets/FixedAspectRatioLabel.h index ded7ba602..7dd058775 100644 --- a/src/libcalamaresui/widgets/FixedAspectRatioLabel.h +++ b/src/libcalamaresui/widgets/FixedAspectRatioLabel.h @@ -19,7 +19,7 @@ class FixedAspectRatioLabel : public QLabel Q_OBJECT public: explicit FixedAspectRatioLabel( QWidget* parent = nullptr ); - virtual ~FixedAspectRatioLabel() override; + ~FixedAspectRatioLabel() override; public slots: void setPixmap( const QPixmap& pixmap ); diff --git a/src/modules/contextualprocess/ContextualProcessJob.h b/src/modules/contextualprocess/ContextualProcessJob.h index f84afb5f1..8d58a3cbe 100644 --- a/src/modules/contextualprocess/ContextualProcessJob.h +++ b/src/modules/contextualprocess/ContextualProcessJob.h @@ -26,7 +26,7 @@ class PLUGINDLLEXPORT ContextualProcessJob : public Calamares::CppJob public: explicit ContextualProcessJob( QObject* parent = nullptr ); - virtual ~ContextualProcessJob() override; + ~ContextualProcessJob() override; QString prettyName() const override; diff --git a/src/modules/dracutlukscfg/DracutLuksCfgJob.h b/src/modules/dracutlukscfg/DracutLuksCfgJob.h index eb517b21d..7965e9834 100644 --- a/src/modules/dracutlukscfg/DracutLuksCfgJob.h +++ b/src/modules/dracutlukscfg/DracutLuksCfgJob.h @@ -26,7 +26,7 @@ class PLUGINDLLEXPORT DracutLuksCfgJob : public Calamares::CppJob public: explicit DracutLuksCfgJob( QObject* parent = nullptr ); - virtual ~DracutLuksCfgJob() override; + ~DracutLuksCfgJob() override; QString prettyName() const override; diff --git a/src/modules/dummycpp/DummyCppJob.h b/src/modules/dummycpp/DummyCppJob.h index 2f267d511..5271a73a5 100644 --- a/src/modules/dummycpp/DummyCppJob.h +++ b/src/modules/dummycpp/DummyCppJob.h @@ -26,7 +26,7 @@ class PLUGINDLLEXPORT DummyCppJob : public Calamares::CppJob public: explicit DummyCppJob( QObject* parent = nullptr ); - virtual ~DummyCppJob() override; + ~DummyCppJob() override; QString prettyName() const override; diff --git a/src/modules/finished/FinishedViewStep.h b/src/modules/finished/FinishedViewStep.h index 97d38b267..729f9126d 100644 --- a/src/modules/finished/FinishedViewStep.h +++ b/src/modules/finished/FinishedViewStep.h @@ -36,7 +36,7 @@ public: static QString modeName( RestartMode m ); explicit FinishedViewStep( QObject* parent = nullptr ); - virtual ~FinishedViewStep() override; + ~FinishedViewStep() override; QString prettyName() const override; diff --git a/src/modules/fsresizer/ResizeFSJob.h b/src/modules/fsresizer/ResizeFSJob.h index 5c9c961a5..52c4692e6 100644 --- a/src/modules/fsresizer/ResizeFSJob.h +++ b/src/modules/fsresizer/ResizeFSJob.h @@ -33,7 +33,7 @@ class PLUGINDLLEXPORT ResizeFSJob : public Calamares::CppJob public: explicit ResizeFSJob( QObject* parent = nullptr ); - virtual ~ResizeFSJob() override; + ~ResizeFSJob() override; QString prettyName() const override; diff --git a/src/modules/hostinfo/HostInfoJob.h b/src/modules/hostinfo/HostInfoJob.h index d9b450ac4..b252da7e0 100644 --- a/src/modules/hostinfo/HostInfoJob.h +++ b/src/modules/hostinfo/HostInfoJob.h @@ -43,7 +43,7 @@ class PLUGINDLLEXPORT HostInfoJob : public Calamares::CppJob public: explicit HostInfoJob( QObject* parent = nullptr ); - virtual ~HostInfoJob() override; + ~HostInfoJob() override; QString prettyName() const override; diff --git a/src/modules/initcpio/InitcpioJob.h b/src/modules/initcpio/InitcpioJob.h index 45421ea05..6e7f2b585 100644 --- a/src/modules/initcpio/InitcpioJob.h +++ b/src/modules/initcpio/InitcpioJob.h @@ -23,7 +23,7 @@ class PLUGINDLLEXPORT InitcpioJob : public Calamares::CppJob public: explicit InitcpioJob( QObject* parent = nullptr ); - virtual ~InitcpioJob() override; + ~InitcpioJob() override; QString prettyName() const override; diff --git a/src/modules/initramfs/InitramfsJob.h b/src/modules/initramfs/InitramfsJob.h index 7b3a03911..c09c9eba2 100644 --- a/src/modules/initramfs/InitramfsJob.h +++ b/src/modules/initramfs/InitramfsJob.h @@ -23,7 +23,7 @@ class PLUGINDLLEXPORT InitramfsJob : public Calamares::CppJob public: explicit InitramfsJob( QObject* parent = nullptr ); - virtual ~InitramfsJob() override; + ~InitramfsJob() override; QString prettyName() const override; diff --git a/src/modules/interactiveterminal/InteractiveTerminalViewStep.h b/src/modules/interactiveterminal/InteractiveTerminalViewStep.h index f01a19ee6..8e0e6508f 100644 --- a/src/modules/interactiveterminal/InteractiveTerminalViewStep.h +++ b/src/modules/interactiveterminal/InteractiveTerminalViewStep.h @@ -26,7 +26,7 @@ class PLUGINDLLEXPORT InteractiveTerminalViewStep : public Calamares::ViewStep public: explicit InteractiveTerminalViewStep( QObject* parent = nullptr ); - virtual ~InteractiveTerminalViewStep() override; + ~InteractiveTerminalViewStep() override; QString prettyName() const override; diff --git a/src/modules/keyboard/KeyboardViewStep.h b/src/modules/keyboard/KeyboardViewStep.h index 5d4882aca..aa9a1d335 100644 --- a/src/modules/keyboard/KeyboardViewStep.h +++ b/src/modules/keyboard/KeyboardViewStep.h @@ -25,7 +25,7 @@ class PLUGINDLLEXPORT KeyboardViewStep : public Calamares::ViewStep public: explicit KeyboardViewStep( QObject* parent = nullptr ); - virtual ~KeyboardViewStep() override; + ~KeyboardViewStep() override; QString prettyName() const override; QString prettyStatus() const override; diff --git a/src/modules/license/LicenseViewStep.h b/src/modules/license/LicenseViewStep.h index 15e345221..0e028f8c1 100644 --- a/src/modules/license/LicenseViewStep.h +++ b/src/modules/license/LicenseViewStep.h @@ -27,7 +27,7 @@ class PLUGINDLLEXPORT LicenseViewStep : public Calamares::ViewStep public: explicit LicenseViewStep( QObject* parent = nullptr ); - virtual ~LicenseViewStep() override; + ~LicenseViewStep() override; QString prettyName() const override; diff --git a/src/modules/license/LicenseWidget.h b/src/modules/license/LicenseWidget.h index 2d810e80a..3f99163b9 100644 --- a/src/modules/license/LicenseWidget.h +++ b/src/modules/license/LicenseWidget.h @@ -24,7 +24,7 @@ class LicenseWidget : public QWidget { public: LicenseWidget( LicenseEntry e, QWidget* parent = nullptr ); - virtual ~LicenseWidget() override; + ~LicenseWidget() override; void retranslateUi(); diff --git a/src/modules/locale/LocaleViewStep.h b/src/modules/locale/LocaleViewStep.h index fd9c00796..12b05f9f8 100644 --- a/src/modules/locale/LocaleViewStep.h +++ b/src/modules/locale/LocaleViewStep.h @@ -27,7 +27,7 @@ class PLUGINDLLEXPORT LocaleViewStep : public Calamares::ViewStep public: explicit LocaleViewStep( QObject* parent = nullptr ); - virtual ~LocaleViewStep() override; + ~LocaleViewStep() override; QString prettyName() const override; QString prettyStatus() const override; diff --git a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.h b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.h index d78a7ecdc..9681228bd 100644 --- a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.h +++ b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.h @@ -25,7 +25,7 @@ class PLUGINDLLEXPORT LuksBootKeyFileJob : public Calamares::CppJob Q_OBJECT public: explicit LuksBootKeyFileJob( QObject* parent = nullptr ); - virtual ~LuksBootKeyFileJob() override; + ~LuksBootKeyFileJob() override; QString prettyName() const override; diff --git a/src/modules/machineid/MachineIdJob.h b/src/modules/machineid/MachineIdJob.h index 136f28ecb..7f406fc55 100644 --- a/src/modules/machineid/MachineIdJob.h +++ b/src/modules/machineid/MachineIdJob.h @@ -29,7 +29,7 @@ class PLUGINDLLEXPORT MachineIdJob : public Calamares::CppJob public: explicit MachineIdJob( QObject* parent = nullptr ); - virtual ~MachineIdJob() override; + ~MachineIdJob() override; QString prettyName() const override; diff --git a/src/modules/netinstall/NetInstallViewStep.h b/src/modules/netinstall/NetInstallViewStep.h index cd79e7a4a..c500cbcd9 100644 --- a/src/modules/netinstall/NetInstallViewStep.h +++ b/src/modules/netinstall/NetInstallViewStep.h @@ -28,7 +28,7 @@ class PLUGINDLLEXPORT NetInstallViewStep : public Calamares::ViewStep public: explicit NetInstallViewStep( QObject* parent = nullptr ); - virtual ~NetInstallViewStep() override; + ~NetInstallViewStep() override; QString prettyName() const override; diff --git a/src/modules/notesqml/NotesQmlViewStep.h b/src/modules/notesqml/NotesQmlViewStep.h index 10f249a88..485a7969e 100644 --- a/src/modules/notesqml/NotesQmlViewStep.h +++ b/src/modules/notesqml/NotesQmlViewStep.h @@ -22,7 +22,7 @@ class PLUGINDLLEXPORT NotesQmlViewStep : public Calamares::QmlViewStep public: NotesQmlViewStep( QObject* parent = nullptr ); - virtual ~NotesQmlViewStep() override; + ~NotesQmlViewStep() override; QString prettyName() const override; diff --git a/src/modules/oemid/OEMViewStep.cpp b/src/modules/oemid/OEMViewStep.cpp index 7405c6e3a..f996d4ff3 100644 --- a/src/modules/oemid/OEMViewStep.cpp +++ b/src/modules/oemid/OEMViewStep.cpp @@ -32,7 +32,7 @@ public: CALAMARES_RETRANSLATE( m_ui->retranslateUi( this ); ) } - virtual ~OEMPage() override; + ~OEMPage() override; Ui_OEMPage* m_ui; }; diff --git a/src/modules/oemid/OEMViewStep.h b/src/modules/oemid/OEMViewStep.h index c07cb7971..a0b07c6fd 100644 --- a/src/modules/oemid/OEMViewStep.h +++ b/src/modules/oemid/OEMViewStep.h @@ -25,7 +25,7 @@ class PLUGINDLLEXPORT OEMViewStep : public Calamares::ViewStep public: explicit OEMViewStep( QObject* parent = nullptr ); - virtual ~OEMViewStep() override; + ~OEMViewStep() override; QString prettyName() const override; QString prettyStatus() const override; diff --git a/src/modules/packagechooser/PackageChooserViewStep.h b/src/modules/packagechooser/PackageChooserViewStep.h index 2a10ce270..9dfd2bdee 100644 --- a/src/modules/packagechooser/PackageChooserViewStep.h +++ b/src/modules/packagechooser/PackageChooserViewStep.h @@ -29,7 +29,7 @@ class PLUGINDLLEXPORT PackageChooserViewStep : public Calamares::ViewStep public: explicit PackageChooserViewStep( QObject* parent = nullptr ); - virtual ~PackageChooserViewStep() override; + ~PackageChooserViewStep() override; QString prettyName() const override; diff --git a/src/modules/packagechooser/PackageModel.h b/src/modules/packagechooser/PackageModel.h index b8fc9a4ce..375cf28c4 100644 --- a/src/modules/packagechooser/PackageModel.h +++ b/src/modules/packagechooser/PackageModel.h @@ -88,7 +88,7 @@ class PackageListModel : public QAbstractListModel public: PackageListModel( PackageList&& items, QObject* parent ); PackageListModel( QObject* parent ); - virtual ~PackageListModel() override; + ~PackageListModel() override; /** @brief Add a package @p to the model * diff --git a/src/modules/partition/gui/PartitionBarsView.h b/src/modules/partition/gui/PartitionBarsView.h index 4dacaaae5..39c3bafe1 100644 --- a/src/modules/partition/gui/PartitionBarsView.h +++ b/src/modules/partition/gui/PartitionBarsView.h @@ -34,7 +34,7 @@ public: }; explicit PartitionBarsView( QWidget* parent = nullptr ); - virtual ~PartitionBarsView() override; + ~PartitionBarsView() override; void setNestedPartitionsMode( NestedPartitionsMode mode ); diff --git a/src/modules/partition/gui/PartitionLabelsView.h b/src/modules/partition/gui/PartitionLabelsView.h index ac7a272ad..9b5a277ab 100644 --- a/src/modules/partition/gui/PartitionLabelsView.h +++ b/src/modules/partition/gui/PartitionLabelsView.h @@ -28,7 +28,7 @@ class PartitionLabelsView : public QAbstractItemView Q_OBJECT public: explicit PartitionLabelsView( QWidget* parent = nullptr ); - virtual ~PartitionLabelsView() override; + ~PartitionLabelsView() override; QSize minimumSizeHint() const override; diff --git a/src/modules/partition/gui/PartitionViewStep.h b/src/modules/partition/gui/PartitionViewStep.h index 6ece9a2b1..9f3da9f3d 100644 --- a/src/modules/partition/gui/PartitionViewStep.h +++ b/src/modules/partition/gui/PartitionViewStep.h @@ -40,7 +40,7 @@ class PLUGINDLLEXPORT PartitionViewStep : public Calamares::ViewStep public: explicit PartitionViewStep( QObject* parent = nullptr ); - virtual ~PartitionViewStep() override; + ~PartitionViewStep() override; QString prettyName() const override; QWidget* createSummaryWidget() const override; diff --git a/src/modules/partition/tests/PartitionJobTests.h b/src/modules/partition/tests/PartitionJobTests.h index 364213f54..c2c01088f 100644 --- a/src/modules/partition/tests/PartitionJobTests.h +++ b/src/modules/partition/tests/PartitionJobTests.h @@ -27,7 +27,7 @@ class QueueRunner : public QObject { public: QueueRunner( Calamares::JobQueue* queue ); - virtual ~QueueRunner() override; + ~QueueRunner() override; /** * Synchronously runs the queue. Returns true on success diff --git a/src/modules/plasmalnf/PlasmaLnfJob.h b/src/modules/plasmalnf/PlasmaLnfJob.h index 314070c0c..83360434e 100644 --- a/src/modules/plasmalnf/PlasmaLnfJob.h +++ b/src/modules/plasmalnf/PlasmaLnfJob.h @@ -21,7 +21,7 @@ class PlasmaLnfJob : public Calamares::Job public: explicit PlasmaLnfJob( const QString& lnfPath, const QString& id ); - virtual ~PlasmaLnfJob() override; + ~PlasmaLnfJob() override; QString prettyName() const override; QString prettyStatusMessage() const override; diff --git a/src/modules/plasmalnf/PlasmaLnfViewStep.h b/src/modules/plasmalnf/PlasmaLnfViewStep.h index a98ec4bf5..46c24c970 100644 --- a/src/modules/plasmalnf/PlasmaLnfViewStep.h +++ b/src/modules/plasmalnf/PlasmaLnfViewStep.h @@ -26,7 +26,7 @@ class PLUGINDLLEXPORT PlasmaLnfViewStep : public Calamares::ViewStep public: explicit PlasmaLnfViewStep( QObject* parent = nullptr ); - virtual ~PlasmaLnfViewStep() override; + ~PlasmaLnfViewStep() override; QString prettyName() const override; diff --git a/src/modules/preservefiles/PreserveFiles.h b/src/modules/preservefiles/PreserveFiles.h index d2b7373e2..7a0aab34d 100644 --- a/src/modules/preservefiles/PreserveFiles.h +++ b/src/modules/preservefiles/PreserveFiles.h @@ -41,7 +41,7 @@ class PLUGINDLLEXPORT PreserveFiles : public Calamares::CppJob public: explicit PreserveFiles( QObject* parent = nullptr ); - virtual ~PreserveFiles() override; + ~PreserveFiles() override; QString prettyName() const override; diff --git a/src/modules/removeuser/RemoveUserJob.h b/src/modules/removeuser/RemoveUserJob.h index 8f7de35e0..c8a4df15d 100644 --- a/src/modules/removeuser/RemoveUserJob.h +++ b/src/modules/removeuser/RemoveUserJob.h @@ -23,7 +23,7 @@ class PLUGINDLLEXPORT RemoveUserJob : public Calamares::CppJob public: explicit RemoveUserJob( QObject* parent = nullptr ); - virtual ~RemoveUserJob() override; + ~RemoveUserJob() override; QString prettyName() const override; diff --git a/src/modules/shellprocess/ShellProcessJob.h b/src/modules/shellprocess/ShellProcessJob.h index c63a7b91f..468aded59 100644 --- a/src/modules/shellprocess/ShellProcessJob.h +++ b/src/modules/shellprocess/ShellProcessJob.h @@ -27,7 +27,7 @@ class PLUGINDLLEXPORT ShellProcessJob : public Calamares::CppJob public: explicit ShellProcessJob( QObject* parent = nullptr ); - virtual ~ShellProcessJob() override; + ~ShellProcessJob() override; QString prettyName() const override; diff --git a/src/modules/summary/SummaryViewStep.h b/src/modules/summary/SummaryViewStep.h index 0a2933d8b..c89efc42f 100644 --- a/src/modules/summary/SummaryViewStep.h +++ b/src/modules/summary/SummaryViewStep.h @@ -25,7 +25,7 @@ class PLUGINDLLEXPORT SummaryViewStep : public Calamares::ViewStep public: explicit SummaryViewStep( QObject* parent = nullptr ); - virtual ~SummaryViewStep() override; + ~SummaryViewStep() override; QString prettyName() const override; diff --git a/src/modules/tracking/TrackingViewStep.h b/src/modules/tracking/TrackingViewStep.h index 7b27dbec6..0601dde57 100644 --- a/src/modules/tracking/TrackingViewStep.h +++ b/src/modules/tracking/TrackingViewStep.h @@ -29,7 +29,7 @@ class PLUGINDLLEXPORT TrackingViewStep : public Calamares::ViewStep public: explicit TrackingViewStep( QObject* parent = nullptr ); - virtual ~TrackingViewStep() override; + ~TrackingViewStep() override; QString prettyName() const override; diff --git a/src/modules/users/UsersViewStep.h b/src/modules/users/UsersViewStep.h index a03948adf..abafc1b23 100644 --- a/src/modules/users/UsersViewStep.h +++ b/src/modules/users/UsersViewStep.h @@ -27,7 +27,7 @@ class PLUGINDLLEXPORT UsersViewStep : public Calamares::ViewStep public: explicit UsersViewStep( QObject* parent = nullptr ); - virtual ~UsersViewStep() override; + ~UsersViewStep() override; QString prettyName() const override; diff --git a/src/modules/webview/WebViewStep.h b/src/modules/webview/WebViewStep.h index 691672211..339997320 100644 --- a/src/modules/webview/WebViewStep.h +++ b/src/modules/webview/WebViewStep.h @@ -41,7 +41,7 @@ class PLUGINDLLEXPORT WebViewStep : public Calamares::ViewStep public: explicit WebViewStep( QObject* parent = nullptr ); - virtual ~WebViewStep() override; + ~WebViewStep() override; QString prettyName() const override; diff --git a/src/modules/welcome/WelcomeViewStep.h b/src/modules/welcome/WelcomeViewStep.h index 16eec6d29..57632f7ac 100644 --- a/src/modules/welcome/WelcomeViewStep.h +++ b/src/modules/welcome/WelcomeViewStep.h @@ -37,7 +37,7 @@ class PLUGINDLLEXPORT WelcomeViewStep : public Calamares::ViewStep public: explicit WelcomeViewStep( QObject* parent = nullptr ); - virtual ~WelcomeViewStep() override; + ~WelcomeViewStep() override; QString prettyName() const override;