[rkward] rkward: Hotfix for type-checking problem.

[Thomas Friedrichsmeier]

Git commit 253a6ada3a0d839337bebf5c5a9ebe3d98d8a390 by Thomas Friedrichsmeier.
Committed on 21/11/2015 at 13:56.
Pushed by tfry into branch 'master'.

Hotfix for type-checking problem.

(Problem was not introduced, but uncovered by cb4987149b6c38f0529442a63d2ef343c8d3be43)

M  +4    -2    rkward/core/robject.cpp
M  +1    -0    rkward/plugin/rkcomponentproperties.cpp

http://commits.kde.org/rkward/253a6ada3a0d839337bebf5c5a9ebe3d98d8a390

diff --git a/rkward/core/robject.cpp b/rkward/core/robject.cpp
index 5166d13..f0d531c 100644
--- a/rkward/core/robject.cpp
+++ b/rkward/core/robject.cpp
@@ -623,10 +623,12 @@ void RObject::remove (bool removed_in_workspace) {
 
 //static
 QString RObject::typeToText (RDataType var_type) {
+	// TODO: These are non-i18n, and not easily i18n-able due to being used, internally.
+	// But they _are_ display strings, too.
 	if (var_type == DataUnknown) {
 		return "Unknown";
 	} else if (var_type == DataNumeric) {
-		return "Number";
+		return "Numeric";
 	} else if (var_type == DataCharacter) {
 		return "String";
 	} else if (var_type == DataFactor) {
@@ -643,7 +645,7 @@ QString RObject::typeToText (RDataType var_type) {
 RObject::RDataType RObject::textToType (const QString &text) {
 	if (text == "Unknown") {
 		return DataUnknown;
-	} else if (text == "Number") {
+	} else if (text == "Numeric") {
 		return DataNumeric;
 	} else if (text == "String") {
 		return DataCharacter;
diff --git a/rkward/plugin/rkcomponentproperties.cpp b/rkward/plugin/rkcomponentproperties.cpp
index 962d611..3972255 100644
--- a/rkward/plugin/rkcomponentproperties.cpp
+++ b/rkward/plugin/rkcomponentproperties.cpp
@@ -856,6 +856,7 @@ void RKComponentPropertyRObjects::removeAt (int index) {
 		return;
 	}
 	RObject* obj = object_list.takeAt (index);
+	problems.remove (obj);
 	if (!object_list.contains (obj)) stopListenForObject (obj);
 	updateValidity ();
 	emit (valueChanged (this));