plib-cvs

[Sebastian U. <ud...@us...>]

Update of /cvsroot/plib/plib/src/pui
In directory usw-pr-cvs1:/tmp/cvs-serv6070

Modified Files:
	pu.h puValue.cxx 
Log Message:
Partial undo of April 21' changes

Index: pu.h
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/pu.h,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- pu.h	26 Apr 2002 20:08:41 -0000	1.103
+++ pu.h	11 May 2002 14:49:31 -0000	1.104
@@ -422,33 +422,30 @@
 
 class puValue
 {
-private:
-  /* Fake mutable */
-  int   *integer ;
-  float *floater ;
+protected:
+  int   type    ;
 
+  int   integer ;
[...96 lines suppressed...]
-  void getDefaultValue ( float *f ) const { default_value.getValue ( f ) ; }
-  void getDefaultValue ( char **s ) const { default_value.getValue ( s ) ; }
-  void getDefaultValue ( char  *s ) const { default_value.getValue ( s ) ; }
+  void getDefaultValue ( int   *i ) { default_value.getValue ( i ) ; }
+  void getDefaultValue ( float *f ) { default_value.getValue ( f ) ; }
+  void getDefaultValue ( char **s ) { default_value.getValue ( s ) ; }
+  void getDefaultValue ( char  *s ) { default_value.getValue ( s ) ; }
 
-  int  getDefaultValue ( void )     const { return default_value.getValue () ; } /* Obsolete ! */
+  int  getDefaultValue ( void )     { return default_value.getValue () ; } /* Obsolete ! */
 
-  int  getDefaultIntegerValue ( void ) const { return default_value.getIntegerValue () ; }
-  float getDefaultFloatValue  ( void ) const { return default_value.getFloatValue   () ; }
-  char *getDefaultStringValue ( void ) const { return default_value.getStringValue  () ; }
+  int  getDefaultIntegerValue ( void ) { return default_value.getIntegerValue () ; }
+  float getDefaultFloatValue  ( void ) { return default_value.getFloatValue   () ; }
+  char *getDefaultStringValue ( void ) { return default_value.getStringValue  () ; }
 } ;
 
 /*

Index: puValue.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puValue.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- puValue.cxx	26 Apr 2002 20:43:47 -0000	1.14
+++ puValue.cxx	11 May 2002 14:49:31 -0000	1.15
@@ -24,25 +24,25 @@
 
 #include "puLocal.h"
 
-void puValue::re_eval ( void ) const
+void puValue::re_eval ( void )
 {
   if ( convert == FALSE )
     return ;
 
   if ( res_integer != NULL )
   {
-    *floater = (float) *res_integer ; sprintf ( string, "%d", *res_integer ) ;
+    floater = (float) *res_integer ; sprintf ( string, "%d", *res_integer ) ;
     puPostRefresh () ;
   }
   else if ( res_floater != NULL )
   {
-    *integer = (int) *res_floater ; sprintf ( string, "%g", *res_floater ) ;
+    integer = (int) *res_floater ; sprintf ( string, "%g", *res_floater ) ;
     puPostRefresh () ;
   }
   else if ( res_string  != NULL )
   {
-    *integer = (int) strtol ( res_string, NULL, 0 ) ;
-    *floater = (float) strtod ( res_string, NULL ) ;
+    integer = (int) strtol ( res_string, NULL, 0 ) ;
+    floater = (float) strtod ( res_string, NULL ) ;
     puPostRefresh () ;
   }
 }