From ff308c1722d14817f098fb4dfb5cccf13a30a1e7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Wed, 22 Nov 2000 18:38:31 +0000 Subject: [PATCH] kde patch from Angus git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1235 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 12 ++++++++++++ src/frontends/kde/Dialogs.C | 5 +++++ src/frontends/kde/FormParagraph.C | 2 ++ src/frontends/kde/Makefile.am | 7 ++++--- src/frontends/kde/paradlg.C | 6 ++++-- src/frontends/kde/paradlg.h | 2 +- src/insets/insetbib.C | 6 +++--- 7 files changed, 31 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b99ff8d2e..2e5967cec5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2000-11-22 Angus Leeming + + * src/frontends/kde/Dialogs.C: added signal Dialogs::redrawGUI. + + * src/frontends/kde/FormParagraph.C: added using directive. + + * src/frontends/kde/paradlg.C: added config.h and using directive. + + * src/frontends/kde/paradlg.h: added std::qualifier. + + * src/frontends/kde/Makefile.am: added Color.lo to libkde_la_OBJADD. + 2000-11-22 Lars Gullik Bjønnes * configure.in (AC_OUTPUT): don't output src/xtl/Makefile diff --git a/src/frontends/kde/Dialogs.C b/src/frontends/kde/Dialogs.C index 0892d444b5..2100c6f8a3 100644 --- a/src/frontends/kde/Dialogs.C +++ b/src/frontends/kde/Dialogs.C @@ -25,6 +25,11 @@ extern void ShowCredits(); +// Signal enabling all visible popups to be redrawn if so desired. +// E.g., when the GUI colours have been remapped. +Signal0 Dialogs::redrawGUI; + + Dialogs::Dialogs(LyXView * lv) { dialogs_.push_back(new FormCitation(lv, this)); diff --git a/src/frontends/kde/FormParagraph.C b/src/frontends/kde/FormParagraph.C index d42cc7df85..c957a0baf7 100644 --- a/src/frontends/kde/FormParagraph.C +++ b/src/frontends/kde/FormParagraph.C @@ -30,6 +30,8 @@ using Liason::setMinibuffer; #endif +using std::endl; + FormParagraph::FormParagraph(LyXView *v, Dialogs *d) : dialog_(0), lv_(v), d_(d), h_(0) { diff --git a/src/frontends/kde/Makefile.am b/src/frontends/kde/Makefile.am index 5b9f94e59b..dbc8315665 100644 --- a/src/frontends/kde/Makefile.am +++ b/src/frontends/kde/Makefile.am @@ -39,6 +39,8 @@ GENSOURCES = copyrightdlgdata.C \ DISTCLEANFILES = $(BUILTSOURCES) *.orig *.rej *~ *.bak core libkde_la_OBJADD = \ + ../xforms/ButtonController.lo \ + ../xforms/Color.lo \ ../xforms/FormBase.lo \ ../xforms/FormDocument.lo \ ../xforms/form_document.lo \ @@ -53,12 +55,11 @@ libkde_la_OBJADD = \ ../xforms/form_tabular.lo \ ../xforms/FormTabularCreate.lo \ ../xforms/form_tabular_create.lo \ - ../xforms/ButtonController.lo \ - ../xforms/xform_helpers.lo \ ../xforms/input_validators.lo \ ../xforms/RadioButtonGroup.lo \ ../xforms/Toolbar_pimpl.lo \ - ../xforms/Menubar_pimpl.lo + ../xforms/Menubar_pimpl.lo \ + ../xforms/xform_helpers.lo LIBS= LDFLAGS= $(libkde_la_OBJADD) diff --git a/src/frontends/kde/paradlg.C b/src/frontends/kde/paradlg.C index 629a124bdc..42459a8ea5 100644 --- a/src/frontends/kde/paradlg.C +++ b/src/frontends/kde/paradlg.C @@ -13,13 +13,15 @@ * * ***************************************************************************/ -#include "support/lstrings.h" +#include +#include "support/lstrings.h" #include "paradlg.h" - #include "gettext.h" #include "debug.h" +using std::endl; + /* * This is the top-level dialog which contains the buttons, and the tab bar for adding * the qtarch-designed child widget dialogs. diff --git a/src/frontends/kde/paradlg.h b/src/frontends/kde/paradlg.h index 7f3d7287b1..cfe8e152ed 100644 --- a/src/frontends/kde/paradlg.h +++ b/src/frontends/kde/paradlg.h @@ -156,7 +156,7 @@ private: case 5: return VSpace::VFILL; case 6: return VSpace::LENGTH; default: - lyxerr[Debug::GUI] << "Unknown kind combo entry " << val << endl; + lyxerr[Debug::GUI] << "Unknown kind combo entry " << val << std::endl; } return VSpace::NONE; } diff --git a/src/insets/insetbib.C b/src/insets/insetbib.C index e374b40c70..d0f9e2dddc 100644 --- a/src/insets/insetbib.C +++ b/src/insets/insetbib.C @@ -352,7 +352,7 @@ bool InsetBibtex::delDatabase(string const & db) { if (contains(getContents(), db)) { string bd = db; - int n = tokenPos(getContents(), ',', bd); + int const n = tokenPos(getContents(), ',', bd); if (n > 0) { // Weird code, would someone care to explain this?(Lgb) string tmp(", "); @@ -376,7 +376,7 @@ int bibitemMaxWidth(BufferView * bv, LyXFont const & font) while (par) { if (par->bibkey) { - int wx = par->bibkey->width(bv, font); + int const wx = par->bibkey->width(bv, font); if (wx > w) w = wx; } par = par->next; @@ -397,7 +397,7 @@ string const bibitemWidest(Buffer const * buffer) while (par) { if (par->bibkey) { - int wx = par->bibkey->width(bv, font); + int const wx = par->bibkey->width(bv, font); if (wx > w) { w = wx; bkey = par->bibkey; -- 2.39.2