From: Lars Gullik Bjønnes <larsbj@gullik.org>
Date: Wed, 18 Aug 2004 15:59:50 +0000 (+0000)
Subject: some pch work
X-Git-Tag: 1.6.10~15040
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=88506129ee244537f2c24d5046338af75b3ca7ef;p=features.git

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 0d40193f43..1185648950 100644
--- 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 5609575423..16ba235948 100644
--- 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 0fd82a937c..5c31fa11ac 100644
--- 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 2a7fe7b713..a9b3afdc27 100644
--- 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
index 0000000000..bc23177471
--- /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 3791089855..6d4a9e853a 100644
--- 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 a5e299c54f..00a6e5c705 100644
--- 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 5baf140a2b..c463ee34ea 100644
--- 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 97540f296d..27744cbfd1 100644
--- 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
index 0000000000..3738e9fe0a
--- /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
index 0000000000..3ac1980386
--- /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>