diff options
| author | Slávek Banko <[email protected]> | 2018-09-23 13:07:23 +0200 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2018-09-23 23:48:57 +0900 |
| commit | 3aadeebb36ac178c7b5cf7f91fd5f2a269d4a21c (patch) | |
| tree | 3398739e53968bdcabb53761d9498b7d3a0d701f | |
| parent | 319590c0d02bcea8b7860514383ea33f2c6a0cdf (diff) | |
| download | tdevelop-3aadeebb36ac178c7b5cf7f91fd5f2a269d4a21c.tar.gz tdevelop-3aadeebb36ac178c7b5cf7f91fd5f2a269d4a21c.zip | |
Add includes to UI files to resolve FTBFS
Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit a213def8e9bf36d3554373e623a8e84ef46ad960)
124 files changed, 469 insertions, 787 deletions
diff --git a/buildtools/ada/adaproject_optionsdlgbase.ui b/buildtools/ada/adaproject_optionsdlgbase.ui index 522467c6..b98bc1a3 100644 --- a/buildtools/ada/adaproject_optionsdlgbase.ui +++ b/buildtools/ada/adaproject_optionsdlgbase.ui @@ -458,15 +458,10 @@ <slot access="protected">setDirty()</slot> <slot access="protected">setDefaultOptions()</slot> </Q_SLOTS> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <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>tqwidget.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/buildtools/ant/antoptionswidget.ui b/buildtools/ant/antoptionswidget.ui index 0beab188..f7274b55 100644 --- a/buildtools/ant/antoptionswidget.ui +++ b/buildtools/ant/antoptionswidget.ui @@ -156,18 +156,13 @@ <tabstop>Verbosity</tabstop> <tabstop>Properties</tabstop> </tabstops> +<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">kdialog.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">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>kcombobox.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/buildtools/ant/classpathwidget.ui b/buildtools/ant/classpathwidget.ui index 61c8f305..3f17cb5b 100644 --- a/buildtools/ant/classpathwidget.ui +++ b/buildtools/ant/classpathwidget.ui @@ -26,14 +26,10 @@ </widget> </hbox> </widget> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> - <include location="global" impldecl="in implementation">keditlistbox.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">keditlistbox.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>keditlistbox.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> </UI> diff --git a/buildtools/autotools/addapplicationdlgbase.ui b/buildtools/autotools/addapplicationdlgbase.ui index 9b357801..e7495907 100644 --- a/buildtools/autotools/addapplicationdlgbase.ui +++ b/buildtools/autotools/addapplicationdlgbase.ui @@ -539,9 +539,6 @@ <tabstop>okbutton</tabstop> <tabstop>cancelbutton</tabstop> </tabstops> -<includes> - <include location="global" impldecl="in implementation">kdialog.h</include> -</includes> <Q_SLOTS> <slot access="protected">addTypeClicked()</slot> <slot access="protected">iconClicked()</slot> @@ -549,4 +546,8 @@ </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<includes> + <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/buildtools/autotools/addexistingdlgbase.ui b/buildtools/autotools/addexistingdlgbase.ui index 5223bd16..8d93cf8f 100644 --- a/buildtools/autotools/addexistingdlgbase.ui +++ b/buildtools/autotools/addexistingdlgbase.ui @@ -445,15 +445,11 @@ <tabstop>okButton</tabstop> <tabstop>cancelButton</tabstop> </tabstops> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> - <include location="global" impldecl="in implementation">ksqueezedtextlabel.h</include> - <include location="global" impldecl="in implementation">kprogress.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">kprogress.h</include> + <include location="global" impldecl="in implementation">ksqueezedtextlabel.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>kprogress.h</includehint> - <includehint>ksqueezedtextlabel.h</includehint> -</includehints> </UI> diff --git a/buildtools/autotools/addfiledlgbase.ui b/buildtools/autotools/addfiledlgbase.ui index 0d86b1a0..980515e8 100644 --- a/buildtools/autotools/addfiledlgbase.ui +++ b/buildtools/autotools/addfiledlgbase.ui @@ -275,15 +275,11 @@ </widget> </grid> </widget> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> - <include location="global" impldecl="in implementation">ksqueezedtextlabel.h</include> - <include location="global" impldecl="in implementation">klineedit.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">ksqueezedtextlabel.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>ksqueezedtextlabel.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> </UI> diff --git a/buildtools/autotools/addicondlgbase.ui b/buildtools/autotools/addicondlgbase.ui index c0e6c114..354a8f88 100644 --- a/buildtools/autotools/addicondlgbase.ui +++ b/buildtools/autotools/addicondlgbase.ui @@ -263,11 +263,11 @@ <Q_SLOTS> <slot>somethingChanged()</slot> </Q_SLOTS> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> - </UI> diff --git a/buildtools/autotools/addservicedlgbase.ui b/buildtools/autotools/addservicedlgbase.ui index c1f52b22..ad8e1b49 100644 --- a/buildtools/autotools/addservicedlgbase.ui +++ b/buildtools/autotools/addservicedlgbase.ui @@ -536,9 +536,10 @@ <slot access="protected">propertyExecuted(TQListViewItem*)</slot> <slot access="protected">removeTypeClicked()</slot> </Q_SLOTS> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/buildtools/autotools/addsubprojectdlgbase.ui b/buildtools/autotools/addsubprojectdlgbase.ui index 3c2e4828..e5483446 100644 --- a/buildtools/autotools/addsubprojectdlgbase.ui +++ b/buildtools/autotools/addsubprojectdlgbase.ui @@ -186,13 +186,10 @@ <tabstop>createButton</tabstop> <tabstop>cancelButton</tabstop> </tabstops> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> - <include location="global" impldecl="in implementation">klineedit.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>klineedit.h</includehint> -</includehints> </UI> diff --git a/buildtools/autotools/addtargetdlgbase.ui b/buildtools/autotools/addtargetdlgbase.ui index 9e8b561f..77bb8adc 100644 --- a/buildtools/autotools/addtargetdlgbase.ui +++ b/buildtools/autotools/addtargetdlgbase.ui @@ -334,15 +334,14 @@ <tabstop>okbutton</tabstop> <tabstop>cancelbutton</tabstop> </tabstops> -<includes> - <include location="global" impldecl="in implementation">kdialog.h</include> -</includes> <Q_SLOTS> <slot access="protected">primaryChanged()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>ksqueezedtextlabel.h</includehint> -</includehints> +<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">ksqueezedtextlabel.h</include> +</includes> </UI> diff --git a/buildtools/autotools/autoprojectviewbase.ui b/buildtools/autotools/autoprojectviewbase.ui index 5419e520..f41dd3d4 100644 --- a/buildtools/autotools/autoprojectviewbase.ui +++ b/buildtools/autotools/autoprojectviewbase.ui @@ -117,7 +117,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> diff --git a/buildtools/autotools/choosetargetdlgbase.ui b/buildtools/autotools/choosetargetdlgbase.ui index 6e3d5096..9bcddff0 100644 --- a/buildtools/autotools/choosetargetdlgbase.ui +++ b/buildtools/autotools/choosetargetdlgbase.ui @@ -202,9 +202,6 @@ <tabstop>newFileList</tabstop> <tabstop>neverAskAgainCheckbox</tabstop> </tabstops> -<includes> - <include location="global" impldecl="in implementation">kdialog.h</include> -</includes> <Q_SLOTS> <slot access="protected">slotActiveTargetToggled(bool)</slot> <slot access="protected">slotChooseTargetToggled(bool)</slot> @@ -212,11 +209,9 @@ <slot access="private">slotTargetChanged(const TQString&)</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>tdelistview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/buildtools/autotools/configureoptionswidgetbase.ui b/buildtools/autotools/configureoptionswidgetbase.ui index 37ac2407..a8821504 100644 --- a/buildtools/autotools/configureoptionswidgetbase.ui +++ b/buildtools/autotools/configureoptionswidgetbase.ui @@ -1014,9 +1014,6 @@ headers in a nonstandard directory <include dir></string> <tabstop>f77flags_edit</tabstop> <tabstop>f77flags_button</tabstop> </tabstops> -<includes> - <include location="global" impldecl="in implementation">kdialog.h</include> -</includes> <Q_SLOTS> <slot access="protected">builddirClicked()</slot> <slot access="protected">cflagsClicked()</slot> @@ -1034,7 +1031,8 @@ headers in a nonstandard directory <include dir></string> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/buildtools/autotools/removetargetdlgbase.ui b/buildtools/autotools/removetargetdlgbase.ui index b7e918cf..eef378b5 100644 --- a/buildtools/autotools/removetargetdlgbase.ui +++ b/buildtools/autotools/removetargetdlgbase.ui @@ -251,14 +251,12 @@ </widget> </grid> </widget> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">kprogress.h</include> + <include location="global" impldecl="in implementation">ksqueezedtextlabel.h</include> + <include location="global" impldecl="in implementation">tdelistbox.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>ksqueezedtextlabel.h</includehint> - <includehint>tdelistbox.h</includehint> - <includehint>kprogress.h</includehint> -</includehints> </UI> diff --git a/buildtools/autotools/subprojectoptionsdlgbase.ui b/buildtools/autotools/subprojectoptionsdlgbase.ui index 6c069718..d417e73b 100644 --- a/buildtools/autotools/subprojectoptionsdlgbase.ui +++ b/buildtools/autotools/subprojectoptionsdlgbase.ui @@ -964,9 +964,6 @@ <tabstop>okbutton</tabstop> <tabstop>cancelbutton</tabstop> </tabstops> -<includes> - <include location="global" impldecl="in implementation">kdialog.h</include> -</includes> <Q_SLOTS> <slot access="protected">buildorderMoveDownClicked()</slot> <slot access="protected">cflagsClicked()</slot> @@ -986,4 +983,8 @@ </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<includes> + <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/buildtools/autotools/targetoptionsdlgbase.ui b/buildtools/autotools/targetoptionsdlgbase.ui index 7e721a42..2fad9db1 100644 --- a/buildtools/autotools/targetoptionsdlgbase.ui +++ b/buildtools/autotools/targetoptionsdlgbase.ui @@ -700,9 +700,6 @@ <tabstop>okbutton</tabstop> <tabstop>cancelbutton</tabstop> </tabstops> -<includes> - <include location="global" impldecl="in implementation">kdialog.h</include> -</includes> <Q_SLOTS> <slot access="protected">insideMoveDownClicked()</slot> <slot access="protected">insideMoveUpClicked()</slot> @@ -714,13 +711,9 @@ </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<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> </UI> diff --git a/buildtools/custommakefiles/custombuildoptionswidgetbase.ui b/buildtools/custommakefiles/custombuildoptionswidgetbase.ui index df063672..bea1e872 100644 --- a/buildtools/custommakefiles/custombuildoptionswidgetbase.ui +++ b/buildtools/custommakefiles/custombuildoptionswidgetbase.ui @@ -147,18 +147,14 @@ </spacer> </vbox> </widget> -<includes> - <include location="global" impldecl="in implementation">kdialog.h</include> -</includes> <Q_SLOTS> <slot access="protected">makeToggled(bool)</slot> <slot access="protected">otherToggled(bool)</slot> </Q_SLOTS> <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> +<includes> + <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/buildtools/custommakefiles/custommakeconfigwidgetbase.ui b/buildtools/custommakefiles/custommakeconfigwidgetbase.ui index 3dcdfef7..cae0a6e0 100644 --- a/buildtools/custommakefiles/custommakeconfigwidgetbase.ui +++ b/buildtools/custommakefiles/custommakeconfigwidgetbase.ui @@ -375,9 +375,6 @@ <tabstop>copyenvs_button</tabstop> <tabstop>removeenvs_button</tabstop> </tabstops> -<includes> - <include location="global" impldecl="in implementation">kdialog.h</include> -</includes> <Q_SLOTS> <slot access="protected">envNameChanged(const TQString &)</slot> <slot access="protected">envChanged(const TQString&)</slot> @@ -387,9 +384,8 @@ </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/buildtools/custommakefiles/custommanagerwidgetbase.ui b/buildtools/custommakefiles/custommanagerwidgetbase.ui index a141c0b1..59d7873d 100644 --- a/buildtools/custommakefiles/custommanagerwidgetbase.ui +++ b/buildtools/custommakefiles/custommanagerwidgetbase.ui @@ -67,8 +67,7 @@ This will be used when adding/removing files in directories and re-populating th </vbox> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>keditlistbox.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">keditlistbox.h</include> +</includes> </UI> diff --git a/buildtools/custommakefiles/selectnewfilesdialogbase.ui b/buildtools/custommakefiles/selectnewfilesdialogbase.ui index d56df24b..5b0aa432 100644 --- a/buildtools/custommakefiles/selectnewfilesdialogbase.ui +++ b/buildtools/custommakefiles/selectnewfilesdialogbase.ui @@ -44,7 +44,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/buildtools/lib/widgets/environmentdisplaydialogbase.ui b/buildtools/lib/widgets/environmentdisplaydialogbase.ui index eb2903ac..5deda025 100644 --- a/buildtools/lib/widgets/environmentdisplaydialogbase.ui +++ b/buildtools/lib/widgets/environmentdisplaydialogbase.ui @@ -105,7 +105,7 @@ </connection> </connections> <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/buildtools/lib/widgets/makeoptionswidgetbase.ui b/buildtools/lib/widgets/makeoptionswidgetbase.ui index 9caba3ee..2311ca55 100644 --- a/buildtools/lib/widgets/makeoptionswidgetbase.ui +++ b/buildtools/lib/widgets/makeoptionswidgetbase.ui @@ -186,9 +186,10 @@ <tabstop>makebin_edit</tabstop> <tabstop>jobs_box</tabstop> </tabstops> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/buildtools/lib/widgets/runoptionswidgetbase.ui b/buildtools/lib/widgets/runoptionswidgetbase.ui index 3243c178..404af030 100644 --- a/buildtools/lib/widgets/runoptionswidgetbase.ui +++ b/buildtools/lib/widgets/runoptionswidgetbase.ui @@ -235,23 +235,15 @@ <tabstop>startinterminal_box</tabstop> <tabstop>autocompile_box</tabstop> </tabstops> -<includes> - <include location="global" impldecl="in implementation">kdialog.h</include> - <include location="global" impldecl="in declaration">ksqueezedtextlabel.h</include> -</includes> <Q_SLOTS> <slot>mainProgramChanged()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in declaration">ksqueezedtextlabel.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/buildtools/lib/widgets/subclassesdlgbase.ui b/buildtools/lib/widgets/subclassesdlgbase.ui index 7a06defb..a87cbd34 100644 --- a/buildtools/lib/widgets/subclassesdlgbase.ui +++ b/buildtools/lib/widgets/subclassesdlgbase.ui @@ -205,9 +205,6 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<includes> - <include location="global" impldecl="in implementation">kdialog.h</include> -</includes> <Q_SLOTS> <slot access="protected">changeCurrentURL(const TQString &str)</slot> <slot access="protected">removeRelation()</slot> @@ -216,9 +213,8 @@ </Q_SLOTS> <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> +<includes> + <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/buildtools/pascal/pascalproject_optionsdlgbase.ui b/buildtools/pascal/pascalproject_optionsdlgbase.ui index a7c7b418..a6f9321c 100644 --- a/buildtools/pascal/pascalproject_optionsdlgbase.ui +++ b/buildtools/pascal/pascalproject_optionsdlgbase.ui @@ -450,9 +450,6 @@ <tabstop>addconfig_button</tabstop> <tabstop>removeconfig_button</tabstop> </tabstops> -<includes> - <include location="global" impldecl="in implementation">kdialog.h</include> -</includes> <Q_SLOTS> <slot access="protected">compiler_box_activated(const TQString&)</slot> <slot access="protected">addconfig_button_clicked()</slot> @@ -466,9 +463,8 @@ </Q_SLOTS> <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> +<includes> + <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/buildtools/qmake/choosesubprojectdlgbase.ui b/buildtools/qmake/choosesubprojectdlgbase.ui index e9ef33f5..854966b3 100644 --- a/buildtools/qmake/choosesubprojectdlgbase.ui +++ b/buildtools/qmake/choosesubprojectdlgbase.ui @@ -127,8 +127,8 @@ <tabstop>buttonCancel</tabstop> </tabstops> <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/buildtools/qmake/createscopedlgbase.ui b/buildtools/qmake/createscopedlgbase.ui index d1550092..09b265d9 100644 --- a/buildtools/qmake/createscopedlgbase.ui +++ b/buildtools/qmake/createscopedlgbase.ui @@ -317,13 +317,9 @@ <tabstop>checkNotInc</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kurlrequester.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">kurlrequester.h</include> +</includes> </UI> diff --git a/buildtools/qmake/disablesubprojectdlgbase.ui b/buildtools/qmake/disablesubprojectdlgbase.ui index 863e28f8..2adc1544 100644 --- a/buildtools/qmake/disablesubprojectdlgbase.ui +++ b/buildtools/qmake/disablesubprojectdlgbase.ui @@ -118,9 +118,8 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <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/buildtools/qmake/newwidgetdlgbase.ui b/buildtools/qmake/newwidgetdlgbase.ui index 243fbff3..84d552b2 100644 --- a/buildtools/qmake/newwidgetdlgbase.ui +++ b/buildtools/qmake/newwidgetdlgbase.ui @@ -216,14 +216,15 @@ <tabstop>okayButton</tabstop> <tabstop>cancelButton</tabstop> </tabstops> -<includes> - <include location="global" impldecl="in implementation">kdialog.h</include> - <include location="global" impldecl="in implementation">kpushbutton.h</include> -</includes> <Q_SLOTS> <slot>subclassingPressed()</slot> <slot>templateSelChanged()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<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">kpushbutton.h</include> +</includes> </UI> diff --git a/buildtools/qmake/projectconfigurationdlgbase.ui b/buildtools/qmake/projectconfigurationdlgbase.ui index 0427a730..686240fe 100644 --- a/buildtools/qmake/projectconfigurationdlgbase.ui +++ b/buildtools/qmake/projectconfigurationdlgbase.ui @@ -2786,11 +2786,6 @@ <tabstop>buttonApply</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<includes> - <include location="global" impldecl="in implementation">klineedit.h</include> - <include location="global" impldecl="in implementation">kdialog.h</include> - <include location="global" impldecl="in implementation">kpushbutton.h</include> -</includes> <Q_SLOTS> <slot>updateProjectConfiguration()</slot> <slot>buildorderMoveUpClicked()</slot> @@ -2838,60 +2833,13 @@ </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>tdelistview.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.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">kdialog.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> + <include location="global" impldecl="in implementation">kurlrequester.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/buildtools/qmake/qmakeoptionswidgetbase.ui b/buildtools/qmake/qmakeoptionswidgetbase.ui index 1ae7a808..31fdccac 100644 --- a/buildtools/qmake/qmakeoptionswidgetbase.ui +++ b/buildtools/qmake/qmakeoptionswidgetbase.ui @@ -209,9 +209,7 @@ This disables the reading of any .qmake.cache files or mkspecs.</string> </vbox> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/buildtools/script/scriptoptionswidgetbase.ui b/buildtools/script/scriptoptionswidgetbase.ui index c23e3941..8cfe4f72 100644 --- a/buildtools/script/scriptoptionswidgetbase.ui +++ b/buildtools/script/scriptoptionswidgetbase.ui @@ -147,9 +147,10 @@ </spacer> </vbox> </widget> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kdevdesigner/designer/createtemplate.ui b/kdevdesigner/designer/createtemplate.ui index e03340b1..b79e7eb4 100644 --- a/kdevdesigner/designer/createtemplate.ui +++ b/kdevdesigner/designer/createtemplate.ui @@ -189,7 +189,7 @@ </connection> </connections> <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/kdevdesigner/designer/customwidgeteditor.ui b/kdevdesigner/designer/customwidgeteditor.ui index 76abc453..057015be 100644 --- a/kdevdesigner/designer/customwidgeteditor.ui +++ b/kdevdesigner/designer/customwidgeteditor.ui @@ -1375,4 +1375,7 @@ <tabstop>editProperty</tabstop> <tabstop>comboType</tabstop> </tabstops> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kdevdesigner/designer/dbconnection.ui b/kdevdesigner/designer/dbconnection.ui index 75b7d5cb..1510629b 100644 --- a/kdevdesigner/designer/dbconnection.ui +++ b/kdevdesigner/designer/dbconnection.ui @@ -219,4 +219,7 @@ <slot access="protected">destroy()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kdevdesigner/designer/editfunctions.ui b/kdevdesigner/designer/editfunctions.ui index ea59e46a..a5075250 100644 --- a/kdevdesigner/designer/editfunctions.ui +++ b/kdevdesigner/designer/editfunctions.ui @@ -711,4 +711,7 @@ <slot access="protected">displaySlots( bool )</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kdevdesigner/designer/formsettings.ui b/kdevdesigner/designer/formsettings.ui index 6337e8cf..812f30a0 100644 --- a/kdevdesigner/designer/formsettings.ui +++ b/kdevdesigner/designer/formsettings.ui @@ -546,4 +546,7 @@ <slot>okClicked()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kdevdesigner/designer/listboxeditor.ui b/kdevdesigner/designer/listboxeditor.ui index df584ddf..6c5a8408 100644 --- a/kdevdesigner/designer/listboxeditor.ui +++ b/kdevdesigner/designer/listboxeditor.ui @@ -449,9 +449,10 @@ <slot access="protected">moveItemUp()</slot> <slot access="protected">moveItemDown()</slot> </Q_SLOTS> +<pixmapfunction>BarIcon2</pixmapfunction> +<layoutdefaults spacing="6" margin="11"/> <includes> + <include location="global" impldecl="in implementation">klineedit.h</include> <include location="local" impldecl="in implementation">myiconloader.h</include> </includes> -<pixmapfunction>BarIcon2</pixmapfunction> -<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdevdesigner/designer/listeditor.ui b/kdevdesigner/designer/listeditor.ui index c477ff1a..addab137 100644 --- a/kdevdesigner/designer/listeditor.ui +++ b/kdevdesigner/designer/listeditor.ui @@ -155,9 +155,6 @@ <slot>renameItem()</slot> </connection> </connections> -<includes> - <include location="local" impldecl="in implementation">listeditor.ui.h</include> -</includes> <forwards> <forward>class TQStringList;</forward> </forwards> @@ -170,10 +167,10 @@ <slot returnType="TQStringList">items()</slot> <slot>renameItem()</slot> </Q_SLOTS> +<pixmapfunction>BarIcon2</pixmapfunction> +<layoutdefaults spacing="6" margin="11"/> <includes> + <include location="local" impldecl="in implementation">listeditor.ui.h</include> <include location="local" impldecl="in implementation">myiconloader.h</include> </includes> -<pixmapfunction>BarIcon2</pixmapfunction> - -<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdevdesigner/designer/pixmapfunction.ui b/kdevdesigner/designer/pixmapfunction.ui index 760abe56..5e54de71 100644 --- a/kdevdesigner/designer/pixmapfunction.ui +++ b/kdevdesigner/designer/pixmapfunction.ui @@ -970,7 +970,7 @@ </connection> </connections> <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/kdevdesigner/designer/preferences.ui b/kdevdesigner/designer/preferences.ui index 363164ed..c00cf82a 100644 --- a/kdevdesigner/designer/preferences.ui +++ b/kdevdesigner/designer/preferences.ui @@ -641,8 +641,4 @@ <slot access="protected">destroy()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>styledbutton.h</includehint> - <includehint>styledbutton.h</includehint> -</includehints> </UI> diff --git a/kdevdesigner/designer/previewwidget.ui b/kdevdesigner/designer/previewwidget.ui index 3b792253..76fb7f51 100644 --- a/kdevdesigner/designer/previewwidget.ui +++ b/kdevdesigner/designer/previewwidget.ui @@ -301,4 +301,7 @@ <slot access="protected" language="C++" returnType="void">init()</slot> <slot access="protected" language="C++" returnType="void">destroy()</slot> </connections> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kdevdesigner/designer/projectsettings.ui b/kdevdesigner/designer/projectsettings.ui index d606a521..2e03d928 100644 --- a/kdevdesigner/designer/projectsettings.ui +++ b/kdevdesigner/designer/projectsettings.ui @@ -298,4 +298,7 @@ <slot access="protected">okClicked()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kdevdesigner/designer/tableeditor.ui b/kdevdesigner/designer/tableeditor.ui index deacf5d4..21874754 100644 --- a/kdevdesigner/designer/tableeditor.ui +++ b/kdevdesigner/designer/tableeditor.ui @@ -793,9 +793,6 @@ <tabstop>buttonRowDown</tabstop> <tabstop>buttonHelp</tabstop> </tabstops> -<includes> - <include location="global" impldecl="in implementation">tqtable.h</include> -</includes> <Q_SLOTS> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> @@ -819,10 +816,11 @@ <slot access="protected">rowUpClicked()</slot> <slot access="protected">columnDownClicked()</slot> </Q_SLOTS> +<pixmapfunction>BarIcon2</pixmapfunction> +<layoutdefaults spacing="6" margin="11"/> <includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">tqtable.h</include> <include location="local" impldecl="in implementation">myiconloader.h</include> </includes> -<pixmapfunction>BarIcon2</pixmapfunction> - -<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdevdesigner/designer/variabledialog.ui b/kdevdesigner/designer/variabledialog.ui index b5971ce9..d9cdc7ef 100644 --- a/kdevdesigner/designer/variabledialog.ui +++ b/kdevdesigner/designer/variabledialog.ui @@ -291,4 +291,7 @@ <slot>currentItemChanged( TQListViewItem * i )</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/languages/cpp/addattributedialogbase.ui b/languages/cpp/addattributedialogbase.ui index 0a109443..18b98e9c 100644 --- a/languages/cpp/addattributedialogbase.ui +++ b/languages/cpp/addattributedialogbase.ui @@ -359,9 +359,6 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<includes> - <include location="global" impldecl="in implementation">kdialog.h</include> -</includes> <Q_SLOTS> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> @@ -372,4 +369,8 @@ </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<includes> + <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/languages/cpp/addmethoddialogbase.ui b/languages/cpp/addmethoddialogbase.ui index 93274d42..3926f966 100644 --- a/languages/cpp/addmethoddialogbase.ui +++ b/languages/cpp/addmethoddialogbase.ui @@ -442,9 +442,6 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<includes> - <include location="global" impldecl="in implementation">kdialog.h</include> -</includes> <Q_SLOTS> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> @@ -456,4 +453,8 @@ </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<includes> + <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/languages/cpp/app_templates/kscons_kxt/prefs-base.ui b/languages/cpp/app_templates/kscons_kxt/prefs-base.ui index b1115e6f..78a12753 100644 --- a/languages/cpp/app_templates/kscons_kxt/prefs-base.ui +++ b/languages/cpp/app_templates/kscons_kxt/prefs-base.ui @@ -123,7 +123,4 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcolorbutton.h</includehint> -</includehints> </UI> diff --git a/languages/cpp/app_templates/kxt/prefs-base.ui b/languages/cpp/app_templates/kxt/prefs-base.ui index 03af967a..4b7ebd8e 100644 --- a/languages/cpp/app_templates/kxt/prefs-base.ui +++ b/languages/cpp/app_templates/kxt/prefs-base.ui @@ -121,7 +121,4 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcolorbutton.h</includehint> -</includehints> </UI> diff --git a/languages/cpp/app_templates/tdeconfig35/prefs-base.ui b/languages/cpp/app_templates/tdeconfig35/prefs-base.ui index 03af967a..4b7ebd8e 100644 --- a/languages/cpp/app_templates/tdeconfig35/prefs-base.ui +++ b/languages/cpp/app_templates/tdeconfig35/prefs-base.ui @@ -121,7 +121,4 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcolorbutton.h</includehint> -</includehints> </UI> diff --git a/languages/cpp/ccconfigwidgetbase.ui b/languages/cpp/ccconfigwidgetbase.ui index 7beabfa5..32b69e92 100644 --- a/languages/cpp/ccconfigwidgetbase.ui +++ b/languages/cpp/ccconfigwidgetbase.ui @@ -1754,10 +1754,6 @@ you right click on a variable in a header file.</string> <tabstop>newPCSButton</tabstop> <tabstop>advancedOptions</tabstop> </tabstops> -<includes> - <include location="global" impldecl="in implementation">kurlrequester.h</include> - <include location="global" impldecl="in implementation">kdialog.h</include> -</includes> <Q_SLOTS> <slot access="protected">implementationFile()</slot> <slot access="protected">interfaceFile()</slot> @@ -1782,17 +1778,10 @@ you right click on a variable in a header file.</string> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <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>kurlrequester.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<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">knuminput.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/languages/cpp/cppnewclassdlgbase.ui b/languages/cpp/cppnewclassdlgbase.ui index 799dce05..03cd0909 100644 --- a/languages/cpp/cppnewclassdlgbase.ui +++ b/languages/cpp/cppnewclassdlgbase.ui @@ -1236,9 +1236,6 @@ Namespace1::Namespace2::...::NamespaceN</string> <tabstop>gen_config</tabstop> <tabstop>constructors_cpp_edit</tabstop> </tabstops> -<includes> - <include location="global" impldecl="in implementation">kdialog.h</include> -</includes> <Q_SLOTS> <slot access="protected">updateClassStore()</slot> <slot access="protected">access_view_mouseButtonPressed( int button, TQListViewItem * item, const TQPoint & p, int c )</slot> @@ -1284,7 +1281,8 @@ Namespace1::Namespace2::...::NamespaceN</string> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>classgeneratorconfig.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/languages/cpp/creategettersetter.ui b/languages/cpp/creategettersetter.ui index 81edebf0..fcd6e684 100644 --- a/languages/cpp/creategettersetter.ui +++ b/languages/cpp/creategettersetter.ui @@ -223,10 +223,8 @@ <slot access="protected">slotInlineChanged()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.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/languages/cpp/createpcsdialogbase.ui b/languages/cpp/createpcsdialogbase.ui index ac65b5f9..a128e877 100644 --- a/languages/cpp/createpcsdialogbase.ui +++ b/languages/cpp/createpcsdialogbase.ui @@ -164,8 +164,8 @@ <slot>slotSelectionChanged(TQListViewItem*)</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/languages/cpp/debugger/debuggerconfigwidgetbase.ui b/languages/cpp/debugger/debuggerconfigwidgetbase.ui index 14ec3344..9d6dcbf1 100644 --- a/languages/cpp/debugger/debuggerconfigwidgetbase.ui +++ b/languages/cpp/debugger/debuggerconfigwidgetbase.ui @@ -428,26 +428,10 @@ or if your executable contains the gdb stub <tabstop>runShellScript_edit</tabstop> <tabstop>runGdbScript_edit</tabstop> </tabstops> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <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> - <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>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/languages/cpp/debugger/debuggertracingdialogbase.ui b/languages/cpp/debugger/debuggertracingdialogbase.ui index faa68cd7..b6e01791 100644 --- a/languages/cpp/debugger/debuggertracingdialogbase.ui +++ b/languages/cpp/debugger/debuggertracingdialogbase.ui @@ -134,8 +134,8 @@ If custom format string is not enabled, names and values of all expressions will <slot>enableOrDisable()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>keditlistbox.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">keditlistbox.h</include> +</includes> </UI> diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui index df22cab6..7fc72d0e 100644 --- a/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui @@ -59,4 +59,7 @@ <signal>enabled(int)</signal> </Q_SIGNALS> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui b/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui index 6c36b44f..b0a48d2a 100644 --- a/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui @@ -73,10 +73,8 @@ Only the selected entry will be used</string> <slot>slotSelectionChanged(TQListBoxItem*)</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>tdelistbox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kurlrequester.h</include> + <include location="global" impldecl="in implementation">tdelistbox.h</include> +</includes> </UI> diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui index e736a074..efba8920 100644 --- a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui @@ -132,11 +132,9 @@ Only the selected entry will be used</string> <slot>slotSelectionChanged(TQListBoxItem*)</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcombobox.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.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">kurlrequester.h</include> + <include location="global" impldecl="in implementation">tdelistbox.h</include> +</includes> </UI> diff --git a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui index 7b133a51..8ac0d2db 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui @@ -125,10 +125,8 @@ Only the selected entry will be used</string> <slot>slotSelectionChanged(TQListBoxItem*)</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>tdelistbox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kurlrequester.h</include> + <include location="global" impldecl="in implementation">tdelistbox.h</include> +</includes> </UI> diff --git a/languages/cpp/subclassingdlgbase.ui b/languages/cpp/subclassingdlgbase.ui index 828414cf..67dcd97f 100644 --- a/languages/cpp/subclassingdlgbase.ui +++ b/languages/cpp/subclassingdlgbase.ui @@ -233,12 +233,13 @@ <slot>onChangedClassName()</slot> </connection> </connections> -<includes> - <include location="global" impldecl="in implementation">kdialog.h</include> -</includes> <Q_SLOTS> <slot>onChangedClassName()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<includes> + <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/languages/csharp/csharpconfigwidgetbase.ui b/languages/csharp/csharpconfigwidgetbase.ui index 5ec36259..9e2ee69a 100644 --- a/languages/csharp/csharpconfigwidgetbase.ui +++ b/languages/csharp/csharpconfigwidgetbase.ui @@ -93,9 +93,10 @@ </spacer> </vbox> </widget> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/java/configproblemreporter.ui b/languages/java/configproblemreporter.ui index 87300352..9bea48d7 100644 --- a/languages/java/configproblemreporter.ui +++ b/languages/java/configproblemreporter.ui @@ -234,10 +234,6 @@ <tabstop>pushButton5</tabstop> <tabstop>pushButton6</tabstop> </tabstops> -<includes> - <include location="global" impldecl="in implementation">kdialog.h</include> - <include location="local" impldecl="in implementation">configproblemreporter.ui.h</include> -</includes> <Q_SLOTS> <slot>init()</slot> <slot>destroy()</slot> @@ -251,7 +247,9 @@ </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>tdelistview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> + <include location="local" impldecl="in implementation">configproblemreporter.ui.h</include> +</includes> </UI> diff --git a/languages/lib/designer_integration/implementationwidgetbase.ui b/languages/lib/designer_integration/implementationwidgetbase.ui index 9d8769d7..d2780bc1 100644 --- a/languages/lib/designer_integration/implementationwidgetbase.ui +++ b/languages/lib/designer_integration/implementationwidgetbase.ui @@ -261,7 +261,8 @@ <slot access="protected">classNameChanged(const TQString &)</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/languages/php/phpconfigwidgetbase.ui b/languages/php/phpconfigwidgetbase.ui index 6f0247e3..02228756 100644 --- a/languages/php/phpconfigwidgetbase.ui +++ b/languages/php/phpconfigwidgetbase.ui @@ -547,9 +547,6 @@ the internal web browser. Please make sure that the webserver was compiled with <tabstop>zend_edit</tabstop> <tabstop>zend_button</tabstop> </tabstops> -<includes> - <include location="global" impldecl="in implementation">kdialog.h</include> -</includes> <Q_SLOTS> <slot>slotAboutClicked()</slot> <slot>slotPHPExeButtonClicked()</slot> @@ -558,4 +555,8 @@ the internal web browser. Please make sure that the webserver was compiled with </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<includes> + <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/languages/php/phpnewclassdlgbase.ui b/languages/php/phpnewclassdlgbase.ui index 94c18baa..e2d9b56d 100644 --- a/languages/php/phpnewclassdlgbase.ui +++ b/languages/php/phpnewclassdlgbase.ui @@ -189,13 +189,10 @@ class CLASSNAME extends BASECLASS { <tabstop>m_okButton</tabstop> <tabstop>m_cancelButton</tabstop> </tabstops> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> - <include location="global" impldecl="in declaration">klineedit.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>klineedit.h</includehint> -</includehints> </UI> diff --git a/languages/python/pythonconfigwidgetbase.ui b/languages/python/pythonconfigwidgetbase.ui index 7c70ed62..81d70c42 100644 --- a/languages/python/pythonconfigwidgetbase.ui +++ b/languages/python/pythonconfigwidgetbase.ui @@ -110,12 +110,10 @@ </spacer> </vbox> </widget> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>klineedit.h</includehint> -</includehints> </UI> diff --git a/languages/ruby/app_templates/kxt/prefs-base.ui b/languages/ruby/app_templates/kxt/prefs-base.ui index 03af967a..4b7ebd8e 100644 --- a/languages/ruby/app_templates/kxt/prefs-base.ui +++ b/languages/ruby/app_templates/kxt/prefs-base.ui @@ -121,7 +121,4 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcolorbutton.h</includehint> -</includehints> </UI> diff --git a/languages/ruby/rubyconfigwidgetbase.ui b/languages/ruby/rubyconfigwidgetbase.ui index 569ac658..3e0943e5 100644 --- a/languages/ruby/rubyconfigwidgetbase.ui +++ b/languages/ruby/rubyconfigwidgetbase.ui @@ -346,18 +346,11 @@ def cd(dir) Dir.chdir dir end</string> <tabstop>sjisOption</tabstop> <tabstop>utf8Option</tabstop> </tabstops> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <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"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/languages/sql/sqlconfigwidget.ui b/languages/sql/sqlconfigwidget.ui index 5f836677..cfa61833 100644 --- a/languages/sql/sqlconfigwidget.ui +++ b/languages/sql/sqlconfigwidget.ui @@ -157,9 +157,6 @@ <slot>updateButtons()</slot> </connection> </connections> -<includes> - <include location="local" impldecl="in implementation">sqlconfigwidget.ui.h</include> -</includes> <forwards> <forward>class TQDomDocument;</forward> </forwards> @@ -182,8 +179,8 @@ </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="local" impldecl="in implementation">sqlconfigwidget.ui.h</include> +</includes> </UI> diff --git a/parts/abbrev/addtemplatedlgbase.ui b/parts/abbrev/addtemplatedlgbase.ui index b4a01258..6db09be9 100644 --- a/parts/abbrev/addtemplatedlgbase.ui +++ b/parts/abbrev/addtemplatedlgbase.ui @@ -170,7 +170,7 @@ </includes> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/parts/appwizard/appwizarddlgbase.ui b/parts/appwizard/appwizarddlgbase.ui index a8071f83..f9c22c2f 100644 --- a/parts/appwizard/appwizarddlgbase.ui +++ b/parts/appwizard/appwizarddlgbase.ui @@ -634,12 +634,6 @@ <forward>class TQListViewItem;</forward> <forward>class TQIconViewItem;</forward> </forwards> -<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">kiconview.h</include> - <include location="global" impldecl="in declaration">kurlrequester.h</include> -</includes> <Q_SLOTS> <slot access="protected">licenseChanged()</slot> <slot access="protected">destButtonClicked( const TQString & )</slot> @@ -654,10 +648,11 @@ </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>tdelistview.h</includehint> - <includehint>kiconview.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">kiconview.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in declaration">kurlrequester.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/parts/appwizard/filepropspagebase.ui b/parts/appwizard/filepropspagebase.ui index eb210f9a..00d7f677 100644 --- a/parts/appwizard/filepropspagebase.ui +++ b/parts/appwizard/filepropspagebase.ui @@ -150,19 +150,14 @@ <tabstop>baseclass_edit</tabstop> <tabstop>implfile_edit</tabstop> </tabstops> -<includes> - <include location="global" impldecl="in implementation">kdialog.h</include> -</includes> <Q_SLOTS> <slot>slotSelectionChanged()</slot> <slot>slotClassnameChanged(const TQString&)</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/parts/appwizard/importdlgbase.ui b/parts/appwizard/importdlgbase.ui index e437e170..aa778f00 100644 --- a/parts/appwizard/importdlgbase.ui +++ b/parts/appwizard/importdlgbase.ui @@ -346,9 +346,6 @@ will be the author, everything between <tabstop>ok_button</tabstop> <tabstop>cancel_button</tabstop> </tabstops> -<includes> - <include location="global" impldecl="in implementation">kdialog.h</include> -</includes> <Q_SLOTS> <slot access="protected">dirButtonClicked()</slot> <slot>dirChanged()</slot> @@ -357,9 +354,9 @@ will be the author, everything between </Q_SLOTS> <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> +<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> </UI> diff --git a/parts/bookmarks/bookmarks_settings_base.ui b/parts/bookmarks/bookmarks_settings_base.ui index e23e55f4..7769649a 100644 --- a/parts/bookmarks/bookmarks_settings_base.ui +++ b/parts/bookmarks/bookmarks_settings_base.ui @@ -234,7 +234,7 @@ </connection> </connections> <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/parts/ctags2/ctags2_createtagfilebase.ui b/parts/ctags2/ctags2_createtagfilebase.ui index bcba6645..111fbf94 100644 --- a/parts/ctags2/ctags2_createtagfilebase.ui +++ b/parts/ctags2/ctags2_createtagfilebase.ui @@ -140,12 +140,8 @@ <slot>validate()</slot> </Q_SLOTS> <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> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/parts/ctags2/ctags2_selecttagfilebase.ui b/parts/ctags2/ctags2_selecttagfilebase.ui index e1479b1d..5a048cab 100644 --- a/parts/ctags2/ctags2_selecttagfilebase.ui +++ b/parts/ctags2/ctags2_selecttagfilebase.ui @@ -120,9 +120,8 @@ <slot>validate()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kurlrequester.h</includehint> - <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">kurlrequester.h</include> +</includes> </UI> diff --git a/parts/ctags2/ctags2_settingswidgetbase.ui b/parts/ctags2/ctags2_settingswidgetbase.ui index c423f79c..a4bd5378 100644 --- a/parts/ctags2/ctags2_settingswidgetbase.ui +++ b/parts/ctags2/ctags2_settingswidgetbase.ui @@ -369,14 +369,9 @@ <slot>moveDownTagFile()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.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>tdelistview.h</includehint> -</includehints> +<includes> + <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> </UI> diff --git a/parts/ctags2/ctags2_widgetbase.ui b/parts/ctags2/ctags2_widgetbase.ui index 58107966..0379142f 100644 --- a/parts/ctags2/ctags2_widgetbase.ui +++ b/parts/ctags2/ctags2_widgetbase.ui @@ -174,8 +174,8 @@ <slot access="private">regeneratebutton_clicked()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/parts/distpart/distpart_ui.ui b/parts/distpart/distpart_ui.ui index 92b22b85..63cad280 100644 --- a/parts/distpart/distpart_ui.ui +++ b/parts/distpart/distpart_ui.ui @@ -1193,14 +1193,6 @@ Build Files</string> <tabstop>uploadRemoveToolButton</tabstop> <tabstop>uploadFileListBox</tabstop> </tabstops> -<includes> - <include location="global" impldecl="in implementation">kdialog.h</include> - <include location="global" impldecl="in implementation">kiconloader.h</include> - <include location="global" impldecl="in implementation">kpushbutton.h</include> - <include location="global" impldecl="in implementation">tdelistbox.h</include> - <include location="global" impldecl="in implementation">klineedit.h</include> - <include location="global" impldecl="in implementation">ktextedit.h</include> -</includes> <Q_SLOTS> <slot>slotbuildAllPushButtonPressed()</slot> <slot>slotexportSPECPushButtonPressed()</slot> @@ -1215,32 +1207,12 @@ Build Files</string> <forwards> <forward>class TQListBoxItem;</forward> </forwards> -<includehints> - <includehint>tdelistbox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>ktextedit.h</includehint> - <includehint>ktextedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>tdelistbox.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">kiconloader.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> + <include location="global" impldecl="in implementation">tdelistbox.h</include> +</includes> </UI> diff --git a/parts/documentation/addcatalogdlgbase.ui b/parts/documentation/addcatalogdlgbase.ui index c77c4bf8..b524720f 100644 --- a/parts/documentation/addcatalogdlgbase.ui +++ b/parts/documentation/addcatalogdlgbase.ui @@ -200,10 +200,8 @@ <slot>docTypeChanged( const TQString & )</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kurlrequester.h</includehint> - <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">kurlrequester.h</include> +</includes> </UI> diff --git a/parts/documentation/docglobalconfigwidgetbase.ui b/parts/documentation/docglobalconfigwidgetbase.ui index 4de6dc2f..5d2d4038 100644 --- a/parts/documentation/docglobalconfigwidgetbase.ui +++ b/parts/documentation/docglobalconfigwidgetbase.ui @@ -567,22 +567,8 @@ <slot>updateIndex()</slot> </Q_SLOTS> <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>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.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">kurlrequester.h</include> + <include location="global" impldecl="in implementation">tdefontcombo.h</include> +</includes> </UI> diff --git a/parts/documentation/docprojectconfigwidgetbase.ui b/parts/documentation/docprojectconfigwidgetbase.ui index d52dd3da..8914aaa1 100644 --- a/parts/documentation/docprojectconfigwidgetbase.ui +++ b/parts/documentation/docprojectconfigwidgetbase.ui @@ -144,9 +144,7 @@ <slot>changeDocSystem(const TQString &)</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kurlrequester.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/parts/documentation/editbookmarkdlg.ui b/parts/documentation/editbookmarkdlg.ui index 8d6ac359..875f4546 100644 --- a/parts/documentation/editbookmarkdlg.ui +++ b/parts/documentation/editbookmarkdlg.ui @@ -157,9 +157,8 @@ <tabstop>buttonCancel</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kurlrequester.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/parts/documentation/editcatalogdlgbase.ui b/parts/documentation/editcatalogdlgbase.ui index 0782952d..4355d579 100644 --- a/parts/documentation/editcatalogdlgbase.ui +++ b/parts/documentation/editcatalogdlgbase.ui @@ -188,9 +188,8 @@ <slot>locationURLChanged( const TQString & )</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kurlrequester.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/parts/documentation/find_documentationbase.ui b/parts/documentation/find_documentationbase.ui index e983c8e0..d7a4e46a 100644 --- a/parts/documentation/find_documentationbase.ui +++ b/parts/documentation/find_documentationbase.ui @@ -163,8 +163,8 @@ <slot>buttonPressedOnItem( int button, TQListViewItem * item, const TQPoint & pos, int c )</slot> </Q_SLOTS> <layoutdefaults spacing="1" margin="1"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>tdelistview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/parts/filecreate/fctemplateeditbase.ui b/parts/filecreate/fctemplateeditbase.ui index df15692c..6e34899d 100644 --- a/parts/filecreate/fctemplateeditbase.ui +++ b/parts/filecreate/fctemplateeditbase.ui @@ -176,18 +176,15 @@ <tabstop>ok_button</tabstop> <tabstop>cancel_button</tabstop> </tabstops> -<includes> - <include location="global" impldecl="in implementation">kdialog.h</include> - <include location="local" impldecl="in implementation">fctemplateeditbase.ui.h</include> -</includes> <Q_SLOTS> <slot>init()</slot> </Q_SLOTS> <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> +<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> + <include location="local" impldecl="in implementation">fctemplateeditbase.ui.h</include> +</includes> </UI> diff --git a/parts/filecreate/fctypeeditbase.ui b/parts/filecreate/fctypeeditbase.ui index e456e146..53fe4203 100644 --- a/parts/filecreate/fctypeeditbase.ui +++ b/parts/filecreate/fctypeeditbase.ui @@ -263,20 +263,15 @@ <tabstop>ok_button</tabstop> <tabstop>cancel_button</tabstop> </tabstops> -<includes> - <include location="local" impldecl="in implementation">kicondialog.h</include> - <include location="global" impldecl="in implementation">kdialog.h</include> - <include location="local" impldecl="in implementation">fctypeeditbase.ui.h</include> -</includes> <Q_SLOTS> <slot>init()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <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> +<includes> + <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> + <include location="local" impldecl="in implementation">fctypeeditbase.ui.h</include> +</includes> </UI> diff --git a/parts/filelist/projectviewprojectconfigbase.ui b/parts/filelist/projectviewprojectconfigbase.ui index eca292ad..1e5a11ab 100644 --- a/parts/filelist/projectviewprojectconfigbase.ui +++ b/parts/filelist/projectviewprojectconfigbase.ui @@ -88,7 +88,7 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcombobox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/parts/fileview/vcscolorsconfigwidgetbase.ui b/parts/fileview/vcscolorsconfigwidgetbase.ui index c0144dcf..96a63df6 100644 --- a/parts/fileview/vcscolorsconfigwidgetbase.ui +++ b/parts/fileview/vcscolorsconfigwidgetbase.ui @@ -253,15 +253,7 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcolorcombo.h</includehint> - <includehint>kcolorcombo.h</includehint> - <includehint>kcolorcombo.h</includehint> - <includehint>kcolorcombo.h</includehint> - <includehint>kcolorcombo.h</includehint> - <includehint>kcolorcombo.h</includehint> - <includehint>kcolorcombo.h</includehint> - <includehint>kcolorcombo.h</includehint> - <includehint>kcolorcombo.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcolorcombo.h</include> +</includes> </UI> diff --git a/parts/outputviews/filterdlg.ui b/parts/outputviews/filterdlg.ui index 6a315a70..eae824f3 100644 --- a/parts/outputviews/filterdlg.ui +++ b/parts/outputviews/filterdlg.ui @@ -161,4 +161,7 @@ <tabstop>buttonCancel</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/parts/partexplorer/partexplorerformbase.ui b/parts/partexplorer/partexplorerformbase.ui index 9f4364b8..d91856d7 100644 --- a/parts/partexplorer/partexplorerformbase.ui +++ b/parts/partexplorer/partexplorerformbase.ui @@ -127,13 +127,10 @@ <tabstops> <tabstop>constraintsText</tabstop> </tabstops> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> <include location="global" impldecl="in implementation">kdialog.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>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> </UI> diff --git a/parts/quickopen/quickopenbase.ui b/parts/quickopen/quickopenbase.ui index 6aea61b1..1fb873fc 100644 --- a/parts/quickopen/quickopenbase.ui +++ b/parts/quickopen/quickopenbase.ui @@ -174,8 +174,8 @@ <slot>slotReturnPressed()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistbox.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">tdelistbox.h</include> +</includes> </UI> diff --git a/parts/quickopen/quickopenfunctionchooseformbase.ui b/parts/quickopen/quickopenfunctionchooseformbase.ui index 88b47e53..48916460 100644 --- a/parts/quickopen/quickopenfunctionchooseformbase.ui +++ b/parts/quickopen/quickopenfunctionchooseformbase.ui @@ -223,9 +223,8 @@ <slot specifier="pure virtual">slotArgsChange( int id )</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>ksqueezedtextlabel.h</includehint> - <includehint>tdelistbox.h</includehint> - <includehint>tdelistbox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">ksqueezedtextlabel.h</include> + <include location="global" impldecl="in implementation">tdelistbox.h</include> +</includes> </UI> diff --git a/parts/regexptest/regexptestdlgbase.ui b/parts/regexptest/regexptestdlgbase.ui index 7e8cff88..8d6bf504 100644 --- a/parts/regexptest/regexptestdlgbase.ui +++ b/parts/regexptest/regexptestdlgbase.ui @@ -336,9 +336,6 @@ <tabstop>cancelbutton</tabstop> <tabstop>extendedposix_button</tabstop> </tabstops> -<includes> - <include location="global" impldecl="in implementation">kdialog.h</include> -</includes> <Q_SLOTS> <slot access="protected">insertQuoted()</slot> <slot>somethingChanged()</slot> @@ -346,7 +343,8 @@ </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/parts/replace/replacedlg.ui b/parts/replace/replacedlg.ui index ce58234a..8a30fae9 100644 --- a/parts/replace/replacedlg.ui +++ b/parts/replace/replacedlg.ui @@ -366,20 +366,11 @@ <tabstop>strings_wholewords_radio</tabstop> <tabstop>files_path_radio</tabstop> </tabstops> +<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">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>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> </UI> diff --git a/parts/scripting/scriptingglobalconfigbase.ui b/parts/scripting/scriptingglobalconfigbase.ui index 4aad50e5..d3b55d4f 100644 --- a/parts/scripting/scriptingglobalconfigbase.ui +++ b/parts/scripting/scriptingglobalconfigbase.ui @@ -44,8 +44,7 @@ </vbox> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>keditlistbox.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">keditlistbox.h</include> +</includes> </UI> diff --git a/parts/snippet/snippetdlg.ui b/parts/snippet/snippetdlg.ui index 3606549b..f7bafb74 100644 --- a/parts/snippet/snippetdlg.ui +++ b/parts/snippet/snippetdlg.ui @@ -197,18 +197,15 @@ <tabstop>btnAdd</tabstop> <tabstop>btnCancel</tabstop> </tabstops> -<includes> - <include location="local" impldecl="in implementation">snippetdlg.ui.h</include> -</includes> <Q_SLOTS> <slot>slotHelp()</slot> </Q_SLOTS> <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> + <include location="local" impldecl="in implementation">snippetdlg.ui.h</include> +</includes> </UI> diff --git a/parts/snippet/snippetsettingsbase.ui b/parts/snippet/snippetsettingsbase.ui index 7ae3bfc8..9d1d0c9d 100644 --- a/parts/snippet/snippetsettingsbase.ui +++ b/parts/snippet/snippetsettingsbase.ui @@ -222,7 +222,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/parts/tools/addtooldlg.ui b/parts/tools/addtooldlg.ui index a1a6157e..ece7a089 100644 --- a/parts/tools/addtooldlg.ui +++ b/parts/tools/addtooldlg.ui @@ -223,10 +223,6 @@ executed.</p></string> <tabstop>okButton</tabstop> <tabstop>cancelButton</tabstop> </tabstops> -<includes> - <include location="global" impldecl="in implementation">kdialog.h</include> - <include location="local" impldecl="in implementation">addtooldlg.ui.h</include> -</includes> <forwards> <forward>class TQListViewItem;</forward> </forwards> @@ -237,9 +233,9 @@ executed.</p></string> </Q_SLOTS> <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> +<includes> + <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="local" impldecl="in implementation">addtooldlg.ui.h</include> +</includes> </UI> diff --git a/parts/valgrind/dialog_widget.ui b/parts/valgrind/dialog_widget.ui index 5da3365d..74b4a941 100644 --- a/parts/valgrind/dialog_widget.ui +++ b/parts/valgrind/dialog_widget.ui @@ -331,30 +331,15 @@ <tabstop>ctParamEdit</tabstop> <tabstop>kcExecutableEdit</tabstop> </tabstops> -<includes> - <include location="global" impldecl="in implementation">kdialog.h</include> -</includes> <Q_SLOTS> <slot access="private" specifier="non virtual">checkBoxToggled()</slot> <slot>init()</slot> </Q_SLOTS> <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>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>klineedit.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> -</includehints> +<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> </UI> diff --git a/src/generalinfowidgetbase.ui b/src/generalinfowidgetbase.ui index 42502e58..6fc8ff8e 100644 --- a/src/generalinfowidgetbase.ui +++ b/src/generalinfowidgetbase.ui @@ -229,17 +229,11 @@ Placed in the AUTHORS file</string> <tabstop>description_edit</tabstop> <tabstop>encoding_combo</tabstop> </tabstops> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> <include location="global" impldecl="in declaration">ksqueezedtextlabel.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>ksqueezedtextlabel.h</includehint> -</includehints> </UI> diff --git a/src/mimewarningdialog.ui b/src/mimewarningdialog.ui index a4ef76dc..189ff2f9 100644 --- a/src/mimewarningdialog.ui +++ b/src/mimewarningdialog.ui @@ -251,4 +251,7 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">ksqueezedtextlabel.h</include> +</includes> </UI> diff --git a/src/pluginselectdialogbase.ui b/src/pluginselectdialogbase.ui index a773a155..8f53d109 100644 --- a/src/pluginselectdialogbase.ui +++ b/src/pluginselectdialogbase.ui @@ -173,7 +173,7 @@ <slot access="protected">saveAsDefault()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kurllabel.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kurllabel.h</include> +</includes> </UI> diff --git a/src/profileengine/editor/addprofilewidget.ui b/src/profileengine/editor/addprofilewidget.ui index 78d20d17..65205678 100644 --- a/src/profileengine/editor/addprofilewidget.ui +++ b/src/profileengine/editor/addprofilewidget.ui @@ -118,4 +118,7 @@ </vbox> </widget> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/src/profileengine/editor/profileeditorbase.ui b/src/profileengine/editor/profileeditorbase.ui index 924baef2..36acd44d 100644 --- a/src/profileengine/editor/profileeditorbase.ui +++ b/src/profileengine/editor/profileeditorbase.ui @@ -662,23 +662,12 @@ <slot>delDisabled()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> - <includehint>tdelistview.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>tdelistbox.h</includehint> - <includehint>tdelistbox.h</includehint> - <includehint>tdelistview.h</includehint> - <includehint>tdelistview.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>tdelistview.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>tdelistview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">kdialog.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">tdelistbox.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/src/settingswidget.ui b/src/settingswidget.ui index c85ba0ab..2d7a5133 100644 --- a/src/settingswidget.ui +++ b/src/settingswidget.ui @@ -518,11 +518,9 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>tdefontrequester.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> + <include location="global" impldecl="in implementation">tdefontrequester.h</include> +</includes> </UI> diff --git a/vcs/cvsservice/checkoutdialogbase.ui b/vcs/cvsservice/checkoutdialogbase.ui index b4ef3cf2..a16479ac 100644 --- a/vcs/cvsservice/checkoutdialogbase.ui +++ b/vcs/cvsservice/checkoutdialogbase.ui @@ -304,9 +304,9 @@ <tabstop>fetchModulesButton</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.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">kurlrequester.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/vcs/cvsservice/commitdialogbase.ui b/vcs/cvsservice/commitdialogbase.ui index 61805f99..12844638 100644 --- a/vcs/cvsservice/commitdialogbase.ui +++ b/vcs/cvsservice/commitdialogbase.ui @@ -158,4 +158,7 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/vcs/cvsservice/cvsformbase.ui b/vcs/cvsservice/cvsformbase.ui index 875bac49..c70b642d 100644 --- a/vcs/cvsservice/cvsformbase.ui +++ b/vcs/cvsservice/cvsformbase.ui @@ -215,9 +215,10 @@ Most of the thime you'll just reuse the project name</string> <tabstop>message_edit</tabstop> <tabstop>release_edit</tabstop> </tabstops> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/vcs/cvsservice/cvsoptionswidgetbase.ui b/vcs/cvsservice/cvsoptionswidgetbase.ui index 687b29dc..8023f43f 100644 --- a/vcs/cvsservice/cvsoptionswidgetbase.ui +++ b/vcs/cvsservice/cvsoptionswidgetbase.ui @@ -218,13 +218,11 @@ </widget> <customwidgets> </customwidgets> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <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">knuminput.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> </UI> diff --git a/vcs/cvsservice/diffdialogbase.ui b/vcs/cvsservice/diffdialogbase.ui index a5e07812..97bbd918 100644 --- a/vcs/cvsservice/diffdialogbase.ui +++ b/vcs/cvsservice/diffdialogbase.ui @@ -272,4 +272,7 @@ <tabstop>buttonCancel</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/vcs/cvsservice/integrator/initdlg.ui b/vcs/cvsservice/integrator/initdlg.ui index 82e26c55..acebc364 100644 --- a/vcs/cvsservice/integrator/initdlg.ui +++ b/vcs/cvsservice/integrator/initdlg.ui @@ -63,9 +63,7 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/vcs/cvsservice/integrator/integratordlgbase.ui b/vcs/cvsservice/integrator/integratordlgbase.ui index 6b53c738..6660faab 100644 --- a/vcs/cvsservice/integrator/integratordlgbase.ui +++ b/vcs/cvsservice/integrator/integratordlgbase.ui @@ -395,4 +395,7 @@ <slot>createModule_clicked()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/vcs/cvsservice/releaseinputdialogbase.ui b/vcs/cvsservice/releaseinputdialogbase.ui index e6e65b15..92687fb8 100644 --- a/vcs/cvsservice/releaseinputdialogbase.ui +++ b/vcs/cvsservice/releaseinputdialogbase.ui @@ -243,4 +243,7 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/vcs/cvsservice/tagdialogbase.ui b/vcs/cvsservice/tagdialogbase.ui index 86390490..dc12e6bc 100644 --- a/vcs/cvsservice/tagdialogbase.ui +++ b/vcs/cvsservice/tagdialogbase.ui @@ -156,4 +156,7 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/vcs/subversion/commitdlgbase.ui b/vcs/subversion/commitdlgbase.ui index d58bd745..904a5d6f 100644 --- a/vcs/subversion/commitdlgbase.ui +++ b/vcs/subversion/commitdlgbase.ui @@ -104,8 +104,7 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>ktextedit.h</includehint> - <includehint>ktextedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">ktextedit.h</include> +</includes> </UI> diff --git a/vcs/subversion/integrator/svnintegratordlgbase.ui b/vcs/subversion/integrator/svnintegratordlgbase.ui index 76b68321..b07cc073 100644 --- a/vcs/subversion/integrator/svnintegratordlgbase.ui +++ b/vcs/subversion/integrator/svnintegratordlgbase.ui @@ -182,9 +182,7 @@ http://localhost/svn/projectname/trunk</string> </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/vcs/subversion/subversionprojectwidget.ui b/vcs/subversion/subversionprojectwidget.ui index 22f43ba9..c6ad03ad 100644 --- a/vcs/subversion/subversionprojectwidget.ui +++ b/vcs/subversion/subversionprojectwidget.ui @@ -82,8 +82,7 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kurlrequester.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/vcs/subversion/svn_co.ui b/vcs/subversion/svn_co.ui index db9d8f31..4cb5b0a2 100644 --- a/vcs/subversion/svn_co.ui +++ b/vcs/subversion/svn_co.ui @@ -326,10 +326,8 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kurlrequester.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/vcs/subversion/svn_copydlgwidget.ui b/vcs/subversion/svn_copydlgwidget.ui index e874206a..d0de091c 100644 --- a/vcs/subversion/svn_copydlgwidget.ui +++ b/vcs/subversion/svn_copydlgwidget.ui @@ -224,15 +224,10 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.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">knuminput.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/vcs/subversion/svn_logviewoptiondlgbase.ui b/vcs/subversion/svn_logviewoptiondlgbase.ui index 52106005..25ed4987 100644 --- a/vcs/subversion/svn_logviewoptiondlgbase.ui +++ b/vcs/subversion/svn_logviewoptiondlgbase.ui @@ -149,8 +149,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/vcs/subversion/svn_mergeoptiondlgbase.ui b/vcs/subversion/svn_mergeoptiondlgbase.ui index b54ead45..6615559b 100644 --- a/vcs/subversion/svn_mergeoptiondlgbase.ui +++ b/vcs/subversion/svn_mergeoptiondlgbase.ui @@ -352,23 +352,9 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.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>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/vcs/subversion/svn_switchdlgbase.ui b/vcs/subversion/svn_switchdlgbase.ui index 53a89eb1..b1811858 100644 --- a/vcs/subversion/svn_switchdlgbase.ui +++ b/vcs/subversion/svn_switchdlgbase.ui @@ -196,18 +196,13 @@ <slot>accept()</slot> </connection> </connections> -<includes> - <include location="local" impldecl="in implementation">svn_switchdlgbase.ui.h</include> -</includes> <Q_SLOTS> <slot>Form1_destroyed( TQObject * )</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.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> + <include location="local" impldecl="in implementation">svn_switchdlgbase.ui.h</include> +</includes> </UI> |