[rkward-cvs] SF.net SVN: rkward: [836] trunk/rkward

[tfry at users.sourceforge.net]

Revision: 836
          http://svn.sourceforge.net/rkward/?rev=836&view=rev
Author:   tfry
Date:     2006-10-09 08:17:43 -0700 (Mon, 09 Oct 2006)

Log Message:
-----------
Escape '<' to '<' in RObject::getObjectDescription

Modified Paths:
--------------
    trunk/rkward/TODO
    trunk/rkward/rkward/core/robject.cpp

Modified: trunk/rkward/TODO
===================================================================
--- trunk/rkward/TODO	2006-10-09 15:08:52 UTC (rev 835)
+++ trunk/rkward/TODO	2006-10-09 15:17:43 UTC (rev 836)
@@ -80,10 +80,6 @@
 		- add virtual rCommandStarted () function, so receivers can find out, when their command becomes active
 	REmbedInternal:
 		- probably we do not need na_double at all (just any NaN) => less confusion
-	RObjectListView:
-		- most of the time seems to be spent on lookups of object->item
-			- probably it would be smarter to use a reverse map, as item->object should be mostly GUI bound
-			- also use a QHash (Qt4)
 	Detecting object modifications inside R:
 		- left TODO:
 			- detection hole:

Modified: trunk/rkward/rkward/core/robject.cpp
===================================================================
--- trunk/rkward/rkward/core/robject.cpp	2006-10-09 15:08:52 UTC (rev 835)
+++ trunk/rkward/rkward/core/robject.cpp	2006-10-09 15:17:43 UTC (rev 836)
@@ -102,16 +102,18 @@
 QString RObject::getObjectDescription () {
 	RK_TRACE (OBJECTS);
 
+#define ESCS replace ('<', "<")
+
 	QString ret;
-	ret.append ("<i>" + getShortName () + "</i>");
-	ret.append ("<br><b>" + i18n ("Full location:") + " </b>" + getFullName ());
+	ret.append ("<i>" + getShortName ().ESCS + "</i>");
+	ret.append ("<br><b>" + i18n ("Full location:") + " </b>" + getFullName ().ESCS);
 	QString lab = getLabel ();
-	if (!lab.isEmpty ()) ret.append ("<br><b>" + i18n ("Label:") + " </b>" + lab);
+	if (!lab.isEmpty ()) ret.append ("<br><b>" + i18n ("Label:") + " </b>" + lab.ESCS);
 	ret.append ("<br><b>" + i18n ("Type:") + " </b>");
 
 	if (isType (Function)) {
 		ret.append (i18n ("Function"));
-		ret.append ("<br><b>" + i18n ("Usage: ") + " </b>" + getShortName () + "(" + static_cast<RFunctionObject *> (this)->printArgs () + ")");
+		ret.append ("<br><b>" + i18n ("Usage: ") + " </b>" + getShortName ().ESCS + "(" + static_cast<RFunctionObject *> (this)->printArgs ().ESCS + ")");
 	} else if (isType (DataFrame)) {
 		ret.append (i18n ("Data frame"));
 	} else if (isType (Array)) {
@@ -139,7 +141,7 @@
 		}
 	}
 
-	ret.append ("<br><b>" + i18n ("Class(es):") + " </b>" + makeClassString (","));
+	ret.append ("<br><b>" + i18n ("Class(es):") + " </b>" + makeClassString (",").ESCS);
 
 	return ret;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.