summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kcontrol/arts/generaltab.ui7
-rw-r--r--kcontrol/arts/hardwaretab.ui3
-rw-r--r--kcontrol/background/bgadvanced_ui.ui5
-rw-r--r--kcontrol/css/cssconfig.ui4
-rw-r--r--kcontrol/dnssd/configdialog.ui11
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui3
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui10
-rw-r--r--kcontrol/hwmanager/devicepropsdlgbase.ui7
-rw-r--r--kcontrol/hwmanager/hwmanagerbase.ui3
-rw-r--r--kcontrol/iccconfig/iccconfigbase.ui5
-rw-r--r--kcontrol/kicker/advancedOptions.ui7
-rw-r--r--kcontrol/kicker/lookandfeeltab.ui12
-rw-r--r--kcontrol/kicker/menutab.ui10
-rw-r--r--kcontrol/knotify/playersettings.ui4
-rw-r--r--kcontrol/konq/desktopbehavior.ui7
-rw-r--r--kcontrol/konsole/sessiondialog.ui6
-rw-r--r--kcontrol/kthememanager/kthemedlg.ui4
-rw-r--r--kcontrol/smserver/smserverconfigdlg.ui1
-rw-r--r--kcontrol/taskbar/kcmtaskbarui.ui8
-rw-r--r--kcontrol/tdeio/cache_ui.ui3
-rw-r--r--kcontrol/tdeio/envvarproxy_ui.ui3
-rw-r--r--kcontrol/tdeio/kcookiesmanagementdlg_ui.ui5
-rw-r--r--kcontrol/tdeio/kcookiespoliciesdlg_ui.ui6
-rw-r--r--kcontrol/tdeio/kproxydlg_ui.ui2
-rw-r--r--kcontrol/tdeio/manualproxy_ui.ui5
-rw-r--r--kcontrol/tdeio/policydlg_ui.ui2
-rw-r--r--kcontrol/tdeio/uagentproviderdlg_ui.ui7
-rw-r--r--kcontrol/tdeio/useragentdlg_ui.ui6
-rw-r--r--kdcop/kdcopview.ui4
-rw-r--r--khotkeys/kcontrol/ui/action_group_tab_ui.ui6
-rw-r--r--khotkeys/kcontrol/ui/command_url_widget_ui.ui2
-rw-r--r--khotkeys/kcontrol/ui/general_settings_tab_ui.ui4
-rw-r--r--khotkeys/kcontrol/ui/general_tab_ui.ui4
-rw-r--r--khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui4
-rw-r--r--khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui4
-rw-r--r--khotkeys/kcontrol/ui/voice_input_widget_ui.ui8
-rw-r--r--khotkeys/kcontrol/ui/voice_settings_tab_ui.ui6
-rw-r--r--kicker/applets/clock/analog.ui10
-rw-r--r--kicker/applets/clock/digital.ui10
-rw-r--r--kicker/applets/clock/fuzzy.ui10
-rw-r--r--kicker/applets/clock/settings.ui17
-rw-r--r--kicker/applets/launcher/configdlgbase.ui7
-rw-r--r--kicker/kicker/core/kmenubase.ui4
-rw-r--r--kicker/kicker/ui/appletview.ui5
-rw-r--r--kicker/kicker/ui/nonKDEButtonSettings.ui4
-rw-r--r--konqueror/sidebar/trees/history_module/history_dlg.ui11
-rw-r--r--kpersonalizer/keyecandypagedlg.ui3
-rw-r--r--ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui1
-rw-r--r--ksysguard/gui/SensorDisplayLib/LogFileSettings.ui1
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui14
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui1
-rw-r--r--tdeioslave/media/medianotifier/notificationdialogview.ui6
-rw-r--r--tdeioslave/media/tdecmodule/notifiermoduleview.ui13
-rw-r--r--tdeioslave/media/tdecmodule/serviceview.ui15
-rw-r--r--tdepasswd/kcm/main_widget.ui3
-rw-r--r--twin/kcmtwin/twinrules/editshortcutbase.ui3
-rw-r--r--twin/kcmtwin/twinrules/ruleslistbase.ui4
-rw-r--r--twin/kcmtwin/twinrules/ruleswidgetbase.ui56
58 files changed, 158 insertions, 238 deletions
diff --git a/kcontrol/arts/generaltab.ui b/kcontrol/arts/generaltab.ui
index 1de5b1e43..673beb852 100644
--- a/kcontrol/arts/generaltab.ui
+++ b/kcontrol/arts/generaltab.ui
@@ -320,11 +320,8 @@ Recommended if you want sound.</string>
<customwidgets>
</customwidgets>
<includes>
- <include location="local" impldecl="in implementation">krichtextlabel.h</include>
+ <include location="global" impldecl="in implementation">knuminput.h</include>
+ <include location="global" impldecl="in implementation">krichtextlabel.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
-</includehints>
</UI>
diff --git a/kcontrol/arts/hardwaretab.ui b/kcontrol/arts/hardwaretab.ui
index ac20fdfe2..8064f8a3c 100644
--- a/kcontrol/arts/hardwaretab.ui
+++ b/kcontrol/arts/hardwaretab.ui
@@ -355,4 +355,7 @@
</vbox>
</widget>
<layoutdefaults spacing="6" margin="11"/>
+<includes>
+ <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
</UI>
diff --git a/kcontrol/background/bgadvanced_ui.ui b/kcontrol/background/bgadvanced_ui.ui
index 34f8f9db5..948af353a 100644
--- a/kcontrol/background/bgadvanced_ui.ui
+++ b/kcontrol/background/bgadvanced_ui.ui
@@ -452,11 +452,8 @@ You can also remove programs from this list clicking on the &lt;b&gt;Remove&lt;/
</tabstops>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">kcolorbutton.h</include>
</includes>
<layoutdefaults spacing="3" margin="6"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
-</includehints>
</UI>
diff --git a/kcontrol/css/cssconfig.ui b/kcontrol/css/cssconfig.ui
index b974fa375..f0baacb79 100644
--- a/kcontrol/css/cssconfig.ui
+++ b/kcontrol/css/cssconfig.ui
@@ -234,8 +234,10 @@
</includes>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<includes>
+ <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
<includehints>
- <includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
</includehints>
diff --git a/kcontrol/dnssd/configdialog.ui b/kcontrol/dnssd/configdialog.ui
index 0066f7d90..4a2ac2809 100644
--- a/kcontrol/dnssd/configdialog.ui
+++ b/kcontrol/dnssd/configdialog.ui
@@ -317,14 +317,9 @@ is configured with 'Browse local network' option above.</string>
</Q_SLOTS>
<includes>
<include location="global" impldecl="in declaration">tdecmodule.h</include>
+ <include location="global" impldecl="in implementation">keditlistbox.h</include>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+ <include location="global" impldecl="in implementation">kpassdlg.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>tdecmodule.h</includehint>
- <includehint>keditlistbox.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>kpassdlg.h</includehint>
- <includehint>klineedit.h</includehint>
-</includehints>
</UI>
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui b/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui
index c823ad095..3c5fd2e3b 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui
@@ -255,4 +255,7 @@ Select the search engine to use for input boxes that provide automatic lookup se
<tabstop>cmbDelimiter</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
+<includes>
+ <include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
</UI>
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui
index 84539366f..9fe898c83 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui
@@ -128,10 +128,8 @@ Recommended is \{@}, since it removes all query variables (name=value) from the
<tabstop>cbCharset</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>kcombobox.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+ <include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
</UI>
diff --git a/kcontrol/hwmanager/devicepropsdlgbase.ui b/kcontrol/hwmanager/devicepropsdlgbase.ui
index 7cfe80b68..60186ddd1 100644
--- a/kcontrol/hwmanager/devicepropsdlgbase.ui
+++ b/kcontrol/hwmanager/devicepropsdlgbase.ui
@@ -1538,7 +1538,12 @@
<slot>enableSupport_toggled(bool)</slot>
</Q_SLOTS>
<includes>
- <include location="local" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">kactivelabel.h</include>
+ <include location="global" impldecl="in implementation">kcombobox.h</include>
+ <include location="global" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
+ <include location="global" impldecl="in implementation">tdelistviewsearchline.h</include>
</includes>
<layoutdefaults spacing="3" margin="6"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
diff --git a/kcontrol/hwmanager/hwmanagerbase.ui b/kcontrol/hwmanager/hwmanagerbase.ui
index 47de4caf5..9a6ecef63 100644
--- a/kcontrol/hwmanager/hwmanagerbase.ui
+++ b/kcontrol/hwmanager/hwmanagerbase.ui
@@ -78,7 +78,8 @@
<slot>enableSupport_toggled(bool)</slot>
</Q_SLOTS>
<includes>
- <include location="local" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">tdelistviewsearchline.h</include>
</includes>
<layoutdefaults spacing="3" margin="6"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
diff --git a/kcontrol/iccconfig/iccconfigbase.ui b/kcontrol/iccconfig/iccconfigbase.ui
index 0666c6e9f..980c62c01 100644
--- a/kcontrol/iccconfig/iccconfigbase.ui
+++ b/kcontrol/iccconfig/iccconfigbase.ui
@@ -187,7 +187,10 @@
<slot>enableSupport_toggled(bool)</slot>
</Q_SLOTS>
<includes>
- <include location="local" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">kcombobox.h</include>
+ <include location="global" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+ <include location="global" impldecl="in implementation">kurlrequester.h</include>
</includes>
<layoutdefaults spacing="3" margin="6"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
diff --git a/kcontrol/kicker/advancedOptions.ui b/kcontrol/kicker/advancedOptions.ui
index 5ba10dd75..23f004925 100644
--- a/kcontrol/kicker/advancedOptions.ui
+++ b/kcontrol/kicker/advancedOptions.ui
@@ -355,13 +355,10 @@
<tabstop>tintSlider</tabstop>
</tabstops>
<includes>
+ <include location="global" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">kcolorbutton.h</include>
<include location="global" impldecl="in declaration">knuminput.h</include>
- <include location="local" impldecl="in implementation">kdialog.h</include>
</includes>
<layoutdefaults spacing="3" margin="6"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
- <includehint>knuminput.h</includehint>
- <includehint>kcolorbutton.h</includehint>
-</includehints>
</UI>
diff --git a/kcontrol/kicker/lookandfeeltab.ui b/kcontrol/kicker/lookandfeeltab.ui
index 522548f40..7938f5f6c 100644
--- a/kcontrol/kicker/lookandfeeltab.ui
+++ b/kcontrol/kicker/lookandfeeltab.ui
@@ -617,6 +617,7 @@ This option is only active if 'Enable background image' is selected.</string>
<tabstop>advancedOptionsButton</tabstop>
</tabstops>
<includes>
+ <include location="global" impldecl="in implementation">kcolorbutton.h</include>
<include location="global" impldecl="in declaration">kcombobox.h</include>
<include location="global" impldecl="in declaration">kurlrequester.h</include>
<include location="global" impldecl="in implementation">kdialog.h</include>
@@ -629,17 +630,6 @@ This option is only active if 'Enable background image' is selected.</string>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
- <includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
</includehints>
diff --git a/kcontrol/kicker/menutab.ui b/kcontrol/kicker/menutab.ui
index 5d3f8fcfe..2614a278a 100644
--- a/kcontrol/kicker/menutab.ui
+++ b/kcontrol/kicker/menutab.ui
@@ -729,14 +729,12 @@
<tabstop>kcfg_NumVisibleEntries</tabstop>
</tabstops>
<includes>
- <include location="global" impldecl="in implementation">tdelistview.h</include>
+ <include location="global" impldecl="in implementation">kdialog.h</include>
<include location="global" impldecl="in implementation">knuminput.h</include>
- <include location="local" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+ <include location="global" impldecl="in implementation">tdefontrequester.h</include>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
- <includehints>
- <includehint>tdelistview.h</includehint>
- <includehint>knuminput.h</includehint>
- </includehints>
</UI>
diff --git a/kcontrol/knotify/playersettings.ui b/kcontrol/knotify/playersettings.ui
index 845377112..def27d1fa 100644
--- a/kcontrol/knotify/playersettings.ui
+++ b/kcontrol/knotify/playersettings.ui
@@ -322,8 +322,10 @@
<tabstop>cbNone</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
+<includes>
+ <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
<includehints>
- <includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
</includehints>
diff --git a/kcontrol/konq/desktopbehavior.ui b/kcontrol/konq/desktopbehavior.ui
index dc4907adf..c247ab354 100644
--- a/kcontrol/konq/desktopbehavior.ui
+++ b/kcontrol/konq/desktopbehavior.ui
@@ -419,8 +419,7 @@
<tabstop>mediaListView</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>tdelistview.h</includehint>
- <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
</UI>
diff --git a/kcontrol/konsole/sessiondialog.ui b/kcontrol/konsole/sessiondialog.ui
index 1f9eae293..950ebe1a9 100644
--- a/kcontrol/konsole/sessiondialog.ui
+++ b/kcontrol/konsole/sessiondialog.ui
@@ -433,13 +433,13 @@
</tabstops>
<includes>
<include location="global" impldecl="in declaration">kcolorbutton.h</include>
- <include location="local" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">kicondialog.h</include>
+ <include location="global" impldecl="in implementation">kurlrequester.h</include>
</includes>
<layoutdefaults spacing="3" margin="6"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
- <includehint>kicondialog.h</includehint>
- <includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
</includehints>
diff --git a/kcontrol/kthememanager/kthemedlg.ui b/kcontrol/kthememanager/kthemedlg.ui
index 08812fd72..717f68e32 100644
--- a/kcontrol/kthememanager/kthemedlg.ui
+++ b/kcontrol/kthememanager/kthemedlg.ui
@@ -501,6 +501,7 @@
</tabstops>
<includes>
<include location="local" impldecl="in implementation">kthemedlg.ui.h</include>
+ <include location="global" impldecl="in implementation">kurllabel.h</include>
</includes>
<Q_SLOTS>
<slot specifier="non virtual">startKonqui( const TQString &amp; url )</slot>
@@ -512,7 +513,4 @@
<slot specifier="non virtual">startSaver()</slot>
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kurllabel.h</includehint>
-</includehints>
</UI>
diff --git a/kcontrol/smserver/smserverconfigdlg.ui b/kcontrol/smserver/smserverconfigdlg.ui
index 654156f20..1449e9d6f 100644
--- a/kcontrol/smserver/smserverconfigdlg.ui
+++ b/kcontrol/smserver/smserverconfigdlg.ui
@@ -317,6 +317,7 @@
</connections>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
</includes>
<Q_SLOTS>
<slot>configChanged()</slot>
diff --git a/kcontrol/taskbar/kcmtaskbarui.ui b/kcontrol/taskbar/kcmtaskbarui.ui
index 94f37f84e..2bf167183 100644
--- a/kcontrol/taskbar/kcmtaskbarui.ui
+++ b/kcontrol/taskbar/kcmtaskbarui.ui
@@ -595,13 +595,9 @@ By default the taskbar groups windows when it is full.</string>
<tabstop>kcfg_RightButtonAction</tabstop>
</tabstops>
<includes>
- <include location="local" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+ <include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
<layoutdefaults spacing="3" margin="6"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
-</includehints>
</UI>
diff --git a/kcontrol/tdeio/cache_ui.ui b/kcontrol/tdeio/cache_ui.ui
index ce9aed797..7d4b718c5 100644
--- a/kcontrol/tdeio/cache_ui.ui
+++ b/kcontrol/tdeio/cache_ui.ui
@@ -184,4 +184,7 @@
</connection>
</connections>
<layoutdefaults spacing="6" margin="11"/>
+<includes>
+ <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
</UI>
diff --git a/kcontrol/tdeio/envvarproxy_ui.ui b/kcontrol/tdeio/envvarproxy_ui.ui
index 3e1babf90..2c1af5ee8 100644
--- a/kcontrol/tdeio/envvarproxy_ui.ui
+++ b/kcontrol/tdeio/envvarproxy_ui.ui
@@ -172,4 +172,7 @@ Alternatively, you can click on the &lt;b&gt;"Auto Detect"&lt;/b&gt; button to a
<tabstop>pbDetect</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
+<includes>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
</UI>
diff --git a/kcontrol/tdeio/kcookiesmanagementdlg_ui.ui b/kcontrol/tdeio/kcookiesmanagementdlg_ui.ui
index 724901ccd..37f6a94fa 100644
--- a/kcontrol/tdeio/kcookiesmanagementdlg_ui.ui
+++ b/kcontrol/tdeio/kcookiesmanagementdlg_ui.ui
@@ -314,10 +314,9 @@
</connections>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
+ <include location="global" impldecl="in implementation">tdelistviewsearchline.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
- <includehint>tdelistviewsearchline.h</includehint>
-</includehints>
</UI>
diff --git a/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui b/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui
index f26173353..64f93206d 100644
--- a/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui
+++ b/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui
@@ -313,11 +313,9 @@ List of sites for which you have set a specific cookie policy. Specific policies
</connections>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
+ <include location="global" impldecl="in implementation">tdelistviewsearchline.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
- <includehint>tdelistview.h</includehint>
- <includehint>tdelistviewsearchline.h</includehint>
-</includehints>
</UI>
diff --git a/kcontrol/tdeio/kproxydlg_ui.ui b/kcontrol/tdeio/kproxydlg_ui.ui
index 9ab0cb3b5..baf2141af 100644
--- a/kcontrol/tdeio/kproxydlg_ui.ui
+++ b/kcontrol/tdeio/kproxydlg_ui.ui
@@ -432,6 +432,8 @@ Although a persistent proxy connection is faster, note that it only works correc
</connections>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+ <include location="global" impldecl="in implementation">kurlrequester.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
diff --git a/kcontrol/tdeio/manualproxy_ui.ui b/kcontrol/tdeio/manualproxy_ui.ui
index dec7e70d4..58a6f7496 100644
--- a/kcontrol/tdeio/manualproxy_ui.ui
+++ b/kcontrol/tdeio/manualproxy_ui.ui
@@ -314,4 +314,9 @@ Reverse the use of the exception list. Checking this box will result in the prox
<tabstop>pbDeleteAll</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
+<includes>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+ <include location="global" impldecl="in implementation">knuminput.h</include>
+ <include location="global" impldecl="in implementation">tdelistbox.h</include>
+</includes>
</UI>
diff --git a/kcontrol/tdeio/policydlg_ui.ui b/kcontrol/tdeio/policydlg_ui.ui
index 2fecfa6d9..ed90e6ce5 100644
--- a/kcontrol/tdeio/policydlg_ui.ui
+++ b/kcontrol/tdeio/policydlg_ui.ui
@@ -100,6 +100,8 @@ Select the desired policy:
</widget>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">kcombobox.h</include>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
diff --git a/kcontrol/tdeio/uagentproviderdlg_ui.ui b/kcontrol/tdeio/uagentproviderdlg_ui.ui
index 578721596..9b15234d2 100644
--- a/kcontrol/tdeio/uagentproviderdlg_ui.ui
+++ b/kcontrol/tdeio/uagentproviderdlg_ui.ui
@@ -196,12 +196,9 @@ The actual browser identification text that will be sent to the remote machine.
</widget>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+ <include location="global" impldecl="in implementation">kcombobox.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
- <includehint>klineedit.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>klineedit.h</includehint>
-</includehints>
</UI>
diff --git a/kcontrol/tdeio/useragentdlg_ui.ui b/kcontrol/tdeio/useragentdlg_ui.ui
index c4e46d9c9..89919793c 100644
--- a/kcontrol/tdeio/useragentdlg_ui.ui
+++ b/kcontrol/tdeio/useragentdlg_ui.ui
@@ -345,11 +345,9 @@ By default, only minimal identification information is sent to remote sites. The
</connections>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
- <includehint>klineedit.h</includehint>
- <includehint>tdelistview.h</includehint>
-</includehints>
</UI>
diff --git a/kdcop/kdcopview.ui b/kdcop/kdcopview.ui
index 3b67fa242..50a13ec4f 100644
--- a/kdcop/kdcopview.ui
+++ b/kdcop/kdcopview.ui
@@ -138,12 +138,12 @@
</images>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">tdelistbox.h</include>
+ <include location="global" impldecl="in implementation">tdelistviewsearchline.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
- <includehint>tdelistviewsearchline.h</includehint>
<includehint>kdcoplistview.h</includehint>
- <includehint>tdelistbox.h</includehint>
</includehints>
</UI>
diff --git a/khotkeys/kcontrol/ui/action_group_tab_ui.ui b/khotkeys/kcontrol/ui/action_group_tab_ui.ui
index ce982399e..69d51ef55 100644
--- a/khotkeys/kcontrol/ui/action_group_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/action_group_tab_ui.ui
@@ -102,7 +102,7 @@
<slot access="protected" specifier="pure virtual">action_group_name_changed( const TQString&amp; )</slot>
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>ktextedit.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">ktextedit.h</include>
+</includes>
</UI>
diff --git a/khotkeys/kcontrol/ui/command_url_widget_ui.ui b/khotkeys/kcontrol/ui/command_url_widget_ui.ui
index ec18138de..6d571e699 100644
--- a/khotkeys/kcontrol/ui/command_url_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/command_url_widget_ui.ui
@@ -55,11 +55,11 @@
</Q_SLOTS>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">kurlrequester.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
- <includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
</includehints>
diff --git a/khotkeys/kcontrol/ui/general_settings_tab_ui.ui b/khotkeys/kcontrol/ui/general_settings_tab_ui.ui
index 95c175a98..9dc10309e 100644
--- a/khotkeys/kcontrol/ui/general_settings_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/general_settings_tab_ui.ui
@@ -105,13 +105,11 @@
</connections>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
</includes>
<Q_SLOTS>
<slot access="protected" specifier="pure virtual">import_clicked()</slot>
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
- <includehint>kpushbutton.h</includehint>
-</includehints>
</UI>
diff --git a/khotkeys/kcontrol/ui/general_tab_ui.ui b/khotkeys/kcontrol/ui/general_tab_ui.ui
index 4817d8662..9deef2245 100644
--- a/khotkeys/kcontrol/ui/general_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/general_tab_ui.ui
@@ -139,10 +139,8 @@
</Q_SLOTS>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">ktextedit.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
- <includehint>ktextedit.h</includehint>
-</includehints>
</UI>
diff --git a/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui b/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui
index 17b881de9..197800098 100644
--- a/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui
@@ -151,10 +151,8 @@
</images>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">knuminput.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
- <includehint>knuminput.h</includehint>
-</includehints>
</UI>
diff --git a/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui b/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui
index 81baf6679..521e44f46 100644
--- a/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui
@@ -181,13 +181,11 @@
</connections>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">ktextedit.h</include>
</includes>
<Q_SLOTS>
<slot access="protected" specifier="pure virtual">modify_pressed()</slot>
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
- <includehint>ktextedit.h</includehint>
-</includehints>
</UI>
diff --git a/khotkeys/kcontrol/ui/voice_input_widget_ui.ui b/khotkeys/kcontrol/ui/voice_input_widget_ui.ui
index c30ff6293..bcd113c57 100644
--- a/khotkeys/kcontrol/ui/voice_input_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/voice_input_widget_ui.ui
@@ -96,9 +96,7 @@
<slot access="protected" specifier="pure virtual">slotStopPressed()</slot>
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
</UI>
diff --git a/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui b/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui
index f80ebae1b..9c1381146 100644
--- a/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui
@@ -101,7 +101,7 @@ make sure &lt;i&gt;Full duplex&lt;/i&gt; is checked in your &lt;i&gt;Sound Syste
<customwidgets>
</customwidgets>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kkeybutton.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kkeybutton.h</include>
+</includes>
</UI>
diff --git a/kicker/applets/clock/analog.ui b/kicker/applets/clock/analog.ui
index e7181c521..e362ef8cc 100644
--- a/kicker/applets/clock/analog.ui
+++ b/kicker/applets/clock/analog.ui
@@ -331,14 +331,10 @@
<tabstop>kcfg_AnalogBackgroundColor</tabstop>
</tabstops>
<includes>
- <include location="local" impldecl="in implementation">kdialog.h</include>
- <include location="local" impldecl="in implementation">tdefontrequester.h</include>
+ <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+ <include location="global" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">tdefontrequester.h</include>
</includes>
<layoutdefaults spacing="3" margin="6"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
-</includehints>
</UI>
diff --git a/kicker/applets/clock/digital.ui b/kicker/applets/clock/digital.ui
index 7fad42834..e8ced7f2d 100644
--- a/kicker/applets/clock/digital.ui
+++ b/kicker/applets/clock/digital.ui
@@ -288,18 +288,14 @@
<tabstop>kcfg_DigitalBackgroundColor</tabstop>
</tabstops>
<includes>
- <include location="local" impldecl="in implementation">kdialog.h</include>
- <include location="local" impldecl="in implementation">tdefontrequester.h</include>
<include location="local" impldecl="in implementation">digital.ui.h</include>
+ <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+ <include location="global" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">tdefontrequester.h</include>
</includes>
<Q_SLOTS>
<slot>kcfg_DigitalLCDStyle_stateChanged( int )</slot>
</Q_SLOTS>
<layoutdefaults spacing="3" margin="6"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
-</includehints>
</UI>
diff --git a/kicker/applets/clock/fuzzy.ui b/kicker/applets/clock/fuzzy.ui
index 386315bc2..1233f4fbb 100644
--- a/kicker/applets/clock/fuzzy.ui
+++ b/kicker/applets/clock/fuzzy.ui
@@ -274,14 +274,10 @@
<tabstop>kcfg_FuzzyBackgroundColor</tabstop>
</tabstops>
<includes>
- <include location="local" impldecl="in implementation">kdialog.h</include>
- <include location="local" impldecl="in implementation">tdefontrequester.h</include>
+ <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+ <include location="global" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">tdefontrequester.h</include>
</includes>
<layoutdefaults spacing="3" margin="6"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>tdefontrequester.h</includehint>
-</includehints>
</UI>
diff --git a/kicker/applets/clock/settings.ui b/kicker/applets/clock/settings.ui
index 0be13e9a9..81e126560 100644
--- a/kicker/applets/clock/settings.ui
+++ b/kicker/applets/clock/settings.ui
@@ -503,22 +503,15 @@
<tabstop>tzListView</tabstop>
</tabstops>
<includes>
- <include location="local" impldecl="in implementation">tqheader.h</include>
- <include location="local" impldecl="in implementation">kdialog.h</include>
- <include location="local" impldecl="in implementation">tdefontrequester.h</include>
+ <include location="global" impldecl="in implementation">tqheader.h</include>
+ <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+ <include location="global" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">tdefontrequester.h</include>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
</includes>
<Q_SLOTS>
<slot>configureType()</slot>
</Q_SLOTS>
<layoutdefaults spacing="3" margin="6"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>tdefontrequester.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>tdefontrequester.h</includehint>
- <includehint>tdelistview.h</includehint>
-</includehints>
</UI>
diff --git a/kicker/applets/launcher/configdlgbase.ui b/kicker/applets/launcher/configdlgbase.ui
index edfa6f02f..026019742 100644
--- a/kicker/applets/launcher/configdlgbase.ui
+++ b/kicker/applets/launcher/configdlgbase.ui
@@ -274,8 +274,7 @@
</connection>
</connections>
<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>
+</includes>
</UI>
diff --git a/kicker/kicker/core/kmenubase.ui b/kicker/kicker/core/kmenubase.ui
index 68c82dc7e..7c740d63b 100644
--- a/kicker/kicker/core/kmenubase.ui
+++ b/kicker/kicker/core/kmenubase.ui
@@ -283,12 +283,10 @@
</images>
<includes>
<include location="local" impldecl="in implementation">kmenubase.ui.h</include>
+ <include location="global" impldecl="in implementation">kcombobox.h</include>
</includes>
<functions>
<function access="private" specifier="non virtual">init()</function>
</functions>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kcombobox.h</includehint>
-</includehints>
</UI>
diff --git a/kicker/kicker/ui/appletview.ui b/kicker/kicker/ui/appletview.ui
index f5a32651b..5d92dab89 100644
--- a/kicker/kicker/ui/appletview.ui
+++ b/kicker/kicker/ui/appletview.ui
@@ -196,9 +196,10 @@
<tabstop>appletFilter</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
+<includes>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
<includehints>
<includehint>tqscrollview.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
</includehints>
</UI>
diff --git a/kicker/kicker/ui/nonKDEButtonSettings.ui b/kicker/kicker/ui/nonKDEButtonSettings.ui
index cbd85b4d0..59976b484 100644
--- a/kicker/kicker/ui/nonKDEButtonSettings.ui
+++ b/kicker/kicker/ui/nonKDEButtonSettings.ui
@@ -218,4 +218,8 @@
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<includes>
+ <include location="global" impldecl="in implementation">kicondialog.h</include>
+ <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
</UI>
diff --git a/konqueror/sidebar/trees/history_module/history_dlg.ui b/konqueror/sidebar/trees/history_module/history_dlg.ui
index 225920387..e42c49759 100644
--- a/konqueror/sidebar/trees/history_module/history_dlg.ui
+++ b/konqueror/sidebar/trees/history_module/history_dlg.ui
@@ -223,17 +223,8 @@
</widget>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">knuminput.h</include>
</includes>
<layoutdefaults spacing="6" margin="0"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
-</includehints>
</UI>
diff --git a/kpersonalizer/keyecandypagedlg.ui b/kpersonalizer/keyecandypagedlg.ui
index c6da0a6ac..1a9c7e570 100644
--- a/kpersonalizer/keyecandypagedlg.ui
+++ b/kpersonalizer/keyecandypagedlg.ui
@@ -256,7 +256,8 @@ If you have a fast, new processor, you might want to turn them all on, but for t
<slot>slotEyeCandySliderMoved(int)</slot>
</Q_SLOTS>
<includes>
- <include location="local" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
</includes>
<layoutdefaults spacing="3" margin="6"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
diff --git a/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui b/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui
index 98bf0e207..619e8583f 100644
--- a/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui
+++ b/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui
@@ -160,6 +160,7 @@
</vbox>
</widget>
<includes>
+ <include location="global" impldecl="in implementation">kcolorbutton.h</include>
<include location="global" impldecl="in implementation">kdialog.h</include>
<include location="local" impldecl="in implementation">ListViewSettingsWidget.ui.h</include>
</includes>
diff --git a/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui b/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui
index c346dfbe3..c8a0e436c 100644
--- a/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui
+++ b/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui
@@ -338,6 +338,7 @@
<tabstop>cancelButton</tabstop>
</tabstops>
<includes>
+ <include location="global" impldecl="in implementation">kcolorbutton.h</include>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui
index 144335654..92109cb9b 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui
@@ -253,11 +253,11 @@
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
- <includehint>kurlrequester.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kcolordialog.h</include>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+ <include location="global" impldecl="in implementation">knuminput.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+ <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
</UI>
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui
index 7a546e7b6..b317d93ba 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui
@@ -162,6 +162,7 @@
</vbox>
</widget>
<includes>
+ <include location="global" impldecl="in implementation">kcolorbutton.h</include>
<include location="global" impldecl="in implementation">kdialog.h</include>
<include location="local" impldecl="in implementation">SensorLoggerSettingsWidget.ui.h</include>
</includes>
diff --git a/tdeioslave/media/medianotifier/notificationdialogview.ui b/tdeioslave/media/medianotifier/notificationdialogview.ui
index 1feea8069..7fc786fcd 100644
--- a/tdeioslave/media/medianotifier/notificationdialogview.ui
+++ b/tdeioslave/media/medianotifier/notificationdialogview.ui
@@ -111,7 +111,7 @@
</image>
</images>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>tdelistbox.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">tdelistbox.h</include>
+</includes>
</UI>
diff --git a/tdeioslave/media/tdecmodule/notifiermoduleview.ui b/tdeioslave/media/tdecmodule/notifiermoduleview.ui
index ad32f7a3c..8c0563ffe 100644
--- a/tdeioslave/media/tdecmodule/notifiermoduleview.ui
+++ b/tdeioslave/media/tdecmodule/notifiermoduleview.ui
@@ -160,12 +160,9 @@
</grid>
</widget>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kcombobox.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>tdelistbox.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kcombobox.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+ <include location="global" impldecl="in implementation">tdelistbox.h</include>
+</includes>
</UI>
diff --git a/tdeioslave/media/tdecmodule/serviceview.ui b/tdeioslave/media/tdecmodule/serviceview.ui
index 64b077583..45af8a941 100644
--- a/tdeioslave/media/tdecmodule/serviceview.ui
+++ b/tdeioslave/media/tdecmodule/serviceview.ui
@@ -237,12 +237,11 @@
</grid>
</widget>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kicondialog.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>tdeactionselector.h</includehint>
- <includehint>kactivelabel.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kactivelabel.h</include>
+ <include location="global" impldecl="in implementation">kicondialog.h</include>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+ <include location="global" impldecl="in implementation">tdeactionselector.h</include>
+</includes>
</UI>
diff --git a/tdepasswd/kcm/main_widget.ui b/tdepasswd/kcm/main_widget.ui
index b1933f592..d4da2cfea 100644
--- a/tdepasswd/kcm/main_widget.ui
+++ b/tdepasswd/kcm/main_widget.ui
@@ -287,7 +287,8 @@
<tabstop>btnChangePassword</tabstop>
</tabstops>
<includes>
- <include location="local" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
diff --git a/twin/kcmtwin/twinrules/editshortcutbase.ui b/twin/kcmtwin/twinrules/editshortcutbase.ui
index 702816263..793784c42 100644
--- a/twin/kcmtwin/twinrules/editshortcutbase.ui
+++ b/twin/kcmtwin/twinrules/editshortcutbase.ui
@@ -161,4 +161,7 @@ For example "&lt;b&gt;Shift+Alt+(123) Shift+Ctrl+(ABC)&lt;/b&gt;" will first try
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<includes>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
</UI>
diff --git a/twin/kcmtwin/twinrules/ruleslistbase.ui b/twin/kcmtwin/twinrules/ruleslistbase.ui
index 078d1ef2c..f079dcda3 100644
--- a/twin/kcmtwin/twinrules/ruleslistbase.ui
+++ b/twin/kcmtwin/twinrules/ruleslistbase.ui
@@ -88,4 +88,8 @@
</widget>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<includes>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+ <include location="global" impldecl="in implementation">tdelistbox.h</include>
+</includes>
</UI>
diff --git a/twin/kcmtwin/twinrules/ruleswidgetbase.ui b/twin/kcmtwin/twinrules/ruleswidgetbase.ui
index 90a438840..21486c4be 100644
--- a/twin/kcmtwin/twinrules/ruleswidgetbase.ui
+++ b/twin/kcmtwin/twinrules/ruleswidgetbase.ui
@@ -2541,57 +2541,13 @@
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<includes>
+ <include location="global" impldecl="in implementation">kcombobox.h</include>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+ <include location="global" impldecl="in implementation">krestrictedline.h</include>
+</includes>
<includehints>
- <includehint>kcombobox.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
<includehint>tdelistbox.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>krestrictedline.h</includehint>
- <includehint>krestrictedline.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>krestrictedline.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>krestrictedline.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>krestrictedline.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>krestrictedline.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>krestrictedline.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
</includehints>
</UI>