summaryrefslogtreecommitdiffstats
path: root/kopete
diff options
context:
space:
mode:
Diffstat (limited to 'kopete')
-rw-r--r--kopete/kopete/addaccountwizard/addaccountwizardpage1.ui6
-rw-r--r--kopete/kopete/addaccountwizard/addaccountwizardpage2.ui6
-rw-r--r--kopete/kopete/addaccountwizard/addaccountwizardpage3.ui3
-rw-r--r--kopete/kopete/addcontactwizard/addcontactwizard_base.ui9
-rw-r--r--kopete/kopete/config/accounts/kopeteaccountconfigbase.ui7
-rw-r--r--kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui10
-rw-r--r--kopete/kopete/config/appearance/appearanceconfig_colors.ui17
-rw-r--r--kopete/kopete/config/appearance/appearanceconfig_contactlist.ui4
-rw-r--r--kopete/kopete/config/appearance/appearanceconfig_emoticons.ui8
-rw-r--r--kopete/kopete/config/appearance/emoticonseditwidget.ui10
-rw-r--r--kopete/kopete/config/appearance/tooltipeditwidget.ui7
-rw-r--r--kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui8
-rw-r--r--kopete/kopete/config/behavior/kopeteawayconfigbase.ui6
-rw-r--r--kopete/kopete/config/identity/kopeteidentityconfigbase.ui18
-rw-r--r--kopete/kopete/contactlist/customnotifications.ui4
-rw-r--r--kopete/kopete/contactlist/kopeteaddrbookexportui.ui3
-rw-r--r--kopete/kopete/contactlist/kopetegvipropswidget.ui7
-rw-r--r--kopete/kopete/contactlist/kopetemetalvipropswidget.ui15
-rw-r--r--kopete/libkopete/ui/addressbooklinkwidget_base.ui8
-rw-r--r--kopete/libkopete/ui/addressbookselectorwidget_base.ui7
-rw-r--r--kopete/libkopete/ui/contactaddednotifywidget.ui13
-rw-r--r--kopete/libkopete/ui/fileconfirmbase.ui11
-rw-r--r--kopete/libkopete/ui/kopeteawaydialogbase.ui4
-rw-r--r--kopete/libkopete/ui/kopetepassworddialog.ui5
-rw-r--r--kopete/libkopete/ui/kopetepasswordwidgetbase.ui6
-rw-r--r--kopete/libkopete/ui/metacontactselectorwidget_base.ui6
-rw-r--r--kopete/plugins/alias/aliasdialog.ui12
-rw-r--r--kopete/plugins/alias/aliasdialogbase.ui10
-rw-r--r--kopete/plugins/cryptography/cryptographyprefsbase.ui6
-rw-r--r--kopete/plugins/cryptography/cryptographyuserkey_ui.ui3
-rw-r--r--kopete/plugins/highlight/highlightprefsbase.ui14
-rw-r--r--kopete/plugins/history/historyprefsui.ui9
-rw-r--r--kopete/plugins/history/historyviewer.ui14
-rw-r--r--kopete/plugins/latex/latexprefsbase.ui9
-rw-r--r--kopete/plugins/motionautoaway/motionawayprefs.ui9
-rw-r--r--kopete/plugins/nowlistening/nowlisteningprefs.ui6
-rw-r--r--kopete/plugins/smpppdcs/smpppdcsprefs.ui6
-rw-r--r--kopete/plugins/smpppdcs/smpppdlocationui.ui10
-rw-r--r--kopete/plugins/statistics/statisticswidget.ui6
-rw-r--r--kopete/plugins/texteffect/texteffectprefs.ui4
-rw-r--r--kopete/plugins/webpresence/webpresenceprefs.ui10
-rw-r--r--kopete/protocols/gadu/ui/gaduadd.ui6
-rw-r--r--kopete/protocols/gadu/ui/gadueditaccountui.ui8
-rw-r--r--kopete/protocols/gadu/ui/gaduregisteraccountui.ui8
-rw-r--r--kopete/protocols/gadu/ui/gadusearch.ui8
-rw-r--r--kopete/protocols/groupwise/ui/gwchatpropswidget.ui10
-rw-r--r--kopete/protocols/groupwise/ui/gwchatsearchwidget.ui8
-rw-r--r--kopete/protocols/groupwise/ui/gwcontactpropswidget.ui6
-rw-r--r--kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui6
-rw-r--r--kopete/protocols/irc/ui/irceditaccount.ui6
-rw-r--r--kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui8
-rw-r--r--kopete/protocols/jabber/ui/dlgaddcontact.ui6
-rw-r--r--kopete/protocols/jabber/ui/dlgbrowse.ui7
-rw-r--r--kopete/protocols/jabber/ui/dlgchangepassword.ui8
-rw-r--r--kopete/protocols/jabber/ui/dlgchatroomslist.ui6
-rw-r--r--kopete/protocols/jabber/ui/dlgjabberchooseserver.ui6
-rw-r--r--kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui11
-rw-r--r--kopete/protocols/jabber/ui/dlgvcard.ui8
-rw-r--r--kopete/protocols/oscar/icq/ui/icqadd.ui6
-rw-r--r--kopete/protocols/oscar/icq/ui/icqsearchbase.ui14
-rw-r--r--kopete/protocols/sms/services/gsmlibprefs.ui4
-rw-r--r--kopete/protocols/sms/services/smsclientprefs.ui7
-rw-r--r--kopete/protocols/sms/services/smssendprefs.ui4
-rw-r--r--kopete/protocols/sms/ui/smsactprefs.ui4
-rw-r--r--kopete/protocols/sms/ui/smsuserprefs.ui6
-rw-r--r--kopete/protocols/winpopup/ui/wpaddcontactbase.ui7
-rw-r--r--kopete/protocols/winpopup/ui/wpeditaccountbase.ui9
-rw-r--r--kopete/protocols/winpopup/ui/wpuserinfowidget.ui10
68 files changed, 245 insertions, 288 deletions
diff --git a/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui b/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui
index e9df15e7..ae48e6ee 100644
--- a/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui
+++ b/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui
@@ -138,7 +138,7 @@
<tabstop>protocolListView</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
</UI>
diff --git a/kopete/kopete/addaccountwizard/addaccountwizardpage2.ui b/kopete/kopete/addaccountwizard/addaccountwizardpage2.ui
index f652cb2e..2c1a114c 100644
--- a/kopete/kopete/addaccountwizard/addaccountwizardpage2.ui
+++ b/kopete/kopete/addaccountwizard/addaccountwizardpage2.ui
@@ -150,7 +150,7 @@ for account:</string>
</image>
</images>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kcolorbutton.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+</includes>
</UI>
diff --git a/kopete/kopete/addaccountwizard/addaccountwizardpage3.ui b/kopete/kopete/addaccountwizard/addaccountwizardpage3.ui
index 4cd6e1ef..432aa9da 100644
--- a/kopete/kopete/addaccountwizard/addaccountwizardpage3.ui
+++ b/kopete/kopete/addaccountwizard/addaccountwizardpage3.ui
@@ -150,4 +150,7 @@ for account:</string>
</image>
</images>
<layoutdefaults spacing="6" margin="11"/>
+<includes>
+ <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+</includes>
</UI>
diff --git a/kopete/kopete/addcontactwizard/addcontactwizard_base.ui b/kopete/kopete/addcontactwizard/addcontactwizard_base.ui
index 02266016..bb4344ec 100644
--- a/kopete/kopete/addcontactwizard/addcontactwizard_base.ui
+++ b/kopete/kopete/addcontactwizard/addcontactwizard_base.ui
@@ -479,9 +479,8 @@
<tabstop>protocolListView</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>tdelistview.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
</UI>
diff --git a/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui b/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui
index 1c93e6dc..f84bbcfc 100644
--- a/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui
+++ b/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui
@@ -260,9 +260,12 @@ The priority is used to determine which contact to use when you click on a metac
<tabstop>mButtonRemove</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
+<includes>
+ <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
<includehints>
- <includehint>tdelistview.h</includehint>
- <includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
</includehints>
</UI>
diff --git a/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui b/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui
index 3e31cc2d..06a15255 100644
--- a/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui
+++ b/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui
@@ -186,10 +186,8 @@
<tabstop>deleteButton</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>tdelistbox.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+ <include location="global" impldecl="in implementation">tdelistbox.h</include>
+</includes>
</UI>
diff --git a/kopete/kopete/config/appearance/appearanceconfig_colors.ui b/kopete/kopete/config/appearance/appearanceconfig_colors.ui
index 6babf4ed..06028935 100644
--- a/kopete/kopete/config/appearance/appearanceconfig_colors.ui
+++ b/kopete/kopete/config/appearance/appearanceconfig_colors.ui
@@ -441,17 +441,8 @@
<tabstop>linkColor</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>tdefontrequester.h</includehint>
- <includehint>tdefontrequester.h</includehint>
- <includehint>tdefontrequester.h</includehint>
- <includehint>tdefontrequester.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+ <include location="global" impldecl="in implementation">tdefontrequester.h</include>
+</includes>
</UI>
diff --git a/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui b/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui
index d92f9467..ff41c06e 100644
--- a/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui
+++ b/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui
@@ -389,8 +389,10 @@
</connection>
</connections>
<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/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui b/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui
index 0c9078b7..362e816d 100644
--- a/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui
+++ b/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui
@@ -229,8 +229,8 @@
</connection>
</connections>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>tdelistbox.h</includehint>
- <includehint>ktextedit.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">ktextedit.h</include>
+ <include location="global" impldecl="in implementation">tdelistbox.h</include>
+</includes>
</UI>
diff --git a/kopete/kopete/config/appearance/emoticonseditwidget.ui b/kopete/kopete/config/appearance/emoticonseditwidget.ui
index a9a78175..ff5fdcde 100644
--- a/kopete/kopete/config/appearance/emoticonseditwidget.ui
+++ b/kopete/kopete/config/appearance/emoticonseditwidget.ui
@@ -78,10 +78,8 @@
</grid>
</widget>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
</UI>
diff --git a/kopete/kopete/config/appearance/tooltipeditwidget.ui b/kopete/kopete/config/appearance/tooltipeditwidget.ui
index d7f863cd..b118ebf5 100644
--- a/kopete/kopete/config/appearance/tooltipeditwidget.ui
+++ b/kopete/kopete/config/appearance/tooltipeditwidget.ui
@@ -208,8 +208,7 @@
<customwidgets>
</customwidgets>
<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/kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui b/kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui
index 5c9743da..a1c522d9 100644
--- a/kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui
+++ b/kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui
@@ -616,9 +616,7 @@
<slot>mHueSlider_destroyed(TQObject*)</slot>
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
</UI>
diff --git a/kopete/kopete/config/behavior/kopeteawayconfigbase.ui b/kopete/kopete/config/behavior/kopeteawayconfigbase.ui
index b1538e6a..41d74e69 100644
--- a/kopete/kopete/config/behavior/kopeteawayconfigbase.ui
+++ b/kopete/kopete/config/behavior/kopeteawayconfigbase.ui
@@ -350,7 +350,7 @@
<tabstop>mGoAvailable</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
</UI>
diff --git a/kopete/kopete/config/identity/kopeteidentityconfigbase.ui b/kopete/kopete/config/identity/kopeteidentityconfigbase.ui
index 08272e07..cf547116 100644
--- a/kopete/kopete/config/identity/kopeteidentityconfigbase.ui
+++ b/kopete/kopete/config/identity/kopeteidentityconfigbase.ui
@@ -526,16 +526,10 @@ current user contact.</string>
</connection>
</connections>
<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>kurlrequester.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>klineedit.h</includehint>
-</includehints>
+<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">kurlrequester.h</include>
+</includes>
</UI>
diff --git a/kopete/kopete/contactlist/customnotifications.ui b/kopete/kopete/contactlist/customnotifications.ui
index 45f15dad..c5949844 100644
--- a/kopete/kopete/contactlist/customnotifications.ui
+++ b/kopete/kopete/contactlist/customnotifications.ui
@@ -230,8 +230,10 @@
<tabstop>chkSuppressCommon</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/kopete/kopete/contactlist/kopeteaddrbookexportui.ui b/kopete/kopete/contactlist/kopeteaddrbookexportui.ui
index a1827dc9..eb31bd37 100644
--- a/kopete/kopete/contactlist/kopeteaddrbookexportui.ui
+++ b/kopete/kopete/contactlist/kopeteaddrbookexportui.ui
@@ -146,4 +146,7 @@
</grid>
</widget>
<layoutdefaults spacing="6" margin="11"/>
+<includes>
+ <include location="global" impldecl="in implementation">tdelistbox.h</include>
+</includes>
</UI>
diff --git a/kopete/kopete/contactlist/kopetegvipropswidget.ui b/kopete/kopete/contactlist/kopetegvipropswidget.ui
index 90eecf6c..5cb78408 100644
--- a/kopete/kopete/contactlist/kopetegvipropswidget.ui
+++ b/kopete/kopete/contactlist/kopetegvipropswidget.ui
@@ -149,8 +149,7 @@
<tabstop>icnbClosed</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kicondialog.h</includehint>
- <includehint>kicondialog.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kicondialog.h</include>
+</includes>
</UI>
diff --git a/kopete/kopete/contactlist/kopetemetalvipropswidget.ui b/kopete/kopete/contactlist/kopetemetalvipropswidget.ui
index b374532d..646e58ff 100644
--- a/kopete/kopete/contactlist/kopetemetalvipropswidget.ui
+++ b/kopete/kopete/contactlist/kopetemetalvipropswidget.ui
@@ -569,19 +569,16 @@
<class>Kopete::UI::AddressBookLinkWidget</class>
<header>addressbooklinkwidget.h</header>
</customwidget>
-</customwidgets>
+</customwidgets>
<layoutdefaults spacing="6" margin="11"/>
+<includes>
+ <include location="global" impldecl="in implementation">kicondialog.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+ <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
<includehints>
<includehint>addressbooklinkwidget.h</includehint>
<includehint>klineedit.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kurlrequester.h</includehint>
<includehint>kcombobox.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kicondialog.h</includehint>
- <includehint>kicondialog.h</includehint>
- <includehint>kicondialog.h</includehint>
- <includehint>kicondialog.h</includehint>
</includehints>
</UI>
diff --git a/kopete/libkopete/ui/addressbooklinkwidget_base.ui b/kopete/libkopete/ui/addressbooklinkwidget_base.ui
index 03982b47..3cde23d7 100644
--- a/kopete/libkopete/ui/addressbooklinkwidget_base.ui
+++ b/kopete/libkopete/ui/addressbooklinkwidget_base.ui
@@ -71,8 +71,8 @@
</vbox>
</widget>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>klineedit.h</includehint>
- <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
</UI>
diff --git a/kopete/libkopete/ui/addressbookselectorwidget_base.ui b/kopete/libkopete/ui/addressbookselectorwidget_base.ui
index fd046bf8..e3bf3c96 100644
--- a/kopete/libkopete/ui/addressbookselectorwidget_base.ui
+++ b/kopete/libkopete/ui/addressbookselectorwidget_base.ui
@@ -163,13 +163,10 @@
</grid>
</widget>
<includes>
+ <include location="global" impldecl="in declaration">kactivelabel.h</include>
+ <include location="global" impldecl="in declaration">tdelistview.h</include>
<include location="global" impldecl="in declaration">tdelistviewsearchline.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
- <includehint>kactivelabel.h</includehint>
- <includehint>tdelistview.h</includehint>
- <includehint>tdelistviewsearchline.h</includehint>
-</includehints>
</UI>
diff --git a/kopete/libkopete/ui/contactaddednotifywidget.ui b/kopete/libkopete/ui/contactaddednotifywidget.ui
index f29756e8..c515f4ae 100644
--- a/kopete/libkopete/ui/contactaddednotifywidget.ui
+++ b/kopete/libkopete/ui/contactaddednotifywidget.ui
@@ -249,12 +249,9 @@ Leave it empty if you want to see the contact nickname as display name.</string>
</customwidget>
</customwidgets>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kpushbutton.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>kpushbutton.h</includehint>
-</includehints>
+<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>
+</includes>
</UI>
diff --git a/kopete/libkopete/ui/fileconfirmbase.ui b/kopete/libkopete/ui/fileconfirmbase.ui
index 98970958..e70f838f 100644
--- a/kopete/libkopete/ui/fileconfirmbase.ui
+++ b/kopete/libkopete/ui/fileconfirmbase.ui
@@ -141,11 +141,8 @@
</grid>
</widget>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>klineedit.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
</UI>
diff --git a/kopete/libkopete/ui/kopeteawaydialogbase.ui b/kopete/libkopete/ui/kopeteawaydialogbase.ui
index 38571bd6..fc057fe2 100644
--- a/kopete/libkopete/ui/kopeteawaydialogbase.ui
+++ b/kopete/libkopete/ui/kopeteawaydialogbase.ui
@@ -82,4 +82,8 @@
</vbox>
</widget>
<layoutdefaults spacing="6" margin="11"/>
+<includes>
+ <include location="global" impldecl="in implementation">kcombobox.h</include>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
</UI>
diff --git a/kopete/libkopete/ui/kopetepassworddialog.ui b/kopete/libkopete/ui/kopetepassworddialog.ui
index ac510361..f6def915 100644
--- a/kopete/libkopete/ui/kopetepassworddialog.ui
+++ b/kopete/libkopete/ui/kopetepassworddialog.ui
@@ -106,4 +106,9 @@
<tabstop>m_save_passwd</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
+<includes>
+ <include location="global" impldecl="in implementation">kactivelabel.h</include>
+ <include location="global" impldecl="in implementation">kpassdlg.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
</UI>
diff --git a/kopete/libkopete/ui/kopetepasswordwidgetbase.ui b/kopete/libkopete/ui/kopetepasswordwidgetbase.ui
index 6919064b..b1657a40 100644
--- a/kopete/libkopete/ui/kopetepasswordwidgetbase.ui
+++ b/kopete/libkopete/ui/kopetepasswordwidgetbase.ui
@@ -92,7 +92,7 @@
<tabstop>mRemembered</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kpassdlg.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kpassdlg.h</include>
+</includes>
</UI>
diff --git a/kopete/libkopete/ui/metacontactselectorwidget_base.ui b/kopete/libkopete/ui/metacontactselectorwidget_base.ui
index 4ff402b1..ee757888 100644
--- a/kopete/libkopete/ui/metacontactselectorwidget_base.ui
+++ b/kopete/libkopete/ui/metacontactselectorwidget_base.ui
@@ -96,12 +96,8 @@
<include location="local" impldecl="in declaration">kopetelistviewsearchline.h</include>
<include location="local" impldecl="in declaration">kopetelistview.h</include>
<include location="global" impldecl="in declaration">tqheader.h</include>
+ <include location="global" impldecl="in implementation">kactivelabel.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
- <includehint>kactivelabel.h</includehint>
- <includehint>kopetelistviewsearchline.h</includehint>
- <includehint>kopetelistview.h</includehint>
-</includehints>
</UI>
diff --git a/kopete/plugins/alias/aliasdialog.ui b/kopete/plugins/alias/aliasdialog.ui
index 47e7e9b6..4a3c2f1d 100644
--- a/kopete/plugins/alias/aliasdialog.ui
+++ b/kopete/plugins/alias/aliasdialog.ui
@@ -183,11 +183,9 @@ Do not include the '/' in the command (if you do it will be stripped off anyway)
<tabstop>kPushButton3</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
</UI>
diff --git a/kopete/plugins/alias/aliasdialogbase.ui b/kopete/plugins/alias/aliasdialogbase.ui
index 0297c6ff..b758ed4d 100644
--- a/kopete/plugins/alias/aliasdialogbase.ui
+++ b/kopete/plugins/alias/aliasdialogbase.ui
@@ -98,10 +98,8 @@
<customwidgets>
</customwidgets>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>tdelistview.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
</UI>
diff --git a/kopete/plugins/cryptography/cryptographyprefsbase.ui b/kopete/plugins/cryptography/cryptographyprefsbase.ui
index 2a6ec002..daa0c81c 100644
--- a/kopete/plugins/cryptography/cryptographyprefsbase.ui
+++ b/kopete/plugins/cryptography/cryptographyprefsbase.ui
@@ -190,7 +190,7 @@
<slot>m_selectOwnKey_stateChanged(int)</slot>
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
</UI>
diff --git a/kopete/plugins/cryptography/cryptographyuserkey_ui.ui b/kopete/plugins/cryptography/cryptographyuserkey_ui.ui
index 8a5b1379..6e7a2094 100644
--- a/kopete/plugins/cryptography/cryptographyuserkey_ui.ui
+++ b/kopete/plugins/cryptography/cryptographyuserkey_ui.ui
@@ -76,4 +76,7 @@
</grid>
</widget>
<layoutdefaults spacing="6" margin="11"/>
+<includes>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
</UI>
diff --git a/kopete/plugins/highlight/highlightprefsbase.ui b/kopete/plugins/highlight/highlightprefsbase.ui
index fa7cc9e1..45653bd4 100644
--- a/kopete/plugins/highlight/highlightprefsbase.ui
+++ b/kopete/plugins/highlight/highlightprefsbase.ui
@@ -453,14 +453,14 @@
<tabstop>m_raise</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
+<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">klineedit.h</include>
+ <include location="global" impldecl="in implementation">kurlrequester.h</include>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
<includehints>
- <includehint>tdelistview.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kurlrequester.h</includehint>
- <includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
</includehints>
</UI>
diff --git a/kopete/plugins/history/historyprefsui.ui b/kopete/plugins/history/historyprefsui.ui
index 558c68a2..52a55502 100644
--- a/kopete/plugins/history/historyprefsui.ui
+++ b/kopete/plugins/history/historyprefsui.ui
@@ -179,9 +179,8 @@
<tabstop>History_color</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>knuminput.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+ <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
</UI>
diff --git a/kopete/plugins/history/historyviewer.ui b/kopete/plugins/history/historyviewer.ui
index be64272d..aae06605 100644
--- a/kopete/plugins/history/historyviewer.ui
+++ b/kopete/plugins/history/historyviewer.ui
@@ -337,11 +337,11 @@
<customwidgets>
</customwidgets>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kprogress.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>tdelistviewsearchline.h</includehint>
- <includehint>tdelistview.h</includehint>
- <includehint>kcombobox.h</includehint>
-</includehints>
+<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">kprogress.h</include>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
+ <include location="global" impldecl="in implementation">tdelistviewsearchline.h</include>
+</includes>
</UI>
diff --git a/kopete/plugins/latex/latexprefsbase.ui b/kopete/plugins/latex/latexprefsbase.ui
index 2d036a3c..2609a0f1 100644
--- a/kopete/plugins/latex/latexprefsbase.ui
+++ b/kopete/plugins/latex/latexprefsbase.ui
@@ -159,10 +159,7 @@
</vbox>
</widget>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
</UI>
diff --git a/kopete/plugins/motionautoaway/motionawayprefs.ui b/kopete/plugins/motionautoaway/motionawayprefs.ui
index f8fd22c7..b9268ba8 100644
--- a/kopete/plugins/motionautoaway/motionawayprefs.ui
+++ b/kopete/plugins/motionautoaway/motionawayprefs.ui
@@ -289,9 +289,8 @@
</vbox>
</widget>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>klineedit.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+ <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
</UI>
diff --git a/kopete/plugins/nowlistening/nowlisteningprefs.ui b/kopete/plugins/nowlistening/nowlisteningprefs.ui
index 3fb6a340..74ec286a 100644
--- a/kopete/plugins/nowlistening/nowlisteningprefs.ui
+++ b/kopete/plugins/nowlistening/nowlisteningprefs.ui
@@ -370,7 +370,7 @@ in place of your status message.</string>
</connection>
</connections>
<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/kopete/plugins/smpppdcs/smpppdcsprefs.ui b/kopete/plugins/smpppdcs/smpppdcsprefs.ui
index 3aa91695..c0445894 100644
--- a/kopete/plugins/smpppdcs/smpppdcsprefs.ui
+++ b/kopete/plugins/smpppdcs/smpppdcsprefs.ui
@@ -276,9 +276,11 @@
<tabstop>accountList</tabstop>
</tabstops>
<layoutdefaults spacing="0" margin="0"/>
+<includes>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
<includehints>
- <includehint>kpushbutton.h</includehint>
<includehint>smpppdlocationwidget.h</includehint>
- <includehint>tdelistview.h</includehint>
</includehints>
</UI>
diff --git a/kopete/plugins/smpppdcs/smpppdlocationui.ui b/kopete/plugins/smpppdcs/smpppdlocationui.ui
index e10c3c3a..be4ccb28 100644
--- a/kopete/plugins/smpppdcs/smpppdlocationui.ui
+++ b/kopete/plugins/smpppdcs/smpppdlocationui.ui
@@ -140,10 +140,8 @@
<customwidgets>
</customwidgets>
<layoutdefaults spacing="6" margin="0"/>
-<includehints>
- <includehint>klineedit.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+ <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
</UI>
diff --git a/kopete/plugins/statistics/statisticswidget.ui b/kopete/plugins/statistics/statisticswidget.ui
index 4c53d8e2..fca8f50e 100644
--- a/kopete/plugins/statistics/statisticswidget.ui
+++ b/kopete/plugins/statistics/statisticswidget.ui
@@ -237,10 +237,12 @@
</grid>
</widget>
<layoutdefaults spacing="6" margin="11"/>
+<includes>
+ <include location="global" impldecl="in implementation">kdatepicker.h</include>
+ <include location="global" impldecl="in implementation">ktimewidget.h</include>
+</includes>
<includehints>
- <includehint>kdatepicker.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kdatetbl.h</includehint>
- <includehint>ktimewidget.h</includehint>
</includehints>
</UI>
diff --git a/kopete/plugins/texteffect/texteffectprefs.ui b/kopete/plugins/texteffect/texteffectprefs.ui
index e93ae0fd..19e01c19 100644
--- a/kopete/plugins/texteffect/texteffectprefs.ui
+++ b/kopete/plugins/texteffect/texteffectprefs.ui
@@ -223,9 +223,7 @@
</tabstops>
<includes>
<include location="global" impldecl="in implementation">knuminput.h</include>
+ <include location="global" impldecl="in implementation">tdelistbox.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>tdelistbox.h</includehint>
-</includehints>
</UI>
diff --git a/kopete/plugins/webpresence/webpresenceprefs.ui b/kopete/plugins/webpresence/webpresenceprefs.ui
index cb78bd36..b075195c 100644
--- a/kopete/plugins/webpresence/webpresenceprefs.ui
+++ b/kopete/plugins/webpresence/webpresenceprefs.ui
@@ -356,12 +356,12 @@ images/winpopup_protocol.png</string>
<tabstop>includeIMAddress</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
+<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">kurlrequester.h</include>
+</includes>
<includehints>
- <includehint>kurlrequester.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kurlrequester.h</includehint>
- <includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
</includehints>
</UI>
diff --git a/kopete/protocols/gadu/ui/gaduadd.ui b/kopete/protocols/gadu/ui/gaduadd.ui
index e51209c6..c3e48974 100644
--- a/kopete/protocols/gadu/ui/gaduadd.ui
+++ b/kopete/protocols/gadu/ui/gaduadd.ui
@@ -354,7 +354,7 @@
<customwidgets>
</customwidgets>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>krestrictedline.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">krestrictedline.h</include>
+</includes>
</UI>
diff --git a/kopete/protocols/gadu/ui/gadueditaccountui.ui b/kopete/protocols/gadu/ui/gadueditaccountui.ui
index 79722aa0..987289d0 100644
--- a/kopete/protocols/gadu/ui/gadueditaccountui.ui
+++ b/kopete/protocols/gadu/ui/gadueditaccountui.ui
@@ -866,8 +866,8 @@ If you do not currently have an account, please click the button to create one.<
<tabstop>dccPort</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>klineedit.h</includehint>
- <includehint>krestrictedline.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+ <include location="global" impldecl="in implementation">krestrictedline.h</include>
+</includes>
</UI>
diff --git a/kopete/protocols/gadu/ui/gaduregisteraccountui.ui b/kopete/protocols/gadu/ui/gaduregisteraccountui.ui
index fcb5b1c3..b9e0e67e 100644
--- a/kopete/protocols/gadu/ui/gaduregisteraccountui.ui
+++ b/kopete/protocols/gadu/ui/gaduregisteraccountui.ui
@@ -415,9 +415,7 @@
<tabstop>valueVerificationSequence</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
</UI>
diff --git a/kopete/protocols/gadu/ui/gadusearch.ui b/kopete/protocols/gadu/ui/gadusearch.ui
index 4c40ae13..d1baab76 100644
--- a/kopete/protocols/gadu/ui/gadusearch.ui
+++ b/kopete/protocols/gadu/ui/gadusearch.ui
@@ -685,8 +685,8 @@
<tabstop>listFound</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>krestrictedline.h</includehint>
- <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">krestrictedline.h</include>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
</UI>
diff --git a/kopete/protocols/groupwise/ui/gwchatpropswidget.ui b/kopete/protocols/groupwise/ui/gwchatpropswidget.ui
index 23388b30..3a10b5a6 100644
--- a/kopete/protocols/groupwise/ui/gwchatpropswidget.ui
+++ b/kopete/protocols/groupwise/ui/gwchatpropswidget.ui
@@ -385,10 +385,8 @@
</vbox>
</widget>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>tdelistbox.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+ <include location="global" impldecl="in implementation">tdelistbox.h</include>
+</includes>
</UI>
diff --git a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui
index 0d69e76d..57617dd8 100644
--- a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui
+++ b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui
@@ -109,8 +109,8 @@
</vbox>
</widget>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>tdelistview.h</includehint>
- <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
</UI>
diff --git a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui
index 305924b0..744ce692 100644
--- a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui
+++ b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui
@@ -205,7 +205,7 @@
</vbox>
</widget>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
</UI>
diff --git a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui
index 4a685311..d130a3f3 100644
--- a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui
+++ b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui
@@ -106,7 +106,7 @@
</hbox>
</widget>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
</UI>
diff --git a/kopete/protocols/irc/ui/irceditaccount.ui b/kopete/protocols/irc/ui/irceditaccount.ui
index 8bdb552a..3f5ee1e4 100644
--- a/kopete/protocols/irc/ui/irceditaccount.ui
+++ b/kopete/protocols/irc/ui/irceditaccount.ui
@@ -1016,7 +1016,7 @@
<tabstop>addButton</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
</UI>
diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui b/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui
index bea1ac4e..1c3bddf3 100644
--- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui
+++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui
@@ -361,9 +361,7 @@
</vbox>
</widget>
<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/kopete/protocols/jabber/ui/dlgaddcontact.ui b/kopete/protocols/jabber/ui/dlgaddcontact.ui
index 30a609a0..8bda3062 100644
--- a/kopete/protocols/jabber/ui/dlgaddcontact.ui
+++ b/kopete/protocols/jabber/ui/dlgaddcontact.ui
@@ -99,7 +99,7 @@
<customwidgets>
</customwidgets>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
</UI>
diff --git a/kopete/protocols/jabber/ui/dlgbrowse.ui b/kopete/protocols/jabber/ui/dlgbrowse.ui
index 66cfcfc5..3b941d10 100644
--- a/kopete/protocols/jabber/ui/dlgbrowse.ui
+++ b/kopete/protocols/jabber/ui/dlgbrowse.ui
@@ -194,8 +194,7 @@
</connection>
</connections>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
</UI>
diff --git a/kopete/protocols/jabber/ui/dlgchangepassword.ui b/kopete/protocols/jabber/ui/dlgchangepassword.ui
index bed6e8d4..d54bd51c 100644
--- a/kopete/protocols/jabber/ui/dlgchangepassword.ui
+++ b/kopete/protocols/jabber/ui/dlgchangepassword.ui
@@ -80,9 +80,7 @@ and then your new password twice.</string>
<customwidgets>
</customwidgets>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kpassdlg.h</includehint>
- <includehint>kpassdlg.h</includehint>
- <includehint>kpassdlg.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kpassdlg.h</include>
+</includes>
</UI>
diff --git a/kopete/protocols/jabber/ui/dlgchatroomslist.ui b/kopete/protocols/jabber/ui/dlgchatroomslist.ui
index b158db62..ba344add 100644
--- a/kopete/protocols/jabber/ui/dlgchatroomslist.ui
+++ b/kopete/protocols/jabber/ui/dlgchatroomslist.ui
@@ -179,7 +179,7 @@
<slot>slotDoubleClick(int row, int col, int button, const TQPoint&amp; mousePos)</slot>
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kdialog.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in declaration">kdialog.h</include>
+</includes>
</UI>
diff --git a/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui b/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui
index ad52240e..916cacd5 100644
--- a/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui
+++ b/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui
@@ -101,7 +101,7 @@
</image>
</images>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kactivelabel.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kactivelabel.h</include>
+</includes>
</UI>
diff --git a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui
index ea3d51c0..3133542d 100644
--- a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui
+++ b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui
@@ -310,10 +310,9 @@
<tabstop>lePasswordVerify</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kpushbutton.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>kpassdlg.h</includehint>
- <includehint>kpassdlg.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">knuminput.h</include>
+ <include location="global" impldecl="in implementation">kpassdlg.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
</UI>
diff --git a/kopete/protocols/jabber/ui/dlgvcard.ui b/kopete/protocols/jabber/ui/dlgvcard.ui
index 6daa3a4e..d5d6e614 100644
--- a/kopete/protocols/jabber/ui/dlgvcard.ui
+++ b/kopete/protocols/jabber/ui/dlgvcard.ui
@@ -1056,9 +1056,7 @@
<tabstop>teAbout</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kurllabel.h</includehint>
- <includehint>kurllabel.h</includehint>
- <includehint>kurllabel.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kurllabel.h</include>
+</includes>
</UI>
diff --git a/kopete/protocols/oscar/icq/ui/icqadd.ui b/kopete/protocols/oscar/icq/ui/icqadd.ui
index 9ee07372..1d253a0a 100644
--- a/kopete/protocols/oscar/icq/ui/icqadd.ui
+++ b/kopete/protocols/oscar/icq/ui/icqadd.ui
@@ -116,7 +116,7 @@
</image>
</images>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
</UI>
diff --git a/kopete/protocols/oscar/icq/ui/icqsearchbase.ui b/kopete/protocols/oscar/icq/ui/icqsearchbase.ui
index e2fb2c6b..da63ff6b 100644
--- a/kopete/protocols/oscar/icq/ui/icqsearchbase.ui
+++ b/kopete/protocols/oscar/icq/ui/icqsearchbase.ui
@@ -480,14 +480,8 @@
<tabstop>searchResults</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>tdelistview.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
</UI>
diff --git a/kopete/protocols/sms/services/gsmlibprefs.ui b/kopete/protocols/sms/services/gsmlibprefs.ui
index 8cccfe81..31e71c76 100644
--- a/kopete/protocols/sms/services/gsmlibprefs.ui
+++ b/kopete/protocols/sms/services/gsmlibprefs.ui
@@ -92,8 +92,10 @@
</vbox>
</widget>
<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/kopete/protocols/sms/services/smsclientprefs.ui b/kopete/protocols/sms/services/smsclientprefs.ui
index 36e9f543..43cb42e1 100644
--- a/kopete/protocols/sms/services/smsclientprefs.ui
+++ b/kopete/protocols/sms/services/smsclientprefs.ui
@@ -124,11 +124,10 @@
</vbox>
</widget>
<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>
- <includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
</includehints>
diff --git a/kopete/protocols/sms/services/smssendprefs.ui b/kopete/protocols/sms/services/smssendprefs.ui
index c902d22d..04cc3406 100644
--- a/kopete/protocols/sms/services/smssendprefs.ui
+++ b/kopete/protocols/sms/services/smssendprefs.ui
@@ -180,8 +180,10 @@
<tabstop>provider</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/kopete/protocols/sms/ui/smsactprefs.ui b/kopete/protocols/sms/ui/smsactprefs.ui
index 10f5c235..972c5009 100644
--- a/kopete/protocols/sms/ui/smsactprefs.ui
+++ b/kopete/protocols/sms/ui/smsactprefs.ui
@@ -427,9 +427,7 @@
</tabstops>
<includes>
<include location="global" impldecl="in implementation">knuminput.h</include>
+ <include location="global" impldecl="in implementation">krestrictedline.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>krestrictedline.h</includehint>
-</includehints>
</UI>
diff --git a/kopete/protocols/sms/ui/smsuserprefs.ui b/kopete/protocols/sms/ui/smsuserprefs.ui
index aa719efe..40c0f713 100644
--- a/kopete/protocols/sms/ui/smsuserprefs.ui
+++ b/kopete/protocols/sms/ui/smsuserprefs.ui
@@ -112,7 +112,7 @@
</vbox>
</widget>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
</UI>
diff --git a/kopete/protocols/winpopup/ui/wpaddcontactbase.ui b/kopete/protocols/winpopup/ui/wpaddcontactbase.ui
index a594a5b1..fde15b0b 100644
--- a/kopete/protocols/winpopup/ui/wpaddcontactbase.ui
+++ b/kopete/protocols/winpopup/ui/wpaddcontactbase.ui
@@ -181,10 +181,11 @@
<tabstop>mRefresh</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
+<includes>
+ <include location="global" impldecl="in implementation">kcombobox.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
<includehints>
- <includehint>kcombobox.h</includehint>
<includehint>klineedit.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>kpushbutton.h</includehint>
</includehints>
</UI>
diff --git a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui
index ecf97df5..ed10dfb2 100644
--- a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui
+++ b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui
@@ -348,11 +348,12 @@ However, the recommended way is to ask your administrator to create this directo
<slot>installSamba()</slot>
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
+<includes>
+ <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>
<includehints>
- <includehint>kpushbutton.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
- <includehint>kpushbutton.h</includehint>
</includehints>
</UI>
diff --git a/kopete/protocols/winpopup/ui/wpuserinfowidget.ui b/kopete/protocols/winpopup/ui/wpuserinfowidget.ui
index 7c87b961..f8513505 100644
--- a/kopete/protocols/winpopup/ui/wpuserinfowidget.ui
+++ b/kopete/protocols/winpopup/ui/wpuserinfowidget.ui
@@ -209,11 +209,7 @@
<tabstop>sServer</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="0"/>
-<includehints>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
</UI>