[rkward-cvs] rkward/rkward/core robject.cpp,1.20,1.21 robjectlist.cpp,1.25,1.26

[Thomas Friedrichsmeier]

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

Modified Files:
	robject.cpp robjectlist.cpp 
Log Message:
Escape internal names of contained objects, as the names may contain quotes

Index: robjectlist.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/core/robjectlist.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** robjectlist.cpp	9 Dec 2005 16:06:32 -0000	1.25
--- robjectlist.cpp	29 Mar 2006 15:35:28 -0000	1.26
***************
*** 132,136 ****
  	
  	QString fullname = parent->makeChildName (cname);
! 	
  	RCommand *command = new RCommand (".rk.get.type (" + fullname + ")", RCommand::App | RCommand::Sync | RCommand::GetIntVector, QString::null, this, CHILD_GET_TYPE_COMMAND);
  	pending_objects.insert (command, obj);
--- 132,136 ----
  	
  	QString fullname = parent->makeChildName (cname);
! 
  	RCommand *command = new RCommand (".rk.get.type (" + fullname + ")", RCommand::App | RCommand::Sync | RCommand::GetIntVector, QString::null, this, CHILD_GET_TYPE_COMMAND);
  	pending_objects.insert (command, obj);

Index: robject.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/core/robject.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** robject.cpp	9 Dec 2005 17:35:40 -0000	1.20
--- robject.cpp	29 Mar 2006 15:35:28 -0000	1.21
***************
*** 149,153 ****
  QString RObject::makeChildName (const QString &short_child_name) {
  	RK_TRACE (OBJECTS);
! 	return (getFullName () + "[[\"" + short_child_name + "\"]]");
  }
  	
--- 149,153 ----
  QString RObject::makeChildName (const QString &short_child_name) {
  	RK_TRACE (OBJECTS);
! 	return (getFullName () + "[[" + rQuote (short_child_name) + "]]");
  }