[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

gEDA-user: [PATCH 2/2] libgeda: remove TYPE_ERASE from OBJECT_TYPE enum



TYPE_ERASE was not documented in file format spec and not used in the code.
---
 libgeda/include/libgeda/struct.h |    2 +-
 libgeda/src/o_arc_basic.c        |    6 ------
 libgeda/src/o_box_basic.c        |    6 ------
 libgeda/src/o_circle_basic.c     |    6 ------
 libgeda/src/o_line_basic.c       |    6 ------
 libgeda/src/o_path_basic.c       |    6 ------
 utils/src/convert_sym.c          |    2 +-
 7 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/libgeda/include/libgeda/struct.h b/libgeda/include/libgeda/struct.h
index fef18c7..232142a 100644
--- a/libgeda/include/libgeda/struct.h
+++ b/libgeda/include/libgeda/struct.h
@@ -81,7 +81,7 @@ typedef enum { F_OPEN_RC           = 1,
 typedef enum {END_NONE, END_SQUARE, END_ROUND} OBJECT_END;
 
 /*! \brief line style of lines, rect, circles, arcs */
-typedef enum {TYPE_SOLID, TYPE_DOTTED, TYPE_DASHED, TYPE_CENTER, TYPE_PHANTOM, TYPE_ERASE} OBJECT_TYPE;
+typedef enum {TYPE_SOLID, TYPE_DOTTED, TYPE_DASHED, TYPE_CENTER, TYPE_PHANTOM} OBJECT_TYPE;
 
 /*! \brief fill style of objects like cirle, rect, path */
 typedef enum {FILLING_HOLLOW, FILLING_FILL, FILLING_MESH, FILLING_HATCH, FILLING_VOID} OBJECT_FILLING;
diff --git a/libgeda/src/o_arc_basic.c b/libgeda/src/o_arc_basic.c
index 761a347..60ffce7 100644
--- a/libgeda/src/o_arc_basic.c
+++ b/libgeda/src/o_arc_basic.c
@@ -677,12 +677,6 @@ void o_arc_print(TOPLEVEL *toplevel, FILE *fp, OBJECT *o_current,
     case(TYPE_PHANTOM):
       outl_func = o_arc_print_phantom;
       break;
-			
-    case(TYPE_ERASE):
-      /* Unused for now, print it solid */
-      length = -1; space = -1;
-      outl_func = o_arc_print_solid;
-      break;
   }
 
   if((space == 0) || (length == 0)) {
diff --git a/libgeda/src/o_box_basic.c b/libgeda/src/o_box_basic.c
index c99ccde..77e9259 100644
--- a/libgeda/src/o_box_basic.c
+++ b/libgeda/src/o_box_basic.c
@@ -733,12 +733,6 @@ void o_box_print(TOPLEVEL *toplevel, FILE *fp, OBJECT *o_current,
     case(TYPE_PHANTOM):
       outl_func = o_box_print_phantom;
       break;
-		
-    case(TYPE_ERASE):
-      /* Unused for now, print it solid */
-      length = -1; space  = -1;
-      outl_func = o_box_print_solid;
-      break;
   }
 
   if((length == 0) || (space == 0)) {
diff --git a/libgeda/src/o_circle_basic.c b/libgeda/src/o_circle_basic.c
index c9b9b68..b6f0a1f 100644
--- a/libgeda/src/o_circle_basic.c
+++ b/libgeda/src/o_circle_basic.c
@@ -641,12 +641,6 @@ void o_circle_print(TOPLEVEL *toplevel, FILE *fp, OBJECT *o_current,
     case(TYPE_PHANTOM):
       outl_func = o_circle_print_phantom;
       break;
-
-    case(TYPE_ERASE):
-      /* Unused for now print it solid */
-      length = -1; space  = -1;
-      outl_func = o_circle_print_solid;
-      break;
   }
 
   if((length == 0) || (space == 0)) {
diff --git a/libgeda/src/o_line_basic.c b/libgeda/src/o_line_basic.c
index b35a705..47b1ea1 100644
--- a/libgeda/src/o_line_basic.c
+++ b/libgeda/src/o_line_basic.c
@@ -592,12 +592,6 @@ void o_line_print(TOPLEVEL *toplevel, FILE *fp, OBJECT *o_current,
     case(TYPE_PHANTOM):
       outl_func = o_line_print_phantom;
       break;
-      
-    case(TYPE_ERASE):
-      /* Unused for now, print it solid */
-      length = -1; space = -1;
-      outl_func =  o_line_print_solid;
-      break;
   }
 
   if((length == 0) || (space == 0)) {
diff --git a/libgeda/src/o_path_basic.c b/libgeda/src/o_path_basic.c
index 1e3b7dd..9e87c38 100644
--- a/libgeda/src/o_path_basic.c
+++ b/libgeda/src/o_path_basic.c
@@ -960,12 +960,6 @@ void o_path_print(TOPLEVEL *toplevel, FILE *fp, OBJECT *o_current,
     case TYPE_PHANTOM:
       outl_func = o_path_print_phantom;
       break;
-
-    case TYPE_ERASE:
-      /* Unused for now, print it solid */
-      length = -1; space  = -1;
-      outl_func = o_path_print_solid;
-      break;
   }
 
   if((length == 0) || (space == 0)) {
diff --git a/utils/src/convert_sym.c b/utils/src/convert_sym.c
index fa61810..66cc281 100644
--- a/utils/src/convert_sym.c
+++ b/utils/src/convert_sym.c
@@ -81,7 +81,7 @@ extern int optind;
 /* gEDA style enumerators */
 typedef enum {END_NONE, END_SQUARE, END_ROUND} OBJECT_END;
 typedef enum {TYPE_SOLID, TYPE_DOTTED, TYPE_DASHED, TYPE_CENTER,
-              TYPE_PHANTOM, TYPE_ERASE} OBJECT_TYPE;
+              TYPE_PHANTOM} OBJECT_TYPE;
 typedef enum {FILLING_HOLLOW, FILLING_FILL, FILLING_MESH, FILLING_HATCH,
               FILLING_VOID} OBJECT_FILLING;
 typedef enum {NORMAL_PIN, BUS_PIN} OBJECT_PINTYPE;
-- 
1.6.2


-- 
Krzysztof KoÅciuszkiewicz
"Simplicity is the ultimate sophistication" -- Leonardo da Vinci


_______________________________________________
geda-user mailing list
geda-user@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-user