From c1093f1c92b21e163f988935cb65ff5e75a6641a Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Mon, 25 Oct 1999 12:33:03 +0000 Subject: [PATCH] Small fixes. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@241 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 8 ++++++++ src/lyxfunc.C | 6 +++--- src/support/lyxstring.h | 4 +++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ebfb0d9721..9fb256b001 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +1999-10-25 Jean-Marc Lasgouttes + + * src/lyxfunc.C (Dispatch): Use _() instead of N_() fot minibuffer + messages. + + * src/support/lyxstring.h: declare struct Srep as friend of + lyxstring, since DEC cxx complains otherwise. + 1999-10-24 Lars Gullik Bjønnes * src/spellchecker.C (create_ispell_pipe): removed old #warning, diff --git a/src/lyxfunc.C b/src/lyxfunc.C index 8ac1df0c70..571df1d930 100644 --- a/src/lyxfunc.C +++ b/src/lyxfunc.C @@ -720,14 +720,14 @@ string LyXFunc::Dispatch(int ac, int res = one.startscript(Systemcalls::System, tmp); if (res == 0) { setMessage(string( - N_("Document exported as HTML to file: ")) + result); + _("Document exported as HTML to file: ")) + result); } else { setErrorMessage(string( - N_("An unexpected error occured while converting document to HTML in file:")) + result); + _("An unexpected error occured while converting document to HTML in file:")) + result); } } else { - setErrorMessage(string(N_("Unknown export type: ")) + setErrorMessage(string(_("Unknown export type: ")) + extyp); } } diff --git a/src/support/lyxstring.h b/src/support/lyxstring.h index 9c6df4bdef..068de3368b 100644 --- a/src/support/lyxstring.h +++ b/src/support/lyxstring.h @@ -524,7 +524,7 @@ public: private: // These three operators can be used to discover erronous use of // ints and strings. However a conforming C++ compiler will flag - // a lot of char operations as abmbigous when they are compiled + // a lot of char operations as ambigous when they are compiled // in. Use them for debugging only (or perhaps not even then.) // Lgb. // @@ -536,6 +536,8 @@ private: /// Forward declaration of the string representation struct Srep; + // DEC cxx requires this. + friend struct Srep; /// A string is a pointer to it's representation Srep * rep; -- 2.39.5