From 127c66285b673b6e08ab06a35d868ab602b56480 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Sun, 12 Jan 2020 20:30:58 +0000
Subject: [PATCH] Rename old DIALOG_BLOCK_OPTIONS to
 DIALOG_FILTER_SELECTION....

... which is what it has done for some time now.
---
 pcbnew/CMakeLists.txt                            |  4 ++--
 ...k_options.cpp => dialog_filter_selection.cpp} | 12 ++++++------
 ...block_options.h => dialog_filter_selection.h} | 16 ++++++++--------
 ...base.cpp => dialog_filter_selection_base.cpp} |  2 +-
 ...base.fbp => dialog_filter_selection_base.fbp} |  6 +++---
 ...ons_base.h => dialog_filter_selection_base.h} |  0
 pcbnew/tools/selection_tool.cpp                  | 10 +++++-----
 qa/qa_utils/mocks.cpp                            | 12 ++++++------
 8 files changed, 31 insertions(+), 31 deletions(-)
 rename pcbnew/dialogs/{dialog_block_options.cpp => dialog_filter_selection.cpp} (87%)
 rename pcbnew/dialogs/{dialog_block_options.h => dialog_filter_selection.h} (83%)
 rename pcbnew/dialogs/{dialog_block_options_base.cpp => dialog_filter_selection_base.cpp} (99%)
 rename pcbnew/dialogs/{dialog_block_options_base.fbp => dialog_filter_selection_base.fbp} (99%)
 rename pcbnew/dialogs/{dialog_block_options_base.h => dialog_filter_selection_base.h} (100%)

diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index 1afeca8606..35af041488 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -50,8 +50,8 @@ include_directories(
     )
 
 set( PCBNEW_DIALOGS
-    dialogs/dialog_block_options.cpp
-    dialogs/dialog_block_options_base.cpp
+    dialogs/dialog_filter_selection.cpp
+    dialogs/dialog_filter_selection_base.cpp
     dialogs/dialog_board_setup.cpp
     dialogs/dialog_board_statistics.cpp
     dialogs/dialog_board_statistics_base.cpp
diff --git a/pcbnew/dialogs/dialog_block_options.cpp b/pcbnew/dialogs/dialog_filter_selection.cpp
similarity index 87%
rename from pcbnew/dialogs/dialog_block_options.cpp
rename to pcbnew/dialogs/dialog_filter_selection.cpp
index 7b46d98ed3..8bc4a133e1 100644
--- a/pcbnew/dialogs/dialog_block_options.cpp
+++ b/pcbnew/dialogs/dialog_filter_selection.cpp
@@ -22,14 +22,14 @@
  */
 
 
-#include <dialog_block_options.h>
+#include <dialog_filter_selection.h>
 
 #include <pcb_edit_frame.h>
 
 
-DIALOG_BLOCK_OPTIONS::DIALOG_BLOCK_OPTIONS( PCB_BASE_FRAME* aParent,
-        OPTIONS& aOptions, bool aShowLegacyOptions,
-        const wxString& aTitle ) :
+DIALOG_FILTER_SELECTION::DIALOG_FILTER_SELECTION( PCB_BASE_FRAME* aParent,
+                                                  OPTIONS& aOptions, bool aShowLegacyOptions,
+                                                  const wxString& aTitle ) :
     DIALOG_BLOCK_OPTIONS_BASE( aParent, -1, aTitle ),
     m_options( aOptions )
 {
@@ -64,7 +64,7 @@ DIALOG_BLOCK_OPTIONS::DIALOG_BLOCK_OPTIONS( PCB_BASE_FRAME* aParent,
 }
 
 
-void DIALOG_BLOCK_OPTIONS::checkBoxClicked( wxCommandEvent& aEvent )
+void DIALOG_FILTER_SELECTION::checkBoxClicked( wxCommandEvent& aEvent )
 {
     if( m_Include_Modules->GetValue() )
         m_IncludeLockedModules->Enable();
@@ -73,7 +73,7 @@ void DIALOG_BLOCK_OPTIONS::checkBoxClicked( wxCommandEvent& aEvent )
 }
 
 
-void DIALOG_BLOCK_OPTIONS::ExecuteCommand( wxCommandEvent& event )
+void DIALOG_FILTER_SELECTION::ExecuteCommand( wxCommandEvent& event )
 {
     m_options.includeModules     = m_Include_Modules->GetValue();
     m_options.includeLockedModules = m_IncludeLockedModules->GetValue();
diff --git a/pcbnew/dialogs/dialog_block_options.h b/pcbnew/dialogs/dialog_filter_selection.h
similarity index 83%
rename from pcbnew/dialogs/dialog_block_options.h
rename to pcbnew/dialogs/dialog_filter_selection.h
index ecccbccd79..f64dbd5007 100644
--- a/pcbnew/dialogs/dialog_block_options.h
+++ b/pcbnew/dialogs/dialog_filter_selection.h
@@ -21,14 +21,14 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#ifndef DIALOG_BLOCK_OPTIONS_H_
-#define DIALOG_BLOCK_OPTIONS_H_
+#ifndef DIALOG_FILTER_SELECTION_H
+#define DIALOG_FILTER_SELECTION_H
 
-#include <dialogs/dialog_block_options_base.h>
+#include <dialogs/dialog_filter_selection_base.h>
 
 class PCB_BASE_FRAME;
 
-class DIALOG_BLOCK_OPTIONS : public DIALOG_BLOCK_OPTIONS_BASE
+class DIALOG_FILTER_SELECTION : public DIALOG_BLOCK_OPTIONS_BASE
 {
 public:
 
@@ -50,11 +50,11 @@ public:
         bool includeItemsOnInvisibleLayers = false;
     };
 
-    DIALOG_BLOCK_OPTIONS( PCB_BASE_FRAME* aParent, OPTIONS& aOptions,
-                          bool aShowLegacyOptions,
-                          const wxString& aTitle );
+    DIALOG_FILTER_SELECTION( PCB_BASE_FRAME* aParent, OPTIONS& aOptions,
+                             bool aShowLegacyOptions,
+                             const wxString& aTitle );
 
-    ~DIALOG_BLOCK_OPTIONS()
+    ~DIALOG_FILTER_SELECTION()
     {
     }
 
diff --git a/pcbnew/dialogs/dialog_block_options_base.cpp b/pcbnew/dialogs/dialog_filter_selection_base.cpp
similarity index 99%
rename from pcbnew/dialogs/dialog_block_options_base.cpp
rename to pcbnew/dialogs/dialog_filter_selection_base.cpp
index 977334e015..4dd2c30393 100644
--- a/pcbnew/dialogs/dialog_block_options_base.cpp
+++ b/pcbnew/dialogs/dialog_filter_selection_base.cpp
@@ -5,7 +5,7 @@
 // PLEASE DO *NOT* EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
-#include "dialog_block_options_base.h"
+#include "dialog_filter_selection_base.h"
 
 ///////////////////////////////////////////////////////////////////////////
 
diff --git a/pcbnew/dialogs/dialog_block_options_base.fbp b/pcbnew/dialogs/dialog_filter_selection_base.fbp
similarity index 99%
rename from pcbnew/dialogs/dialog_block_options_base.fbp
rename to pcbnew/dialogs/dialog_filter_selection_base.fbp
index d54d73061c..5d2e4a0d92 100644
--- a/pcbnew/dialogs/dialog_block_options_base.fbp
+++ b/pcbnew/dialogs/dialog_filter_selection_base.fbp
@@ -11,12 +11,12 @@
         <property name="embedded_files_path">res</property>
         <property name="encoding">UTF-8</property>
         <property name="event_generation">connect</property>
-        <property name="file">dialog_block_options_base</property>
+        <property name="file">dialog_filter_selection_base</property>
         <property name="first_id">1000</property>
         <property name="help_provider">none</property>
         <property name="indent_with_spaces"></property>
         <property name="internationalize">1</property>
-        <property name="name">dialog_block_options_base</property>
+        <property name="name">dialog_filter_selection_base</property>
         <property name="namespace"></property>
         <property name="path">.</property>
         <property name="precompiled_header"></property>
@@ -43,7 +43,7 @@
             <property name="id">wxID_ANY</property>
             <property name="maximum_size"></property>
             <property name="minimum_size"></property>
-            <property name="name">DIALOG_BLOCK_OPTIONS_BASE</property>
+            <property name="name">DIALOG_FILTER_SELECTION_BASE</property>
             <property name="pos"></property>
             <property name="size">-1,-1</property>
             <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
diff --git a/pcbnew/dialogs/dialog_block_options_base.h b/pcbnew/dialogs/dialog_filter_selection_base.h
similarity index 100%
rename from pcbnew/dialogs/dialog_block_options_base.h
rename to pcbnew/dialogs/dialog_filter_selection_base.h
diff --git a/pcbnew/tools/selection_tool.cpp b/pcbnew/tools/selection_tool.cpp
index 0ef5b3d6d3..9a5e451108 100644
--- a/pcbnew/tools/selection_tool.cpp
+++ b/pcbnew/tools/selection_tool.cpp
@@ -36,7 +36,7 @@ using namespace std::placeholders;
 #include <collectors.h>
 #include <confirm.h>
 #include <dialog_find.h>
-#include <dialog_block_options.h>
+#include <dialog_filter_selection.h>
 #include <class_draw_panel_gal.h>
 #include <view/view_controls.h>
 #include <preview_items/selection_area.h>
@@ -103,7 +103,7 @@ private:
 class SELECTION_TOOL::PRIV
 {
 public:
-    DIALOG_BLOCK_OPTIONS::OPTIONS m_filterOpts;
+    DIALOG_FILTER_SELECTION::OPTIONS m_filterOpts;
 };
 
 
@@ -1179,7 +1179,7 @@ int SELECTION_TOOL::find( const TOOL_EVENT& aEvent )
  */
 static bool itemIsIncludedByFilter( const BOARD_ITEM& aItem,
                                     const BOARD& aBoard,
-                                    const DIALOG_BLOCK_OPTIONS::OPTIONS& aBlockOpts )
+                                    const DIALOG_FILTER_SELECTION::OPTIONS& aBlockOpts )
 {
     bool include = true;
     const PCB_LAYER_ID layer = aItem.GetLayer();
@@ -1255,8 +1255,8 @@ static bool itemIsIncludedByFilter( const BOARD_ITEM& aItem,
 int SELECTION_TOOL::filterSelection( const TOOL_EVENT& aEvent )
 {
     const BOARD&                   board = *getModel<BOARD>();
-    DIALOG_BLOCK_OPTIONS::OPTIONS& opts = m_priv->m_filterOpts;
-    DIALOG_BLOCK_OPTIONS           dlg( m_frame, opts, false, _( "Filter selection" ) );
+    DIALOG_FILTER_SELECTION::OPTIONS& opts = m_priv->m_filterOpts;
+    DIALOG_FILTER_SELECTION           dlg( m_frame, opts, false, _( "Filter selection" ) );
 
     const int cmd = dlg.ShowModal();
 
diff --git a/qa/qa_utils/mocks.cpp b/qa/qa_utils/mocks.cpp
index 60859cc2a1..f71f49b3de 100644
--- a/qa/qa_utils/mocks.cpp
+++ b/qa/qa_utils/mocks.cpp
@@ -43,7 +43,7 @@
 #include <tools/pcb_actions.h>
 #include <router/router_tool.h>
 #include <dialog_find.h>
-#include <dialog_block_options.h>
+#include <dialog_filter_selection.h>
 
 
 static struct IFACE : public KIFACE_I
@@ -235,9 +235,9 @@ DIALOG_BLOCK_OPTIONS_BASE::~DIALOG_BLOCK_OPTIONS_BASE()
 }
 
 
-DIALOG_BLOCK_OPTIONS::DIALOG_BLOCK_OPTIONS( PCB_BASE_FRAME* aParent,
-        OPTIONS& aOptions, bool aShowLegacyOptions,
-        const wxString& aTitle ) :
+DIALOG_FILTER_SELECTION::DIALOG_FILTER_SELECTION( PCB_BASE_FRAME* aParent,
+                                                  OPTIONS& aOptions, bool aShowLegacyOptions,
+                                                  const wxString& aTitle ) :
     DIALOG_BLOCK_OPTIONS_BASE( aParent, -1, aTitle ),
     m_options( aOptions )
 {
@@ -247,12 +247,12 @@ DIALOG_BLOCK_OPTIONS::DIALOG_BLOCK_OPTIONS( PCB_BASE_FRAME* aParent,
 }
 
 
-void DIALOG_BLOCK_OPTIONS::checkBoxClicked( wxCommandEvent& aEvent )
+void DIALOG_FILTER_SELECTION::checkBoxClicked( wxCommandEvent& aEvent )
 {
 }
 
 
-void DIALOG_BLOCK_OPTIONS::ExecuteCommand( wxCommandEvent& event )
+void DIALOG_FILTER_SELECTION::ExecuteCommand( wxCommandEvent& event )
 {
 }