[rkward/kde4] /: Fix for R 3.5.0

[Thomas Friedrichsmeier]

Git commit 5b43ea3d9f53622398108fa833bbc8ef5db1c4fb by Thomas Friedrichsmeier.
Committed on 26/03/2018 at 16:45.
Pushed by tfry into branch 'kde4'.

Fix for R 3.5.0

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

https://commits.kde.org/rkward/5b43ea3d9f53622398108fa833bbc8ef5db1c4fb

diff --git a/ChangeLog b/ChangeLog
index 6d37e821..1de03c7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,9 @@
 --- Version 0.6.5a - UNRELEASED
+- Fix crash with R 3.5.x due to use to STRING_PTR
 - EXPERIMENTAL: Fix NAs introduced by editing data containing characters that cannot be encoded in the system locale
 - Fixed: Preview boxes followed by a <stretch/> element would not work under some circumstances
 - Fixed: Setting an output CSS file via the GUI did not work
-- Fixed: Bug report feature on Windows did nothing 		TODO: Really test this!
+- Fixed: Bug report feature on Windows did nothing
 - Avoid some potential encoding issues, that could cause graphical select.list to fail for certain strings, under some circumstances
 
 --- Version 0.6.5 - Apr-02-2016
diff --git a/rkward/rbackend/rkrsupport.cpp b/rkward/rbackend/rkrsupport.cpp
index e3ef219e..98e96d53 100644
--- a/rkward/rbackend/rkrsupport.cpp
+++ b/rkward/rbackend/rkrsupport.cpp
@@ -116,11 +116,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::this_pointer->current_locale_codec->toUnicode ((char *) STRING_PTR (dummy)));
+					list.append (RKRBackend::this_pointer->current_locale_codec->toUnicode (CHAR (dummy)));
 				}
 			}
 		}