[libcalamaresui] Provide default implementations of next() and back()

- These methods are used for multi-page view-steps, which are rare. For all the others, just drop the empty implementation and defer to the base class.
6 years ago · 6071489788
parent 08565b5f17
commit 6071489788
26 changed files with 10 additions and 169 deletions
--- a/src/libcalamaresui/viewpages/ViewStep.cpp
+++ b/src/libcalamaresui/viewpages/ViewStep.cpp
@ -52,6 +52,14 @@ void
 ViewStep::onLeave()
 {}

+void
+ViewStep::next()
+{}
+
+void
+ViewStep::back()
+{}
+

 void
 ViewStep::setModuleInstanceKey( const QString& instanceKey )
--- a/src/libcalamaresui/viewpages/ViewStep.h
+++ b/src/libcalamaresui/viewpages/ViewStep.h
@ -68,8 +68,8 @@ public:
    //TODO: we might want to make this a QSharedPointer
    virtual QWidget* widget() = 0;

-    virtual void next() = 0;
-    virtual void back() = 0;
+    virtual void next();
+    virtual void back();

    virtual bool isNextEnabled() const = 0;
    virtual bool isBackEnabled() const = 0;
--- a/src/modules/finished/FinishedViewStep.cpp
+++ b/src/modules/finished/FinishedViewStep.cpp
@ -67,17 +67,6 @@ FinishedViewStep::widget()
 }


-void
-FinishedViewStep::next()
-{
-}
-
-
-void
-FinishedViewStep::back()
-{}
-
-
 bool
 FinishedViewStep::isNextEnabled() const
 {
--- a/src/modules/finished/FinishedViewStep.h
+++ b/src/modules/finished/FinishedViewStep.h
@ -40,9 +40,6 @@ public:

    QWidget* widget() override;

-    void next() override;
-    void back() override;
-
    bool isNextEnabled() const override;
    bool isBackEnabled() const override;

--- a/src/modules/interactiveterminal/InteractiveTerminalViewStep.cpp
+++ b/src/modules/interactiveterminal/InteractiveTerminalViewStep.cpp
@ -53,17 +53,6 @@ InteractiveTerminalViewStep::widget()
 }


-void
-InteractiveTerminalViewStep::next()
-{
-}
-
-
-void
-InteractiveTerminalViewStep::back()
-{}
-
-
 bool
 InteractiveTerminalViewStep::isNextEnabled() const
 {
--- a/src/modules/interactiveterminal/InteractiveTerminalViewStep.h
+++ b/src/modules/interactiveterminal/InteractiveTerminalViewStep.h
@ -41,9 +41,6 @@ public:

    QWidget* widget() override;

-    void next() override;
-    void back() override;
-
    bool isNextEnabled() const override;
    bool isBackEnabled() const override;

--- a/src/modules/keyboard/KeyboardViewStep.cpp
+++ b/src/modules/keyboard/KeyboardViewStep.cpp
@ -65,17 +65,6 @@ KeyboardViewStep::widget()
 }


-void
-KeyboardViewStep::next()
-{
-}
-
-
-void
-KeyboardViewStep::back()
-{}
-
-
 bool
 KeyboardViewStep::isNextEnabled() const
 {
--- a/src/modules/keyboard/KeyboardViewStep.h
+++ b/src/modules/keyboard/KeyboardViewStep.h
@ -42,9 +42,6 @@ public:

    QWidget* widget() override;

-    void next() override;
-    void back() override;
-
    bool isNextEnabled() const override;
    bool isBackEnabled() const override;

--- a/src/modules/license/LicenseViewStep.cpp
+++ b/src/modules/license/LicenseViewStep.cpp
@ -59,17 +59,6 @@ LicenseViewStep::widget()
 }


-void
-LicenseViewStep::next()
-{
-}
-
-
-void
-LicenseViewStep::back()
-{}
-
-
 bool
 LicenseViewStep::isNextEnabled() const
 {
--- a/src/modules/license/LicenseViewStep.h
+++ b/src/modules/license/LicenseViewStep.h
@ -42,9 +42,6 @@ public:

    QWidget* widget() override;

-    void next() override;
-    void back() override;
-
    bool isNextEnabled() const override;
    bool isBackEnabled() const override;

--- a/src/modules/locale/LocaleViewStep.cpp
+++ b/src/modules/locale/LocaleViewStep.cpp
@ -190,17 +190,6 @@ LocaleViewStep::widget()
 }


-void
-LocaleViewStep::next()
-{
-}
-
-
-void
-LocaleViewStep::back()
-{}
-
-
 bool
 LocaleViewStep::isNextEnabled() const
 {
--- a/src/modules/locale/LocaleViewStep.h
+++ b/src/modules/locale/LocaleViewStep.h
@ -45,9 +45,6 @@ public:

    QWidget* widget() override;

-    void next() override;
-    void back() override;
-
    bool isNextEnabled() const override;
    bool isBackEnabled() const override;

--- a/src/modules/netinstall/NetInstallViewStep.cpp
+++ b/src/modules/netinstall/NetInstallViewStep.cpp
@ -69,17 +69,6 @@ NetInstallViewStep::widget()
 }


-void
-NetInstallViewStep::next()
-{
-}
-
-
-void
-NetInstallViewStep::back()
-{}
-
-
 bool
 NetInstallViewStep::isNextEnabled() const
 {
--- a/src/modules/netinstall/NetInstallViewStep.h
+++ b/src/modules/netinstall/NetInstallViewStep.h
@ -42,9 +42,6 @@ public:

    QWidget* widget() override;

-    void next() override;
-    void back() override;
-
    bool isNextEnabled() const override;
    bool isBackEnabled() const override;

--- a/src/modules/plasmalnf/PlasmaLnfViewStep.cpp
+++ b/src/modules/plasmalnf/PlasmaLnfViewStep.cpp
@ -76,17 +76,6 @@ PlasmaLnfViewStep::widget()
 }


-void
-PlasmaLnfViewStep::next()
-{
-}
-
-
-void
-PlasmaLnfViewStep::back()
-{}
-
-
 bool
 PlasmaLnfViewStep::isNextEnabled() const
 {
--- a/src/modules/plasmalnf/PlasmaLnfViewStep.h
+++ b/src/modules/plasmalnf/PlasmaLnfViewStep.h
@ -41,9 +41,6 @@ public:

    QWidget* widget() override;

-    void next() override;
-    void back() override;
-
    bool isNextEnabled() const override;
    bool isBackEnabled() const override;

--- a/src/modules/summary/SummaryViewStep.cpp
+++ b/src/modules/summary/SummaryViewStep.cpp
@ -51,17 +51,6 @@ SummaryViewStep::widget()
 }


-void
-SummaryViewStep::next()
-{
-}
-
-
-void
-SummaryViewStep::back()
-{}
-
-
 bool
 SummaryViewStep::isNextEnabled() const
 {
--- a/src/modules/summary/SummaryViewStep.h
+++ b/src/modules/summary/SummaryViewStep.h
@ -40,9 +40,6 @@ public:

    QWidget* widget() override;

-    void next() override;
-    void back() override;
-
    bool isNextEnabled() const override;
    bool isBackEnabled() const override;

--- a/src/modules/tracking/TrackingViewStep.cpp
+++ b/src/modules/tracking/TrackingViewStep.cpp
@ -67,17 +67,6 @@ TrackingViewStep::widget()
 }


-void
-TrackingViewStep::next()
-{
-}
-
-
-void
-TrackingViewStep::back()
-{}
-
-
 bool
 TrackingViewStep::isNextEnabled() const
 {
--- a/src/modules/tracking/TrackingViewStep.h
+++ b/src/modules/tracking/TrackingViewStep.h
@ -43,9 +43,6 @@ public:

    QWidget* widget() override;

-    void next() override;
-    void back() override;
-
    bool isNextEnabled() const override;
    bool isBackEnabled() const override;

--- a/src/modules/users/UsersViewStep.cpp
+++ b/src/modules/users/UsersViewStep.cpp
@ -61,17 +61,6 @@ UsersViewStep::widget()
 }


-void
-UsersViewStep::next()
-{
-}
-
-
-void
-UsersViewStep::back()
-{}
-
-
 bool
 UsersViewStep::isNextEnabled() const
 {
--- a/src/modules/users/UsersViewStep.h
+++ b/src/modules/users/UsersViewStep.h
@ -43,9 +43,6 @@ public:

    QWidget* widget() override;

-    void next() override;
-    void back() override;
-
    bool isNextEnabled() const override;
    bool isBackEnabled() const override;

--- a/src/modules/webview/WebViewStep.cpp
+++ b/src/modules/webview/WebViewStep.cpp
@ -72,17 +72,6 @@ WebViewStep::widget()
 }


-void
-WebViewStep::next()
-{
-}
-
-
-void
-WebViewStep::back()
-{}
-
-
 bool
 WebViewStep::isNextEnabled() const
 {
--- a/src/modules/webview/WebViewStep.h
+++ b/src/modules/webview/WebViewStep.h
@ -50,8 +50,6 @@ public:

    QWidget* widget() override;

-    void next() override;
-    void back() override;
    void onActivate() override;

    bool isNextEnabled() const override;
--- a/src/modules/welcome/WelcomeViewStep.cpp
+++ b/src/modules/welcome/WelcomeViewStep.cpp
@ -60,17 +60,6 @@ WelcomeViewStep::widget()
 }


-void
-WelcomeViewStep::next()
-{
-}
-
-
-void
-WelcomeViewStep::back()
-{}
-
-
 bool
 WelcomeViewStep::isNextEnabled() const
 {
--- a/src/modules/welcome/WelcomeViewStep.h
+++ b/src/modules/welcome/WelcomeViewStep.h
@ -43,9 +43,6 @@ public:

    QWidget* widget() override;

-    void next() override;
-    void back() override;
-
    bool isNextEnabled() const override;
    bool isBackEnabled() const override;