Replaced 'includehints' with 'includes' in *.ui files.

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit b070dc1873b27bbe1e9b551569feb77efe477f9e)

7 files changed, 25 insertions, 50 deletions

diff --git a/lib/kotext/KoParagDecorationTab.ui b/lib/kotext/KoParagDecorationTab.ui
index 131e1b0c..886157f0 100644
--- a/lib/kotext/KoParagDecorationTab.ui
+++ b/lib/kotext/KoParagDecorationTab.ui
@@ -389,14 +389,9 @@ regardless of the style of the preceeding and subsequent paragraphs.&lt;/p&gt;</
     </image>
 </images>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/lib/kotext/kodecorationtabbase.ui b/lib/kotext/kodecorationtabbase.ui
index 7c8896b5..5d1301c9 100644
--- a/lib/kotext/kodecorationtabbase.ui
+++ b/lib/kotext/kodecorationtabbase.ui
@@ -342,19 +342,9 @@
     </image>
 </images>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/lib/kotext/kofonttabbase.ui b/lib/kotext/kofonttabbase.ui
index d6d0a2f6..1d05d2fb 100644
--- a/lib/kotext/kofonttabbase.ui
+++ b/lib/kotext/kofonttabbase.ui
@@ -20,9 +20,6 @@
             </widget>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
-	<include location="local" impldecl="in declaration">TDEFontDialog_local.h</include>
+    <include location="global" impldecl="in implementation">TDEFontDialog_local.h</include>
 </includes>
-<includehints>
-    <includehint>TDEFontDialog_local.h</includehint>
-</includehints>
 </UI>
diff --git a/lib/kotext/kohighlightingtabbase.ui b/lib/kotext/kohighlightingtabbase.ui
index b2b4ce26..12e3903d 100644
--- a/lib/kotext/kohighlightingtabbase.ui
+++ b/lib/kotext/kohighlightingtabbase.ui
@@ -130,11 +130,8 @@
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
 </UI>
diff --git a/lib/kotext/kolanguagetabbase.ui b/lib/kotext/kolanguagetabbase.ui
index 0fbd5442..799ab09a 100644
--- a/lib/kotext/kolanguagetabbase.ui
+++ b/lib/kotext/kolanguagetabbase.ui
@@ -70,7 +70,7 @@
     </vbox>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
 </UI>
diff --git a/lib/kotext/kolayouttabbase.ui b/lib/kotext/kolayouttabbase.ui
index cddc4798..2e05a707 100644
--- a/lib/kotext/kolayouttabbase.ui
+++ b/lib/kotext/kolayouttabbase.ui
@@ -285,11 +285,10 @@
     </connection>
 </connections>
 <includes>
+</includes>
+<layoutdefaults spacing="6" margin="11"/>
+<includes>
     <include location="global" impldecl="in declaration">knuminput.h</include>
     <include location="global" impldecl="in declaration">tdelocale.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-</includehints>
 </UI>
diff --git a/lib/kotext/timedateformatwidget.ui b/lib/kotext/timedateformatwidget.ui
index b298d4da..baf0e1a3 100644
--- a/lib/kotext/timedateformatwidget.ui
+++ b/lib/kotext/timedateformatwidget.ui
@@ -203,16 +203,13 @@
 <tabstops>
     <tabstop>combo1</tabstop>
 </tabstops>
-<includes>
-    <include location="local" impldecl="in implementation">timedateformatwidget.ui.h</include>
-</includes>
 <Q_SLOTS>
     <slot>comboActivated()</slot>
     <slot>updateLabel()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+    <include location="local"  impldecl="in implementation">timedateformatwidget.ui.h</include>
+</includes>
 </UI>