From 60cc8696e336e004b7cf7e2db903ca8660070abc Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 28 Sep 2021 23:56:52 +0200
Subject: [PATCH] Remove PythonQt support -- C++ bits
---
src/libcalamares/modulesystem/Descriptor.cpp | 2 --
src/libcalamares/modulesystem/Descriptor.h | 3 +--
src/libcalamaresui/modulesystem/ModuleFactory.cpp | 4 ----
3 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/src/libcalamares/modulesystem/Descriptor.cpp b/src/libcalamares/modulesystem/Descriptor.cpp
index 71b50d8677..62c376a3d3 100644
--- a/src/libcalamares/modulesystem/Descriptor.cpp
+++ b/src/libcalamares/modulesystem/Descriptor.cpp
@@ -40,7 +40,6 @@ interfaceNames()
{ QStringLiteral("process"), Interface::Process },
{ QStringLiteral("qtplugin"), Interface::QtPlugin },
{ QStringLiteral("python"), Interface::Python },
- { QStringLiteral("pythonqt"), Interface::PythonQt }
};
// *INDENT-ON*
// clang-format on
@@ -98,7 +97,6 @@ Descriptor::fromDescriptorData( const QVariantMap& moduleDesc )
consumedKeys << "load";
break;
case Interface::Python:
- case Interface::PythonQt:
d.m_script = CalamaresUtils::getString( moduleDesc, "script" );
if ( d.m_script.isEmpty() )
{
diff --git a/src/libcalamares/modulesystem/Descriptor.h b/src/libcalamares/modulesystem/Descriptor.h
index 614d5f15a4..6ab47269d0 100644
--- a/src/libcalamares/modulesystem/Descriptor.h
+++ b/src/libcalamares/modulesystem/Descriptor.h
@@ -42,7 +42,6 @@ enum class Interface
QtPlugin, // Jobs or Views
Python, // Jobs only
Process, // Deprecated interface
- PythonQt // Views only, available as enum even if PythonQt isn't used
};
const NamedEnumTable< Interface >& interfaceNames();
@@ -111,7 +110,7 @@ public:
*/
QString script() const
{
- return ( m_interface == Interface::Python || m_interface == Interface::PythonQt ) ? m_script : QString();
+ return m_interface == Interface::Python ? m_script : QString();
}
private:
diff --git a/src/libcalamaresui/modulesystem/ModuleFactory.cpp b/src/libcalamaresui/modulesystem/ModuleFactory.cpp
index 99bba5955c..7f44a0052a 100644
--- a/src/libcalamaresui/modulesystem/ModuleFactory.cpp
+++ b/src/libcalamaresui/modulesystem/ModuleFactory.cpp
@@ -55,10 +55,6 @@ moduleFromDescriptor( const Calamares::ModuleSystem::Descriptor& moduleDescripto
{
m.reset( new ViewModule() );
}
- else if ( moduleDescriptor.interface() == Interface::PythonQt )
- {
- cError() << "PythonQt view modules are not supported in this version of Calamares.";
- }
else
{
cError() << "Bad interface"
--
GitLab