[GRASS-SVN] r51177 - in grass/trunk: include lib/gis vector/v.in.dxf vector/v.in.lidar vector/v.in.ogr vector/v.overlay vector/v.select vector/v.to.points vector/v.voronoi

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-03-28 07:36:45 -0700 (Wed, 28 Mar 2012)
New Revision: 51177

Modified:
   grass/trunk/include/gis.h
   grass/trunk/lib/gis/parser_standard_options.c
   grass/trunk/vector/v.in.dxf/main.c
   grass/trunk/vector/v.in.lidar/main.c
   grass/trunk/vector/v.in.ogr/main.c
   grass/trunk/vector/v.overlay/main.c
   grass/trunk/vector/v.select/args.c
   grass/trunk/vector/v.to.points/main.c
   grass/trunk/vector/v.voronoi/main.c
Log:
G_FLG_DB_TABLE -> G_FLG_V_TABLE
update modules to use G_FLG_V_TABLE


Modified: grass/trunk/include/gis.h
===================================================================
--- grass/trunk/include/gis.h	2012-03-28 13:59:36 UTC (rev 51176)
+++ grass/trunk/include/gis.h	2012-03-28 14:36:45 UTC (rev 51177)
@@ -256,7 +256,7 @@
 /**/ typedef enum
 {
     G_FLG_UNDEFINED,
-    G_FLG_DB_TABLE,		/* do not create table */
+    G_FLG_V_TABLE,		/* do not create attribute table */
     G_FLG_V_TOPO,               /* do not build topology */
 } STD_FLG;
 

Modified: grass/trunk/lib/gis/parser_standard_options.c
===================================================================
--- grass/trunk/lib/gis/parser_standard_options.c	2012-03-28 13:59:36 UTC (rev 51176)
+++ grass/trunk/lib/gis/parser_standard_options.c	2012-03-28 14:36:45 UTC (rev 51177)
@@ -781,7 +781,7 @@
   If an invalid parameter was specified a empty Flag structure will be
   returned (not NULL).
 
-  - G_FLG_DB_TABLE (do not create attribute table)
+  - G_FLG_V_TABLE  (do not create attribute table)
   - G_FLG_V_TOPO   (do not build topology)
 
   \param flag type of Flag struct to create
@@ -795,7 +795,7 @@
     Flg = G_define_flag();
 
     switch (flag) {
-    case G_FLG_DB_TABLE:
+    case G_FLG_V_TABLE:
 	Flg->key = 't';
 	Flg->description = _("Do not create attribute table");
 	break;

Modified: grass/trunk/vector/v.in.dxf/main.c
===================================================================
--- grass/trunk/vector/v.in.dxf/main.c	2012-03-28 13:59:36 UTC (rev 51176)
+++ grass/trunk/vector/v.in.dxf/main.c	2012-03-28 14:36:45 UTC (rev 51177)
@@ -71,9 +71,7 @@
     flag.extent->key = 'e';
     flag.extent->description = _("Ignore the map extent of DXF file");
 
-    flag.table = G_define_flag();
-    flag.table->key = 't';
-    flag.table->description = _("Do not create attribute tables");
+    flag.table = G_define_standard_flag(G_FLG_V_TABLE);
 
     flag.topo = G_define_standard_flag(G_FLG_V_TOPO);
 

Modified: grass/trunk/vector/v.in.lidar/main.c
===================================================================
--- grass/trunk/vector/v.in.lidar/main.c	2012-03-28 13:59:36 UTC (rev 51176)
+++ grass/trunk/vector/v.in.lidar/main.c	2012-03-28 14:36:45 UTC (rev 51177)
@@ -192,9 +192,7 @@
 	_("Print LAS file info and exit");
     print_flag->suppress_required = YES;
     
-    notab_flag = G_define_flag();
-    notab_flag->key = 't';
-    notab_flag->description = _("Do not create attribute table");
+    notab_flag = G_define_standard_flag(G_FLG_V_TABLE);
     notab_flag->guisection = _("Attributes");
 
     over_flag = G_define_flag();

Modified: grass/trunk/vector/v.in.ogr/main.c
===================================================================
--- grass/trunk/vector/v.in.ogr/main.c	2012-03-28 13:59:36 UTC (rev 51176)
+++ grass/trunk/vector/v.in.ogr/main.c	2012-03-28 14:36:45 UTC (rev 51177)
@@ -230,9 +230,7 @@
     flag.z->description = _("Create 3D output");
     flag.z->guisection = _("Output");
 
-    flag.notab = G_define_flag();
-    flag.notab->key = 't';
-    flag.notab->description = _("Do not create attribute table");
+    flag.notab = G_define_standard_flag(G_FLG_V_TABLE);
     flag.notab->guisection = _("Attributes");
 
     flag.over = G_define_flag();

Modified: grass/trunk/vector/v.overlay/main.c
===================================================================
--- grass/trunk/vector/v.overlay/main.c	2012-03-28 13:59:36 UTC (rev 51176)
+++ grass/trunk/vector/v.overlay/main.c	2012-03-28 14:36:45 UTC (rev 51177)
@@ -33,7 +33,6 @@
 {
     int i, input, line, nlines, operator;
     int type[2], field[2], ofield[3];
-    char *pre[2];
     struct GModule *module;
     struct Option *in_opt[2], *out_opt, *type_opt[2], *field_opt[2],
 	*ofield_opt, *operator_opt;
@@ -51,9 +50,6 @@
 
     G_gisinit(argv[0]);
 
-    pre[0] = "a";
-    pre[1] = "b";
-
     module = G_define_module();
     G_add_keyword(_("vector"));
     G_add_keyword(_("geometry"));
@@ -118,9 +114,7 @@
     ofield_opt->description = _("If 0 or not given, "
 				"the category is not written");
 
-    table_flag = G_define_flag();
-    table_flag->key = 't';
-    table_flag->description = _("Do not create attribute table");
+    table_flag = G_define_standard_flag(G_FLG_V_TABLE);
 
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);

Modified: grass/trunk/vector/v.select/args.c
===================================================================
--- grass/trunk/vector/v.select/args.c	2012-03-28 13:59:36 UTC (rev 51176)
+++ grass/trunk/vector/v.select/args.c	2012-03-28 14:36:45 UTC (rev 51177)
@@ -74,9 +74,7 @@
     parm->relate->description = _("Intersection Matrix Pattern used for 'relate' operator");
 #endif
 
-    flag->table = G_define_flag();
-    flag->table->key = 't';
-    flag->table->description = _("Do not create attribute table");
+    flag->table = G_define_standard_flag(G_FLG_V_TABLE);
     
     flag->cat = G_define_flag();
     flag->cat->key = 'c';

Modified: grass/trunk/vector/v.to.points/main.c
===================================================================
--- grass/trunk/vector/v.to.points/main.c	2012-03-28 13:59:36 UTC (rev 51176)
+++ grass/trunk/vector/v.to.points/main.c	2012-03-28 14:36:45 UTC (rev 51177)
@@ -210,9 +210,7 @@
     dmax_opt->answer = "100";
     dmax_opt->description = _("Maximum distance between points in map units");
 
-    table_flag = G_define_flag();
-    table_flag->key = 't';
-    table_flag->description = _("Do not create attribute table");
+    table_flag = G_define_standard_flag(G_FLG_V_TABLE);
 
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);

Modified: grass/trunk/vector/v.voronoi/main.c
===================================================================
--- grass/trunk/vector/v.voronoi/main.c	2012-03-28 13:59:36 UTC (rev 51176)
+++ grass/trunk/vector/v.voronoi/main.c	2012-03-28 14:36:45 UTC (rev 51177)
@@ -135,7 +135,7 @@
     flag.line->description =
 	_("Output tessellation as a graph (lines), not areas");
 
-    flag.table = G_define_standard_flag(G_FLG_DB_TABLE);
+    flag.table = G_define_standard_flag(G_FLG_V_TABLE);
     
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);