From a99eccf19d41d092d02fd3ac93e946dc8417d59d Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 7 May 2019 08:47:33 -0400
Subject: [PATCH] [libcalamaresui] Fix PythonQt code w/ moved enums

---
 .../modulesystem/PythonQtViewModule.cpp              |  4 ++--
 src/libcalamaresui/utils/DebugWindow.cpp             | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/libcalamaresui/modulesystem/PythonQtViewModule.cpp b/src/libcalamaresui/modulesystem/PythonQtViewModule.cpp
index 2af6d81e7..ec9f3c805 100644
--- a/src/libcalamaresui/modulesystem/PythonQtViewModule.cpp
+++ b/src/libcalamaresui/modulesystem/PythonQtViewModule.cpp
@@ -46,14 +46,14 @@ namespace Calamares
 Module::Type
 PythonQtViewModule::type() const
 {
-    return View;
+    return Module::Type::View;
 }
 
 
 Module::Interface
 PythonQtViewModule::interface() const
 {
-    return PythonQtInterface;
+    return Module::Interface::PythonQt;
 }
 
 
diff --git a/src/libcalamaresui/utils/DebugWindow.cpp b/src/libcalamaresui/utils/DebugWindow.cpp
index e12f4d60f..164da02d9 100644
--- a/src/libcalamaresui/utils/DebugWindow.cpp
+++ b/src/libcalamaresui/utils/DebugWindow.cpp
@@ -98,16 +98,16 @@ DebugWindow::DebugWindow()
 #ifdef WITH_PYTHONQT
     QPushButton* pythonConsoleButton = new QPushButton;
     pythonConsoleButton->setText( "Attach Python console" );
-    modulesVerticalLayout->insertWidget( 1, pythonConsoleButton );
+    m_ui->modulesVerticalLayout->insertWidget( 1, pythonConsoleButton );
     pythonConsoleButton->hide();
 
     QObject::connect( pythonConsoleButton, &QPushButton::clicked,
                       this, [ this, moduleConfigModel ]
     {
-        QString moduleName = modulesListView->currentIndex().data().toString();
+        QString moduleName = m_ui->modulesListView->currentIndex().data().toString();
         Module* module = ModuleManager::instance()->moduleInstance( moduleName );
-        if ( module->interface() != Module::PythonQtInterface ||
-             module->type() != Module::View )
+        if ( module->interface() != Module::Interface::PythonQt ||
+             module->type() != Module::Type::View )
             return;
 
         for ( ViewStep* step : ViewManager::instance()->viewSteps() )
@@ -180,8 +180,8 @@ DebugWindow::DebugWindow()
             m_ui->moduleInterfaceLabel->setText( module->interfaceString() );
 #ifdef WITH_PYTHONQT
             pythonConsoleButton->setVisible(
-                        module->interface() == Module::PythonQtInterface &&
-                        module->type() == Module::View );
+                        module->interface() == Module::Interface::PythonQt &&
+                        module->type() == Module::Type::View );
 #endif
         }
     } );