get qt2 compiling again. Won't link lyx for me though :(

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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index a52314e2af3f0967f371ffd0096d3fcc7f49e23e..fa99b1c3d3d233d14c0d3b7e49e2067459e61177 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,15 @@
+2001-05-17  Allan Rae  <rae@lyx.org>
+
+       * FormCharacter.C:
+       * FormCopyright.C:
+       * FormCredits.C:
+       * FormSearch.C: gettext went missing but is back gain now _().
+
+       * Makefile.am:  ButtonController is now ButtonControllerBase.
+       It now compiles but it won't link lyx on my system.  Complaints about
+       not being able to link in libraries lib{GL,GLU,Xft,Xext,Xmu} which
+       are all present and accounted for by ldconfig.  YMMV.
+
 2001-05-09  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * FormParagraph.C: remove !NEW_INSETS and !NO_PEXTRA cruft

diff --git a/src/frontends/qt2/FormCharacter.C b/src/frontends/qt2/FormCharacter.C
index 81bddf4c77b708be2db0ce044027390a77af263d..56bc42de4a9c615b38267569feb92d9f10a4d11a 100644 (file)
--- a/src/frontends/qt2/FormCharacter.C
+++ b/src/frontends/qt2/FormCharacter.C
@@ -8,6 +8,7 @@
 
 #include <config.h>
 
+#include "gettext.h"
 #include "chardlgimpl.h"
 #include "FormCharacter.h"
 #include "bufferview_funcs.h"

diff --git a/src/frontends/qt2/FormCopyright.C b/src/frontends/qt2/FormCopyright.C
index d90767a7788a79489df1c8c52a4a292805723736..af5624820ce2e0d254453e34c87d05550c3d7e54 100644 (file)
--- a/src/frontends/qt2/FormCopyright.C
+++ b/src/frontends/qt2/FormCopyright.C
@@ -17,7 +17,7 @@
 
 #include <config.h>
 
-
+#include "gettext.h"
 #include "FormCopyrightDialogImpl.h"
 #include <qlabel.h>
 #include <qpushbutton.h>

diff --git a/src/frontends/qt2/FormCredits.C b/src/frontends/qt2/FormCredits.C
index ae950c03a13699b2c6019606093a4748d1a9c147..f69da0efc0c653a19579a11d586c2ca8f4f17023 100644 (file)
--- a/src/frontends/qt2/FormCredits.C
+++ b/src/frontends/qt2/FormCredits.C
@@ -14,6 +14,7 @@
 
 #include <config.h>
 
+#include "gettext.h"
 #include "FormCreditsDialogImpl.h"
 #include <qtextview.h>
 #include <qpushbutton.h>

diff --git a/src/frontends/qt2/FormSearch.C b/src/frontends/qt2/FormSearch.C
index ecd567a007d10101e114ee28b48a66ac2251e7ea..60d24380d4def89f95991e3985031737603cfa60 100644 (file)
--- a/src/frontends/qt2/FormSearch.C
+++ b/src/frontends/qt2/FormSearch.C
@@ -8,6 +8,7 @@
 
 #include <config.h>
 
+#include "gettext.h"
 #include "searchdlgimpl.h"
 #include "FormSearch.h"
 #include "Dialogs.h"

diff --git a/src/frontends/qt2/Makefile.am b/src/frontends/qt2/Makefile.am
index 81625203350196f4b79378371af507d7586e8e50..52700356f1474cf15a35cd8800e9f1f652ff714d 100644 (file)
--- a/src/frontends/qt2/Makefile.am
+++ b/src/frontends/qt2/Makefile.am
@@ -34,7 +34,7 @@ LYXDATADIRS = dlg
 DISTCLEANFILES = $(BUILTSOURCES) *.orig *.rej *~ *.bak core
 
 libqt2_la_OBJADD = \
-       ../controllers/ButtonController.lo \
+       ../controllers/ButtonControllerBase.lo \
        ../xforms/combox.lo \
        ../xforms/Color.lo \
        ../xforms/FormBaseDeprecated.lo \
@@ -88,7 +88,7 @@ libqt2_la_OBJADD = \
 LIBS=
 LDFLAGS= $(libqt2_la_OBJADD)
 ETAGS_ARGS = --lang=c++
- 
+
 libqt2_la_SOURCES = \
        $(BUILTSOURCES) \
        Dialogs.C \