From 3575eed37bda8fef308131afed41211d15d450d9 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sun, 19 Mar 2017 22:58:32 +0100
Subject: [PATCH] refs #912, static utility function lastStepSkipped for
 configuration wizard

---
 src/blackgui/components/configurationwizard.cpp        | 6 ++++++
 src/blackgui/components/configurationwizard.h          | 3 +++
 src/blackgui/components/copyconfigurationcomponent.cpp | 6 +-----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/blackgui/components/configurationwizard.cpp b/src/blackgui/components/configurationwizard.cpp
index ced08e220..e2860e59c 100644
--- a/src/blackgui/components/configurationwizard.cpp
+++ b/src/blackgui/components/configurationwizard.cpp
@@ -50,6 +50,12 @@ namespace BlackGui
             return m_skipped;
         }
 
+        bool CConfigurationWizard::lastWizardStepSkipped(const QWizard *standardWizard)
+        {
+            const CConfigurationWizard *wizard = qobject_cast<const CConfigurationWizard *>(standardWizard);
+            return wizard && wizard->lastStepSkipped();
+        }
+
         void CConfigurationWizard::wizardCurrentIdChanged(int id)
         {
             const int previousId = m_previousId;
diff --git a/src/blackgui/components/configurationwizard.h b/src/blackgui/components/configurationwizard.h
index 641b42b24..042cbfbb7 100644
--- a/src/blackgui/components/configurationwizard.h
+++ b/src/blackgui/components/configurationwizard.h
@@ -48,6 +48,9 @@ namespace BlackGui
             //! Was the last step skipped?
             bool lastStepSkipped() const;
 
+            //! Static version of CConfigurationWizard::lastStepSkipped
+            static bool lastWizardStepSkipped(const QWizard *standardWizard);
+
         private:
             //! The current page has changed
             void wizardCurrentIdChanged(int id);
diff --git a/src/blackgui/components/copyconfigurationcomponent.cpp b/src/blackgui/components/copyconfigurationcomponent.cpp
index 0510f39f2..70eef9b48 100644
--- a/src/blackgui/components/copyconfigurationcomponent.cpp
+++ b/src/blackgui/components/copyconfigurationcomponent.cpp
@@ -252,11 +252,7 @@ namespace BlackGui
 
         bool CCopyConfigurationWizardPage::validatePage()
         {
-            CConfigurationWizard *wizard = qobject_cast<CConfigurationWizard *>(this->wizard());
-            Q_ASSERT_X(m_config, Q_FUNC_INFO, "Missing config");
-            Q_ASSERT_X(wizard, Q_FUNC_INFO, "No wizard");
-
-            if (wizard->lastStepSkipped()) { return true; }
+            if (CConfigurationWizard::lastWizardStepSkipped(this->wizard())) { return true; }
             m_config->copySelectedFiles();
             return true;
         }