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

[tfry at users.sourceforge.net]

Revision: 4490
          http://rkward.svn.sourceforge.net/rkward/?rev=4490&view=rev
Author:   tfry
Date:     2013-01-15 10:05:46 +0000 (Tue, 15 Jan 2013)
Log Message:
-----------
Fix compilation for R 3.0.0

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/rkward/rbackend/rkrbackend.cpp

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2013-01-14 19:00:10 UTC (rev 4489)
+++ trunk/rkward/ChangeLog	2013-01-15 10:05:46 UTC (rev 4490)
@@ -1,3 +1,4 @@
+- Added support for the upcoming R 3.0.0		TODO: Check for any more regressions, before release
 - Added <switch> logic element to switch between several target properties (or fixed values) based on the value of a condition property
 - Sort plugin gains option to sort data.frames by more than one column at a time, and options for type conversion	TODO: adjust test(s)
 - Add in-application debug message viewer (targetted at (plugin) developers)

Modified: trunk/rkward/rkward/rbackend/rkrbackend.cpp
===================================================================
--- trunk/rkward/rkward/rbackend/rkrbackend.cpp	2013-01-14 19:00:10 UTC (rev 4489)
+++ trunk/rkward/rkward/rbackend/rkrbackend.cpp	2013-01-15 10:05:46 UTC (rev 4490)
@@ -1463,7 +1463,8 @@
 	if (parameters.value (0) == "getSessionInfo") {
 		QStringList dummy = parameters;
 		dummy.append (RKRBackendProtocolBackend::backendDebugFile ());
-		dummy.append (R_MAJOR "." R_MINOR " " R_STATUS " (" R_YEAR "-" R_MONTH "-" R_DAY " r" R_SVN_REVISION ")");
+// NOTE: R_SVN_REVISON used to be a string, but has changed to numeric constant in R 3.0.0. QString::arg() handles both.
+		dummy.append (QString (R_MAJOR "." R_MINOR " " R_STATUS " (" R_YEAR "-" R_MONTH "-" R_DAY " r%1)").arg (R_SVN_REVISION));
 		request.params["call"] = dummy;
 	} else if (parameters.value (0) == "set.output.file") {
 		output_file = parameters.value (1);

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