kde patch from Angus

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1235 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 3b99ff8d2e88e996548b7eca3f89e2ea67781b93..2e5967cec527ee9f7a3bc4d007b4a1df31d4acc9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2000-11-22  Angus Leeming <a.leeming@ic.ac.uk>
+
+       * 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  <larsbj@lyx.org>
 
        * 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 0892d444b5ce74ae53d0ebd16408151bc0c8c382..2100c6f8a3ab0e6b8753ebd598d9ff2c9ccf8a00 100644 (file)
--- 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<void> 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 d42cc7df852d37f357bcc185ade4def5efcb8b94..c957a0baf7d5983d604d657085d3c720b5447b4c 100644 (file)
--- 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 5b9f94e59ba1194790cbeab476eefb9c8bcb837b..dbc8315665842bd1602d876e74e8c1a987f048b7 100644 (file)
--- 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 629a124bdcc7257728594542e70631e9b6f9a3c7..42459a8ea5827c2c29fb726e01fd87ef709fc777 100644 (file)
--- a/src/frontends/kde/paradlg.C
+++ b/src/frontends/kde/paradlg.C
@@ -13,13 +13,15 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "support/lstrings.h" 
+#include <config.h>
 
+#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 7f3d7287b1bacb2b89ddf8f916430821f338c067..cfe8e152ede7827a11cb07557e244d73487305c3 100644 (file)
--- 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 e374b40c700840cd80d2707ecc47c4de36856011..d0f9e2dddce6e3cc9c57c8a7b2bbf1feb3579f1f 100644 (file)
--- 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;