X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2Fforms_gettext.C;h=1f8f5d1466bf10ca8e72f29902452b2187f62edf;hb=d5443737342903de489d527802cd2cdd38987d74;hp=fc261528eb16054c1afb81832d3be086f7c38a86;hpb=967a220aadfc3becbecf52b09644eb3cab652440;p=lyx.git

diff --git a/src/frontends/xforms/forms_gettext.C b/src/frontends/xforms/forms_gettext.C
index fc261528eb..1f8f5d1466 100644
--- a/src/frontends/xforms/forms_gettext.C
+++ b/src/frontends/xforms/forms_gettext.C
@@ -5,48 +5,33 @@
  *
  * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "forms_gettext.h"
 
-#include FORMS_H_LOCATION
+#include "support/lstrings.h"
+
+using std::string;
 
-// Extract shortcut from "<ident>|<shortcut>" string
-char const * scex(char const * sc)
+namespace lyx {
+namespace frontend {
+
+// Extract shortcut from "<identifier>|<shortcut>" string
+string const scex(string const & str)
 {
-	// Find '|' in the sc and return the string after that.
-	register char const * sd = sc;
-	while (sd[0]!= 0 && sd[0] != '|') ++sd;
-
-	if (sd[0] == '|') {
-		++sd;
-		return sd;
-	}
-	return "";
+	return support::split(str, '|');
 }
 
 
-// Extract identifier from "<ident>|<shortcut>" string
-char const * idex(char const * sc)
+// Extract identifier from "<identifier>|<shortcut>" string
+string const idex(string const & str)
 {
-	register char const * se = sc;
-	while (se[0]!= 0 && se[0] != '|') ++se;
-
-	if (se[0] == 0) return sc;
-
-	char * sb = new char[se - sc + 1];
-	int index = 0;
-	register char const * sd = sc;
-	while (sd != se) {
-		sb[index] = sd[0];
-		++index; ++sd;
-	}
-	sb[index] = 0;
-	return sb;
+	string identifier;
+	support::split(str, identifier, '|');
+	return identifier;
 }
+
+} // namespace frontend
+} // namespace lyx