some pch work

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

diff --git a/src/frontends/qt2/.cvsignore b/src/frontends/qt2/.cvsignore
index 0d40193f43f5731b8059324c71887368850c90c9..1185648950415076496cc2a65e3f5552718db0ff 100644 (file)
--- a/src/frontends/qt2/.cvsignore
+++ b/src/frontends/qt2/.cvsignore
@@ -7,3 +7,4 @@ libqt2.la
 moc_*.C
 *_moc.C
 pch.h.gch
+pch.h.gch.dep

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 56095754238d3dbd2e20b4a08cbccf37c04c6ce6..16ba23594831d17b8a822dc9aeb030d35da48058 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-18  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+       * Some pch work.
+
 2004-08-18  José Matos  <jamatos@lyx.org>
 
        * BulletsModule.C (setBullet): show custom bullet instead of "...",

diff --git a/src/frontends/qt2/moc/.cvsignore b/src/frontends/qt2/moc/.cvsignore
index 0fd82a937c12aa4fce9f4faa7531612fc078af42..5c31fa11acfebc2186e90c3afdc5dc40fca4a286 100644 (file)
--- a/src/frontends/qt2/moc/.cvsignore
+++ b/src/frontends/qt2/moc/.cvsignore
@@ -6,3 +6,5 @@ Makefile
 libqt2moc.la
 moc_*.C
 *_moc.C
+pch.h.gch
+pch.h.gch.dep

diff --git a/src/frontends/qt2/moc/Makefile.am b/src/frontends/qt2/moc/Makefile.am
index 2a7fe7b7136444ab8265b3fb9fa9ec2ecb66a47d..a9b3afdc2758240d419394b307d679a6b4cef211 100644 (file)
--- a/src/frontends/qt2/moc/Makefile.am
+++ b/src/frontends/qt2/moc/Makefile.am
@@ -10,7 +10,8 @@ INCLUDES = -I$(top_srcdir)/src/ \
        $(QT_INCLUDES) \
        $(BOOST_INCLUDES)
 
-AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION
+AM_CPPFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION
+AM_CXXFLAGS = $(PCH_FLAGS)
 
 noinst_LTLIBRARIES = libqt2moc.la
 

diff --git a/src/frontends/qt2/moc/pch.h b/src/frontends/qt2/moc/pch.h
new file mode 100644 (file)
index 0000000..bc23177
--- /dev/null
+++ b/src/frontends/qt2/moc/pch.h
@@ -0,0 +1,28 @@
+// -*- C++ -*-
+
+#include <config.h>
+
+#include <boost/array.hpp>
+#include <boost/assert.hpp>
+#include <boost/function.hpp>
+#include <boost/scoped_ptr.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/signals/trackable.hpp>
+#include <boost/signal.hpp>
+#include <boost/tuple/tuple.hpp>
+#include <boost/utility.hpp>
+
+#include <algorithm>
+#include <cmath>
+#include <iomanip>
+#include <limits.h>
+#include <map>
+#include <sstream>
+#include <stack>
+#include <string>
+#include <utility>
+#include <vector>
+
+// Have I said anything about the braindeadness of QT lately?
+// Just to remind you: signals slot emit as macros, pure lunacy!
+// So we are not able to have any qt headers in the pch.

diff --git a/src/frontends/qt2/ui/.cvsignore b/src/frontends/qt2/ui/.cvsignore
index 37910898550c53aea24efad52d10b3864ee675a5..6d4a9e853a608cc46b266e77312f1d16c27d67c8 100644 (file)
--- a/src/frontends/qt2/ui/.cvsignore
+++ b/src/frontends/qt2/ui/.cvsignore
@@ -8,3 +8,6 @@ moc_*.C
 *_moc.C
 *.C
 *.h
+pch.h.gch
+pch.h.gch.dep
+

diff --git a/src/frontends/qt2/ui/Makefile.am b/src/frontends/qt2/ui/Makefile.am
index a5e299c54fff45d4707c1eec21f40223ecf9d9c5..00a6e5c705f6d15cfc3181923e8630e0f2f50259 100644 (file)
--- a/src/frontends/qt2/ui/Makefile.am
+++ b/src/frontends/qt2/ui/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/config/common.am
 include $(srcdir)/../Makefile.dialogs
 
-DISTCLEANFILES += *.C *.h
+CLEANFILES += *.C *Base.h
 
 SUBDIRS = . moc
 
@@ -12,7 +12,8 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/frontends \
        $(QT_INCLUDES) $(BOOST_INCLUDES) \
        -I$(top_srcdir)/src/frontends/controllers
 
-AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION
+AM_CPPFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION
+AM_CXXFLAGS = $(PCH_FLAGS)
 
 noinst_LTLIBRARIES = libqt2ui.la
 
@@ -25,5 +26,5 @@ UICFLAGS=-tr qt_
 
 %.h: %.ui
        $(UIC) $(UICFLAGS) $< -o $@
-%.C: %.h %.ui
-       $(UIC) $(UICFLAGS) -impl $^ -o $@
+%.C: %.h %.ui $(PCH_FILE)
+       $(UIC) $(UICFLAGS) -impl `echo $^ | sed 's/pch.h.gch//'` -o $@

diff --git a/src/frontends/qt2/ui/moc/.cvsignore b/src/frontends/qt2/ui/moc/.cvsignore
index 5baf140a2bb083a4d561e3c7a4622b2fda9bfd51..c463ee34ea86bd4e447a574da97ddcf2175b2fb1 100644 (file)
--- a/src/frontends/qt2/ui/moc/.cvsignore
+++ b/src/frontends/qt2/ui/moc/.cvsignore
@@ -8,3 +8,5 @@ moc_*.C
 *_moc.C
 *.C
 *.h
+pch.h.gch
+pch.h.gch.dep

diff --git a/src/frontends/qt2/ui/moc/Makefile.am b/src/frontends/qt2/ui/moc/Makefile.am
index 97540f296d02eedc8b130d1d97c383c56f840278..27744cbfd141aeab981e064f61c95e985396d33a 100644 (file)
--- a/src/frontends/qt2/ui/moc/Makefile.am
+++ b/src/frontends/qt2/ui/moc/Makefile.am
@@ -9,7 +9,8 @@ INCLUDES = -I$(top_srcdir)/src \
        $(QT_INCLUDES) \
        $(BOOST_INCLUDES)
 
-AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION
+AM_CPPFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION
+AM_CXXFLAGS = $(PCH_FLAGS)
 
 noinst_LTLIBRARIES = libqt2uimoc.la
 

diff --git a/src/frontends/qt2/ui/moc/pch.h b/src/frontends/qt2/ui/moc/pch.h
new file mode 100644 (file)
index 0000000..3738e9f
--- /dev/null
+++ b/src/frontends/qt2/ui/moc/pch.h
@@ -0,0 +1,2 @@
+#include <qapplication.h>
+#include <qmetaobject.h>

diff --git a/src/frontends/qt2/ui/pch.h b/src/frontends/qt2/ui/pch.h
new file mode 100644 (file)
index 0000000..3ac1980
--- /dev/null
+++ b/src/frontends/qt2/ui/pch.h
@@ -0,0 +1,30 @@
+#include <config.h>
+
+#include <qbuttongroup.h>
+#include <qcheckbox.h>
+#include <qcombobox.h>
+#include <qdialog.h>
+#include <qframe.h>
+#include <qgroupbox.h>
+#include <qheader.h>
+#include <qimage.h>
+#include <qlabel.h>
+#include <qlayout.h>
+#include <qlineedit.h>
+#include <qlistbox.h>
+#include <qlistview.h>
+#include <qmultilineedit.h>
+#include <qpixmap.h>
+#include <qprogressbar.h>
+#include <qpushbutton.h>
+#include <qradiobutton.h>
+#include <qslider.h>
+#include <qspinbox.h>
+#include <qtabwidget.h>
+#include <qtextbrowser.h>
+#include <qtextview.h>
+#include <qtooltip.h>
+#include <qvariant.h>
+#include <qwhatsthis.h>
+#include <qwidget.h>
+#include <qwidgetstack.h>