diff options
26 files changed, 80 insertions, 114 deletions
diff --git a/cervisia/settingsdlg_advanced.ui b/cervisia/settingsdlg_advanced.ui index c15d391f..d7b28f8d 100644 --- a/cervisia/settingsdlg_advanced.ui +++ b/cervisia/settingsdlg_advanced.ui @@ -88,10 +88,7 @@ </grid> </widget> <layoutdefaults spacing="6" margin="0"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/kbabel/catalogmanager/markpatternwidget.ui b/kbabel/catalogmanager/markpatternwidget.ui index 1380acfe..0f9932b0 100644 --- a/kbabel/catalogmanager/markpatternwidget.ui +++ b/kbabel/catalogmanager/markpatternwidget.ui @@ -121,7 +121,4 @@ <forward>class KComboBox;</forward> </forwards> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> -</includehints> </UI> diff --git a/kbabel/catalogmanager/validateprogresswidget.ui b/kbabel/catalogmanager/validateprogresswidget.ui index a1573341..fc2741e4 100644 --- a/kbabel/catalogmanager/validateprogresswidget.ui +++ b/kbabel/catalogmanager/validateprogresswidget.ui @@ -120,10 +120,8 @@ <slot>setupFileProgressBar( TQString text, int maxvalue )</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kprogress.h</includehint> - <includehint>ksqueezedtextlabel.h</includehint> - <includehint>kprogress.h</includehint> - <includehint>ksqueezedtextlabel.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kprogress.h</include> + <include location="global" impldecl="in implementation">ksqueezedtextlabel.h</include> +</includes> </UI> diff --git a/kbabel/commonui/diffpreferences.ui b/kbabel/commonui/diffpreferences.ui index a1bfd757..2f4e92d8 100644 --- a/kbabel/commonui/diffpreferences.ui +++ b/kbabel/commonui/diffpreferences.ui @@ -128,14 +128,13 @@ the database are used for diffing.</p></qt></string> <customwidgets> </customwidgets> <includes> - <include location="local" impldecl="in implementation">diffpreferences.ui.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> + <include location="local" impldecl="in implementation">diffpreferences.ui.h</include> </includes> <functions> <function>init()</function> </functions> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/kbabel/commonui/projectwizardwidget.ui b/kbabel/commonui/projectwizardwidget.ui index 74f13148..bae9dc64 100644 --- a/kbabel/commonui/projectwizardwidget.ui +++ b/kbabel/commonui/projectwizardwidget.ui @@ -253,14 +253,10 @@ done</li> <tabstop>_projectType</tabstop> </tabstops> <includes> - <include location="local" impldecl="in implementation">projectwizardwidget.ui.h</include> + <include location="local" impldecl="in implementation">projectwizardwidget.ui.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>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> </UI> diff --git a/kbabel/commonui/projectwizardwidget2.ui b/kbabel/commonui/projectwizardwidget2.ui index ef1fb414..75a5fef0 100644 --- a/kbabel/commonui/projectwizardwidget2.ui +++ b/kbabel/commonui/projectwizardwidget2.ui @@ -150,8 +150,7 @@ will not work.</string> <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/kbabel/kbabel/colorpreferences.ui b/kbabel/kbabel/colorpreferences.ui index 63a0dcf1..56ffe604 100644 --- a/kbabel/kbabel/colorpreferences.ui +++ b/kbabel/kbabel/colorpreferences.ui @@ -176,13 +176,7 @@ phrases.</qt></string> <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> +</includes> </UI> diff --git a/kbabel/kbabel/editordiffpreferences.ui b/kbabel/kbabel/editordiffpreferences.ui index 7aa23aad..ddddcb98 100644 --- a/kbabel/kbabel/editordiffpreferences.ui +++ b/kbabel/kbabel/editordiffpreferences.ui @@ -185,8 +185,7 @@ <function>init()</function> </functions> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> +</includes> </UI> diff --git a/kbabel/kbabel/editorpreferences.ui b/kbabel/kbabel/editorpreferences.ui index 77c64683..e0f4a612 100644 --- a/kbabel/kbabel/editorpreferences.ui +++ b/kbabel/kbabel/editorpreferences.ui @@ -339,15 +339,12 @@ activated, you will still see a message in the statusbar. </connection> </connections> <includes> - <include location="local" impldecl="in implementation">editorpreferences.ui.h</include> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> + <include location="local" impldecl="in implementation">editorpreferences.ui.h</include> </includes> <Q_SLOTS> <slot specifier="non virtual">ledWarning( bool show )</slot> <slot specifier="non virtual">toggleOther( bool other )</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>toolselectionwidget.h</includehint> - <includehint>kcolorbutton.h</includehint> -</includehints> </UI> diff --git a/kbabel/kbabel/fontpreferences.ui b/kbabel/kbabel/fontpreferences.ui index 4befa080..404f0580 100644 --- a/kbabel/kbabel/fontpreferences.ui +++ b/kbabel/kbabel/fontpreferences.ui @@ -54,7 +54,8 @@ </connection> </connections> <includes> - <include location="local" impldecl="in implementation">fontpreferences.ui.h</include> + <include location="local" impldecl="in implementation">fontpreferences.ui.h</include> + <include location="global" impldecl="in implementation">tdefontdialog.h</include> </includes> <Q_SLOTS> <slot access="private">showOnlyFixedFonts( bool on )</slot> diff --git a/kbabel/kbabel/headerwidget.ui b/kbabel/kbabel/headerwidget.ui index 344ef7f0..6297fd58 100644 --- a/kbabel/kbabel/headerwidget.ui +++ b/kbabel/kbabel/headerwidget.ui @@ -57,8 +57,7 @@ </vbox> </widget> <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/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui index e1f1db77..1d11069e 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui @@ -1029,8 +1029,9 @@ Finally you can set the maximum number of entries in the list.</string> </connection> </connections> <includes> - <include location="local" impldecl="in declaration">tdelocale.h</include> - <include location="global" impldecl="in declaration">kseparator.h</include> + <include location="local" impldecl="in declaration">tdelocale.h</include> + <include location="global" impldecl="in declaration">klineedit.h</include> + <include location="global" impldecl="in declaration">kurlrequester.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui index 685e86bd..bc8a3728 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui @@ -707,26 +707,10 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.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> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui index 5bf22ced..1b67ae40 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui @@ -1032,8 +1032,9 @@ Finally you can set the maximum number of entries in the list.</string> </connection> </connections> <includes> - <include location="local" impldecl="in declaration">tdelocale.h</include> - <include location="global" impldecl="in declaration">kseparator.h</include> + <include location="local" impldecl="in declaration">tdelocale.h</include> + <include location="global" impldecl="in declaration">klineedit.h</include> + <include location="global" impldecl="in declaration">kurlrequester.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui b/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui index a34953df..0417b5b6 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui +++ b/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui @@ -263,4 +263,10 @@ <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> </includehints> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/kbabel/kbabeldict/modules/tmx/pwidget.ui b/kbabel/kbabeldict/modules/tmx/pwidget.ui index 875e744f..0a65683d 100644 --- a/kbabel/kbabeldict/modules/tmx/pwidget.ui +++ b/kbabel/kbabeldict/modules/tmx/pwidget.ui @@ -207,10 +207,7 @@ <tabstop>caseBtn</tabstop> </tabstops> <includes> - <include location="global" impldecl="in declaration">kseparator.h</include> + <include location="global" impldecl="in declaration">kurlrequester.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kurlrequester.h</includehint> -</includehints> </UI> diff --git a/kbugbuster/gui/centralwidget_base.ui b/kbugbuster/gui/centralwidget_base.ui index 969709aa..421d8a68 100644 --- a/kbugbuster/gui/centralwidget_base.ui +++ b/kbugbuster/gui/centralwidget_base.ui @@ -233,4 +233,7 @@ </image> </images> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kactivelabel.h</include> +</includes> </UI> diff --git a/kbugbuster/gui/cwbugdetailscontainer_base.ui b/kbugbuster/gui/cwbugdetailscontainer_base.ui index 5f6db167..839a82c7 100644 --- a/kbugbuster/gui/cwbugdetailscontainer_base.ui +++ b/kbugbuster/gui/cwbugdetailscontainer_base.ui @@ -241,4 +241,7 @@ </image> </images> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kactivelabel.h</include> +</includes> </UI> diff --git a/kompare/komparepart/komparesaveoptionsbase.ui b/kompare/komparepart/komparesaveoptionsbase.ui index 47cfc893..d6b2ec50 100644 --- a/kompare/komparepart/komparesaveoptionsbase.ui +++ b/kompare/komparepart/komparesaveoptionsbase.ui @@ -333,4 +333,7 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/tdeioslave/svn/ksvnd/commitdlg.ui b/tdeioslave/svn/ksvnd/commitdlg.ui index fb45eda1..2b06eeec 100644 --- a/tdeioslave/svn/ksvnd/commitdlg.ui +++ b/tdeioslave/svn/ksvnd/commitdlg.ui @@ -109,8 +109,7 @@ <function returnType="TQString">logMessage() const</function> </functions> <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/tdeioslave/svn/svnhelper/subversioncheckout.ui b/tdeioslave/svn/svnhelper/subversioncheckout.ui index 8f583932..887e1674 100644 --- a/tdeioslave/svn/svnhelper/subversioncheckout.ui +++ b/tdeioslave/svn/svnhelper/subversioncheckout.ui @@ -196,9 +196,7 @@ </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/tdeioslave/svn/svnhelper/subversionswitch.ui b/tdeioslave/svn/svnhelper/subversionswitch.ui index 1e48b29e..6b5f5ccf 100644 --- a/tdeioslave/svn/svnhelper/subversionswitch.ui +++ b/tdeioslave/svn/svnhelper/subversionswitch.ui @@ -196,9 +196,7 @@ </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/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui index dee5c9f4..a8fcccd5 100644 --- a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui +++ b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui @@ -474,8 +474,7 @@ <slot>browseClicked()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui b/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui index 0adc90c3..da39750a 100644 --- a/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui +++ b/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui @@ -526,8 +526,7 @@ is empty</string> <slot access="protected">activeLanguageChanged(int id)</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui index f4e107f3..759752fa 100644 --- a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui +++ b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui @@ -363,7 +363,8 @@ </image> </images> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcolorbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> + <include location="global" impldecl="in implementation">tdefontdialog.h</include> +</includes> </UI> diff --git a/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui b/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui index 4a7edb52..cacd3490 100644 --- a/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui +++ b/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui @@ -208,9 +208,7 @@ Only the folders made by the user are created in the base directory (Logical vie </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> |