]> git.lyx.org Git - features.git/commitdiff
Qt4 compilation speedup patch by Bo Peng and me.
authorAbdelrazak Younes <younes@lyx.org>
Thu, 18 May 2006 08:51:12 +0000 (08:51 +0000)
committerAbdelrazak Younes <younes@lyx.org>
Thu, 18 May 2006 08:51:12 +0000 (08:51 +0000)
* configure.ac: removed frontends/qt4/moc compilation.
* frontends/qt4/: moc files (*_moc.cpp) are now included at the end of relevant source file (*.C)
* SConscript: adapted to "moc included in .C file" change.
* frontends/qt4/Makefile.am:  adapted to "moc included in .C file" change.

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

65 files changed:
configure.ac
development/scons/SConscript
src/frontends/qt4/BulletsModule.C
src/frontends/qt4/FileDialog_private.C
src/frontends/qt4/Makefile.am
src/frontends/qt4/QAboutDialog.C
src/frontends/qt4/QBibitemDialog.C
src/frontends/qt4/QBibtexDialog.C
src/frontends/qt4/QBoxDialog.C
src/frontends/qt4/QBranchDialog.C
src/frontends/qt4/QBranches.C
src/frontends/qt4/QChangesDialog.C
src/frontends/qt4/QCharacterDialog.C
src/frontends/qt4/QCitationDialog.C
src/frontends/qt4/QCommandBuffer.C
src/frontends/qt4/QCommandEdit.C
src/frontends/qt4/QDelimiterDialog.C
src/frontends/qt4/QDialogView.C
src/frontends/qt4/QDocumentDialog.C
src/frontends/qt4/QERTDialog.C
src/frontends/qt4/QErrorListDialog.C
src/frontends/qt4/QExternalDialog.C
src/frontends/qt4/QFloatDialog.C
src/frontends/qt4/QGraphicsDialog.C
src/frontends/qt4/QIncludeDialog.C
src/frontends/qt4/QIndexDialog.C
src/frontends/qt4/QLAction.C
src/frontends/qt4/QLMenubar.C
src/frontends/qt4/QLPopupMenu.C
src/frontends/qt4/QLPrintDialog.C
src/frontends/qt4/QLToolbar.C
src/frontends/qt4/QLogDialog.C
src/frontends/qt4/QMathDialog.C
src/frontends/qt4/QMathMatrixDialog.C
src/frontends/qt4/QNoteDialog.C
src/frontends/qt4/QParagraphDialog.C
src/frontends/qt4/QPrefsDialog.C
src/frontends/qt4/QRefDialog.C
src/frontends/qt4/QSearchDialog.C
src/frontends/qt4/QSendtoDialog.C
src/frontends/qt4/QShowFileDialog.C
src/frontends/qt4/QSpellcheckerDialog.C
src/frontends/qt4/QTabularCreateDialog.C
src/frontends/qt4/QTabularDialog.C
src/frontends/qt4/QTexinfoDialog.C
src/frontends/qt4/QThesaurusDialog.C
src/frontends/qt4/QTocDialog.C
src/frontends/qt4/QURLDialog.C
src/frontends/qt4/QVSpaceDialog.C
src/frontends/qt4/QViewSource.C
src/frontends/qt4/QViewSourceDialog.C
src/frontends/qt4/QWorkArea.C
src/frontends/qt4/QWrapDialog.C
src/frontends/qt4/QtView.C
src/frontends/qt4/TocModel.C
src/frontends/qt4/emptytable.C
src/frontends/qt4/floatplacement.C
src/frontends/qt4/iconpalette.C
src/frontends/qt4/lengthcombo.C
src/frontends/qt4/moc/Makefile.am [deleted file]
src/frontends/qt4/moc/pch.h [deleted file]
src/frontends/qt4/panelstack.C
src/frontends/qt4/qsetborder.C
src/frontends/qt4/socket_callback.C
src/frontends/qt4/validators.C

index 9cb3675efc44f273b1562cb0728c1f35c5c86d6e..e6edf8963042b0d0a027e5d662e20bd9fcb99c9e 100644 (file)
@@ -455,7 +455,6 @@ AC_CONFIG_FILES([Makefile  m4/Makefile \
        src/frontends/qt3/ui/Makefile \
        src/frontends/qt3/ui/moc/Makefile \
        src/frontends/qt4/Makefile \
-       src/frontends/qt4/moc/Makefile \
        src/frontends/qt4/ui/Makefile \
 ])
 
index 195a63b67152771112f0a68e6d0d1e032434fdc2..5fce12148bac896d25ee2085800de2ca3f1bd51d 100644 (file)
@@ -879,7 +879,7 @@ elif frontend == 'qt4':
   resources = [qt4env.Uic4(x) for x in qt4_ui_files]
 
   # 
-  # moc qt4_moc_files
+  # moc qt4_moc_files, the moced files are included in the original files
   #
   qt4_moced_files = [qt4env.Moc4(x.replace('.C', '_moc.cpp'), x.replace('.C', '.h')) for x in qt4_moc_files]
 
@@ -888,7 +888,7 @@ elif frontend == 'qt4':
   qt4 = qt4env.StaticLibrary(
     target = '$LOCALLIBPATH/qt4',
     LIBS = qt4env['QT_LIB'],
-    source = qt4_source_files + qt4_moc_files + Flatten(qt4_moced_files)
+    source = qt4_source_files + qt4_moc_files
   )
   Alias('qt4', qt4)
 
index 04a734f4ab29791773a08e20fb26dd83df46bff3..a23d3934e014d7af1ef34d4dc15559ab69c23a8a 100644 (file)
@@ -358,3 +358,5 @@ void BulletsModule::setCustom()
        tmpbullet.setText(fromqstr(text));
        tmpbullet.setFont(-1);
 }
+
+#include "BulletsModule_moc.cpp"
index ff851c309d6f04b2ebfe77a4c466bc3d6d61daac..32eb8f3581981d852ba09ad866d961c44a0c969c 100644 (file)
@@ -81,3 +81,5 @@ void LyXFileDialog::buttonClicked()
        else if (sender() == b2_)
                setDir(toqstr(b2_dir_));
 }
+
+#include "FileDialog_private_moc.cpp"
index e9cde4a51599b68b49056dd6690cc749ead2a342..2dabd434cacc70c278d33615d67f626d4328637a 100644 (file)
@@ -1,16 +1,25 @@
 include $(top_srcdir)/config/common.am
 include $(srcdir)/Makefile.dialogs
 
-SUBDIRS = ui moc
+DISTCLEANFILES += *_moc.cpp
+
+libqt4_la_DEPENDENCIES = $(MOCEDFILES)
+
+MOCEDFILES = $(MOCFILES:.C=_moc.cpp)
+
+%_moc.cpp: %.h
+       $(MOC4) -o $@ $<
+
+SUBDIRS = ui
 
 EXTRA_DIST = pch.h Makefile.dialogs
 
-BUILT_SOURCES = $(PCH_FILE)
+BUILT_SOURCES = $(PCH_FILE) $(MOCEDFILES)
 
 noinst_LTLIBRARIES = libqt4.la
 
 libqt4_la_LDFLAGS = $(QT4_LDFLAGS)
-libqt4_la_LIBADD = $(QT4_LIB) moc/*.lo 
+libqt4_la_LIBADD = $(QT4_LIB) 
 AM_CPPFLAGS += \
        $(QT4_CPPFLAGS) \
        $(PCH_FLAGS) \
index 919963a3d8a1d338b0611ba5e8c96a7a7aa01a42..81d364d970ef3bf5ad786149a55a50922fcd0669 100644 (file)
@@ -30,3 +30,5 @@ QAboutDialog::~QAboutDialog()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QAboutDialog_moc.cpp"
index 547fa5354081e443826cc50b8a7196e140a4fd6c..9ef306f1addb8e07ae134d052c2afb12bb6d32d6 100644 (file)
@@ -47,3 +47,5 @@ void QBibitemDialog::closeEvent(QCloseEvent *e)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QBibitemDialog_moc.cpp"
index 0fe64e3b719c3aef74e97acd9a08c4175c7785b5..3fa387561726e23e7e99458ce4bd2df314612cfe 100644 (file)
@@ -232,3 +232,5 @@ void QBibtexDialog::closeEvent(QCloseEvent *e)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QBibtexDialog_moc.cpp"
index 4b7f5b672a8e44c439a908a718a6fe46314494a7..22643dc17185fce6ca2605b41ec49214a428c31a 100644 (file)
@@ -111,3 +111,5 @@ void QBoxDialog::restoreClicked()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QBoxDialog_moc.cpp"
index 02c5b7fa92d14440387929e9dbf6333488b768c9..b4e0725536e37a0077d27763f01652d6419544d5 100644 (file)
@@ -46,3 +46,5 @@ void QBranchDialog::change_adaptor()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QBranchDialog_moc.cpp"
index 221ae45ca379eaa2f8cb5e65e35f84e1a489ae5c..a34be4144b5bd5399ab88aa6a3a6660e997999a3 100644 (file)
@@ -176,3 +176,5 @@ void QBranches::on_colorPB_clicked()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QBranches_moc.cpp"
index 239a9550075c15cc885ec36bdc06cc79f33e9e37..25ee375af040129574078182c397e18c8ce01028 100644 (file)
@@ -60,3 +60,5 @@ void QChangesDialog::closeEvent(QCloseEvent *e)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QChangesDialog_moc.cpp"
index 0899c639799915611a66bbafc29a509dde8bd389..f461c7f7f06afc27c0e9fd0a6f7dd6ab7b61f64c 100644 (file)
@@ -72,3 +72,5 @@ void QCharacterDialog::closeEvent(QCloseEvent * e)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QCharacterDialog_moc.cpp"
index 68960ceff0ac20ecb3ad4fbedcfc8ac9eb39681c..fcd2214d6f2361a71caf6eea6d3e7859e77c10d4 100644 (file)
@@ -466,3 +466,5 @@ void QCitationFind::find(biblio::Direction dir)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QCitationDialog_moc.cpp"
index aea7f31a5c81728be272a45a1c7ac86225c8c3a5..43e89a30e7958cd96f08a37d83594f2be1e93ed6 100644 (file)
@@ -232,3 +232,5 @@ void XMiniBuffer::suffix_timeout()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QCommandBuffer_moc.cpp"
index 80cc49e578da4d99ec0461a90edf3c0e4791369e..dd786e6072f2c0c96c0e09bb5c28728cbcd51943 100644 (file)
@@ -63,3 +63,5 @@ bool QCommandEdit::event(QEvent * e)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QCommandEdit_moc.cpp"
index e78c4b2fc5ab19e8f1f0f3e32d9aabc758629ed6..8ba79ba5cc3c34b9c7124fc3ce3996cba387bf57 100644 (file)
@@ -145,3 +145,5 @@ void QDelimiterDialog::rdelim_clicked(const string & str)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QDelimiterDialog_moc.cpp"
index 6251a689ad01bcbe3494c217a0966e4408a10e77..8d92cc94d1deccf216bbe5232aba84feb5f8ed10 100644 (file)
@@ -116,3 +116,5 @@ void QDialogView::slotRestore()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QDialogView_moc.cpp"
index 187849c0aae71a41b7c1bf6de036472e648d59d8..61a8edf3c78fc95d45eabf957c8bd3cbd9375d62 100644 (file)
@@ -1035,3 +1035,5 @@ void QDocumentDialog::update(BufferParams const & params)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QDocumentDialog_moc.cpp"
index fb95efaaa8eaeca336af86f66b35b01c2f8b6d41..9d4f5fa6550517ebc90b494ba12b6631803c4873 100644 (file)
@@ -49,3 +49,5 @@ void QERTDialog::change_adaptor()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QERTDialog_moc.cpp"
index 6392fab2d8057655e4ebed7c8ab7a4e8c51fb048..205d257e127ad456d9df60a8ef0c3ccac3489ebe 100644 (file)
@@ -51,3 +51,5 @@ void QErrorListDialog::closeEvent(QCloseEvent * e)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QErrorListDialog_moc.cpp"
index 15bd83bbf9f1a3f8eba10dfa6c21659dfba9135e..9f4debec7de45da7b70cf12d8e7181b667e8cb1e 100644 (file)
@@ -224,3 +224,5 @@ void QExternalDialog::widthUnitChanged()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QExternalDialog_moc.cpp"
index f45048025429f1e6552202fe663d81d3f89dd132..84c24f81fcd2f964597229213032f7ed9747cdf8 100644 (file)
@@ -60,3 +60,5 @@ void QFloatDialog::closeEvent(QCloseEvent * e)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QFloatDialog_moc.cpp"
index ab06db94650a50811d0748674e4ce36e4d996bb0..fa55cecad283f750666d44d3cf212ce25c7c84ac 100644 (file)
@@ -165,3 +165,5 @@ void QGraphicsDialog::filenameChanged(const QString & filename)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QGraphicsDialog_moc.cpp"
index 989ea4ae7b6771f73fcf6e83b9ada341736fd88f..6fbebe6e107598751d024c0c9082c73155fe4220 100644 (file)
@@ -103,3 +103,5 @@ void QIncludeDialog::browseClicked()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QIncludeDialog_moc.cpp"
index 78487601cf0a63547be7242e827d9b2d795d1961..1ab740cda117f44169afa471175b5335f0d6e1fa 100644 (file)
@@ -80,3 +80,5 @@ void QIndexDialog::closeEvent(QCloseEvent * e)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QIndexDialog_moc.cpp"
index dffe69f170829dce79fcb9b565ef8713d30d2952..56ccdf45a5a9899a686d2ffd3a830802b5cf2890 100644 (file)
@@ -87,3 +87,5 @@ void QLAction::action()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QLAction_moc.cpp"
index 64e2f1f30eb7bbff8e4716176dabd429edd074ef..846feed71441d9705cb6621c3bd4da682deb5912 100644 (file)
@@ -171,3 +171,5 @@ void QLMenubar::macxMenuBarInit()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QLMenubar_moc.cpp"
index 892e6b0103abfcca18494b2eddf1acfc15898b3c..3e105f38f964a9b488aee6d6022239bad60fa0ea 100644 (file)
@@ -200,3 +200,5 @@ void QLPopupMenu::specialMacXmenuHack()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QLPopupMenu_moc.cpp"
index 79d728afb52a6dff3276fd924478f23ee8b83d61..873a16264b5d0ceefa47cd750daf3dbf42b842d4 100644 (file)
@@ -97,3 +97,5 @@ void QLPrintDialog::pagerangeChanged()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QLPrintDialog_moc.cpp"
index 03003ed9402d5f36b4ba55c01fb593874bce7843..2a24e35c45f73dac0f9a93bac1509ceecee8aec3 100644 (file)
@@ -270,3 +270,5 @@ void QLToolbar::update()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QLToolbar_moc.cpp"
index 0afbc818abcb54ebfd8fd6b431fc2f8f6252215e..6367d6b8901b7cc511ab04c9cb2f5418579db237 100644 (file)
@@ -46,3 +46,5 @@ void QLogDialog::updateClicked()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QLogDialog_moc.cpp"
index 26c9a0cc2aae706bd4eb5f05e31c05b6601257b3..f03157402bbe197520cd8b25801d0b19def1742f 100644 (file)
@@ -261,3 +261,5 @@ void QMathDialog::insertCubeRoot()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QMathDialog_moc.cpp"
index b02a26a560f5e74a1c84ae624724e23876077807..c1787824095aee93b6ddf30769fc5c5dd217390e 100644 (file)
@@ -113,3 +113,5 @@ void QMathMatrixDialog::slotClose()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QMathMatrixDialog_moc.cpp"
index 15f9e758028ee56e5233fcdd8a7c87bb937cae6c..948afceaee87bbb0064969b4c19cc81f0ef09104 100644 (file)
@@ -50,3 +50,5 @@ void QNoteDialog::change_adaptor()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QNoteDialog_moc.cpp"
index 330e08c69e5e22f01bf437ce4431de5a8f4c825b..9284c93f2276c020af7be69982db738ec4c29346 100644 (file)
@@ -86,3 +86,5 @@ void QParagraphDialog::enableLinespacingValue(int)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QParagraphDialog_moc.cpp"
index 5d147b80f31baa3c4000a6331e9af40ae452ee95..23c849598c1300e7761bdf1ac38b0e96cd40593f 100644 (file)
@@ -1605,3 +1605,5 @@ void QPrefsDialog::update(LyXRC const & rc)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QPrefsDialog_moc.cpp"
index d9537c2de422f83497124f5f1f63281ba2e8c579..0427198b8c42e71f427c545ee6b9607c7a701ed8 100644 (file)
@@ -135,3 +135,5 @@ void QRefDialog::closeEvent(QCloseEvent * e)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QRefDialog_moc.cpp"
index 2e561a05a7379293798e965939ae4b7e9452b920..6586f1b2baa670d372d1d058f0de0326829552f7 100644 (file)
@@ -123,3 +123,5 @@ void QSearchDialog::replaceallClicked()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QSearchDialog_moc.cpp"
index 82b4f440337e06b11f155c1252192574ca401096..fabe956b096b71546115daa56e1ed99522a74eea 100644 (file)
@@ -57,3 +57,5 @@ void QSendtoDialog::closeEvent(QCloseEvent * e)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QSendtoDialog_moc.cpp"
index 31a8d0705e092ceada675f58a6cd823202fa7044..89e600c45b271ebec85da3c3022088eadf0a0d2f 100644 (file)
@@ -37,3 +37,5 @@ void QShowFileDialog::closeEvent(QCloseEvent * e)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QShowFileDialog_moc.cpp"
index e831875cf00dda95a4ab4c123cdd1a6f0f1a0b71..015103006bc56fc686ad69fe6cb430711f5a957a 100644 (file)
@@ -106,3 +106,5 @@ void QSpellcheckerDialog::reject()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QSpellcheckerDialog_moc.cpp"
index 0626a99ce91b7d3d8e376fc5f65921a7708bc4d8..173581f9a75c5fad5a01eb35c5868cc2a797b4d6 100644 (file)
@@ -57,3 +57,5 @@ void QTabularCreateDialog::rowsChanged(int)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QTabularCreateDialog_moc.cpp"
index 1c4ef53a4b293f59c2d2a006b6141dc8ca1753e2..822dc75553e660d5ebe42dfd65b9474990165217 100644 (file)
@@ -383,3 +383,5 @@ void QTabularDialog::ltLastFooterEmpty_clicked()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QTabularDialog_moc.cpp"
index d5cd63972ebe8d6c48c03c1eeb113c43c9fd5cd4..decb8a48f00d429e6f58613a5b815f70df304d5a 100644 (file)
@@ -104,3 +104,5 @@ void QTexinfoDialog::enableViewPB()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QTexinfoDialog_moc.cpp"
index c24487325a6f8c41e93547384fd1aea86fdb2b08..064a189bb27b5ade31eaafd71ad0a3a0f56a15ef 100644 (file)
@@ -133,3 +133,5 @@ void QThesaurusDialog::updateLists()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QThesaurusDialog_moc.cpp"
index 4a155bdfcee0fe7021947d901e34992262928505..2e15f12c28b7ffadc90400730e40e0bb4344dd3e 100644 (file)
@@ -239,3 +239,5 @@ bool QTocDialog::isVisible() const
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QTocDialog_moc.cpp"
index 665b046b363bf4c28f413a6649cd49c324bf39a4..8b355817ec13a366b040b9708a66e93648bbcb99 100644 (file)
@@ -62,3 +62,5 @@ void QURLDialog::closeEvent(QCloseEvent * e)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QURLDialog_moc.cpp"
index 8f63f762feafba93296a74d88fc4870058c6a919..1187c41c8c863a2d218c5d6a8f39cd6cc1f1ec01 100644 (file)
@@ -74,3 +74,5 @@ void QVSpaceDialog::enableCustom(int selection)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QVSpaceDialog_moc.cpp"
index f492e67854cf192928af49ed53c8730cbb1f6bb5..b3ce1915231e3885499508d98638f95e1667a991 100644 (file)
@@ -108,3 +108,5 @@ void QViewSource::update_contents()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QViewSource_moc.cpp"
index 5ddd43fb269ec2143a8172bf39ad0b06113cb041..227aa9e96df7e48a71fc82ea97bb545b120340a0 100644 (file)
@@ -38,3 +38,5 @@ void QViewSourceDialog::closeEvent(QCloseEvent * e)
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QViewSourceDialog_moc.cpp"
index ec92b42510d3824814b77e44344c19becfd598e4..6693c5f28c95710bbe67222213ea31e0671a4082 100644 (file)
@@ -671,3 +671,5 @@ pascal OSErr handleOpenDocuments(const AppleEvent* inEvent,
        return err;
 }
 #endif  // Q_WS_MACX
+
+#include "QWorkArea_moc.cpp"
index ab0fdfada7fac8c28726ba51ab83451b822223c5..eb40d2f5630a3bdfbe784d80c543ed1282ebb24f 100644 (file)
@@ -55,3 +55,5 @@ void QWrapDialog::change_adaptor()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QWrapDialog_moc.cpp"
index 782781b9fe42c7df833fb1f1bbe720b05cc6e60e..c79383356ab49f50279cd2a5e34b28bc805dce05 100644 (file)
@@ -209,3 +209,5 @@ void QtView::busy(bool yes) const
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QtView_moc.cpp"
index a97eba44cca53fced72e22e45c740f514171d226..7363dc995104d6d1b7ab4380306c862cb7bc6afb 100644 (file)
@@ -151,3 +151,5 @@ void TocModel::populate(TocIterator & iter,
 
 } // namespace frontend
 } // namespace lyx
+
+#include "TocModel_moc.cpp"
index 8b913d17d1b518544667e3261e4ffc6c8a796925..888d288c93384cbb08badf69e802b4d1ba293722 100644 (file)
@@ -110,3 +110,5 @@ void EmptyTable::mouseMoveEvent(QMouseEvent *ev)
                setNumberRows(y / cellsize + rowCount()-1);
 }
 */
+
+#include "emptytable_moc.cpp"
index f09bee192e5cbea616cca0ca58aa54e9a4a356d4..54fba48b8eedd27f664cd7030fad688915ae3b1c 100644 (file)
@@ -277,3 +277,5 @@ void FloatPlacement::checkAllowed()
                heredefinitelyCB->setEnabled(!defaults);
        }
 }
+
+#include "floatplacement_moc.cpp"
index f912e5674bcdb48cbd453ce65934641ecdcc3fed..6766c5e85e07f87f435349546b17c910ed5c908d 100644 (file)
@@ -120,3 +120,5 @@ out:
        setUpdatesEnabled(true);
        update();
 }
+
+#include "iconpalette_moc.cpp"
index c65b63dbbf97bde9000a368b2103e588c533e392..2d681fb9c8786f26a24316d5a73f79c04f9bf976 100644 (file)
@@ -77,3 +77,5 @@ void LengthCombo::noPercents()
                }
        }
 }
+
+#include "lengthcombo_moc.cpp"
diff --git a/src/frontends/qt4/moc/Makefile.am b/src/frontends/qt4/moc/Makefile.am
deleted file mode 100644 (file)
index ac16156..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-include $(top_srcdir)/config/common.am
-include $(srcdir)/../Makefile.dialogs
-
-DISTCLEANFILES += *.C
-
-EXTRA_DIST = pch.h
-
-BUILT_SOURCES = $(PCH_FILE)
-
-AM_CPPFLAGS += \
-       $(QT4_CPPFLAGS) -DQT_NO_TRANSLATION \
-       $(PCH_FLAGS) \
-       -I$(top_srcdir)/src \
-       -I$(top_srcdir)/src/frontends \
-       -I$(top_srcdir)/src/frontends/controllers \
-       -I$(top_srcdir)/src/frontends/qt4 \
-       -I$(top_builddir)/src/frontends/qt4 \
-       $(QT4_INCLUDES) \
-       $(BOOST_INCLUDES)
-
-noinst_LTLIBRARIES = libqt4moc.la
-
-nodist_libqt4moc_la_SOURCES = $(MOCFILES:.C=_moc.C)
-# The trick.
-libqt4moc_la_LINK = touch libqt4moc.la ; echo
-
-%_moc.C: $(srcdir)/../%.h
-       $(MOC4) -o $@ $<
diff --git a/src/frontends/qt4/moc/pch.h b/src/frontends/qt4/moc/pch.h
deleted file mode 100644 (file)
index 0eda1f7..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-// -*- 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 <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.
index 393b8946c58329b366b1413c4c1748a8830df057..d0d22907f942e11856f10e8bb8bfb7a4e70a801c 100644 (file)
@@ -132,3 +132,5 @@ void PanelStack::switchPanel(QTreeWidgetItem * item, QTreeWidgetItem* previous)
 
        stack_->setCurrentWidget(cit->second);
 }
+
+#include "panelstack_moc.cpp"
index acc001e6649649e1cbe6c1824333d5dde25ed46d..542ca8e43e2c971ff6c5f8b59a613ef468f3c9f4 100644 (file)
@@ -234,3 +234,5 @@ bool QSetBorder::getBottom()
 {
        return bottom_.set;
 }
+
+#include "qsetborder_moc.cpp"
index 89d684c0a82dca33b6a3b13b98c8bdedbf5c3f35..43fa05e7b803abb5d981313b1d5acc40563a2b77 100644 (file)
@@ -27,3 +27,5 @@ void socket_callback::data_received()
 {
        func_();
 }
+
+#include "socket_callback_moc.cpp"
index deef5be71682d2f18e04e645c982b4624723cff7..2de6e5df000b80c72d764194b88df757f11f02b7 100644 (file)
@@ -167,3 +167,5 @@ PathValidator * getPathValidator(QLineEdit * ed)
                return 0;
        return dynamic_cast<PathValidator *>(validator);
 }
+
+#include "validators_moc.cpp"