From 967a220aadfc3becbecf52b09644eb3cab652440 Mon Sep 17 00:00:00 2001
From: Angus Leeming <leeming@lyx.org>
Date: Tue, 26 Nov 2002 21:12:39 +0000
Subject: [PATCH] One less thing for the preprocessor to do.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5724 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/xforms/ChangeLog       |  3 +++
 src/frontends/xforms/forms_gettext.C |  8 ++++----
 src/frontends/xforms/forms_gettext.h | 14 ++++----------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 4457579fd7..57e9d8cab6 100644
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,5 +1,8 @@
 2002-11-26  Angus Leeming  <leeming@lyx.org>
 
+	* forms_gettext.[Ch] (scex, idex): ditch the #defines and rename the
+	functions in their place.
+
 	* FormBase.h (FormDB::form): Implement in 1 line not 2.
 
 	* fdesign_base.[Ch]: new files. All fdesign-generated structures will
diff --git a/src/frontends/xforms/forms_gettext.C b/src/frontends/xforms/forms_gettext.C
index 8126d6d00e..fc261528eb 100644
--- a/src/frontends/xforms/forms_gettext.C
+++ b/src/frontends/xforms/forms_gettext.C
@@ -17,8 +17,8 @@
 
 #include FORMS_H_LOCATION
 
-// Extract shortcut from <ident>|<shortcut> string
-char const * flyx_shortcut_extract(char const * sc)
+// Extract shortcut from "<ident>|<shortcut>" string
+char const * scex(char const * sc)
 {
 	// Find '|' in the sc and return the string after that.
 	register char const * sd = sc;
@@ -32,8 +32,8 @@ char const * flyx_shortcut_extract(char const * sc)
 }
 
 
-// Extract identifier from <ident>|<shortcut> string
-char const * flyx_ident_extract(char const * sc)
+// Extract identifier from "<ident>|<shortcut>" string
+char const * idex(char const * sc)
 {
 	register char const * se = sc;
 	while (se[0]!= 0 && se[0] != '|') ++se;
diff --git a/src/frontends/xforms/forms_gettext.h b/src/frontends/xforms/forms_gettext.h
index f7abf2a6e6..6f1f9870bf 100644
--- a/src/frontends/xforms/forms_gettext.h
+++ b/src/frontends/xforms/forms_gettext.h
@@ -16,16 +16,10 @@
 #pragma interface
 #endif
 
-#include "forms_fwd.h"
+/// Extract shortcut from "<ident>|<shortcut>" string
+char const * scex(char const *);
 
-/// Extract shortcut from <ident>|<shortcut> string
-char const * flyx_shortcut_extract(char const * sc);
-/// Shortcut for flyx_shortcut_extract
-#define scex flyx_shortcut_extract
-
-/// Extract shortcut from <ident>|<shortcut> string
-char const * flyx_ident_extract(char const * sc);
-/// Shortcut for flyx_ident_extract
-#define idex flyx_ident_extract
+/// Extract ident from "<ident>|<shortcut>" string
+char const * idex(char const *);
 
 #endif // FORMS_GETTEXT_H
-- 
2.39.2