[Freeciv-Dev] (PR#39691) [Patch] Rename variables named 'string' from scripting API

[Marko Lindqvist]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=39691 >

 tolua++ and toluaxx consider word 'string' to mean C++ string class.
They produce weird result when there is variables named 'string'
around.


 - ML


diff -Nurd -X.diff_ignore freeciv/server/scripting/api_intl.c freeciv/server/scripting/api_intl.c
--- freeciv/server/scripting/api_intl.c	2007-08-04 18:36:19.000000000 +0300
+++ freeciv/server/scripting/api_intl.c	2007-09-08 20:57:24.000000000 +0300
@@ -19,19 +19,19 @@
 
 #include "api_intl.h"
 
-const char *api_intl__(const char *string) {
-  return _(string);
+const char *api_intl__(const char *untranslated) {
+  return _(untranslated);
 }
 
-const char *api_intl_N_(const char *string) {
-  return N_(string);
+const char *api_intl_N_(const char *untranslated) {
+  return N_(untranslated);
 }
 
-const char *api_intl_Q_(const char *string) {
-  return Q_(string);
+const char *api_intl_Q_(const char *untranslated) {
+  return Q_(untranslated);
 }
 
-const char *api_intl_PL_(const char *string1, const char *string2, int n) {
-  return PL_(string1, string2, n);
+const char *api_intl_PL_(const char *singular, const char *plural, int n) {
+  return PL_(singular, plural, n);
 }
 
diff -Nurd -X.diff_ignore freeciv/server/scripting/api_intl.h freeciv/server/scripting/api_intl.h
--- freeciv/server/scripting/api_intl.h	2007-08-04 18:36:19.000000000 +0300
+++ freeciv/server/scripting/api_intl.h	2007-09-08 20:58:16.000000000 +0300
@@ -14,10 +14,9 @@
 #ifndef FC__API_INTL_H
 #define FC__API_INTL_H
 
-const char *api_intl__(const char *string);
-const char *api_intl_N_(const char *string);
-const char *api_intl_Q_(const char *string);
-const char *api_intl_PL_(const char *string1, const char *string2, int n);
-
-#endif
+const char *api_intl__(const char *untranslated);
+const char *api_intl_N_(const char *untranslated);
+const char *api_intl_Q_(const char *untranslated);
+const char *api_intl_PL_(const char *singular, const char *plural, int n);
 
+#endif /* FC__API_INTL_H */
diff -Nurd -X.diff_ignore freeciv/server/scripting/api.pkg freeciv/server/scripting/api.pkg
--- freeciv/server/scripting/api.pkg	2007-09-07 19:24:44.000000000 +0300
+++ freeciv/server/scripting/api.pkg	2007-09-08 20:57:35.000000000 +0300
@@ -353,10 +353,10 @@
 }
 
 /* Intl module. */
-const char *api_intl__ @ _ (const char *string);
-const char *api_intl_N_ @ N_ (const char *string);
-const char *api_intl_Q_ @ Q_ (const char *string);
-const char *api_intl_PL_ @ PL_ (const char *string1, const char *string2,
+const char *api_intl__ @ _ (const char *untranslated);
+const char *api_intl_N_ @ N_ (const char *untranslated);
+const char *api_intl_Q_ @ Q_ (const char *untranslated);
+const char *api_intl_PL_ @ PL_ (const char *singular, const char *plural,
 				int n);
 
 /* Notify module. */

_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev