[education/rkward] rkward: A few more warnings

Thomas Friedrichsmeier null at kde.org
Sat Jan 31 08:17:04 GMT 2026


Git commit aa51f39a272abc2747f22f1a68ddfd31c2c2c40e by Thomas Friedrichsmeier.
Committed on 31/01/2026 at 08:16.
Pushed by tfry into branch 'master'.

A few more warnings

M  +4    -9    rkward/plugin/rkformula.cpp
M  +0    -1    rkward/settings/rksettingsmoduleplugins.cpp

https://invent.kde.org/education/rkward/-/commit/aa51f39a272abc2747f22f1a68ddfd31c2c2c40e

diff --git a/rkward/plugin/rkformula.cpp b/rkward/plugin/rkformula.cpp
index fc22d2ae3..e8f02d73e 100644
--- a/rkward/plugin/rkformula.cpp
+++ b/rkward/plugin/rkformula.cpp
@@ -162,11 +162,8 @@ void RKFormula::makeModelString() {
 	} else if (!vlist.empty()) {
 		container = vlist.first()->parentObject();
 	}
-	for (RObject::ObjectList::const_iterator it = vlist.cbegin(); it != vlist.cend(); ++it) {
-		if ((*it)->parentObject() != container) {
-			multitable = true;
-			break;
-		}
+	if (std::find_if(vlist.cbegin(), vlist.cend(), [container](RObject *obj) { return (obj->parentObject() != container); }) != vlist.cend()) {
+		multitable = true;
 	}
 	if (multitable) {
 		table_string = u"data.frame ("_s;
@@ -232,7 +229,7 @@ QString RKFormula::mangleName(const RObject *var) {
 	MangledNames::iterator it;
 	int i = -1;
 	while (((it = mangled_names.find(dummy)) != mangled_names.end()) && (it.value() != var)) {
-		dummy = dummy + QString::number(++i);
+		dummy = dummy2 + QString::number(++i);
 	}
 	mangled_names.insert(dummy, var);
 	return dummy;
@@ -309,15 +306,13 @@ QList<RKFormula::Interaction> RKFormula::makeInteractions(int level, RObject::Ob
 
 	QList<Interaction> ret;
 
-	int start_var;
-
 	// enough vars available for this level of crossing?
 	if (source_vars.count() < (level + 1)) return ret;
 
 	// reached bottom level?
 	if (!level) {
 		// return an list of level 0 interactions (i.e. each var in a single "interaction")
-		for (start_var = 0; start_var < source_vars.count(); ++start_var) {
+		for (int start_var = 0; start_var < source_vars.count(); ++start_var) {
 			Interaction inter;
 			inter.level = 0;
 			inter.vars.append(source_vars[start_var]);
diff --git a/rkward/settings/rksettingsmoduleplugins.cpp b/rkward/settings/rksettingsmoduleplugins.cpp
index 5fc31ab2a..ac62d46c5 100644
--- a/rkward/settings/rksettingsmoduleplugins.cpp
+++ b/rkward/settings/rksettingsmoduleplugins.cpp
@@ -253,7 +253,6 @@ void RKSettingsModulePlugins::RKPluginMapList::removeObsoleteMaps() {
 			if (!QFile::exists(filename)) {
 				sublist.list.removeAt(i);
 				--i;
-				break;
 			}
 		}
 		if (sublist.list.isEmpty()) ids_to_remove.insert(it.key());



More information about the rkward-tracker mailing list