[education/rkward] rkward: Fix compilation

Thomas Friedrichsmeier null at kde.org
Sat May 14 10:44:10 BST 2022


Git commit 4cba230394bcb076d554207e32ab16d0ae05991b by Thomas Friedrichsmeier.
Committed on 14/05/2022 at 09:44.
Pushed by tfry into branch 'master'.

Fix compilation

M  +1    -0    rkward/core/rkvariable.cpp
M  +1    -1    rkward/misc/rkcommonfunctions.h
M  +1    -0    rkward/plugin/rkcomponentmeta.cpp
M  +1    -0    rkward/plugin/rkmatrixinput.cpp
M  +1    -0    rkward/plugin/rkvarslot.cpp

https://invent.kde.org/education/rkward/commit/4cba230394bcb076d554207e32ab16d0ae05991b

diff --git a/rkward/core/rkvariable.cpp b/rkward/core/rkvariable.cpp
index d99ca3cd..23c708eb 100644
--- a/rkward/core/rkvariable.cpp
+++ b/rkward/core/rkvariable.cpp
@@ -13,6 +13,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
 #include "rcontainerobject.h"
 #include "robjectlist.h"
 #include "../rbackend/rkrinterface.h"
+#include "../misc/rkcommonfunctions.h"
 
 #include "rkmodificationtracker.h"
 
diff --git a/rkward/misc/rkcommonfunctions.h b/rkward/misc/rkcommonfunctions.h
index 4d5ecc5c..6f07df56 100644
--- a/rkward/misc/rkcommonfunctions.h
+++ b/rkward/misc/rkcommonfunctions.h
@@ -66,7 +66,7 @@ namespace RKCommonFunctions {
 	inline Qt::SplitBehaviorFlags KeepEmptyParts() { return Qt::KeepEmptyParts; };
 	inline Qt::SplitBehaviorFlags SkipEmptyParts() { return Qt::SkipEmptyParts; };
 #else
-	inline QString::SplitBehavior KeepEmptyParts() { return RKCommonFunctions::KeepEmptyParts(); };
+	inline QString::SplitBehavior KeepEmptyParts() { return QString::KeepEmptyParts; };
 	inline QString::SplitBehavior SkipEmptyParts() { return QString::SkipEmptyParts; };
 #endif
 };
diff --git a/rkward/plugin/rkcomponentmeta.cpp b/rkward/plugin/rkcomponentmeta.cpp
index 9da593c6..296036e3 100644
--- a/rkward/plugin/rkcomponentmeta.cpp
+++ b/rkward/plugin/rkcomponentmeta.cpp
@@ -9,6 +9,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "../misc/xmlhelper.h"
 #include "../misc/rkmessagecatalog.h"
+#include "../misc/rkcommonfunctions.h"
 #include "../rbackend/rksessionvars.h"
 
 #include <KLocalizedString>
diff --git a/rkward/plugin/rkmatrixinput.cpp b/rkward/plugin/rkmatrixinput.cpp
index 51f349d6..3efde48a 100644
--- a/rkward/plugin/rkmatrixinput.cpp
+++ b/rkward/plugin/rkmatrixinput.cpp
@@ -17,6 +17,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
 #include "../misc/rktableview.h"
 #include "../dataeditor/rktextmatrix.h"
 #include "../misc/xmlhelper.h"
+#include "../misc/rkcommonfunctions.h"
 
 #include "../debug.h"
 
diff --git a/rkward/plugin/rkvarslot.cpp b/rkward/plugin/rkvarslot.cpp
index 830d67f1..9d548aa1 100644
--- a/rkward/plugin/rkvarslot.cpp
+++ b/rkward/plugin/rkvarslot.cpp
@@ -24,6 +24,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
 #include "../debug.h"
 #include "../misc/xmlhelper.h"
 #include "../misc/rkstandardicons.h"
+#include "../misc/rkcommonfunctions.h"
 
 RKVarSlot::RKVarSlot (const QDomElement &element, RKComponent *parent_component, QWidget *parent_widget) : RKComponent (parent_component, parent_widget) {
 	RK_TRACE (PLUGIN);


More information about the rkward-tracker mailing list