Closer approximation to compiling and building

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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index e679a534bedfa315abfcd5d64bcb81724acb8cfd..9bbbf9b0b8249e41b395e20e549ecc4e9a57d27d 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,13 @@
+2002-04-16  John Levon  <moz@compsoc.man.ac.uk>
+
+       * Dialogs.C: add tooltipsEnabled()
+
+       * QTeXInfo.C: include right header
+ 
+       * moc/Makefile.am: add back missing moc files
+
+       * xforms/Makefile.am: add missing FeedbackController
+ 
 2002-04-08  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * xforms/Makefile.am (link_files): use correct _SOURCES variable.

diff --git a/src/frontends/qt2/Dialogs.C b/src/frontends/qt2/Dialogs.C
index b6d8f9a39875b826ee96d64e1de6ac0e6a89a1b2..25ebb9377f1b12ef46a819c6a72a68455ea606d0 100644 (file)
--- a/src/frontends/qt2/Dialogs.C
+++ b/src/frontends/qt2/Dialogs.C
@@ -123,3 +123,9 @@ Dialogs::Dialogs(LyXView * lv)
        // dialogs by a simple connection here.
        hideAll.connect(hideBufferDependent.slot());
 }
+
+ 
+bool Dialogs::tooltipsEnabled(void)
+{
+       return false; 
+} 

diff --git a/src/frontends/qt2/QTexinfo.C b/src/frontends/qt2/QTexinfo.C
index f10bed706bcc04af2ed2558d5990584246dd3b2a..c9c09a99a99d68b931f7d29d5345b5773de5814e 100644 (file)
--- a/src/frontends/qt2/QTexinfo.C
+++ b/src/frontends/qt2/QTexinfo.C
@@ -21,6 +21,8 @@
 #include "gettext.h"
 #include "helper_funcs.h"
 
+#include "support/lstrings.h"
+ 
 #include <qlistbox.h>
 #include <qpushbutton.h>
 #include <qcheckbox.h>
@@ -51,7 +53,7 @@ void QTexinfo::updateStyles(ControlTexinfo::texFileSuffix whichStyle)
        bool const withFullPath = dialog_->path->isChecked();
 
        string const str =  controller().getContents(whichStyle, withFullPath);
-       std::vector<string> flist = getVectorFromString(str,"\n");
+       std::vector<string> flist = getVectorFromString(str, "\n");
 
        dialog_->fileList->clear();
 

diff --git a/src/frontends/qt2/moc/Makefile.am b/src/frontends/qt2/moc/Makefile.am
index d976266fd67185d164765a1897e48baa78532f96..d27620866e0a276bd5d113d5268dce54dcb6840c 100644 (file)
--- a/src/frontends/qt2/moc/Makefile.am
+++ b/src/frontends/qt2/moc/Makefile.am
@@ -15,13 +15,13 @@ INCLUDES = -I$(top_srcdir)/src/ \
 
 AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
 
-#libqt2moc_la_SOURCES = FileDialog_private_moc.C \
-#      emptytable_moc.C \
-#      lengthcombo_moc.C \
-#      qttableview_moc.C \
-#      Qt2Base_moc.C
-
-nodist_libqt2moc_la_SOURCES = $(MOCDIALOGS)
+nodist_libqt2moc_la_SOURCES = \
+       $(MOCDIALOGS) \
+       FileDialog_private_moc.C \
+       emptytable_moc.C \
+       lengthcombo_moc.C \
+       qttableview_moc.C \
+       Qt2Base_moc.C
 
 libqt2moc.la: $(libqt2moc_la_OBJECTS) $(libqt2moc_la_DEPENDENCIES)
 

diff --git a/src/frontends/qt2/xforms/Makefile.am b/src/frontends/qt2/xforms/Makefile.am
index 426ab94096bf81e777ea4e724b0e14af43fcd1b7..56ae1b3aee56b004da5f1936faf6c7f6c12d49c7 100644 (file)
--- a/src/frontends/qt2/xforms/Makefile.am
+++ b/src/frontends/qt2/xforms/Makefile.am
@@ -21,6 +21,8 @@ nodist_libqt2xforms_la_SOURCES = \
        Color.C \
        DropDown.h \
        DropDown.C \
+       FeedbackController.h \
+       FeedbackController.C \
        FormBase.h \
        FormBase.C \
        FormBaseDeprecated.h \