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

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 4457579fd75bec9604e3aedf1a1c55b57ca894f8..57e9d8cab68217e7aeb50044657963b9e8585376 100644 (file)
--- 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 8126d6d00eedc4120310a60c2227afb14c0cef13..fc261528eb16054c1afb81832d3be086f7c38a86 100644 (file)
--- 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 f7abf2a6e610ac4d8e2f88fca806e2136c2b79b5..6f1f9870bf47f1156cbf17ad657ce94d4023386a 100644 (file)
--- 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