diff options
27 files changed, 100 insertions, 122 deletions
diff --git a/akregator/src/addfeedwidgetbase.ui b/akregator/src/addfeedwidgetbase.ui index 8ee0614dc..fce602923 100644 --- a/akregator/src/addfeedwidgetbase.ui +++ b/akregator/src/addfeedwidgetbase.ui @@ -138,8 +138,8 @@ </vbox> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>ksqueezedtextlabel.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">ksqueezedtextlabel.h</include> +</includes> </UI> diff --git a/akregator/src/propertieswidgetbase.ui b/akregator/src/propertieswidgetbase.ui index 4ab1ea910..fae011b0a 100644 --- a/akregator/src/propertieswidgetbase.ui +++ b/akregator/src/propertieswidgetbase.ui @@ -457,11 +457,8 @@ <slot access="protected" specifier="pure virtual">slotUpdateCheckBoxToggled( bool )</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>knuminput.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/akregator/src/settings_advancedbase.ui b/akregator/src/settings_advancedbase.ui index 352fbaf51..ffe663ef2 100644 --- a/akregator/src/settings_advancedbase.ui +++ b/akregator/src/settings_advancedbase.ui @@ -151,7 +151,7 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcombobox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/akregator/src/settings_appearance.ui b/akregator/src/settings_appearance.ui index 08be6c450..9f2b63257 100644 --- a/akregator/src/settings_appearance.ui +++ b/akregator/src/settings_appearance.ui @@ -283,16 +283,12 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>tdefontcombo.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>tdefontcombo.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>tdefontcombo.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>tdefontcombo.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">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">tdefontcombo.h</include> +</includes> </UI> diff --git a/akregator/src/settings_archive.ui b/akregator/src/settings_archive.ui index 68107e398..054298c16 100644 --- a/akregator/src/settings_archive.ui +++ b/akregator/src/settings_archive.ui @@ -169,8 +169,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/akregator/src/tagpropertieswidgetbase.ui b/akregator/src/tagpropertieswidgetbase.ui index b7f56db56..9eefa7266 100644 --- a/akregator/src/tagpropertieswidgetbase.ui +++ b/akregator/src/tagpropertieswidgetbase.ui @@ -129,7 +129,7 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kicondialog.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kicondialog.h</include> +</includes> </UI> diff --git a/certmanager/certificatewizard.ui b/certmanager/certificatewizard.ui index 54b5f877d..cb5448075 100644 --- a/certmanager/certificatewizard.ui +++ b/certmanager/certificatewizard.ui @@ -551,6 +551,9 @@ If you want to change anything, press Back and make your changes; otherwise, pre <slot access="protected">slotGenerateCertificate()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kaddressbook/editors/imeditorbase.ui b/kaddressbook/editors/imeditorbase.ui index aca1c105f..bca99a623 100644 --- a/kaddressbook/editors/imeditorbase.ui +++ b/kaddressbook/editors/imeditorbase.ui @@ -154,11 +154,9 @@ </customwidgets> <layoutdefaults spacing="6" margin="0"/> <layoutfunctions spacing="KDialog::spacingHint"/> -<includehints> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>tdelistview.h</includehint> - <includehint>kactivelabel.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kactivelabel.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/kaddressbook/printing/ds_appearance.ui b/kaddressbook/printing/ds_appearance.ui index a5944f331..2b515bce5 100644 --- a/kaddressbook/printing/ds_appearance.ui +++ b/kaddressbook/printing/ds_appearance.ui @@ -476,4 +476,9 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> + <include location="global" impldecl="in implementation">tdefontcombo.h</include> +</includes> </UI> diff --git a/karm/csvexportdialog_base.ui b/karm/csvexportdialog_base.ui index 1b06db1dd..65d0fd90b 100644 --- a/karm/csvexportdialog_base.ui +++ b/karm/csvexportdialog_base.ui @@ -406,8 +406,11 @@ <slot>enableExportButton()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> <includehints> <includehint>kdateedit.h</includehint> - <includehint>kdateedit.h</includehint> </includehints> </UI> diff --git a/kmail/customtemplates_base.ui b/kmail/customtemplates_base.ui index df92c4f3e..4b877aece 100644 --- a/kmail/customtemplates_base.ui +++ b/kmail/customtemplates_base.ui @@ -356,14 +356,14 @@ <slot>mRemove_clicked()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kactivelabel.h</include> + <include location="global" impldecl="in implementation">kkeybutton.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> <includehints> <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kmfawidgets.h</includehint> <includehint>kmfawidgets.h</includehint> <includehint>templatesinsertcommand.h</includehint> - <includehint>kkeybutton.h</includehint> - <includehint>kactivelabel.h</includehint> </includehints> </UI> diff --git a/kmail/folderpropertiesdialog.ui b/kmail/folderpropertiesdialog.ui index 1428a54b5..80bdfad22 100644 --- a/kmail/folderpropertiesdialog.ui +++ b/kmail/folderpropertiesdialog.ui @@ -635,4 +635,9 @@ </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">kicondialog.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/kmail/snippetdlgbase.ui b/kmail/snippetdlgbase.ui index 3f05f08f1..a9ebba845 100644 --- a/kmail/snippetdlgbase.ui +++ b/kmail/snippetdlgbase.ui @@ -170,11 +170,10 @@ <tabstop>btnCancel</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>ktextedit.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">ktextedit.h</include> +</includes> </UI> diff --git a/kmail/snippetsettingsbase.ui b/kmail/snippetsettingsbase.ui index c266a202f..14be08e90 100644 --- a/kmail/snippetsettingsbase.ui +++ b/kmail/snippetsettingsbase.ui @@ -178,7 +178,7 @@ </grid> </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/kmail/templatesconfiguration_base.ui b/kmail/templatesconfiguration_base.ui index c1ed8d44c..683c7e862 100644 --- a/kmail/templatesconfiguration_base.ui +++ b/kmail/templatesconfiguration_base.ui @@ -325,8 +325,12 @@ </image> </images> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kactivelabel.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> <includehints> - <includehint>kactivelabel.h</includehint> <includehint>templatesinsertcommand.h</includehint> </includehints> </UI> diff --git a/kmobile/kmobile_selectiondialog.ui b/kmobile/kmobile_selectiondialog.ui index 67b41b143..a15f88a3f 100644 --- a/kmobile/kmobile_selectiondialog.ui +++ b/kmobile/kmobile_selectiondialog.ui @@ -106,10 +106,7 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kdialog.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> +</includes> </UI> diff --git a/knode/smtpaccountwidget_base.ui b/knode/smtpaccountwidget_base.ui index b55c0ee1b..702ce90d3 100644 --- a/knode/smtpaccountwidget_base.ui +++ b/knode/smtpaccountwidget_base.ui @@ -226,10 +226,7 @@ <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in declaration">tdecmodule.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> </includes> -<includehints> - <includehint>tdecmodule.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> </UI> diff --git a/korganizer/filteredit_base.ui b/korganizer/filteredit_base.ui index a5c3f792b..d0f43c948 100644 --- a/korganizer/filteredit_base.ui +++ b/korganizer/filteredit_base.ui @@ -313,8 +313,7 @@ Only to-dos which have least one attendee will be checked. If you are not in th <slot>updateFilter()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/korganizer/koeditoralarms_base.ui b/korganizer/koeditoralarms_base.ui index 716252f2a..a5f89cc11 100644 --- a/korganizer/koeditoralarms_base.ui +++ b/korganizer/koeditoralarms_base.ui @@ -661,13 +661,10 @@ </connections> <includes> <include location="global" impldecl="in declaration">addresseelineedit.h</include> + <include location="global" impldecl="in declaration">kurlrequester.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> <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> <includehint>libtdepim/addresseelineedit.h</includehint> diff --git a/korganizer/printing/calprintmonthconfig_base.ui b/korganizer/printing/calprintmonthconfig_base.ui index ceace2461..e11fea47c 100644 --- a/korganizer/printing/calprintmonthconfig_base.ui +++ b/korganizer/printing/calprintmonthconfig_base.ui @@ -198,13 +198,9 @@ <tabstop>mIncludeTodos</tabstop> </tabstops> <includes> + <include location="global" impldecl="in declaration">kcombobox.h</include> <include location="global" impldecl="in declaration">kdateedit.h</include> + <include location="global" impldecl="in declaration">knuminput.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcombobox.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> </UI> diff --git a/korganizer/template_management_dialog_base.ui b/korganizer/template_management_dialog_base.ui index 3bc983433..6b93e3a9a 100644 --- a/korganizer/template_management_dialog_base.ui +++ b/korganizer/template_management_dialog_base.ui @@ -87,7 +87,7 @@ <customwidgets> </customwidgets> <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/korn/kornaccountcfg.ui b/korn/kornaccountcfg.ui index 5e540b4b2..74c525b7d 100644 --- a/korn/kornaccountcfg.ui +++ b/korn/kornaccountcfg.ui @@ -238,11 +238,10 @@ <slot access="protected">slotProtocolChanged( const TQString& )</slot> </Q_SLOTS> <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/korn/kornboxcfg.ui b/korn/kornboxcfg.ui index f7717c53e..c70fef907 100644 --- a/korn/kornboxcfg.ui +++ b/korn/kornboxcfg.ui @@ -1678,21 +1678,13 @@ <slot access="protected">slotNewAnimToggled( bool )</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> + <include location="global" impldecl="in implementation">kicondialog.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> <includehints> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>keditlistbox.h</includehint> - <includehint>klineedit.h</includehint> </includehints> </UI> diff --git a/ktnef/gui/attachpropertydialogbase.ui b/ktnef/gui/attachpropertydialogbase.ui index 919b85480..ca34103a3 100644 --- a/ktnef/gui/attachpropertydialogbase.ui +++ b/ktnef/gui/attachpropertydialogbase.ui @@ -275,7 +275,7 @@ <slot access="protected">saveClicked()</slot> </Q_SLOTS> <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/libtdepim/addresspicker.ui b/libtdepim/addresspicker.ui index e03932b76..704b3d584 100644 --- a/libtdepim/addresspicker.ui +++ b/libtdepim/addresspicker.ui @@ -316,12 +316,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> - <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/plugins/kmail/bodypartformatter/ui_attendeeselector.ui b/plugins/kmail/bodypartformatter/ui_attendeeselector.ui index 295812401..a83a4d27c 100644 --- a/plugins/kmail/bodypartformatter/ui_attendeeselector.ui +++ b/plugins/kmail/bodypartformatter/ui_attendeeselector.ui @@ -76,13 +76,9 @@ </widget> <includes> <include location="global" impldecl="in declaration">libtdepim/addresseelineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tdelistbox.h</include> </includes> <layoutdefaults spacing="6" margin="0"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>tdelistbox.h</includehint> - <includehint>libtdepim/addresseelineedit.h</includehint> -</includehints> </UI> diff --git a/tderesources/groupwise/groupwisesettingswidgetbase.ui b/tderesources/groupwise/groupwisesettingswidgetbase.ui index b4b220521..34b310b11 100644 --- a/tderesources/groupwise/groupwisesettingswidgetbase.ui +++ b/tderesources/groupwise/groupwisesettingswidgetbase.ui @@ -74,7 +74,7 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> |