← Back to team overview

kicad-developers team mailing list archive

[PATCH 2/4] Also move traceFindItem to trace_helpers.h

 

There was already a string definition that wasn't used, so it's obvious
that was intended.
---
 eeschema/lib_pin.cpp       |  1 +
 eeschema/sch_component.cpp |  2 ++
 eeschema/sch_field.cpp     |  1 +
 eeschema/sch_item_struct.h | 10 ----------
 eeschema/sch_sheet.cpp     |  1 +
 eeschema/sch_sheet_pin.cpp |  1 +
 eeschema/sch_text.cpp      |  1 +
 include/trace_helpers.h    |  5 +++++
 8 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/eeschema/lib_pin.cpp b/eeschema/lib_pin.cpp
index 994aea4c2..ccf1eba98 100644
--- a/eeschema/lib_pin.cpp
+++ b/eeschema/lib_pin.cpp
@@ -47,6 +47,7 @@
 #include <lib_pin.h>
 #include <transform.h>
 #include <sch_component.h>
+#include <trace_helpers.h>
 
 
 static const int pin_orientation_codes[] =
diff --git a/eeschema/sch_component.cpp b/eeschema/sch_component.cpp
index 04f75e00c..ab0ea1b6b 100644
--- a/eeschema/sch_component.cpp
+++ b/eeschema/sch_component.cpp
@@ -57,6 +57,8 @@
 
 #include <eeschema_id.h>    // for MAX_UNIT_COUNT_PER_PACKAGE definition
 
+#include <trace_helpers.h>
+
 #define NULL_STRING "_NONAME_"
 
 /**
diff --git a/eeschema/sch_field.cpp b/eeschema/sch_field.cpp
index 15609b1b7..eb58c531a 100644
--- a/eeschema/sch_field.cpp
+++ b/eeschema/sch_field.cpp
@@ -50,6 +50,7 @@
 #include <sch_component.h>
 #include <sch_field.h>
 #include <kicad_string.h>
+#include <trace_helpers.h>
 
 
 SCH_FIELD::SCH_FIELD( const wxPoint& aPos, int aFieldId, SCH_COMPONENT* aParent, const wxString& aName ) :
diff --git a/eeschema/sch_item_struct.h b/eeschema/sch_item_struct.h
index 4052328f9..09be6eb66 100644
--- a/eeschema/sch_item_struct.h
+++ b/eeschema/sch_item_struct.h
@@ -44,16 +44,6 @@ class NETLIST_OBJECT;
 class NETLIST_OBJECT_LIST;
 
 
-/**
- * @ingroup trace_env_vars
- *
- * Flag to enable finding schematic item debug output.
- *
- * @warning This generates a log of debug output.
- */
-extern const wxString traceFindItem;
-
-
 enum DANGLING_END_T {
     UNKNOWN = 0,
     WIRE_START_END,
diff --git a/eeschema/sch_sheet.cpp b/eeschema/sch_sheet.cpp
index b52b59d1b..74b9f76d3 100644
--- a/eeschema/sch_sheet.cpp
+++ b/eeschema/sch_sheet.cpp
@@ -41,6 +41,7 @@
 #include <sch_sheet_path.h>
 #include <sch_component.h>
 #include <netlist_object.h>
+#include <trace_helpers.h>
 
 
 SCH_SHEET::SCH_SHEET( const wxPoint& pos ) :
diff --git a/eeschema/sch_sheet_pin.cpp b/eeschema/sch_sheet_pin.cpp
index 780e56fbc..2fa178754 100644
--- a/eeschema/sch_sheet_pin.cpp
+++ b/eeschema/sch_sheet_pin.cpp
@@ -40,6 +40,7 @@
 #include <general.h>
 #include <sch_sheet.h>
 #include <kicad_string.h>
+#include <trace_helpers.h>
 
 
 SCH_SHEET_PIN::SCH_SHEET_PIN( SCH_SHEET* parent, const wxPoint& pos, const wxString& text ) :
diff --git a/eeschema/sch_text.cpp b/eeschema/sch_text.cpp
index 782b885f1..f440085a3 100644
--- a/eeschema/sch_text.cpp
+++ b/eeschema/sch_text.cpp
@@ -43,6 +43,7 @@
 #include <list_operations.h>
 #include <sch_text.h>
 #include <netlist_object.h>
+#include <trace_helpers.h>
 
 
 extern void IncrementLabelMember( wxString& name, int aIncrement );
diff --git a/include/trace_helpers.h b/include/trace_helpers.h
index bfe02023f..3c692de55 100644
--- a/include/trace_helpers.h
+++ b/include/trace_helpers.h
@@ -44,6 +44,11 @@
 /// \ingroup trace_env_vars
 
 /**
+ * Flag to enable find debug tracing.
+ */
+extern const wxChar* traceFindItem;
+
+/**
  * Flag to enable find and replace debug tracing.
  */
 extern const wxChar* traceFindReplace;

References