libgis: G__get_window() renamed to G_get_element_window()

        update modules
        (merge r63823-4 from trunk)


git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@63825 15284696-431f-4ddb-bdfa-cd5b030d7da7

display/d.grid/main.c

@@ -206,7 +206,7 @@ int main(int argc, char **argv)
 	G_fatal_error("Invalid direction: %s", direction->answer);
 
     if (align->answer || strcmp(opt2->answer, "0") == 0)
-	G__get_window(&wind, "", "WIND", G_mapset());
+	G_get_element_window(&wind, "", "WIND", G_mapset());
 
     if (strcmp(opt2->answer, "0") == 0) {
 	if (geogrid->answer)

general/g.list/main.c

@@ -263,9 +263,9 @@ int main(int argc, char *argv[])
 	    char name[GNAME_MAX], mapset[GMAPSET_MAX];
 
 	    if (G_name_is_fully_qualified(opt.region->answer, name, mapset))
-		G__get_window(&window, "windows", name, mapset);
+		G_get_element_window(&window, "windows", name, mapset);
 	    else
-		G__get_window(&window, "windows", opt.region->answer, "");
+		G_get_element_window(&window, "windows", opt.region->answer, "");
 	}
     }
     else

general/g.region/main.c

@@ -401,7 +401,7 @@ int main(int argc, char *argv[])
 	mapset = G_find_file2("windows", name, "");
 	if (!mapset)
 	    G_fatal_error(_("Region <%s> not found"), name);
-	G__get_window(&window, "windows", name, mapset);
+	G_get_element_window(&window, "windows", name, mapset);
     }
 
     /* raster= */

include/defs/gis.h

@@ -305,8 +305,8 @@ struct Key_Value *G_get_projepsg(void);
 /* get_window.c */
 void G_get_window(struct Cell_head *);
 void G_get_default_window(struct Cell_head *);
-void G__get_window(struct Cell_head *, const char *, const char *,
-		   const char *);
+void G_get_element_window(struct Cell_head *, const char *, const char *,
+                          const char *);
 
 /* getl.c */
 int G_getl(char *, int, FILE *);

lib/gis/get_window.c

@@ -26,10 +26,10 @@ static struct state {
 static struct state *st = &state;
 
 /*!
-  \brief Read the database region
+  \brief Get the current region
   
-  Reads the database region as stored in the WIND file in the user's
-  current mapset into region.
+  Reads the region as stored in the WIND file in the user's current
+  mapset into region.
   
   3D values are set to defaults if not available in WIND file.  An
   error message is printed and exit() is called if there is a problem
@@ -63,9 +63,9 @@ void G_get_window(struct Cell_head *window)
     else {
 	char *wind = getenv("WIND_OVERRIDE");
 	if (wind)
-	    G__get_window(&st->dbwindow, "windows", wind, G_mapset());
+	    G_get_element_window(&st->dbwindow, "windows", wind, G_mapset());
 	else
-	    G__get_window(&st->dbwindow, "", "WIND", G_mapset());
+	    G_get_element_window(&st->dbwindow, "", "WIND", G_mapset());
     }
 
     *window = st->dbwindow;
@@ -79,7 +79,7 @@ void G_get_window(struct Cell_head *window)
 }
 
 /*!
-  \brief Read the default region
+  \brief Get the default region
   
   Reads the default region for the location into <i>region.</i> 3D
   values are set to defaults if not available in WIND file.
@@ -91,21 +91,21 @@ void G_get_window(struct Cell_head *window)
 */
 void G_get_default_window(struct Cell_head *window)
 {
-    G__get_window(window, "", "DEFAULT_WIND", "PERMANENT");
+    G_get_element_window(window, "", "DEFAULT_WIND", "PERMANENT");
 }
 
 /*!
-  \brief Get window (region) of selected map
+  \brief Get region for selected element (raster, vector, window, etc.)
   
   G_fatal_error() is called on error
   
-  \param window pointer to Cell_head
+  \param[out] window pointer to Cell_head
   \param element element type
-  \param name map name
+  \param name element name
   \param mapset mapset name
 */
-void G__get_window(struct Cell_head *window,
-		   const char *element, const char *name, const char *mapset)
+void G_get_element_window(struct Cell_head *window,
+                          const char *element, const char *name, const char *mapset)
 {
     FILE *fp;
 
@@ -122,7 +122,7 @@ void G__get_window(struct Cell_head *window,
 }
 
 /*!
-  \brief Unset current window
+  \brief Unset current region
 */
 void G_unset_window()
 {

ps/ps.map/r_wind.c

@@ -28,7 +28,7 @@ int read_wind(char *name, char *mapset)
 
     sprintf(fullname, "%s in %s", name, mapset);
 
-    G__get_window(&window, "windows", name, mapset);
+    G_get_element_window(&window, "windows", name, mapset);
 
     width = 1.;
     color_R = color_G = color_B = 0;

raster/r.region/main.c

@@ -155,7 +155,7 @@ int main(int argc, char *argv[])
 	G_get_window(&window);
 
     if ((name = parm.region->answer))	/* region= */
-	G__get_window(&window, "windows", name, "");
+	G_get_element_window(&window, "windows", name, "");
 
     if ((name = parm.raster->answer)) {	/* raster= */
 	Rast_get_cellhd(name, "", &window);