* src/frontends/qt3/moc/Makefile.am: Remove extra qt3 include path

	* src/frontends/qt3/ui/moc/Makefile.am: ditto
	* src/frontends/qt3/ui/*.ui: Add extra includes to the
	implementation rather than the declaration

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

diff --git a/src/frontends/qt3/moc/Makefile.am b/src/frontends/qt3/moc/Makefile.am
index ee13ecd95bd2f74b12c2b2833e9cafa9e1344a3d..a961f6744ddc98b0b01a3d9641cf193a293ce0fc 100644 (file)
--- a/src/frontends/qt3/moc/Makefile.am
+++ b/src/frontends/qt3/moc/Makefile.am
@@ -12,7 +12,6 @@ AM_CPPFLAGS += \
        $(PCH_FLAGS) \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/frontends \
-       -I$(top_srcdir)/src/frontends/qt3 \
        -I$(top_srcdir)/src/frontends/controllers \
        -I$(top_builddir)/src/frontends/qt3 \
        $(QT_INCLUDES) \

diff --git a/src/frontends/qt3/ui/BiblioModuleBase.ui b/src/frontends/qt3/ui/BiblioModuleBase.ui
index 4c607133ae71c156a88f8e0d284e820c062470a7..ddc6de86e61cd850957bc620818c3b6a529c0444 100644 (file)
--- a/src/frontends/qt3/ui/BiblioModuleBase.ui
+++ b/src/frontends/qt3/ui/BiblioModuleBase.ui
@@ -168,8 +168,8 @@
     </connection>
 </connections>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

diff --git a/src/frontends/qt3/ui/BranchesModuleBase.ui b/src/frontends/qt3/ui/BranchesModuleBase.ui
index eb02fa14347232abee96b1b585c64440af2051df..d7c32096b82610400431d1f3a87c369fe401e7e2 100644 (file)
--- a/src/frontends/qt3/ui/BranchesModuleBase.ui
+++ b/src/frontends/qt3/ui/BranchesModuleBase.ui
@@ -230,8 +230,8 @@
     <tabstop>branchesLV</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

diff --git a/src/frontends/qt3/ui/BulletsModuleBase.ui b/src/frontends/qt3/ui/BulletsModuleBase.ui
index a002ef98ba97f1cd17bf0a8ebc70029c5bd94dc9..d7353df3f463e11807cbbf3ad98ae8afd811004f 100644 (file)
--- a/src/frontends/qt3/ui/BulletsModuleBase.ui
+++ b/src/frontends/qt3/ui/BulletsModuleBase.ui
@@ -909,8 +909,8 @@
     <tabstop>bulletsize4CO</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

diff --git a/src/frontends/qt3/ui/LaTeXModuleBase.ui b/src/frontends/qt3/ui/LaTeXModuleBase.ui
index 7e2f175a887add84db3c9c808a5e0ff6efcb9139..360d62319b47dbad45a90b10924fdcdf15c38cb6 100644 (file)
--- a/src/frontends/qt3/ui/LaTeXModuleBase.ui
+++ b/src/frontends/qt3/ui/LaTeXModuleBase.ui
@@ -209,8 +209,8 @@
     <tabstop>psdriverCO</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

diff --git a/src/frontends/qt3/ui/LanguageModuleBase.ui b/src/frontends/qt3/ui/LanguageModuleBase.ui
index 7351533983a1f60557497238dbf4c7635d5908a9..57cb24c207b69c0c7bc558b78566db16a908d6a3 100644 (file)
--- a/src/frontends/qt3/ui/LanguageModuleBase.ui
+++ b/src/frontends/qt3/ui/LanguageModuleBase.ui
@@ -256,8 +256,8 @@
     <tabstop>quoteStyleCO</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

diff --git a/src/frontends/qt3/ui/MarginsModuleBase.ui b/src/frontends/qt3/ui/MarginsModuleBase.ui
index 9bfdf7af1597ffe3199bc04bbff19cd4c51dc590..270cc5e949f1988da3f6e3a2bcb5227bc3da183b 100644 (file)
--- a/src/frontends/qt3/ui/MarginsModuleBase.ui
+++ b/src/frontends/qt3/ui/MarginsModuleBase.ui
@@ -383,8 +383,8 @@
     <tabstop>footskipLE</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>

diff --git a/src/frontends/qt3/ui/MathsModuleBase.ui b/src/frontends/qt3/ui/MathsModuleBase.ui
index 0655182df0ac056038e2139d524fb35e5f29f0f6..e21224e378910c934da75098597733bb866451a7 100644 (file)
--- a/src/frontends/qt3/ui/MathsModuleBase.ui
+++ b/src/frontends/qt3/ui/MathsModuleBase.ui
@@ -75,8 +75,8 @@
     <tabstop>amsautoCB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

diff --git a/src/frontends/qt3/ui/NumberingModuleBase.ui b/src/frontends/qt3/ui/NumberingModuleBase.ui
index 8442ef749610a91042e4b4f959b3e7e0e3b6027d..ac75f2c1532eba1472add8b78eaee73efb5b0e6a 100644 (file)
--- a/src/frontends/qt3/ui/NumberingModuleBase.ui
+++ b/src/frontends/qt3/ui/NumberingModuleBase.ui
@@ -164,8 +164,8 @@
     <tabstop>tocLV</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

diff --git a/src/frontends/qt3/ui/PageLayoutModuleBase.ui b/src/frontends/qt3/ui/PageLayoutModuleBase.ui
index 5327249b13f40acd8896742b21269ce89d27ee5e..20c9c78e5a117a27cff4af4bdb01d3aba1fed289 100644 (file)
--- a/src/frontends/qt3/ui/PageLayoutModuleBase.ui
+++ b/src/frontends/qt3/ui/PageLayoutModuleBase.ui
@@ -284,8 +284,8 @@
     <tabstop>facingPagesCB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>

diff --git a/src/frontends/qt3/ui/PreambleModuleBase.ui b/src/frontends/qt3/ui/PreambleModuleBase.ui
index ff45bacb475b1d4ad298ec198bf1b37b52764aa5..7d57cb05937d454a48f04a4d8bb28d5c987db1ea 100644 (file)
--- a/src/frontends/qt3/ui/PreambleModuleBase.ui
+++ b/src/frontends/qt3/ui/PreambleModuleBase.ui
@@ -38,8 +38,8 @@
     </grid>
 </widget>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

diff --git a/src/frontends/qt3/ui/QAboutDialogBase.ui b/src/frontends/qt3/ui/QAboutDialogBase.ui
index 689f1f3057cd6e55340d28c5c7fb5bdddd084f1d..a9e58984770e75bbd85d2ff0db8785d351f28219 100644 (file)
--- a/src/frontends/qt3/ui/QAboutDialogBase.ui
+++ b/src/frontends/qt3/ui/QAboutDialogBase.ui
@@ -193,8 +193,8 @@
     </connection>
 </connections>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

diff --git a/src/frontends/qt3/ui/QAskForTextDialog.ui b/src/frontends/qt3/ui/QAskForTextDialog.ui
index 3fd753164d5829624505cdb02d57c126a904e437..cbc96f87a4a4d88a812b8d0cd0b803498c4ca60b 100644 (file)
--- a/src/frontends/qt3/ui/QAskForTextDialog.ui
+++ b/src/frontends/qt3/ui/QAskForTextDialog.ui
@@ -136,8 +136,8 @@
     </connection>
 </connections>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

diff --git a/src/frontends/qt3/ui/QBibitemDialogBase.ui b/src/frontends/qt3/ui/QBibitemDialogBase.ui
index 5859138f11301e49404fd32dfc9b92a10af0481f..d0520bdab17292f925ae7fcce87574cee7268358 100644 (file)
--- a/src/frontends/qt3/ui/QBibitemDialogBase.ui
+++ b/src/frontends/qt3/ui/QBibitemDialogBase.ui
@@ -189,8 +189,8 @@
     </connection>
 </connections>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot>change_adaptor()</slot>

diff --git a/src/frontends/qt3/ui/QBibtexAddDialogBase.ui b/src/frontends/qt3/ui/QBibtexAddDialogBase.ui
index f32cb6f3f478d76bde8eecbb7b941d2cd3bb34a9..295ff07fda5d277a2ba426867a99e096d224bcc5 100644 (file)
--- a/src/frontends/qt3/ui/QBibtexAddDialogBase.ui
+++ b/src/frontends/qt3/ui/QBibtexAddDialogBase.ui
@@ -186,8 +186,8 @@
     <tabstop>closePB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

diff --git a/src/frontends/qt3/ui/QBibtexDialogBase.ui b/src/frontends/qt3/ui/QBibtexDialogBase.ui
index 37cf2cf052003e0e401db529066c2d006fc6757e..e2cdd9f61c815cd7853c09bc70cd43b668fe3162 100644 (file)
--- a/src/frontends/qt3/ui/QBibtexDialogBase.ui
+++ b/src/frontends/qt3/ui/QBibtexDialogBase.ui
@@ -347,8 +347,8 @@
     <tabstop>closePB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot>addPressed()</slot>

diff --git a/src/frontends/qt3/ui/QBoxDialogBase.ui b/src/frontends/qt3/ui/QBoxDialogBase.ui
index d4a15f60c8e9b09338b3a6e412a77aefed83f4d3..aaea2a8a668fee34479a75461d6c6ea612f127cc 100644 (file)
--- a/src/frontends/qt3/ui/QBoxDialogBase.ui
+++ b/src/frontends/qt3/ui/QBoxDialogBase.ui
@@ -727,9 +727,9 @@
     <tabstop>closePB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
-    <include location="local" impldecl="in declaration">vspace.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
+    <include location="local" impldecl="in implementation">vspace.h</include>
 </includes>
 <slots>
     <slot>change_adaptor()</slot>

diff --git a/src/frontends/qt3/ui/QBranchDialogBase.ui b/src/frontends/qt3/ui/QBranchDialogBase.ui
index 1689781fde5dcaae32c3bda112f09a1c1bc8ba3f..8730baf5454a0448289202cba6b4206b99662557 100644 (file)
--- a/src/frontends/qt3/ui/QBranchDialogBase.ui
+++ b/src/frontends/qt3/ui/QBranchDialogBase.ui
@@ -99,8 +99,8 @@
     </connection>
 </connections>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot>change_adaptor()</slot>

diff --git a/src/frontends/qt3/ui/QChangesDialogBase.ui b/src/frontends/qt3/ui/QChangesDialogBase.ui
index 88b0f1927dee4e3e03320c3db756639b851a1069..69bade7afcfefa21fda72a079123392a4624ba67 100644 (file)
--- a/src/frontends/qt3/ui/QChangesDialogBase.ui
+++ b/src/frontends/qt3/ui/QChangesDialogBase.ui
@@ -226,8 +226,8 @@
     <tabstop>closePB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot>acceptPressed()</slot>

diff --git a/src/frontends/qt3/ui/QCharacterDialogBase.ui b/src/frontends/qt3/ui/QCharacterDialogBase.ui
index 0ca27f2a30e4a9c2370063d7577aab24f8b3e6a7..760267ebf9c8ade6872c5282ee52cd28a99bab0a 100644 (file)
--- a/src/frontends/qt3/ui/QCharacterDialogBase.ui
+++ b/src/frontends/qt3/ui/QCharacterDialogBase.ui
@@ -518,8 +518,8 @@
     <tabstop>closePB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot>change_adaptor()</slot>

diff --git a/src/frontends/qt3/ui/QCitationDialogBase.ui b/src/frontends/qt3/ui/QCitationDialogBase.ui
index 5e41faca3b443b30cdd587c20b7334f2e2c74fc0..a37075ddb4a5997683ba2ddb28dbeaa43ff69fef 100644 (file)
--- a/src/frontends/qt3/ui/QCitationDialogBase.ui
+++ b/src/frontends/qt3/ui/QCitationDialogBase.ui
@@ -478,8 +478,8 @@
     <tabstop>closePB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot access="protected">add()</slot>

diff --git a/src/frontends/qt3/ui/QCitationFindDialogBase.ui b/src/frontends/qt3/ui/QCitationFindDialogBase.ui
index fcb02422ef28b0b25e5afa71dd9220e5f96eaeb4..7f27e28ab280ddad878f522d6e9a9f437f467908 100644 (file)
--- a/src/frontends/qt3/ui/QCitationFindDialogBase.ui
+++ b/src/frontends/qt3/ui/QCitationFindDialogBase.ui
@@ -331,8 +331,8 @@
     <tabstop>closePB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

diff --git a/src/frontends/qt3/ui/QDelimiterDialogBase.ui b/src/frontends/qt3/ui/QDelimiterDialogBase.ui
index fca4f33a0841408d19546ab7fb36f39916d53367..2711f9b219f936b519984f095070992a9f36c5f8 100644 (file)
--- a/src/frontends/qt3/ui/QDelimiterDialogBase.ui
+++ b/src/frontends/qt3/ui/QDelimiterDialogBase.ui
@@ -401,8 +401,8 @@
     </connection>
 </connections>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot>insertClicked()</slot>

diff --git a/src/frontends/qt3/ui/QDocumentDialogBase.ui b/src/frontends/qt3/ui/QDocumentDialogBase.ui
index bde9484af1613d665a5bbd0a90253bb94932bd4d..6568cd10b19da260b9c5b3648bc07a405171db01 100644 (file)
--- a/src/frontends/qt3/ui/QDocumentDialogBase.ui
+++ b/src/frontends/qt3/ui/QDocumentDialogBase.ui
@@ -223,8 +223,8 @@
     </connection>
 </connections>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot>change_adaptor()</slot>

diff --git a/src/frontends/qt3/ui/QERTDialogBase.ui b/src/frontends/qt3/ui/QERTDialogBase.ui
index a372a95ca2f89f286b28447a0f605a717f10d610..f8b68afe78cd3fedafa996c1ab1c018f496c68a6 100644 (file)
--- a/src/frontends/qt3/ui/QERTDialogBase.ui
+++ b/src/frontends/qt3/ui/QERTDialogBase.ui
@@ -158,8 +158,8 @@
     </connection>
 </connections>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot>change_adaptor()</slot>

diff --git a/src/frontends/qt3/ui/QErrorListDialogBase.ui b/src/frontends/qt3/ui/QErrorListDialogBase.ui
index b388b73559d48d42ec46837b2569d7962e1ab9e6..612b473a965c760eb4eff574aacd84b20af744f6 100644 (file)
--- a/src/frontends/qt3/ui/QErrorListDialogBase.ui
+++ b/src/frontends/qt3/ui/QErrorListDialogBase.ui
@@ -79,8 +79,8 @@
     </connection>
 </connections>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot>close_adaptor()</slot>

diff --git a/src/frontends/qt3/ui/QExternalDialogBase.ui b/src/frontends/qt3/ui/QExternalDialogBase.ui
index 3d4cc9c6d37f4393a5c9e886eedbf3e7196d4079..f95474d03a7c6e5d1fa747aeff6d592cbede920a 100644 (file)
--- a/src/frontends/qt3/ui/QExternalDialogBase.ui
+++ b/src/frontends/qt3/ui/QExternalDialogBase.ui
@@ -1163,8 +1163,8 @@
     <tabstop>closePB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot>browseClicked()</slot>

diff --git a/src/frontends/qt3/ui/QFloatDialogBase.ui b/src/frontends/qt3/ui/QFloatDialogBase.ui
index 4589225a6696f994b0b353c0d6d97fba2b5d5528..b9d30dd2e9a060ad7a6520e0f1935a08915db5d3 100644 (file)
--- a/src/frontends/qt3/ui/QFloatDialogBase.ui
+++ b/src/frontends/qt3/ui/QFloatDialogBase.ui
@@ -136,8 +136,8 @@
     <tabstop>closePB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot access="protected">change_adaptor()</slot>

diff --git a/src/frontends/qt3/ui/QGraphicsDialogBase.ui b/src/frontends/qt3/ui/QGraphicsDialogBase.ui
index 7b7564584ff882c491fe440d0922c812a99b1805..1dacdde671386dcec442c4abfce78b5dce03c807 100644 (file)
--- a/src/frontends/qt3/ui/QGraphicsDialogBase.ui
+++ b/src/frontends/qt3/ui/QGraphicsDialogBase.ui
@@ -1250,8 +1250,8 @@
     <tabstop>closePB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot access="protected">browse_clicked()</slot>

diff --git a/src/frontends/qt3/ui/QIncludeDialogBase.ui b/src/frontends/qt3/ui/QIncludeDialogBase.ui
index 1dd440d5d0c4b33daee3ef6b1477ffdec2ad6621..6d4741a0aecaf2bdba388c981b0ebdc97f5a0757 100644 (file)
--- a/src/frontends/qt3/ui/QIncludeDialogBase.ui
+++ b/src/frontends/qt3/ui/QIncludeDialogBase.ui
@@ -365,8 +365,8 @@
     <tabstop>closePB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot>browseClicked()</slot>

diff --git a/src/frontends/qt3/ui/QIndexDialogBase.ui b/src/frontends/qt3/ui/QIndexDialogBase.ui
index 44fc497a5d506143847fe5cc0c2ee2e3565a77c2..f209e665b334725548ef36c80290af7d65a4a714 100644 (file)
--- a/src/frontends/qt3/ui/QIndexDialogBase.ui
+++ b/src/frontends/qt3/ui/QIndexDialogBase.ui
@@ -129,8 +129,8 @@
     </connection>
 </connections>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot>change_adaptor()</slot>

diff --git a/src/frontends/qt3/ui/QLogDialogBase.ui b/src/frontends/qt3/ui/QLogDialogBase.ui
index e15b795355997adfff4b1629c6ac997e1b3326e4..ce3574ffb98f24b49ad67a9da40980977fd07cd2 100644 (file)
--- a/src/frontends/qt3/ui/QLogDialogBase.ui
+++ b/src/frontends/qt3/ui/QLogDialogBase.ui
@@ -104,8 +104,8 @@
     <tabstop>closePB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot>updateClicked()</slot>

diff --git a/src/frontends/qt3/ui/QMathDialogBase.ui b/src/frontends/qt3/ui/QMathDialogBase.ui
index 97d6649c3cc71653d84368b7334da2734ded63de..1a619b517803e37d41bebb3e61c2029dce68713e 100644 (file)
--- a/src/frontends/qt3/ui/QMathDialogBase.ui
+++ b/src/frontends/qt3/ui/QMathDialogBase.ui
@@ -702,8 +702,8 @@
     </connection>
 </connections>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot>delimiterClicked()</slot>

diff --git a/src/frontends/qt3/ui/QMathMatrixDialogBase.ui b/src/frontends/qt3/ui/QMathMatrixDialogBase.ui
index e50d8011c95f0b22656b7b38789dfa4f4f074775..b08b11da766f8069fc4ad9c6a94acdb840e11569 100644 (file)
--- a/src/frontends/qt3/ui/QMathMatrixDialogBase.ui
+++ b/src/frontends/qt3/ui/QMathMatrixDialogBase.ui
@@ -405,8 +405,8 @@
     </connection>
 </connections>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot>change_adaptor()</slot>

diff --git a/src/frontends/qt3/ui/QNoteDialogBase.ui b/src/frontends/qt3/ui/QNoteDialogBase.ui
index 1dda4ada1f723c9e21799669ebcadb755b368cbb..58d5428d393013779a61b38cb8c1dfffe4c6622c 100644 (file)
--- a/src/frontends/qt3/ui/QNoteDialogBase.ui
+++ b/src/frontends/qt3/ui/QNoteDialogBase.ui
@@ -125,8 +125,8 @@
     </connection>
 </connections>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot>change_adaptor()</slot>

diff --git a/src/frontends/qt3/ui/QParagraphDialogBase.ui b/src/frontends/qt3/ui/QParagraphDialogBase.ui
index 5152b01a76d48b8ccea5bb77c724a6892110dff9..4d079a568115f98d6fec153acbd9c983e955b490 100644 (file)
--- a/src/frontends/qt3/ui/QParagraphDialogBase.ui
+++ b/src/frontends/qt3/ui/QParagraphDialogBase.ui
@@ -375,8 +375,8 @@
     <tabstop>closePB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot access="protected">change_adaptor()</slot>

diff --git a/src/frontends/qt3/ui/QPrefAsciiModule.ui b/src/frontends/qt3/ui/QPrefAsciiModule.ui
index 6a61b8cd487a92a5183b438c5a7209d8c45050b9..f4a679df864edc67cae63e92e1630bbfef8b3d08 100644 (file)
--- a/src/frontends/qt3/ui/QPrefAsciiModule.ui
+++ b/src/frontends/qt3/ui/QPrefAsciiModule.ui
@@ -135,8 +135,8 @@
     </vbox>
 </widget>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

diff --git a/src/frontends/qt3/ui/QPrefColorsModule.ui b/src/frontends/qt3/ui/QPrefColorsModule.ui
index 0982aa4846a708fd3eed9fbcf99c780f7c2997b6..07e366634589adc59aea5084acce587f742834a4 100644 (file)
--- a/src/frontends/qt3/ui/QPrefColorsModule.ui
+++ b/src/frontends/qt3/ui/QPrefColorsModule.ui
@@ -130,8 +130,8 @@
     </hbox>
 </widget>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

diff --git a/src/frontends/qt3/ui/QPrefConvertersModule.ui b/src/frontends/qt3/ui/QPrefConvertersModule.ui
index 7c0e7b12cb2a19e7f232fc189d52144ba29acf6c..14b91c6dd47f5489b70a67cbb1e748f3755255a9 100644 (file)
--- a/src/frontends/qt3/ui/QPrefConvertersModule.ui
+++ b/src/frontends/qt3/ui/QPrefConvertersModule.ui
@@ -307,8 +307,8 @@
     <tabstop>converterRemovePB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

diff --git a/src/frontends/qt3/ui/QPrefCopiersModule.ui b/src/frontends/qt3/ui/QPrefCopiersModule.ui
index 6af49f236a5e4d92b94286337475cccf5fc17a32..01c441b5764d1c8b24488cbde813c2aaa93a0546 100644 (file)
--- a/src/frontends/qt3/ui/QPrefCopiersModule.ui
+++ b/src/frontends/qt3/ui/QPrefCopiersModule.ui
@@ -265,8 +265,8 @@
     <tabstop>copierRemovePB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

diff --git a/src/frontends/qt3/ui/QPrefCygwinPathModule.ui b/src/frontends/qt3/ui/QPrefCygwinPathModule.ui
index b1b4dd232ca668779cb700d6085a29ef0a1f8067..77f34560046644c1939c9b5365c1ce2051ddeb47 100644 (file)
--- a/src/frontends/qt3/ui/QPrefCygwinPathModule.ui
+++ b/src/frontends/qt3/ui/QPrefCygwinPathModule.ui
@@ -67,8 +67,8 @@
     </spacer>
 </widget>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

diff --git a/src/frontends/qt3/ui/QPrefDateModule.ui b/src/frontends/qt3/ui/QPrefDateModule.ui
index 0777c5392db9f342bfe6f31c3dc00857bff34385..1fe9a0d16363de2a133c028c16d7145eb58390df 100644 (file)
--- a/src/frontends/qt3/ui/QPrefDateModule.ui
+++ b/src/frontends/qt3/ui/QPrefDateModule.ui
@@ -80,8 +80,8 @@
     </vbox>
 </widget>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

diff --git a/src/frontends/qt3/ui/QPrefDisplayModule.ui b/src/frontends/qt3/ui/QPrefDisplayModule.ui
index e74add7f0e51b0926e4db4feca0c04e1aa9c21ba..a67066cdc2dea8f088fa4df927de675085cfbdbd 100644 (file)
--- a/src/frontends/qt3/ui/QPrefDisplayModule.ui
+++ b/src/frontends/qt3/ui/QPrefDisplayModule.ui
@@ -128,8 +128,8 @@
     </grid>
 </widget>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

diff --git a/src/frontends/qt3/ui/QPrefFileformatsModule.ui b/src/frontends/qt3/ui/QPrefFileformatsModule.ui
index de4a029e0935371c91aa3bcc94d9f38542696c7e..a812962ffdd04d0c8da16c3c70cbb653833ef1e3 100644 (file)
--- a/src/frontends/qt3/ui/QPrefFileformatsModule.ui
+++ b/src/frontends/qt3/ui/QPrefFileformatsModule.ui
@@ -326,8 +326,8 @@
     <tabstop>editorED</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

diff --git a/src/frontends/qt3/ui/QPrefIdentityModule.ui b/src/frontends/qt3/ui/QPrefIdentityModule.ui
index be7470d7e3cf8f148a9a18a81e36372d477280eb..97e128eb828726e75c1ebbdbef9d0d5b60eea26f 100644 (file)
--- a/src/frontends/qt3/ui/QPrefIdentityModule.ui
+++ b/src/frontends/qt3/ui/QPrefIdentityModule.ui
@@ -103,8 +103,8 @@
     <tabstop>emailED</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

diff --git a/src/frontends/qt3/ui/QPrefKeyboardModule.ui b/src/frontends/qt3/ui/QPrefKeyboardModule.ui
index 436056670f494ec45d48f6af8e90a89ddef0a20a..d8e2137928e400363626e0850684099eeed62923 100644 (file)
--- a/src/frontends/qt3/ui/QPrefKeyboardModule.ui
+++ b/src/frontends/qt3/ui/QPrefKeyboardModule.ui
@@ -152,8 +152,8 @@
     <tabstop>secondKeymapPB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

diff --git a/src/frontends/qt3/ui/QPrefLanguageModule.ui b/src/frontends/qt3/ui/QPrefLanguageModule.ui
index c87cbe7a8026c88c99ae2e057436401a684a88c0..d023ffee8bd4a694caf4534f052ee544e108f06f 100644 (file)
--- a/src/frontends/qt3/ui/QPrefLanguageModule.ui
+++ b/src/frontends/qt3/ui/QPrefLanguageModule.ui
@@ -203,8 +203,8 @@
     <tabstop>rtlCB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

diff --git a/src/frontends/qt3/ui/QPrefLatexModule.ui b/src/frontends/qt3/ui/QPrefLatexModule.ui
index 0cff5e8d35091454dba1d2c61528fe9b201176a9..6689743139243102038bf15a3607fba7e344ad15 100644 (file)
--- a/src/frontends/qt3/ui/QPrefLatexModule.ui
+++ b/src/frontends/qt3/ui/QPrefLatexModule.ui
@@ -295,8 +295,8 @@
     <tabstop>latexDviPaperED</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

diff --git a/src/frontends/qt3/ui/QPrefPathsModule.ui b/src/frontends/qt3/ui/QPrefPathsModule.ui
index bb5e5d719fc7b754ddcc8200f1468bed57f8d724..2c835568a3694e798e4d1d2d79eeb88d810f3944 100644 (file)
--- a/src/frontends/qt3/ui/QPrefPathsModule.ui
+++ b/src/frontends/qt3/ui/QPrefPathsModule.ui
@@ -224,8 +224,8 @@
     <tabstop>tempDirPB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

diff --git a/src/frontends/qt3/ui/QPrefPrinterModule.ui b/src/frontends/qt3/ui/QPrefPrinterModule.ui
index 3b6d18c12a81912dda7ef0376c7f2e0ee4591cd8..1bf20499e3f012a1668d80999d4d721f688c352b 100644 (file)
--- a/src/frontends/qt3/ui/QPrefPrinterModule.ui
+++ b/src/frontends/qt3/ui/QPrefPrinterModule.ui
@@ -427,8 +427,8 @@
     <tabstop>printerPaperSizeED</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

diff --git a/src/frontends/qt3/ui/QPrefScreenFontsModule.ui b/src/frontends/qt3/ui/QPrefScreenFontsModule.ui
index a164ee9007f76fe2350697bef404bb9aeb90e5b0..64e81ff9b95eb194fc1e80e01de61c352fe55cf9 100644 (file)
--- a/src/frontends/qt3/ui/QPrefScreenFontsModule.ui
+++ b/src/frontends/qt3/ui/QPrefScreenFontsModule.ui
@@ -497,8 +497,8 @@
     <tabstop>screenHugerED</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>

diff --git a/src/frontends/qt3/ui/QPrefSpellcheckerModule.ui b/src/frontends/qt3/ui/QPrefSpellcheckerModule.ui
index 680e38fde7700875af1fd8acac1c11418d564fca..1ca748571a9ed7432c99330afeaf7f7c321597e2 100644 (file)
--- a/src/frontends/qt3/ui/QPrefSpellcheckerModule.ui
+++ b/src/frontends/qt3/ui/QPrefSpellcheckerModule.ui
@@ -218,8 +218,8 @@
     <tabstop>inputEncodingCB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

diff --git a/src/frontends/qt3/ui/QPrefsDialogBase.ui b/src/frontends/qt3/ui/QPrefsDialogBase.ui
index 5415d201127cc98a505cf8c7da8fba579c159662..728b3bcd2e3133944bde86bb5da9a121da8f2026 100644 (file)
--- a/src/frontends/qt3/ui/QPrefsDialogBase.ui
+++ b/src/frontends/qt3/ui/QPrefsDialogBase.ui
@@ -150,8 +150,8 @@
     <tabstop>closePB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot>change_adaptor()</slot>

diff --git a/src/frontends/qt3/ui/QPrintDialogBase.ui b/src/frontends/qt3/ui/QPrintDialogBase.ui
index 8162f15a6f4f1d7f37a69e1cfe8f13eb274433f0..04c38db4262bdfa3c3ea17bbb744da3300121817 100644 (file)
--- a/src/frontends/qt3/ui/QPrintDialogBase.ui
+++ b/src/frontends/qt3/ui/QPrintDialogBase.ui
@@ -486,8 +486,8 @@
     <tabstop>closePB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot access="protected">browseClicked()</slot>

diff --git a/src/frontends/qt3/ui/QRefDialogBase.ui b/src/frontends/qt3/ui/QRefDialogBase.ui
index b589371589e3132172c52e8f2c6b5df50c8f9e25..65de12e9a60f07044471995c8b0c4c95f525d585 100644 (file)
--- a/src/frontends/qt3/ui/QRefDialogBase.ui
+++ b/src/frontends/qt3/ui/QRefDialogBase.ui
@@ -381,8 +381,8 @@
     <tabstop>closePB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot>changed_adaptor()</slot>

diff --git a/src/frontends/qt3/ui/QSearchDialogBase.ui b/src/frontends/qt3/ui/QSearchDialogBase.ui
index 1c5ea73b37032f733cc439e19c4ae92c3ee643f3..b597042f455ba75259f75837c8885a2117246cee 100644 (file)
--- a/src/frontends/qt3/ui/QSearchDialogBase.ui
+++ b/src/frontends/qt3/ui/QSearchDialogBase.ui
@@ -278,8 +278,8 @@
     <tabstop>closePB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot access="protected">findClicked()</slot>

diff --git a/src/frontends/qt3/ui/QSendtoDialogBase.ui b/src/frontends/qt3/ui/QSendtoDialogBase.ui
index 35ef9319a7e3af535f26d6e51497fdb872022e08..4ebbbcb0aa1f2a050fbd1225c7af16d626e39d18 100644 (file)
--- a/src/frontends/qt3/ui/QSendtoDialogBase.ui
+++ b/src/frontends/qt3/ui/QSendtoDialogBase.ui
@@ -187,8 +187,8 @@
     <tabstop>closePB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot>changed_adaptor()</slot>

diff --git a/src/frontends/qt3/ui/QShowFileDialogBase.ui b/src/frontends/qt3/ui/QShowFileDialogBase.ui
index 59fcb81789f32e6426d4e911e5ee1c0d6eacbedd..0ddb6f35af6a99f12e9b775b9bf20f3340dd4ec3 100644 (file)
--- a/src/frontends/qt3/ui/QShowFileDialogBase.ui
+++ b/src/frontends/qt3/ui/QShowFileDialogBase.ui
@@ -83,8 +83,8 @@
     </vbox>
 </widget>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot>change_adaptor()</slot>

diff --git a/src/frontends/qt3/ui/QSpellcheckerDialogBase.ui b/src/frontends/qt3/ui/QSpellcheckerDialogBase.ui
index d94cab9d4b3e66223d77bb11816d8d4a038abe22..c5026891995078905776b165ff9992c0c4b080ac 100644 (file)
--- a/src/frontends/qt3/ui/QSpellcheckerDialogBase.ui
+++ b/src/frontends/qt3/ui/QSpellcheckerDialogBase.ui
@@ -259,8 +259,8 @@
     <tabstop>closePB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot>acceptClicked()</slot>

diff --git a/src/frontends/qt3/ui/QTabularCreateDialogBase.ui b/src/frontends/qt3/ui/QTabularCreateDialogBase.ui
index 1cbb95bda7b518d045373422a6667fca74230662..2997bc85b64399635823b2f07bf4b61cf7374f46 100644 (file)
--- a/src/frontends/qt3/ui/QTabularCreateDialogBase.ui
+++ b/src/frontends/qt3/ui/QTabularCreateDialogBase.ui
@@ -340,8 +340,8 @@
     <tabstop>closePB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot>columnsChanged(int)</slot>

diff --git a/src/frontends/qt3/ui/QTabularDialogBase.ui b/src/frontends/qt3/ui/QTabularDialogBase.ui
index 1d459b8ad6b921d32be6d366b93425341d15f0bb..cc607d8f9e6f7eabb666e8a5e6347ae6d919bb1a 100644 (file)
--- a/src/frontends/qt3/ui/QTabularDialogBase.ui
+++ b/src/frontends/qt3/ui/QTabularDialogBase.ui
@@ -1356,8 +1356,8 @@
     <tabstop>closePB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot access="protected">borderSet_clicked()</slot>

diff --git a/src/frontends/qt3/ui/QTexinfoDialogBase.ui b/src/frontends/qt3/ui/QTexinfoDialogBase.ui
index 9b20524f81554c27ca8133ad3c8b7eac1d5f7125..8bd5e723ec91e406ceab8ec24525e2acf763277f 100644 (file)
--- a/src/frontends/qt3/ui/QTexinfoDialogBase.ui
+++ b/src/frontends/qt3/ui/QTexinfoDialogBase.ui
@@ -265,8 +265,8 @@
     <tabstop>closePB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot access="protected">enableViewPB()</slot>

diff --git a/src/frontends/qt3/ui/QThesaurusDialogBase.ui b/src/frontends/qt3/ui/QThesaurusDialogBase.ui
index 05edf01ce417f3d59d885da4abb0e57b5c140e54..a0886e2957328bcff65d09acc43132cf6c481c44 100644 (file)
--- a/src/frontends/qt3/ui/QThesaurusDialogBase.ui
+++ b/src/frontends/qt3/ui/QThesaurusDialogBase.ui
@@ -242,8 +242,8 @@
     <tabstop>closePB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot>change_adaptor()</slot>

diff --git a/src/frontends/qt3/ui/QTocDialogBase.ui b/src/frontends/qt3/ui/QTocDialogBase.ui
index adfafa4cb412d75932d9c3f09d5ff499d8e59d11..7848020a8ffaffc5a3661337316b39aac03c53b2 100644 (file)
--- a/src/frontends/qt3/ui/QTocDialogBase.ui
+++ b/src/frontends/qt3/ui/QTocDialogBase.ui
@@ -231,8 +231,8 @@
     </connection>
 </connections>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot>activate_adaptor(int)</slot>

diff --git a/src/frontends/qt3/ui/QURLDialogBase.ui b/src/frontends/qt3/ui/QURLDialogBase.ui
index 0a105b678eba8445a5f6a499dcf8f8642133d270..29da7595959b23d85bbe586a32c35199f9ebdf59 100644 (file)
--- a/src/frontends/qt3/ui/QURLDialogBase.ui
+++ b/src/frontends/qt3/ui/QURLDialogBase.ui
@@ -168,8 +168,8 @@
     <tabstop>closePB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot>changed_adaptor()</slot>

diff --git a/src/frontends/qt3/ui/QVSpaceDialogBase.ui b/src/frontends/qt3/ui/QVSpaceDialogBase.ui
index 8bc1de7a4a44b2ad2fa27bafbb1c596395e39e43..72a5946d29c49f07ba70607ae0a3326c35a1af52 100644 (file)
--- a/src/frontends/qt3/ui/QVSpaceDialogBase.ui
+++ b/src/frontends/qt3/ui/QVSpaceDialogBase.ui
@@ -296,8 +296,8 @@
     <tabstop>closePB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <slots>
     <slot access="protected">change_adaptor()</slot>

diff --git a/src/frontends/qt3/ui/QViewSourceDialogBase.ui b/src/frontends/qt3/ui/QViewSourceDialogBase.ui
index a95e53dde677e37f0819e3056a34f22f0497e91c..41b863818a65496dce86b53b37c1eefd454b9ff3 100644 (file)
--- a/src/frontends/qt3/ui/QViewSourceDialogBase.ui
+++ b/src/frontends/qt3/ui/QViewSourceDialogBase.ui
@@ -81,8 +81,8 @@
     <tabstop>closePB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

diff --git a/src/frontends/qt3/ui/QWrapDialogBase.ui b/src/frontends/qt3/ui/QWrapDialogBase.ui
index 201d387cdc6dff30ea643ec241e6018e57683be2..66074a67330b414a3f044a57f11d8a8a7c5b4f35 100644 (file)
--- a/src/frontends/qt3/ui/QWrapDialogBase.ui
+++ b/src/frontends/qt3/ui/QWrapDialogBase.ui
@@ -315,9 +315,9 @@
     <tabstop>closePB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
-    <include location="local" impldecl="in declaration">vspace.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
+    <include location="local" impldecl="in implementation">vspace.h</include>
 </includes>
 <slots>
     <slot>change_adaptor()</slot>

diff --git a/src/frontends/qt3/ui/TextLayoutModuleBase.ui b/src/frontends/qt3/ui/TextLayoutModuleBase.ui
index fda480b5fcfdecfaf32f0edb5a33c6538559b172..de79fbbc5435bcb51352520de96a4db24ce605c4 100644 (file)
--- a/src/frontends/qt3/ui/TextLayoutModuleBase.ui
+++ b/src/frontends/qt3/ui/TextLayoutModuleBase.ui
@@ -420,8 +420,8 @@
     <tabstop>twoColumnCB</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">config.h</include>
-    <include location="local" impldecl="in declaration">qt_helpers.h</include>
+    <include location="global" impldecl="in implementation">config.h</include>
+    <include location="local" impldecl="in implementation">qt_helpers.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>

diff --git a/src/frontends/qt3/ui/moc/Makefile.am b/src/frontends/qt3/ui/moc/Makefile.am
index c1d4935fb159a15b1ca556115a87aa1ff95cf631..324c7be244beeb962046f577a1f67bd65b74d2a3 100644 (file)
--- a/src/frontends/qt3/ui/moc/Makefile.am
+++ b/src/frontends/qt3/ui/moc/Makefile.am
@@ -12,7 +12,6 @@ AM_CPPFLAGS += \
        $(PCH_FLAGS) \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/frontends \
-       -I$(top_srcdir)/src/frontends/qt3 \
        -I$(top_srcdir)/src/frontends/controllers \
        $(QT_INCLUDES) \
        $(BOOST_INCLUDES)