From 5e5fcf5eda29bc13f3826ca392a9965f7019b610 Mon Sep 17 00:00:00 2001
From: joye <joye>
Date: Thu, 24 Apr 2014 17:39:29 +0000
Subject: *** empty log message ***

---
 src/bltInt.C    | 36 ++----------------------------------
 src/bltSwitch.C | 29 -----------------------------
 src/bltVecCmd.C | 28 ++++++++++++++++++++++++++++
 src/bltVector.C |  1 -
 4 files changed, 30 insertions(+), 64 deletions(-)

diff --git a/src/bltInt.C b/src/bltInt.C
index 6c65f39..4a73026 100644
--- a/src/bltInt.C
+++ b/src/bltInt.C
@@ -27,6 +27,8 @@
  *	WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#include <tk.h>
+
 extern "C" {
 #include "bltInt.h"
 Tcl_AppInitProc Tkblt_Init;
@@ -34,8 +36,6 @@ Tcl_AppInitProc Tkblt_SafeInit;
 Tcl_AppInitProc Blt_VectorCmdInitProc;
 };
 
-#include <tk.h>
-
 Tcl_AppInitProc Blt_GraphCmdInitProc;
 
 int Tkblt_Init(Tcl_Interp* interp)
@@ -86,35 +86,3 @@ int Tkblt_SafeInit(Tcl_Interp* interp)
 {
   return Tkblt_Init(interp);
 }
-
-int Blt_InitCmd(Tcl_Interp* interp, const char *nsName, 
-		Blt_InitCmdSpec *specPtr)
-{
-  Tcl_DString dString;
-  Tcl_DStringInit(&dString);
-  if (nsName)
-    Tcl_DStringAppend(&dString, nsName, -1);
-  Tcl_DStringAppend(&dString, "::", -1);
-  Tcl_DStringAppend(&dString, specPtr->name, -1);
-
-  const char* cmdPath = Tcl_DStringValue(&dString);
-  Tcl_Command cmdToken = Tcl_FindCommand(interp, cmdPath, NULL, 0);
-  if (cmdToken) {
-    Tcl_DStringFree(&dString);
-    return TCL_OK;		/* Assume command was already initialized */
-  }
-  cmdToken = Tcl_CreateObjCommand(interp, cmdPath, specPtr->cmdProc, 
-				  specPtr->clientData, specPtr->cmdDeleteProc);
-  Tcl_DStringFree(&dString);
-  Tcl_Namespace* nsPtr = Tcl_FindNamespace(interp, nsName, NULL, 
-					   TCL_LEAVE_ERR_MSG);
-  if (nsPtr == NULL)
-    return TCL_ERROR;
-
-  if (Tcl_Export(interp, nsPtr, specPtr->name, 0) != TCL_OK)
-    return TCL_ERROR;
-
-  return TCL_OK;
-}
-
-
diff --git a/src/bltSwitch.C b/src/bltSwitch.C
index 1b4006d..a786708 100644
--- a/src/bltSwitch.C
+++ b/src/bltSwitch.C
@@ -406,32 +406,3 @@ void Blt_FreeSwitches(Blt_SwitchSpec *specs, void *record, int needFlags)
     }
   }
 }
-
-int Blt_ExprDoubleFromObj(Tcl_Interp* interp, Tcl_Obj *objPtr, double *valuePtr)
-{
-  // First try to extract the value as a double precision number.
-  if (Tcl_GetDoubleFromObj((Tcl_Interp *)NULL, objPtr, valuePtr) == TCL_OK)
-    return TCL_OK;
-
-  // Then try to parse it as an expression.
-  if (Tcl_ExprDouble(interp, Tcl_GetString(objPtr), valuePtr) == TCL_OK)
-    return TCL_OK;
-
-  return TCL_ERROR;
-}
-
-int Blt_ExprIntFromObj(Tcl_Interp* interp, Tcl_Obj *objPtr, int *valuePtr)
-{
-  // First try to extract the value as a simple integer.
-  if (Tcl_GetIntFromObj((Tcl_Interp *)NULL, objPtr, valuePtr) == TCL_OK)
-    return TCL_OK;
-
-  // Otherwise try to parse it as an expression.
-  long lvalue;
-  if (Tcl_ExprLong(interp, Tcl_GetString(objPtr), &lvalue) == TCL_OK) {
-    *valuePtr = lvalue;
-    return TCL_OK;
-  }
-  return TCL_ERROR;
-}
-
diff --git a/src/bltVecCmd.C b/src/bltVecCmd.C
index 3579e2e..bfecd7c 100644
--- a/src/bltVecCmd.C
+++ b/src/bltVecCmd.C
@@ -135,6 +135,34 @@ static Blt_SwitchSpec fftSwitches[] = {
     {BLT_SWITCH_END}
 };
 
+static int Blt_ExprIntFromObj(Tcl_Interp* interp, Tcl_Obj *objPtr, int *valuePtr)
+{
+  // First try to extract the value as a simple integer.
+  if (Tcl_GetIntFromObj((Tcl_Interp *)NULL, objPtr, valuePtr) == TCL_OK)
+    return TCL_OK;
+ 
+  // Otherwise try to parse it as an expression.
+  long lvalue;
+  if (Tcl_ExprLong(interp, Tcl_GetString(objPtr), &lvalue) == TCL_OK) {
+    *valuePtr = lvalue;
+    return TCL_OK;
+  }
+  return TCL_ERROR;
+}
+
+static int Blt_ExprDoubleFromObj(Tcl_Interp* interp, Tcl_Obj *objPtr, double *valuePtr)
+{
+  // First try to extract the value as a double precision number.
+  if (Tcl_GetDoubleFromObj((Tcl_Interp *)NULL, objPtr, valuePtr) == TCL_OK)
+    return TCL_OK;
+
+  // Then try to parse it as an expression.
+  if (Tcl_ExprDouble(interp, Tcl_GetString(objPtr), valuePtr) == TCL_OK)
+    return TCL_OK;
+
+  return TCL_ERROR;
+}
+
 /*
  *---------------------------------------------------------------------------
  *
diff --git a/src/bltVector.C b/src/bltVector.C
index 10387d8..1f7d1d4 100644
--- a/src/bltVector.C
+++ b/src/bltVector.C
@@ -50,7 +50,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-//#include "bltInt.h"
 #include "bltVecInt.h"
 #include "bltNsUtil.h"
 #include "bltSwitch.h"
-- 
cgit v0.12