[rkward-cvs] SF.net SVN: rkward: [1559] trunk/rkward/rkward/rbackend/rembedinternal.cpp

[tfry at users.sourceforge.net]

Revision: 1559
          http://svn.sourceforge.net/rkward/?rev=1559&view=rev
Author:   tfry
Date:     2007-03-11 10:37:36 -0700 (Sun, 11 Mar 2007)

Log Message:
-----------
More #ifdefs

Modified Paths:
--------------
    trunk/rkward/rkward/rbackend/rembedinternal.cpp

Modified: trunk/rkward/rkward/rbackend/rembedinternal.cpp
===================================================================
--- trunk/rkward/rkward/rbackend/rembedinternal.cpp	2007-03-11 17:28:13 UTC (rev 1558)
+++ trunk/rkward/rkward/rbackend/rembedinternal.cpp	2007-03-11 17:37:36 UTC (rev 1559)
@@ -78,6 +78,10 @@
 #define USE_R_REPLDLLDO1
 #endif
 
+#ifdef R_2_5
+#define USE_ENCODING_HINTS
+#endif
+
 #ifdef R_2_4
 #include "Rembedded.h"
 #else
@@ -443,6 +447,7 @@
 			if (dummy == NA_STRING) {
 				list[i] = QString::null;
 			} else {
+#ifdef USE_ENCODING_HINTS
 				if (IS_UTF8 (dummy)) {
 					list[i] = QString::fromUtf8 ((char *) STRING_PTR (dummy));
 				} else if (IS_LATIN1 (dummy)) {
@@ -450,6 +455,9 @@
 				} else {
 					list[i] = REmbedInternal::this_pointer->current_locale_codec->toUnicode ((char *) STRING_PTR (dummy));
 				}
+#else
+			list[i] = REmbedInternal::this_pointer->current_locale_codec->toUnicode ((char *) STRING_PTR (dummy));
+#endif
 			}
 		}
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.