Minor fixup to intersheet reference files

eeschema/sch_iref.h

@@ -1,7 +1,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -31,8 +31,8 @@
 
 
 #include <macros.h>
+#include <sch_text.h>
 
-class SCH_TEXT;
 class SCH_GLOBALLABEL;
 
 class SCH_IREF : public SCH_TEXT
@@ -77,6 +77,10 @@ public:
 private:
     void SetIrefOrientation( LABEL_SPIN_STYLE aSpinStyle );
 
+    // We create a different set parent function for this class, so we hide
+    // the inherited one.
+    using EDA_ITEM::SetParent;
+
     std::vector<int> m_refTable;
     SCH_GLOBALLABEL* m_parent;
     int              m_ownPageNumber;

eeschema/schematic_settings.cpp

@@ -41,10 +41,10 @@ SCHEMATIC_SETTINGS::SCHEMATIC_SETTINGS( JSON_SETTINGS* aParent, const std::strin
         m_TextOffsetRatio( 0.08 ),
         m_PinSymbolSize( DEFAULT_TEXT_SIZE * IU_PER_MILS / 2 ),
         m_JunctionSize( DEFAULT_JUNCTION_DIAM * IU_PER_MILS ),
-        m_IntersheetsRefShow ( false ),
-        m_IntersheetsRefFormatShort (false ),
-        m_IntersheetsRefPrefix ( DEFAULT_IREF_PREFIX ),
-        m_IntersheetsRefSuffix ( DEFAULT_IREF_SUFFIX ),
+        m_IntersheetsRefShow( false ),
+        m_IntersheetsRefFormatShort( false ),
+        m_IntersheetsRefPrefix( DEFAULT_IREF_PREFIX ),
+        m_IntersheetsRefSuffix( DEFAULT_IREF_SUFFIX ),
         m_SpiceAdjustPassiveValues( false )
 {
     EESCHEMA_SETTINGS* appSettings = dynamic_cast<EESCHEMA_SETTINGS*>( Kiface().KifaceSettings() );
@@ -71,10 +71,10 @@ SCHEMATIC_SETTINGS::SCHEMATIC_SETTINGS( JSON_SETTINGS* aParent, const std::strin
             appSettings ? appSettings->m_Drawing.intersheets_ref_suffix : DEFAULT_IREF_SUFFIX;
 
     m_params.emplace_back( new PARAM<bool>( "drawing.intersheets_ref_show",
-            &m_IntersheetsRefShow, false ) );
+            &m_IntersheetsRefShow, defaultIntersheetsRefShow ) );
 
     m_params.emplace_back( new PARAM<bool>( "drawing.intersheets_ref_short",
-            &m_IntersheetsRefFormatShort, false ) );
+            &m_IntersheetsRefFormatShort, defaultIntersheetsRefFormatShort ) );
 
     m_params.emplace_back( new PARAM<wxString>( "drawing.intersheets_ref_prefix",
             &m_IntersheetsRefPrefix, "[" ) );