From 2b81c65b78845ace71f2f1f0f671f0f3e791011a Mon Sep 17 00:00:00 2001 From: Allan Rae Date: Tue, 15 Aug 2000 03:04:12 +0000 Subject: [PATCH] Dekel's patch -- I didn't fix the xforms-0.88 keysyms stuff so it still doesn't finish compiling git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@971 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 5 ++ src/ext_l10n.h | 90 +++++++++++++++++----------------- src/frontends/ButtonPolicies.C | 49 ++++++++++++------ src/lyxfunc.h | 8 +-- 4 files changed, 89 insertions(+), 63 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3776396481..8dc3b64968 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-08-15 Dekel Tsur + + * src/frontends/ButtonPolicies.C: make gcc happy when compiling with + -pedantic + 2000-08-14 Lars Gullik Bjønnes * src/Timeout.h: remove Qt::emit hack. diff --git a/src/ext_l10n.h b/src/ext_l10n.h index d4c5eae411..cc8a06ef60 100644 --- a/src/ext_l10n.h +++ b/src/ext_l10n.h @@ -165,18 +165,17 @@ _("Credits...|e"); _("Version...|V"); _(""); _("A&A"); -_("ACT"); -_("AT_RISE:"); _("Abstract"); _("Accepted"); _("Acknowledgement"); -_("Acknowledgement(s)"); _("Acknowledgement*"); _("Acknowledgement-numbered"); -_("Acknowledgement-unnumbered"); +_("Acknowledgement(s)"); _("Acknowledgements"); +_("Acknowledgement-unnumbered"); _("Acknowledgments"); _("Acnowledgement"); +_("ACT"); _("Addchap"); _("Addchap*"); _("Addition"); @@ -194,15 +193,15 @@ _("Anlagen"); _("Anrede"); _("Appendices"); _("Appendix"); +_("AT_RISE:"); _("Author"); -_("AuthorRunning"); _("Author_Email"); _("Author_Running"); +_("AuthorRunning"); _("Author_URL"); _("Axiom"); _("Axiom-numbered"); _("Axiom-plain"); -_("BLZ"); _("Backaddress"); _("Bank"); _("BankAccount"); @@ -210,12 +209,13 @@ _("BankCode"); _("Betreff"); _("Bibliography"); _("Biography"); +_("BLZ"); _("Brieftext"); -_("CC"); -_("CURTAIN"); _("Caption"); _("Case"); _("Case-numbered"); +_("CC"); +_("cc"); _("CenteredCaption"); _("Chapter"); _("Chapter*"); @@ -255,6 +255,7 @@ _("Criterion-plain"); _("CrossList"); _("Current"); _("Current_Address"); +_("CURTAIN"); _("Customer"); _("Data"); _("Date"); @@ -269,10 +270,10 @@ _("Definition-unnumbered"); _("Description"); _("Dialogue"); _("EMail"); -_("EXT."); _("Email"); _("Encl"); _("Encl."); +_("encl"); _("End_All_Slides"); _("Enumerate"); _("Example"); @@ -283,43 +284,48 @@ _("Example-unnumbered"); _("Exercise"); _("Exercise-numbered"); _("Exercise-plain"); +_("EXT."); _("Extratitle"); -_("FADE_IN:"); -_("FADE_OUT:"); _("Fact"); _("Fact*"); _("Fact-numbered"); _("Fact-plain"); _("Fact-unnumbered"); +_("FADE_IN:"); +_("FADE_OUT:"); _("FigCaption"); +_("first"); _("FirstAuthor"); _("FirstName"); _("FitBitmap"); _("FitFigure"); _("Foilhead"); +_("foilhead"); _("Footernote"); _("FourAffiliations"); _("FourAuthors"); _("Gruss"); -_("HTTP"); _("Headnote"); -_("INT."); +_("HTTP"); _("Idea"); _("IhrSchreiben"); _("IhrZeichen"); _("Institute"); _("Institution"); +_("INT."); _("InvisibleText"); _("Invoice"); _("Itemize"); _("Journal"); +_("journal"); _("Keywords"); _("Konto"); -_("LaTeX"); -_("LaTeX_Title"); _("Labeling"); _("Land"); +_("landscape"); _("LandscapeSlide"); +_("LaTeX"); +_("LaTeX_Title"); _("Lemma"); _("Lemma*"); _("Lemma-numbered"); @@ -338,8 +344,10 @@ _("MarkBoth"); _("MathLetters"); _("MeinZeichen"); _("Minisec"); -_("MyRef"); +_("modying"); +_("msnumber"); _("My_Address"); +_("MyRef"); _("Myref"); _("Name"); _("Narrative"); @@ -349,18 +357,18 @@ _("Note"); _("Note*"); _("Note-numbered"); _("Note-plain"); -_("Note-unnumbered"); _("NoteToEditor"); _("Notetoeditor"); +_("Note-unnumbered"); _("Offprint"); _("Offprints"); _("Offsets"); +_("offsets"); _("Oggetto"); _("Opening"); _("Ort"); _("Overlay"); _("PACS"); -_("PS"); _("Paragraph"); _("Paragraph*"); _("Paragraph-numbered"); @@ -371,8 +379,8 @@ _("Petit"); _("Phone"); _("Place"); _("PlaceFigure"); -_("PlaceTable"); _("Placefigure"); +_("PlaceTable"); _("Placetable"); _("PortraitSlide"); _("PostalCommend"); @@ -389,11 +397,12 @@ _("Proposition*"); _("Proposition-numbered"); _("Proposition-plain"); _("Proposition-unnumbered"); +_("PS"); +_("ps"); _("Publishers"); _("Question"); _("Quotation"); _("Quote"); -_("REVTEX_Title"); _("Received"); _("Recieved"); _("Recieved/Accepted"); @@ -403,17 +412,17 @@ _("Remark"); _("Remark*"); _("Remark-numbered"); _("Remark-plain"); -_("Remark-unnumbered"); _("Remarks"); +_("Remark-unnumbered"); _("RetourAdresse"); _("ReturnAddress"); -_("RightHeader"); +_("REVTEX_Title"); _("Right_Address"); +_("RightHeader"); _("Rotatefoilhead"); _("Running_LaTeX_Title"); _("SCENE"); _("SCENE*"); -_("SGML"); _("Scrap"); _("Section"); _("Section*"); @@ -421,10 +430,11 @@ _("Section-numbered"); _("Send"); _("Send_To_Address"); _("Seriate"); +_("SGML"); _("ShortFoilhead"); +_("Shortfoilhead"); _("ShortRotatefoilhead"); _("ShortTitle"); -_("Shortfoilhead"); _("Signature"); _("Slide"); _("Slide*"); @@ -440,26 +450,26 @@ _("State"); _("Strasse"); _("Street"); _("Style"); -_("SubSection"); -_("SubTitle"); +_("style"); _("Subitle"); _("Subject"); _("Subjectclass"); _("Subparagraph"); _("Subparagraph*"); +_("SubSection"); _("Subsection"); _("Subsection*"); _("Subsection-numbered"); _("Subsubsection"); _("Subsubsection*"); _("Subsubsection-numbered"); +_("SubTitle"); _("Subtitle"); _("Suggested"); _("Summary"); _("Summary-numbered"); _("Surname"); -_("TOC_Author"); -_("TOC_Title"); +_("surname"); _("TableComments"); _("TableRefs"); _("Telefax"); @@ -471,8 +481,8 @@ _("Theorem"); _("Theorem*"); _("Theorem-numbered"); _("Theorem-plain"); -_("Theorem-unnumbered"); _("TheoremTemplate"); +_("Theorem-unnumbered"); _("Thesaurus"); _("ThickLine"); _("This"); @@ -480,39 +490,29 @@ _("ThreeAffiliations"); _("ThreeAuthors"); _("TickList"); _("Title"); -_("Title_Running"); _("Titlehead"); +_("Title_Running"); +_("TOC_Author"); +_("TOC_Title"); _("Town"); -_("Trans_Keywords"); _("Transition"); +_("Trans_Keywords"); _("Translated"); _("TranslatedAbstract"); _("Translated_Title"); _("Translator"); _("TwoAffiliations"); _("TwoAuthors"); -_("URL"); _("Unterschrift"); _("Uppertitleback"); +_("URL"); _("Use"); _("Verbatim"); _("Verse"); _("Verteiler"); _("VisibleText"); _("YourMail"); -_("YourRef"); _("Yourmail"); +_("YourRef"); _("Yourref"); _("Zusatz"); -_("cc"); -_("encl"); -_("first"); -_("foilhead"); -_("journal"); -_("landscape"); -_("modying"); -_("msnumber"); -_("offsets"); -_("ps"); -_("style"); -_("surname"); diff --git a/src/frontends/ButtonPolicies.C b/src/frontends/ButtonPolicies.C index 418df35b56..384020a1d6 100644 --- a/src/frontends/ButtonPolicies.C +++ b/src/frontends/ButtonPolicies.C @@ -46,8 +46,11 @@ inline void nextState(ButtonPolicy::State & state, PreferencesPolicy::PreferencesPolicy() : state_(INITIAL), - outputs_(APPLIED+1, OKAY | APPLY | CANCEL | UNDO_ALL), - state_machine_(APPLIED+1, StateArray(SMI_TOTAL, BOGUS)) + outputs_(APPLIED+1, + static_cast(OKAY | APPLY | CANCEL | UNDO_ALL)), + state_machine_(APPLIED+1, + StateArray(SMI_TOTAL, + static_cast(BOGUS))) { // Build the state output map outputs_[INITIAL] = CLOSE; @@ -118,8 +121,11 @@ void PreferencesPolicy::input(SMInput input) OkCancelPolicy::OkCancelPolicy() : state_(INITIAL), - outputs_(INVALID+1, OKAY | APPLY | CANCEL | UNDO_ALL), - state_machine_(INVALID+1, StateArray(SMI_TOTAL, BOGUS)) + outputs_(INVALID+1, + static_cast(OKAY | APPLY | CANCEL | UNDO_ALL)), + state_machine_(INVALID+1, + StateArray(SMI_TOTAL, + static_cast(BOGUS))) { // Build the state output map outputs_[INITIAL] = CLOSE; @@ -168,8 +174,11 @@ void OkCancelPolicy::input(SMInput input) OkCancelReadOnlyPolicy::OkCancelReadOnlyPolicy() : state_(INITIAL), - outputs_(RO_INVALID+1, OKAY | APPLY | CANCEL | UNDO_ALL), - state_machine_(RO_INVALID+1, StateArray(SMI_TOTAL, BOGUS)) + outputs_(RO_INVALID+1, + static_cast(OKAY | APPLY | CANCEL | UNDO_ALL)), + state_machine_(RO_INVALID+1, + StateArray(SMI_TOTAL, + static_cast(BOGUS))) { // Build the state output map outputs_[INITIAL] = CLOSE; @@ -238,8 +247,11 @@ void OkCancelReadOnlyPolicy::input(SMInput input) NoRepeatedApplyReadOnlyPolicy::NoRepeatedApplyReadOnlyPolicy() : state_(INITIAL), - outputs_(RO_INVALID+1, OKAY | APPLY | CANCEL | UNDO_ALL), - state_machine_(RO_INVALID+1, StateArray(SMI_TOTAL, BOGUS)) + outputs_(RO_INVALID+1, + static_cast(OKAY | APPLY | CANCEL | UNDO_ALL)), + state_machine_(RO_INVALID+1, + StateArray(SMI_TOTAL, + static_cast(BOGUS))) { // Build the state output map outputs_[INITIAL] = CLOSE; @@ -309,8 +321,11 @@ void NoRepeatedApplyReadOnlyPolicy::input(SMInput input) OkApplyCancelReadOnlyPolicy::OkApplyCancelReadOnlyPolicy() : state_(INITIAL), - outputs_(RO_APPLIED+1, OKAY | APPLY | CANCEL | UNDO_ALL), - state_machine_(RO_APPLIED+1, StateArray(SMI_TOTAL, BOGUS)) + outputs_(RO_APPLIED+1, + static_cast(OKAY | APPLY | CANCEL | UNDO_ALL)), + state_machine_(RO_APPLIED+1, + StateArray(SMI_TOTAL, + static_cast(BOGUS))) { // Build the state output map outputs_[INITIAL] = CLOSE; @@ -394,8 +409,11 @@ void OkApplyCancelReadOnlyPolicy::input(SMInput input) OkApplyCancelPolicy::OkApplyCancelPolicy() : state_(INITIAL), - outputs_(APPLIED+1, OKAY | APPLY | CANCEL | UNDO_ALL), - state_machine_(APPLIED+1, StateArray(SMI_TOTAL, BOGUS)) + outputs_(APPLIED+1, + static_cast(OKAY | APPLY | CANCEL | UNDO_ALL)), + state_machine_(APPLIED+1, + StateArray(SMI_TOTAL, + static_cast(BOGUS))) { // Build the state output map outputs_[INITIAL] = CLOSE; @@ -455,8 +473,11 @@ void OkApplyCancelPolicy::input(SMInput input) NoRepeatedApplyPolicy::NoRepeatedApplyPolicy() : state_(INITIAL), - outputs_(INVALID+1, OKAY | APPLY | CANCEL | UNDO_ALL), - state_machine_(INVALID+1, StateArray(SMI_TOTAL, BOGUS)) + outputs_(INVALID+1, + static_cast(OKAY | APPLY | CANCEL | UNDO_ALL)), + state_machine_(INVALID+1, + StateArray(SMI_TOTAL, + static_cast(BOGUS))) { // Build the state output map outputs_[INITIAL] = CLOSE; diff --git a/src/lyxfunc.h b/src/lyxfunc.h index 508d035085..ced5a7dc41 100644 --- a/src/lyxfunc.h +++ b/src/lyxfunc.h @@ -49,13 +49,13 @@ public: /// Same again but for xtl buffers. Still looking for better idea. bool Dispatch(int action, auto_mem_buffer &); -#if FL_REVISION < 89 + #if FL_REVISION < 89 /// A keyboard event is processed to execute a lyx action. - int processKeyEvent(XEvent * ev); -#else + int processKeyEvent(XEvent * ev); + #else /// int processKeySym(KeySym k, unsigned int state); -#endif + #endif /// func_status getStatus(int ac) const; -- 2.39.2