small changes to enable compilation once again of the kde frontend.

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

diff --git a/src/frontends/kde/ChangeLog b/src/frontends/kde/ChangeLog
index 3540d4989adfc0b5e27ded0988f7b8ca611f7cb0..9bb607a9be241d6374985c33081c3305223a4f5b 100644 (file)
--- a/src/frontends/kde/ChangeLog
+++ b/src/frontends/kde/ChangeLog
@@ -1,3 +1,7 @@
+2001-02-22  Angus Leeming  <a.leeming@ic.ac.uk>
+
+       * <various>: small changes to enable compilation once again.
+
 2001-02-12  John Levon  <moz@compsoc.man.ac.uk>
 
        * <various>: move to house style

diff --git a/src/frontends/kde/FormCitation.C b/src/frontends/kde/FormCitation.C
index 0a5d88d7323dc189eaf35b81c27d83c5b8a45497..98e7a1c70ff056e882b935e18fb1317e6460617f 100644 (file)
--- a/src/frontends/kde/FormCitation.C
+++ b/src/frontends/kde/FormCitation.C
@@ -45,7 +45,7 @@ void FormCitation::showCitation(InsetCommand * const inset)
 
        inset_ = inset;
        readonly = lv_->buffer()->isReadonly();
-       ih_ = inset_->hide.connect(slot(this,&FormCitation::hide));
+       ih_ = inset_->hideDialog.connect(slot(this,&FormCitation::hide));
        params = inset->params();
        
        show();

diff --git a/src/frontends/kde/FormIndex.C b/src/frontends/kde/FormIndex.C
index daac49f01b611d8368bec10f8b00555ba75e8e27..c8ee2573dc97c0d362744c27701ecfa983eb7afd 100644 (file)
--- a/src/frontends/kde/FormIndex.C
+++ b/src/frontends/kde/FormIndex.C
@@ -38,7 +38,7 @@ void FormIndex::showIndex(InsetCommand * const inset)
 
        inset_ = inset;
        readonly = lv_->buffer()->isReadonly();
-       ih_ = inset_->hide.connect(slot(this,&FormIndex::hide));
+       ih_ = inset_->hideDialog.connect(slot(this,&FormIndex::hide));
        params = inset->params();
        
        show();

diff --git a/src/frontends/kde/FormParagraph.C b/src/frontends/kde/FormParagraph.C
index 879aeecb7466a2986e2a755803cf10e48869814a..7bfa3b6ff11e5760c466e83cae350392ac8892f8 100644 (file)
--- a/src/frontends/kde/FormParagraph.C
+++ b/src/frontends/kde/FormParagraph.C
@@ -179,7 +179,10 @@ void FormParagraph::apply()
                dialog_->getHfillBetween(),
                dialog_->getStartNewMinipage());
 
-       lv_->view()->update(BufferView::SELECT | BufferView::FITCUR | BufferView::CHANGE);
+       lv_->view()->update(lv_->view()->text, 
+                           BufferView::SELECT |
+                           BufferView::FITCUR |
+                           BufferView::CHANGE);
        lv_->buffer()->markDirty();
        setMinibuffer(lv_, _("Paragraph layout set"));
 }

diff --git a/src/frontends/kde/FormRef.C b/src/frontends/kde/FormRef.C
index 3a2f2cc4d82cc546ce930429e776c0de3c048473..47dbf981a70f78e8f2f04c7cab0991c35b01be90 100644 (file)
--- a/src/frontends/kde/FormRef.C
+++ b/src/frontends/kde/FormRef.C
@@ -45,7 +45,7 @@ void FormRef::showRef(InsetCommand * const inset)
 
        inset_ = inset;
        readonly = lv_->buffer()->isReadonly();
-       ih_ = inset_->hide.connect(slot(this,&FormRef::hide));
+       ih_ = inset_->hideDialog.connect(slot(this,&FormRef::hide));
        params = inset->params();
        
        show();

diff --git a/src/frontends/kde/FormToc.C b/src/frontends/kde/FormToc.C
index d4c229655d6ec4c38abdd89768292e18322927a1..adadb1a13f93c27b01ada6d28c14e5605d4180a1 100644 (file)
--- a/src/frontends/kde/FormToc.C
+++ b/src/frontends/kde/FormToc.C
@@ -53,7 +53,7 @@ void FormToc::showTOC(InsetCommand * const inset)
                return;
 
        inset_ = inset;
-       ih_ = inset_->hide.connect(slot(this,&FormToc::hide));
+       ih_ = inset_->hideDialog.connect(slot(this,&FormToc::hide));
        params = inset->params();
        
        show();

diff --git a/src/frontends/kde/FormUrl.C b/src/frontends/kde/FormUrl.C
index eb421eb40fc79caa40c0c5130eac35bd5d3f248c..93eb9f8528c9d6042150e79bcbfd4f58a406657e 100644 (file)
--- a/src/frontends/kde/FormUrl.C
+++ b/src/frontends/kde/FormUrl.C
@@ -38,7 +38,7 @@ void FormUrl::showUrl(InsetCommand * const inset)
 
        inset_ = inset;
        readonly = lv_->buffer()->isReadonly();
-       ih_ = inset_->hide.connect(slot(this,&FormUrl::hide));
+       ih_ = inset_->hideDialog.connect(slot(this,&FormUrl::hide));
        params = inset->params();
        
        show();

diff --git a/src/frontends/kde/Makefile.am b/src/frontends/kde/Makefile.am
index d46953e75e03d6c0d90e7c3b5dcdb8fdd70c2763..35adde245c59fdf80fb6c580190bb35e017b932e 100644 (file)
--- a/src/frontends/kde/Makefile.am
+++ b/src/frontends/kde/Makefile.am
@@ -27,6 +27,8 @@ libkde_la_OBJADD = \
        ../xforms/FormInclude.lo \
        ../xforms/form_include.lo \
        ../xforms/FormInset.lo \
+        ../xforms/FormPreamble.lo \
+        ../xforms/form_preamble.lo \
         ../xforms/FormPreferences.lo \
         ../xforms/form_preferences.lo \
        ../xforms/FormSplash.lo \

diff --git a/src/frontends/kde/docdlg.C b/src/frontends/kde/docdlg.C
index 1a1ea8b3da8236814396ceafe205cd44fda01f1d..5d4d0278e4017b689fe3afaaf3e14d5d716f4274 100644 (file)
--- a/src/frontends/kde/docdlg.C
+++ b/src/frontends/kde/docdlg.C
@@ -446,7 +446,7 @@ bool DocDialog::updateParams(BufferParams & params)
                        break;
        }
        
-       if (tmpskip != params.getDefSkip()) {
+       if (!(tmpskip == params.getDefSkip())) {
                redo = true;
                params.setDefSkip(tmpskip);
        }