diff options
Diffstat (limited to 'kopete')
20 files changed, 39 insertions, 70 deletions
diff --git a/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui b/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui index 88e7ecba..a96bbcd8 100644 --- a/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui +++ b/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui @@ -213,7 +213,7 @@ </image> </images> <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/config/accounts/kopeteaccountconfigbase.ui b/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui index f84bbcfc..725c64c8 100644 --- a/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui +++ b/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui @@ -265,7 +265,4 @@ The priority is used to determine which contact to use when you click on a metac <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">tdelistview.h</include> </includes> -<includehints> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui b/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui index ff41c06e..dfc1d19a 100644 --- a/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui +++ b/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui @@ -390,10 +390,8 @@ </connections> <layoutdefaults spacing="6" margin="11"/> <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">kurlrequester.h</include> </includes> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/kopete/kopete/contactlist/customnotifications.ui b/kopete/kopete/contactlist/customnotifications.ui index c5949844..ed48c00a 100644 --- a/kopete/kopete/contactlist/customnotifications.ui +++ b/kopete/kopete/contactlist/customnotifications.ui @@ -231,10 +231,8 @@ </tabstops> <layoutdefaults spacing="6" margin="11"/> <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">kurlrequester.h</include> </includes> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/kopete/kopete/contactlist/kopetemetalvipropswidget.ui b/kopete/kopete/contactlist/kopetemetalvipropswidget.ui index 646e58ff..64201f76 100644 --- a/kopete/kopete/contactlist/kopetemetalvipropswidget.ui +++ b/kopete/kopete/contactlist/kopetemetalvipropswidget.ui @@ -572,13 +572,11 @@ </customwidgets> <layoutdefaults spacing="6" margin="11"/> <includes> + <include location="global" impldecl="in implementation">addressbooklinkwidget.h</include> + <include location="global" impldecl="in implementation">kcombobox.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">kurlrequester.h</include> </includes> -<includehints> - <includehint>addressbooklinkwidget.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kcombobox.h</includehint> -</includehints> </UI> diff --git a/kopete/kopete/grouptdeabcselectorwidget.ui b/kopete/kopete/grouptdeabcselectorwidget.ui index bdcf1045..5a0ecfb9 100644 --- a/kopete/kopete/grouptdeabcselectorwidget.ui +++ b/kopete/kopete/grouptdeabcselectorwidget.ui @@ -84,8 +84,8 @@ <header>addressbooklinkwidget.h</header> </customwidget> </customwidgets> -<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/plugins/highlight/highlightprefsbase.ui b/kopete/plugins/highlight/highlightprefsbase.ui index 45653bd4..0c3c1c87 100644 --- a/kopete/plugins/highlight/highlightprefsbase.ui +++ b/kopete/plugins/highlight/highlightprefsbase.ui @@ -457,10 +457,8 @@ <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">kpushbutton.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> <include location="global" impldecl="in implementation">tdelistview.h</include> </includes> -<includehints> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/kopete/plugins/smpppdcs/smpppdcsprefs.ui b/kopete/plugins/smpppdcs/smpppdcsprefs.ui index c0445894..b75b8d9c 100644 --- a/kopete/plugins/smpppdcs/smpppdcsprefs.ui +++ b/kopete/plugins/smpppdcs/smpppdcsprefs.ui @@ -278,9 +278,7 @@ <layoutdefaults spacing="0" margin="0"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">smpppdlocationwidget.h</include> <include location="global" impldecl="in implementation">tdelistview.h</include> </includes> -<includehints> - <includehint>smpppdlocationwidget.h</includehint> -</includehints> </UI> diff --git a/kopete/plugins/statistics/statisticswidget.ui b/kopete/plugins/statistics/statisticswidget.ui index fca8f50e..f996f8b7 100644 --- a/kopete/plugins/statistics/statisticswidget.ui +++ b/kopete/plugins/statistics/statisticswidget.ui @@ -239,10 +239,8 @@ <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kdatepicker.h</include> + <include location="global" impldecl="in implementation">kdatetbl.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> <include location="global" impldecl="in implementation">ktimewidget.h</include> </includes> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kdatetbl.h</includehint> -</includehints> </UI> diff --git a/kopete/plugins/webpresence/webpresenceprefs.ui b/kopete/plugins/webpresence/webpresenceprefs.ui index dfe781f1..9ede265d 100644 --- a/kopete/plugins/webpresence/webpresenceprefs.ui +++ b/kopete/plugins/webpresence/webpresenceprefs.ui @@ -361,9 +361,7 @@ images/winpopup_protocol.png</string> <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> -<includehints> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui index 551d9322..5a13dbd9 100644 --- a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui +++ b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui @@ -1043,7 +1043,7 @@ If two resources have the same priority, the messages will be sent to the one co <tabstop>cbSendComposingEvent</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kopetepasswordwidget.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kopetepasswordwidget.h</include> +</includes> </UI> diff --git a/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui b/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui index 914d1533..024b4657 100644 --- a/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui +++ b/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui @@ -431,7 +431,7 @@ <tabstop>mScreenName</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kopetepasswordwidget.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kopetepasswordwidget.h</include> +</includes> </UI> diff --git a/kopete/protocols/msn/config/msnprefs.ui b/kopete/protocols/msn/config/msnprefs.ui index 13817584..96821c2f 100644 --- a/kopete/protocols/msn/config/msnprefs.ui +++ b/kopete/protocols/msn/config/msnprefs.ui @@ -210,8 +210,4 @@ <include location="global" impldecl="in implementation">knuminput.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> </UI> diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui index 98932d9b..18386cc2 100644 --- a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui +++ b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui @@ -534,7 +534,7 @@ <tabstop>rbBlockDenyList</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kopetepasswordwidget.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kopetepasswordwidget.h</include> +</includes> </UI> diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui index bd9f2f8e..fd0ac697 100644 --- a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui +++ b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui @@ -480,7 +480,7 @@ If you do not currently have an ICQ account, please click the button to create o <tabstop>chkWebAware</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kopetepasswordwidget.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kopetepasswordwidget.h</include> +</includes> </UI> diff --git a/kopete/protocols/sms/services/gsmlibprefs.ui b/kopete/protocols/sms/services/gsmlibprefs.ui index 31e71c76..e37dcee1 100644 --- a/kopete/protocols/sms/services/gsmlibprefs.ui +++ b/kopete/protocols/sms/services/gsmlibprefs.ui @@ -93,10 +93,8 @@ </widget> <layoutdefaults spacing="6" margin="11"/> <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">kurlrequester.h</include> </includes> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/kopete/protocols/sms/services/smsclientprefs.ui b/kopete/protocols/sms/services/smsclientprefs.ui index 43cb42e1..0e35f7f5 100644 --- a/kopete/protocols/sms/services/smsclientprefs.ui +++ b/kopete/protocols/sms/services/smsclientprefs.ui @@ -125,10 +125,8 @@ </widget> <layoutdefaults spacing="6" margin="11"/> <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">kurlrequester.h</include> </includes> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/kopete/protocols/sms/services/smssendprefs.ui b/kopete/protocols/sms/services/smssendprefs.ui index 04cc3406..98ac7c31 100644 --- a/kopete/protocols/sms/services/smssendprefs.ui +++ b/kopete/protocols/sms/services/smssendprefs.ui @@ -181,10 +181,8 @@ </tabstops> <layoutdefaults spacing="6" margin="11"/> <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">kurlrequester.h</include> </includes> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/kopete/protocols/winpopup/ui/wpaddcontactbase.ui b/kopete/protocols/winpopup/ui/wpaddcontactbase.ui index fde15b0b..fa427760 100644 --- a/kopete/protocols/winpopup/ui/wpaddcontactbase.ui +++ b/kopete/protocols/winpopup/ui/wpaddcontactbase.ui @@ -183,9 +183,7 @@ <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">kpushbutton.h</include> </includes> -<includehints> - <includehint>klineedit.h</includehint> -</includehints> </UI> diff --git a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui index ed10dfb2..df48d194 100644 --- a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui +++ b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui @@ -349,11 +349,9 @@ However, the recommended way is to ask your administrator to create this directo </Q_SLOTS> <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">kpushbutton.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> -<includehints> - <includehint>klineedit.h</includehint> -</includehints> </UI> |