napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove PythonQt support -- C++ bits

Browse Source
This commit is contained in:
Adriaan de Groot 2021-09-28 23:56:52 +02:00
parent ca4dbabf70
commit 60cc8696e3
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libcalamares/modulesystem/Descriptor.cpp
View File

@ -40,7 +40,6 @@ interfaceNames()
{ QStringLiteral("process"), Interface::Process }, { QStringLiteral("process"), Interface::Process },
{ QStringLiteral("qtplugin"), Interface::QtPlugin }, { QStringLiteral("qtplugin"), Interface::QtPlugin },
{ QStringLiteral("python"), Interface::Python }, { QStringLiteral("python"), Interface::Python },
{ QStringLiteral("pythonqt"), Interface::PythonQt }
}; };
// *INDENT-ON* // *INDENT-ON*
// clang-format on // clang-format on
@ -98,7 +97,6 @@ Descriptor::fromDescriptorData( const QVariantMap& moduleDesc )
consumedKeys << "load"; consumedKeys << "load";
break; break;
case Interface::Python: case Interface::Python:
case Interface::PythonQt:
d.m_script = CalamaresUtils::getString( moduleDesc, "script" ); d.m_script = CalamaresUtils::getString( moduleDesc, "script" );
if ( d.m_script.isEmpty() ) if ( d.m_script.isEmpty() )
{ {

3
src/libcalamares/modulesystem/Descriptor.h
View File

@ -42,7 +42,6 @@ enum class Interface
QtPlugin, // Jobs or Views QtPlugin, // Jobs or Views
Python, // Jobs only Python, // Jobs only
Process, // Deprecated interface Process, // Deprecated interface
PythonQt // Views only, available as enum even if PythonQt isn't used
}; };
const NamedEnumTable< Interface >& interfaceNames(); const NamedEnumTable< Interface >& interfaceNames();
@ -111,7 +110,7 @@ public:
*/ */
QString script() const QString script() const
{ {
return ( m_interface == Interface::Python || m_interface == Interface::PythonQt ) ? m_script : QString(); return m_interface == Interface::Python ? m_script : QString();
} }
private: private:

4
src/libcalamaresui/modulesystem/ModuleFactory.cpp
View File

@ -55,10 +55,6 @@ moduleFromDescriptor( const Calamares::ModuleSystem::Descriptor& moduleDescripto
{ {
m.reset( new ViewModule() ); m.reset( new ViewModule() );
} }
else if ( moduleDescriptor.interface() == Interface::PythonQt )
{
cError() << "PythonQt view modules are not supported in this version of Calamares.";
}
else else
{ {
cError() << "Bad interface" cError() << "Bad interface"