From 7dd6a182f278e4af6bc8b4276d45aca3a2ed25c8 Mon Sep 17 00:00:00 2001
From: Jon Evans <jon@craftyjon.com>
Date: Thu, 8 Apr 2021 22:22:03 -0400
Subject: [PATCH] Unhide the Altium schematic importer

Fixes https://gitlab.com/kicad/code/kicad/-/issues/8069
---
 common/advanced_config.cpp | 9 ---------
 eeschema/files-io.cpp      | 3 +--
 include/advanced_config.h  | 6 ------
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/common/advanced_config.cpp b/common/advanced_config.cpp
index cbcbf75f11..d64f712159 100644
--- a/common/advanced_config.cpp
+++ b/common/advanced_config.cpp
@@ -139,11 +139,6 @@ static const wxChar MaxTrackLengthToKeep[] = wxT( "MaxTrackLengthToKeep" );
  */
 static const wxChar StrokeTriangulation[] = wxT( "StrokeTriangulation" );
 
-/**
- * When true, enable Altium Schematic import (*.SchDoc)
- */
-static const wxChar PluginAltiumSch[] = wxT( "PluginAltiumSch" );
-
 /**
  * Absolute minimum pen width to send to the plotter.  PDF seems happy enough with 0.0212mm
  * (which equates to 1px @ 1200dpi).
@@ -253,7 +248,6 @@ ADVANCED_CFG::ADVANCED_CFG()
     m_MaxTangentAngleDeviation  = 1.0;
     m_MaxTrackLengthToKeep      = 0.0001;
     m_DrawTriangulationOutlines = false;
-    m_PluginAltiumSch           = false;
 
     m_ExtraClearance            = 0.0001;
     m_DRCEpsilon                = 0.0001;   // 0.1um is small enough not to materially violate
@@ -347,9 +341,6 @@ void ADVANCED_CFG::loadSettings( wxConfigBase& aCfg )
     configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::StrokeTriangulation,
                                                 &m_DrawTriangulationOutlines, false ) );
 
-    configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::PluginAltiumSch,
-                                                &m_PluginAltiumSch, false ) );
-
     configParams.push_back( new PARAM_CFG_DOUBLE( true, AC_KEYS::MinPlotPenWidth,
                                                   &m_MinPlotPenWidth, 0.0212, 0.0, 1.0 ) );
 
diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp
index 5b64dcf8a5..ac573d0d0c 100644
--- a/eeschema/files-io.cpp
+++ b/eeschema/files-io.cpp
@@ -680,8 +680,7 @@ void SCH_EDIT_FRAME::OnImportProject( wxCommandEvent& aEvent )
     std::list<std::pair<const wxString, const SCH_IO_MGR::SCH_FILE_T>> loaders;
 
     // Import Altium schematic files.
-    if( ADVANCED_CFG::GetCfg().m_PluginAltiumSch )
-        loaders.emplace_back( AltiumSchematicFileWildcard(), SCH_IO_MGR::SCH_ALTIUM );
+    loaders.emplace_back( AltiumSchematicFileWildcard(), SCH_IO_MGR::SCH_ALTIUM );
 
     // Import CADSTAR Schematic Archive files.
     loaders.emplace_back( CadstarSchematicArchiveFileWildcard(), SCH_IO_MGR::SCH_CADSTAR_ARCHIVE );
diff --git a/include/advanced_config.h b/include/advanced_config.h
index e6105aace0..5924e9f39d 100644
--- a/include/advanced_config.h
+++ b/include/advanced_config.h
@@ -133,12 +133,6 @@ public:
      */
     bool m_DrawTriangulationOutlines;
 
-    /**
-     * When true, enable Altium Schematic import (*.SchDoc)
-     * the current implementation is highly incomplete
-     */
-    bool m_PluginAltiumSch;
-
     /**
      * Sets an absolute minimum pen width for plotting.  Some formats (PDF, for example) don't
      * like ultra-thin lines.  Units are mm.