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

[tfry at users.sf.net]

Revision: 4795
          http://sourceforge.net/p/rkward/code/4795
Author:   tfry
Date:     2014-06-16 08:16:34 +0000 (Mon, 16 Jun 2014)
Log Message:
-----------
Fix a compilation problem.

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/rkward/plugin/rkcomponent.cpp

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2014-05-06 14:06:00 UTC (rev 4794)
+++ trunk/rkward/ChangeLog	2014-06-16 08:16:34 UTC (rev 4795)
@@ -1,3 +1,4 @@
+- Fixed some compilation problems
 - Add basic support to export plots using tikzDevice
 - Fixed: cbind-value of <matrix> element was missing commas
 - Fixed: Give a label to an unlabelled toolbar

Modified: trunk/rkward/rkward/plugin/rkcomponent.cpp
===================================================================
--- trunk/rkward/rkward/plugin/rkcomponent.cpp	2014-05-06 14:06:00 UTC (rev 4794)
+++ trunk/rkward/rkward/plugin/rkcomponent.cpp	2014-06-16 08:16:34 UTC (rev 4795)
@@ -2,7 +2,7 @@
                           rkcomponent  -  description
                              -------------------
     begin                : Tue Dec 13 2005
-    copyright            : (C) 2005, 2006, 2009, 2010, 2011, 2012 by Thomas Friedrichsmeier
+    copyright            : (C) 2005, 2006, 2009, 2010, 2011, 2012, 2013, 2014 by Thomas Friedrichsmeier
     email                : tfry at users.sourceforge.net
  ***************************************************************************/
 
@@ -202,7 +202,7 @@
 		QVariant val = prop->value (mod);
 		if (hint == BooleanValue) {
 			bool ok;
-			return (RKComponentPropertyBool::variantToBool (val, &ok));
+			val = RKComponentPropertyBool::variantToBool (val, &ok);
 			if (!ok) RK_DEBUG (PLUGIN, DL_WARNING, "Could not convert value of %s to boolean", qPrintable (id));
 		} else {
 			if (hint == StringlistValue) {
@@ -212,8 +212,8 @@
 			} else {
 				RK_ASSERT (false);
 			}
-			return (val);
 		}
+		return (val);
 	}
 }