From 72f6127e53f99cf75f56e592df65623400a5960d Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Sun, 11 Oct 2020 22:30:43 +0100
Subject: [PATCH] Clean up terminology so it matches the user message better.

---
 pcbnew/drc/drc_item.cpp                         | 6 +++---
 pcbnew/drc/drc_item.h                           | 4 ++--
 pcbnew/drc/drc_test_provider_silk_clearance.cpp | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pcbnew/drc/drc_item.cpp b/pcbnew/drc/drc_item.cpp
index 9a137b7f7d..bc5574f8ba 100644
--- a/pcbnew/drc/drc_item.cpp
+++ b/pcbnew/drc/drc_item.cpp
@@ -168,7 +168,7 @@ DRC_ITEM DRC_ITEM::silkMaskClearance( DRCE_SILK_MASK_CLEARANCE,
         _( "Silkscreen clipped by solder mask" ),
         wxT( "silk_over_copper" ) );
 
-DRC_ITEM DRC_ITEM::silkSilkClearance( DRCE_SILK_SILK_CLEARANCE,
+DRC_ITEM DRC_ITEM::silkOverlaps( DRCE_OVERLAPPING_SILK,
         _( "Silkscreen overlap" ),
         wxT( "silk_overlap" ) );
 
@@ -224,7 +224,7 @@ std::vector<std::reference_wrapper<RC_ITEM>> DRC_ITEM::allItemTypes( {
             DRC_ITEM::extraFootprint,
             DRC_ITEM::netConflict,
             DRC_ITEM::unresolvedVariable,
-            DRC_ITEM::silkSilkClearance,
+            DRC_ITEM::silkOverlaps,
             DRC_ITEM::silkMaskClearance,
             DRC_ITEM::lengthOutOfRange,
             DRC_ITEM::skewOutOfRange,
@@ -270,7 +270,7 @@ std::shared_ptr<DRC_ITEM> DRC_ITEM::Create( int aErrorCode )
     case DRCE_NET_CONFLICT:             return std::make_shared<DRC_ITEM>( netConflict );
     case DRCE_EXTRA_FOOTPRINT:          return std::make_shared<DRC_ITEM>( extraFootprint );
     case DRCE_UNRESOLVED_VARIABLE:      return std::make_shared<DRC_ITEM>( unresolvedVariable );
-    case DRCE_SILK_SILK_CLEARANCE:      return std::make_shared<DRC_ITEM>( silkSilkClearance );
+    case DRCE_OVERLAPPING_SILK:         return std::make_shared<DRC_ITEM>( silkOverlaps );
     case DRCE_SILK_MASK_CLEARANCE:      return std::make_shared<DRC_ITEM>( silkMaskClearance );
     case DRCE_LENGTH_OUT_OF_RANGE:      return std::make_shared<DRC_ITEM>( lengthOutOfRange );
     case DRCE_SKEW_OUT_OF_RANGE:        return std::make_shared<DRC_ITEM>( skewOutOfRange );
diff --git a/pcbnew/drc/drc_item.h b/pcbnew/drc/drc_item.h
index ee7cf1f0f1..006ce0a21a 100644
--- a/pcbnew/drc/drc_item.h
+++ b/pcbnew/drc/drc_item.h
@@ -70,7 +70,7 @@ enum PCB_DRC_CODE {
     DRCE_UNRESOLVED_VARIABLE,
     DRCE_SILK_MASK_CLEARANCE,            // silkscreen clipped by mask (potentially leaving it
                                          //   over pads, exposed copper, etc.)
-    DRCE_SILK_SILK_CLEARANCE,            // silk to silk clearance error
+    DRCE_OVERLAPPING_SILK,               // silk to silk clearance error
     DRCE_LENGTH_OUT_OF_RANGE,
     DRCE_SKEW_OUT_OF_RANGE,
     DRCE_TOO_MANY_VIAS,
@@ -154,7 +154,7 @@ private:
     static DRC_ITEM netConflict;
     static DRC_ITEM unresolvedVariable;
     static DRC_ITEM silkMaskClearance;
-    static DRC_ITEM silkSilkClearance;
+    static DRC_ITEM silkOverlaps;
     static DRC_ITEM lengthOutOfRange;
     static DRC_ITEM skewOutOfRange;
     static DRC_ITEM tooManyVias;
diff --git a/pcbnew/drc/drc_test_provider_silk_clearance.cpp b/pcbnew/drc/drc_test_provider_silk_clearance.cpp
index 44e67a6adc..71435e1dc0 100644
--- a/pcbnew/drc/drc_test_provider_silk_clearance.cpp
+++ b/pcbnew/drc/drc_test_provider_silk_clearance.cpp
@@ -38,7 +38,7 @@
 /*
     Silk to silk clearance test. Check all silkscreen features against each other.
     Errors generated:
-    - DRCE_SILK_SILK_CLEARANCE
+    - DRCE_OVERLAPPING_SILK
 
 */
 
@@ -117,7 +117,7 @@ bool DRC_TEST_PROVIDER_SILK_CLEARANCE::Run()
             [&]( const DRC_RTREE::LAYER_PAIR& aLayers, DRC_RTREE::ITEM_WITH_SHAPE* aRefItem,
                  DRC_RTREE::ITEM_WITH_SHAPE* aTestItem, bool* aCollisionDetected ) -> bool
             {
-                if( m_drcEngine->IsErrorLimitExceeded( DRCE_SILK_SILK_CLEARANCE ) )
+                if( m_drcEngine->IsErrorLimitExceeded( DRCE_OVERLAPPING_SILK ) )
                     return false;
 
                 auto constraint = m_drcEngine->EvalRulesForItems( DRC_CONSTRAINT_TYPE_SILK_CLEARANCE,
@@ -178,7 +178,7 @@ bool DRC_TEST_PROVIDER_SILK_CLEARANCE::Run()
                 if( !aRefItem->shape->Collide( aTestItem->shape, minClearance, &actual, &pos ) )
                     return true;
 
-                std::shared_ptr<DRC_ITEM> drcItem = DRC_ITEM::Create( DRCE_SILK_SILK_CLEARANCE );
+                std::shared_ptr<DRC_ITEM> drcItem = DRC_ITEM::Create( DRCE_OVERLAPPING_SILK );
 
                 if( minClearance > 0 )
                 {