Move some more declarations to a specific command

BRL-CAD · Dec 2, 2024 · 9a47f3a · 9a47f3a
1 parent 9f83c3b
commit 9a47f3a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 27 deletions.
diff --git a/src/libged/draw/ged_draw.h b/src/libged/draw/ged_draw.h
@@ -33,6 +33,15 @@
 
 __BEGIN_DECLS
 
+extern int _ged_cm_vsize(const int argc, const char **argv);
+extern int _ged_cm_eyept(const int argc, const char **argv);
+extern int _ged_cm_lookat_pt(const int argc, const char **argv);
+extern int _ged_cm_vrot(const int argc, const char **argv);
+extern int _ged_cm_orientation(const int argc, const char **argv);
+extern int _ged_cm_set(const int argc, const char **argv);
+extern int _ged_cm_end(const int argc, const char **argv);
+extern int _ged_cm_null(const int argc, const char **argv);
+
 extern void _ged_drawH_part2(int dashflag, struct bu_list *vhead, const struct db_full_path *pathp, struct db_tree_state *tsp, struct _ged_client_data *dgcdp);
 
 extern int ged_E_core(struct ged *gedp, int argc, const char *argv[]);

diff --git a/src/libged/draw/loadview.c b/src/libged/draw/loadview.c
@@ -30,6 +30,7 @@
 #include <string.h>
 
 #include "../ged_private.h"
+#include "./ged_draw.h"
 
 /**
  * here we define a minimal table of commands that are supported by the

diff --git a/src/libged/draw/preview.c b/src/libged/draw/preview.c
@@ -35,6 +35,7 @@
 #include "bu/getopt.h"
 
 #include "../ged_private.h"
+#include "./ged_draw.h"
 
 static struct bv_vlblock *preview_vbp;
 static double preview_delay;

diff --git a/src/libged/ged_private.h b/src/libged/ged_private.h
@@ -336,32 +336,6 @@ GED_EXPORT extern void _ged_do_list(struct ged *gedp,
 GED_EXPORT extern vect_t _ged_eye_model;
 GED_EXPORT extern mat_t _ged_viewrot;
 GED_EXPORT extern struct ged *_ged_current_gedp;
-GED_EXPORT extern int _ged_cm_vsize(const int argc,
-			 const char **argv);
-GED_EXPORT extern int _ged_cm_eyept(const int argc,
-			 const char **argv);
-GED_EXPORT extern int _ged_cm_lookat_pt(const int argc,
-			     const char **argv);
-GED_EXPORT extern int _ged_cm_vrot(const int argc,
-			const char **argv);
-GED_EXPORT extern int _ged_cm_orientation(const int argc,
-			       const char **argv);
-GED_EXPORT extern int _ged_cm_set(const int argc,
-		       const char **argv);
-GED_EXPORT extern int _ged_cm_end(const int argc,
-		       const char **argv);
-GED_EXPORT extern int _ged_cm_null(const int argc,
-			const char **argv);
-
-/* defined in preview.c */
-extern void _ged_setup_rt(struct ged *gedp,
-			  char **vp,
-			  int printcmd);
-
-/* defined in red.c */
-
-extern char _ged_tmpfil[];
-
 
 /* defined in rt.c */
 GED_EXPORT extern void

diff --git a/src/libged/ged_util.cpp b/src/libged/ged_util.cpp
@@ -712,7 +712,7 @@ _ged_read_densities(struct analyze_densities **dens, char **den_src, struct ged
 	if (dp != (struct directory *)NULL) {
 
 	    if (rt_db_get_internal(&intern, dp, gedp->dbip, NULL, &rt_uniresource) < 0) {
-		bu_vls_printf(_ged_current_gedp->ged_result_str, "could not import %s\n", dp->d_namep);
+		bu_vls_printf(gedp->ged_result_str, "could not import %s\n", dp->d_namep);
 		return BRLCAD_ERROR;
 	    }