[rkward-cvs] SF.net SVN: rkward: [2064] branches/KDE4_port/rkward/core

[tfry at users.sourceforge.net]

Revision: 2064
          http://rkward.svn.sourceforge.net/rkward/?rev=2064&view=rev
Author:   tfry
Date:     2007-10-14 13:40:01 -0700 (Sun, 14 Oct 2007)

Log Message:
-----------
no GUI code means subdir core was real easy

Modified Paths:
--------------
    branches/KDE4_port/rkward/core/rcontainerobject.cpp
    branches/KDE4_port/rkward/core/rkvariable.cpp
    branches/KDE4_port/rkward/core/robject.cpp
    branches/KDE4_port/rkward/core/robjectlist.cpp

Modified: branches/KDE4_port/rkward/core/rcontainerobject.cpp
===================================================================
--- branches/KDE4_port/rkward/core/rcontainerobject.cpp	2007-10-14 20:37:03 UTC (rev 2063)
+++ branches/KDE4_port/rkward/core/rcontainerobject.cpp	2007-10-14 20:40:01 UTC (rev 2064)
@@ -55,7 +55,7 @@
 	} else {
 		if (just_created) {
 			RK_ASSERT (false);
-			RK_DO (qDebug ("%s", child->getFullName ().toLatin1 ()), OBJECTS, DL_ERROR);
+			RK_DO (qDebug ("%s", child->getFullName ().toLatin1 ().data ()), OBJECTS, DL_ERROR);
 			delete child;
 			return 0;
 		} else {
@@ -116,7 +116,7 @@
 	} else if (child_type & RObject::Variable) {
 		child_object = new RKVariable (this, child_name);
 	} else {
-		RK_DO (qDebug ("Can't represent object '%s', type %d", child_name.toLatin1 (), child_type), OBJECTS, DL_WARNING);
+		RK_DO (qDebug ("Can't represent object '%s', type %d", child_name.toLatin1 ().data (), child_type), OBJECTS, DL_WARNING);
 		return 0;
 	}
 	RK_ASSERT (child_object);
@@ -172,7 +172,7 @@
 
 // finally delete the missing old ones
 	for (Q3ValueList<RObject*>::iterator it = removed_list.begin (); it != removed_list.end (); ++it) {
-		RK_DO (qDebug ("child no longer present: %s.", (*it)->getFullName ().toLatin1 ()), OBJECTS, DL_DEBUG);
+		RK_DO (qDebug ("child no longer present: %s.", (*it)->getFullName ().toLatin1 ().data ()), OBJECTS, DL_DEBUG);
 		RKGlobals::tracker ()->removeObject ((*it), 0, true);
 	}
 

Modified: branches/KDE4_port/rkward/core/rkvariable.cpp
===================================================================
--- branches/KDE4_port/rkward/core/rkvariable.cpp	2007-10-14 20:37:03 UTC (rev 2063)
+++ branches/KDE4_port/rkward/core/rkvariable.cpp	2007-10-14 20:40:01 UTC (rev 2064)
@@ -21,6 +21,7 @@
 #include <Q3ValueList>
 #include "float.h"
 #include "math.h"
+#include "limits.h"
 
 #include "rcontainerobject.h"
 #include "robjectlist.h"

Modified: branches/KDE4_port/rkward/core/robject.cpp
===================================================================
--- branches/KDE4_port/rkward/core/robject.cpp	2007-10-14 20:37:03 UTC (rev 2063)
+++ branches/KDE4_port/rkward/core/robject.cpp	2007-10-14 20:40:01 UTC (rev 2064)
@@ -262,7 +262,7 @@
 
 	if (command->getFlags () == ROBJECT_UDPATE_STRUCTURE_COMMAND) {
 		if (command->failed ()) {
-			RK_DO (qDebug ("command failed while trying to update object '%s'. No longer present?", getShortName ().toLatin1 ()), OBJECTS, DL_INFO);
+			RK_DO (qDebug ("command failed while trying to update object '%s'. No longer present?", getShortName ().toLatin1 ().data ()), OBJECTS, DL_INFO);
 			// this may happen, if the object has been removed in the workspace in between
 			RKGlobals::tracker ()->removeObject (this, 0, true);
 			return;

Modified: branches/KDE4_port/rkward/core/robjectlist.cpp
===================================================================
--- branches/KDE4_port/rkward/core/robjectlist.cpp	2007-10-14 20:37:03 UTC (rev 2063)
+++ branches/KDE4_port/rkward/core/robjectlist.cpp	2007-10-14 20:40:01 UTC (rev 2064)
@@ -122,7 +122,7 @@
 
 	// remove the environments which are gone
 	for (Q3ValueList<REnvironmentObject *>::const_iterator it = removelist.constBegin (); it != removelist.constEnd (); ++it) {
-		RK_DO (qDebug ("removing toplevel environment %s from list", (*it)->getShortName ().toLatin1 ()), OBJECTS, DL_INFO);
+		RK_DO (qDebug ("removing toplevel environment %s from list", (*it)->getShortName ().toLatin1 ().data ()), OBJECTS, DL_INFO);
 		RKGlobals::tracker ()->removeObject (*it, 0, true);
 	}
 


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