minor tweaks to make qt2 compile (Edwin)

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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 919637839f0401b77e47a9845e2cdcf5e8972f6b..7d75cf993e7577bd61c897796863a0669522369a 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,10 @@
+2001-03-19  Edwin Leuven  <leuven@fee.uva.nl>
+
+       * qt2 compiles again:
+       * Makefile.am: added missing xform dialogs
+       * FormParagraph.C: only extra setting if wanted
+       * FormParagraph.h: add namespace to connection
+       
 2001-03-16  Kalle Dalheimer  <kalle@klaralvdalens-datakonsult.se>
 
        * FormParagraph.C (apply): Only call SetParagraphExtraOpt() when

diff --git a/src/frontends/qt2/FormParagraph.C b/src/frontends/qt2/FormParagraph.C
index 0c0d5bb0ad967db55ba35241b00ec1082d941166..bf5a2c51f032a2a0e0e646c9cb8336f9b0f9c957 100644 (file)
--- a/src/frontends/qt2/FormParagraph.C
+++ b/src/frontends/qt2/FormParagraph.C
@@ -148,6 +148,7 @@ void FormParagraph::apply()
                spaceabove, spacebelow, dialog_->getAlign(),
                dialog_->getLabelWidth(), dialog_->getNoIndent());
 
+#ifndef NO_PEXTRA
        // extra stuff
 
        string width("");
@@ -167,7 +168,7 @@ void FormParagraph::apply()
                dialog_->getExtraAlign(),
                dialog_->getHfillBetween(),
                dialog_->getStartNewMinipage());
-
+#endif
        lv_->view()->update(lv_->view()->text,
                            BufferView::SELECT |
                            BufferView::FITCUR |

diff --git a/src/frontends/qt2/FormParagraph.h b/src/frontends/qt2/FormParagraph.h
index 8c061b80cfbea7288d30095cccfccaafc46fd939..fa13d2e879ce48ca1cf965a523eab650602a40b5 100644 (file)
--- a/src/frontends/qt2/FormParagraph.h
+++ b/src/frontends/qt2/FormParagraph.h
@@ -50,7 +50,7 @@ private:
        Dialogs * d_;
        
        /// Hide connection.
-       Connection h_;
+   SigC::Connection h_;
        
        /// readonly file or not
        bool readonly; 

diff --git a/src/frontends/qt2/Makefile.am b/src/frontends/qt2/Makefile.am
index 8f5cf534c09beba199a7f44725ece066f69299ee..4e3b55ecfa2ec68f0b6d136d1938293325a1d35f 100644 (file)
--- a/src/frontends/qt2/Makefile.am
+++ b/src/frontends/qt2/Makefile.am
@@ -30,34 +30,52 @@ LYXDATADIRS = dlg
 DISTCLEANFILES = $(BUILTSOURCES) *.orig *.rej *~ *.bak core
 
 libqt2_la_OBJADD = \
-       ../xforms/ButtonController.lo \
+       ../controllers/ButtonController.lo \
+       ../xforms/combox.lo \
        ../xforms/Color.lo \
        ../xforms/FormBase.lo \
        ../xforms/FormBaseDeprecated.lo \
+       ../xforms/FormBibitem.lo \
+       ../xforms/FormBibtex.lo \
+       ../xforms/FormBrowser.lo \
        ../xforms/FormCopyright.lo      \
        ../xforms/FormCredits.lo \
        ../xforms/FormDocument.lo \
        ../xforms/FormError.lo \
+       ../xforms/FormExternal.lo \
        ../xforms/FormGraphics.lo \
+       ../xforms/FormInclude.lo \
        ../xforms/FormIndex.lo \
        ../xforms/FormInset.lo \
+       ../xforms/FormLog.lo \
+       ../xforms/FormMinipage.lo \
+       ../xforms/FormMaths.lo \
        ../xforms/FormPreamble.lo \
        ../xforms/FormPreferences.lo \
        ../xforms/FormRef.lo \
        ../xforms/FormTabular.lo \
        ../xforms/FormToc.lo \
        ../xforms/FormUrl.lo \
+       ../xforms/FormVCLog.lo \
+       ../xforms/MathsSymbols.lo \
        ../xforms/Menubar_pimpl.lo \
        ../xforms/RadioButtonGroup.lo \
-       ../xforms/Toolbar_pimpl.lo \
        ../xforms/Timeout_pimpl.lo \
-       ../xforms/form_citation.lo \
+       ../xforms/Toolbar_pimpl.lo \
+       ../xforms/bmtable.lo \
+       ../xforms/form_bibitem.lo \
+       ../xforms/form_bibtex.lo \
+       ../xforms/form_browser.lo \
        ../xforms/form_credits.lo \
-       ../xforms/form_copyright.lo \
        ../xforms/form_document.lo \
        ../xforms/form_error.lo \
+       ../xforms/form_external.lo \
        ../xforms/form_index.lo \
        ../xforms/form_graphics.lo \
+       ../xforms/form_include.lo \
+       ../xforms/form_index.lo \
+       ../xforms/form_maths.lo \
+       ../xforms/form_minipage.lo \
        ../xforms/form_preamble.lo \
        ../xforms/form_preferences.lo \
        ../xforms/form_ref.lo \
@@ -65,8 +83,8 @@ libqt2_la_OBJADD = \
        ../xforms/form_toc.lo \
        ../xforms/form_url.lo \
        ../xforms/input_validators.lo \
-       ../xforms/xforms_helpers.lo     \
-       ../xforms/xformsBC.lo
+       ../xforms/xformsBC.lo \
+       ../xforms/xforms_helpers.lo
 
 LIBS=
 LDFLAGS= $(libqt2_la_OBJADD)