From: Allan Rae <rae@lyx.org>
Date: Thu, 17 May 2001 08:59:04 +0000 (+0000)
Subject: get qt2 compiling again.  Won't link lyx for me though :(
X-Git-Tag: 1.6.10~21241
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=97c5ea56cf0623ff09e2a9c62dedff341585348d;p=features.git

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 a52314e2af..fa99b1c3d3 100644
--- 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 81bddf4c77..56bc42de4a 100644
--- 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 d90767a778..af5624820c 100644
--- 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 ae950c03a1..f69da0efc0 100644
--- 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 ecd567a007..60d24380d4 100644
--- 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 8162520335..52700356f1 100644
--- 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 \