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

[tfry at users.sourceforge.net]

Revision: 2468
          http://rkward.svn.sourceforge.net/rkward/?rev=2468&view=rev
Author:   tfry
Date:     2009-05-12 15:40:38 +0000 (Tue, 12 May 2009)

Log Message:
-----------
Silence some warnings

Modified Paths:
--------------
    trunk/rkward/rkward/plugin/rkcomponent.cpp
    trunk/rkward/rkward/plugin/rkcomponent.h
    trunk/rkward/rkward/plugin/rkvarslot.cpp

Modified: trunk/rkward/rkward/plugin/rkcomponent.cpp
===================================================================
--- trunk/rkward/rkward/plugin/rkcomponent.cpp	2009-05-12 15:22:24 UTC (rev 2467)
+++ trunk/rkward/rkward/plugin/rkcomponent.cpp	2009-05-12 15:40:38 UTC (rev 2468)
@@ -64,7 +64,7 @@
 	}
 }
 
-void RKComponentBase::setPropertyValues (QMap<QString, QString> *list) {
+void RKComponentBase::setPropertyValues (QMap<QString, QString> *list, bool warn_internal) {
 	RK_TRACE (PLUGIN);
 	// TODO: visibility enabledness and requiredness should be excluded, as those are not directly user settable. Perhaps even mark up all properties as user settable or not.
 
@@ -73,7 +73,7 @@
 		RKComponentBase *prop = lookupComponent (it.key (), &mod);
 		if (mod.isEmpty () && prop->isProperty ()) {		// found a property
 			RKComponentPropertyBase* p = static_cast<RKComponentPropertyBase*>(prop);
-			RK_ASSERT (!p->isInternal ());
+			RK_ASSERT (!(p->isInternal () && warn_internal));
 			p->setValue (it.value ());
 		}
 	}

Modified: trunk/rkward/rkward/plugin/rkcomponent.h
===================================================================
--- trunk/rkward/rkward/plugin/rkcomponent.h	2009-05-12 15:22:24 UTC (rev 2467)
+++ trunk/rkward/rkward/plugin/rkcomponent.h	2009-05-12 15:40:38 UTC (rev 2468)
@@ -99,7 +99,7 @@
 	void fetchPropertyValuesRecursive (QMap<QString, QString> *list, bool include_top_level=false, const QString &prefix=QString::null) const;
 /** counterpart to fetchPropertyValuesRecursive (). Tries to apply all values from the list to properties of the given names. If some keys can not be found, or do not resolve to properties, the are ignored.
 @param list a list of id->value such as generated by fetchPropertyValuesRecursive () */
-	void setPropertyValues (QMap<QString, QString> *list);
+	void setPropertyValues (QMap<QString, QString> *list, bool warn_internal=false);
 };
 
 #include "rkcomponentproperties.h"

Modified: trunk/rkward/rkward/plugin/rkvarslot.cpp
===================================================================
--- trunk/rkward/rkward/plugin/rkvarslot.cpp	2009-05-12 15:22:24 UTC (rev 2467)
+++ trunk/rkward/rkward/plugin/rkvarslot.cpp	2009-05-12 15:40:38 UTC (rev 2468)
@@ -66,7 +66,7 @@
 	selected->setInternal (true);
 
 	// find out about options
-	if (multi = xml->getBoolAttribute (element, "multi", false, DL_INFO)) {
+	if ((multi = xml->getBoolAttribute (element, "multi", false, DL_INFO))) {
 		available->setListLength (xml->getIntAttribute (element, "min_vars", 1, DL_INFO), xml->getIntAttribute (element, "min_vars_if_any", 1, DL_INFO), xml->getIntAttribute (element, "max_vars", 0, DL_INFO));
 		connect (list, SIGNAL (itemSelectionChanged ()), this, SLOT (listSelectionChanged ()));
 	} else {


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