[rkward-cvs] rkward/rkward/core rkvariable.cpp,1.30,1.31 rkvariable.h,1.19,1.20 robject.h,1.22,1.23

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/rkward/core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7396/core

Modified Files:
	rkvariable.cpp rkvariable.h robject.h 
Log Message:
Moved over RKFormula

Index: robject.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/core/robject.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** robject.h	9 Dec 2005 17:35:40 -0000	1.22
--- robject.h	16 Mar 2006 22:31:07 -0000	1.23
***************
*** 167,169 ****
--- 167,171 ----
  };
  
+ typedef RObject* RObjectPtr;
+ 
  #endif

Index: rkvariable.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/core/rkvariable.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** rkvariable.cpp	9 Dec 2005 16:06:32 -0000	1.30
--- rkvariable.cpp	16 Mar 2006 22:31:07 -0000	1.31
***************
*** 94,102 ****
  }
  
- QString RKVariable::getTable () {
- 	RK_TRACE (OBJECTS);
- 	return parent->getFullName ();
- }
- 
  void RKVariable::updateFromR () {
  	RK_TRACE (OBJECTS);
--- 94,97 ----

Index: rkvariable.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/core/rkvariable.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** rkvariable.h	9 Dec 2005 16:06:32 -0000	1.19
--- rkvariable.h	16 Mar 2006 22:31:07 -0000	1.20
***************
*** 48,54 ****
  	void setVarType (RObject::VarType, bool sync=true);
  
- /** A hack for now: returns the name of the parent (data.frame) */
- 	QString getTable ();
- 
  /** reimplemented from RObject */
  	void updateFromR ();
--- 48,51 ----