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

[tfry at users.sourceforge.net]

Revision: 790
          http://svn.sourceforge.net/rkward/?rev=790&view=rev
Author:   tfry
Date:     2006-10-02 11:18:15 -0700 (Mon, 02 Oct 2006)

Log Message:
-----------
small cleanups

Modified Paths:
--------------
    trunk/rkward/rkward/core/rcontainerobject.cpp
    trunk/rkward/rkward/core/rfunctionobject.cpp
    trunk/rkward/rkward/misc/rkobjectlistview.cpp

Modified: trunk/rkward/rkward/core/rcontainerobject.cpp
===================================================================
--- trunk/rkward/rkward/core/rcontainerobject.cpp	2006-10-02 17:24:35 UTC (rev 789)
+++ trunk/rkward/rkward/core/rcontainerobject.cpp	2006-10-02 18:18:15 UTC (rev 790)
@@ -55,6 +55,7 @@
 			RK_ASSERT (false);
 			return 0;
 		} else {
+qDebug (child->getFullName ().latin1());
 			RKGlobals::tracker ()->removeObject (child, 0, true);
 
 			RData *child_name_data = new_data->getStructureVector ()[0];
@@ -96,7 +97,6 @@
 	RData *type_data = child_data->getStructureVector ()[1];
 	RK_ASSERT (type_data->getDataType () == RData::IntVector);
 	RK_ASSERT (type_data->getDataLength () == 1);
-	qDebug ("t%d l%d", type_data->getDataType (), type_data->getDataLength ()); 
 
 	int child_type = type_data->getIntVector ()[0];
 
@@ -133,7 +133,6 @@
 		RK_ASSERT (child_name_data->getDataType () == RData::StringVector);
 		RK_ASSERT (child_name_data->getDataLength () >= 1);
 		QString child_name = child_name_data->getStringVector ()[0];
-		qDebug (child_name.latin1 ());
 
 		RObject *child_object;
 		RObjectMap::const_iterator it = childmap.find (child_name);

Modified: trunk/rkward/rkward/core/rfunctionobject.cpp
===================================================================
--- trunk/rkward/rkward/core/rfunctionobject.cpp	2006-10-02 17:24:35 UTC (rev 789)
+++ trunk/rkward/rkward/core/rfunctionobject.cpp	2006-10-02 18:18:15 UTC (rev 790)
@@ -56,9 +56,9 @@
 	RData *argvalues_data = new_data->getStructureVector ()[6];
 
 	unsigned int new_arglen = argnames_data->getDataLength (); 
-	RK_ASSERT (argnames_data->getDataType () == argvalues_data->getDataType () == RData::StringVector);
-#warning Change this!
-return false;
+	RK_ASSERT (argnames_data->getDataType () == RData::StringVector);
+	RK_ASSERT (argvalues_data->getDataType () == RData::StringVector);
+
 	RK_ASSERT (new_arglen == argvalues_data->getDataLength ());
 	QString *new_argnames = argnames_data->getStringVector ();
 	QString *new_argvalues = argvalues_data->getStringVector ();

Modified: trunk/rkward/rkward/misc/rkobjectlistview.cpp
===================================================================
--- trunk/rkward/rkward/misc/rkobjectlistview.cpp	2006-10-02 17:24:35 UTC (rev 789)
+++ trunk/rkward/rkward/misc/rkobjectlistview.cpp	2006-10-02 18:18:15 UTC (rev 790)
@@ -181,7 +181,6 @@
 
 	RKListViewItem *item = findObjectItem (object);
 	RK_ASSERT (item);
-	qDebug (object->getFullName ().latin1 ());
 	updateItem (item, object);
 
 	if (update_in_progress) {


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