[rkward/frameworks] /: Fix for R 3.5.0

[Thomas Friedrichsmeier]

Git commit eb252517d4b80075683f4cba4246c7a17487037a by Thomas Friedrichsmeier.
Committed on 26/03/2018 at 14:49.
Pushed by tfry into branch 'frameworks'.

Fix for R 3.5.0

M  +1    -0    ChangeLog
M  +3    -3    rkward/rbackend/rkrsupport.cpp

https://commits.kde.org/rkward/eb252517d4b80075683f4cba4246c7a17487037a

diff --git a/ChangeLog b/ChangeLog
index 6464a0b8..16f03c62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+- Fix crash with R 3.5.x due to use to STRING_PTR
 - Double click on object in Workspace browser tries to open reference page, not object viewer, if the object is outside of .GlobalEnv
 - Implement "split view" feature, allowing to partion the main window, and to hvae several views of the same files / data side-by-side
 - Fixed: Creating trellis on-screen plots, while package lattice is not on the search path would produce errors in plot history mechanism
diff --git a/rkward/rbackend/rkrsupport.cpp b/rkward/rbackend/rkrsupport.cpp
index e31f188b..bf49dadc 100644
--- a/rkward/rbackend/rkrsupport.cpp
+++ b/rkward/rbackend/rkrsupport.cpp
@@ -114,11 +114,11 @@ QStringList RKRSupport::SEXPToStringList (SEXP from_exp) {
 				list.append (QString ());
 			} else {
 				if (IS_UTF8 (dummy)) {
-					list.append (QString::fromUtf8 ((char *) STRING_PTR (dummy)));
+					list.append (QString::fromUtf8 (CHAR (dummy)));
 				} else if (IS_LATIN1 (dummy)) {
-					list.append (QString::fromLatin1 ((char *) STRING_PTR (dummy)));
+					list.append (QString::fromLatin1 (CHAR (dummy)));
 				} else {
-					list.append (RKRBackend::toUtf8 ((char *) STRING_PTR (dummy)));
+					list.append (RKRBackend::toUtf8 (CHAR (dummy)));
 				}
 			}
 		}