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

[tfry at users.sourceforge.net]

Revision: 2879
          http://rkward.svn.sourceforge.net/rkward/?rev=2879&view=rev
Author:   tfry
Date:     2010-06-15 12:51:19 +0000 (Tue, 15 Jun 2010)

Log Message:
-----------
Properly handle pending children in environments, too.

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/rkward/core/renvironmentobject.cpp
    trunk/rkward/rkward/dataeditor/rkvareditmodel.cpp

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2010-06-15 12:36:32 UTC (rev 2878)
+++ trunk/rkward/ChangeLog	2010-06-15 12:51:19 UTC (rev 2879)
@@ -1,5 +1,6 @@
 TODO: Do not use SmartInterface for KDE 4.5 and above
 
+- Fixed: When starting with an empty table, RKWard would sometimes claim that this object has been removed
 - Fixed: Would crash when trying to configure toolbars under certain circumstances (workaround for bug in kdelibs)
 - Fixed: Crash while analysing some objects returned by XML::xmlParseTree() for invalid XML
 - Fixed: Error while installing packages with R 2.11.0, when archiving packages in a non-existing directory

Modified: trunk/rkward/rkward/core/renvironmentobject.cpp
===================================================================
--- trunk/rkward/rkward/core/renvironmentobject.cpp	2010-06-15 12:36:32 UTC (rev 2878)
+++ trunk/rkward/rkward/core/renvironmentobject.cpp	2010-06-15 12:51:19 UTC (rev 2879)
@@ -2,7 +2,7 @@
                           renvironmentobject  -  description
                              -------------------
     begin                : Wed Sep 27 2006
-    copyright            : (C) 2006, 2009 by Thomas Friedrichsmeier
+    copyright            : (C) 2006, 2009, 2010 by Thomas Friedrichsmeier
     email                : tfry at users.sourceforge.net
  ***************************************************************************/
 
@@ -117,7 +117,7 @@
 	for (int i = childmap.size () - 1; i >= 0; --i) {
 		RObject *object = childmap[i];
 		if (!current_symbols.contains (object->getShortName ())) {
-			if (!(RKGlobals::tracker ()->removeObject (object, 0, true))) debug_baseline++;
+			if (!object->isPending ()) if (!(RKGlobals::tracker ()->removeObject (object, 0, true))) debug_baseline++;
 		}
 	}
 

Modified: trunk/rkward/rkward/dataeditor/rkvareditmodel.cpp
===================================================================
--- trunk/rkward/rkward/dataeditor/rkvareditmodel.cpp	2010-06-15 12:36:32 UTC (rev 2878)
+++ trunk/rkward/rkward/dataeditor/rkvareditmodel.cpp	2010-06-15 12:51:19 UTC (rev 2879)
@@ -706,7 +706,6 @@
 		RObject* child = df->createPendingChild (df->validizeName (QString ()), -1, false, false);
 		RK_ASSERT (child->isVariable ());
 	}
-#warning: TODO: properly initialize the rownames!
 
 	init (df);
 


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