diff options
111 files changed, 439 insertions, 702 deletions
diff --git a/chalk/colorspaces/wetsticky/wstool.ui b/chalk/colorspaces/wetsticky/wstool.ui index 3824b626..4a87e7f7 100644 --- a/chalk/colorspaces/wetsticky/wstool.ui +++ b/chalk/colorspaces/wetsticky/wstool.ui @@ -251,12 +251,7 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <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/chalk/plugins/filters/blur/wdgblur.ui b/chalk/plugins/filters/blur/wdgblur.ui index 8cd89f63..acafe634 100644 --- a/chalk/plugins/filters/blur/wdgblur.ui +++ b/chalk/plugins/filters/blur/wdgblur.ui @@ -213,15 +213,8 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcombobox.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> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/chalk/plugins/filters/bumpmap/wdgbumpmap.ui b/chalk/plugins/filters/bumpmap/wdgbumpmap.ui index 2934623a..8cd33f85 100644 --- a/chalk/plugins/filters/bumpmap/wdgbumpmap.ui +++ b/chalk/plugins/filters/bumpmap/wdgbumpmap.ui @@ -361,14 +361,8 @@ layer, the current layer will be used.</string> <tabstop>intAmbient</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <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>kcombobox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/chalk/plugins/filters/cimg/wdg_cimg.ui b/chalk/plugins/filters/cimg/wdg_cimg.ui index 09d4e323..3a049a7a 100644 --- a/chalk/plugins/filters/cimg/wdg_cimg.ui +++ b/chalk/plugins/filters/cimg/wdg_cimg.ui @@ -277,22 +277,7 @@ <tabstop>chkNormalize</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <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>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> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/chalk/plugins/filters/colorify/WdgColorifyBase.ui b/chalk/plugins/filters/colorify/WdgColorifyBase.ui index 90337f22..dedf6aad 100644 --- a/chalk/plugins/filters/colorify/WdgColorifyBase.ui +++ b/chalk/plugins/filters/colorify/WdgColorifyBase.ui @@ -91,7 +91,7 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcolorbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> +</includes> </UI> diff --git a/chalk/plugins/filters/colors/wdgcolortoalphabase.ui b/chalk/plugins/filters/colors/wdgcolortoalphabase.ui index 70ff3071..27c0d754 100644 --- a/chalk/plugins/filters/colors/wdgcolortoalphabase.ui +++ b/chalk/plugins/filters/colors/wdgcolortoalphabase.ui @@ -107,7 +107,7 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcolorbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> +</includes> </UI> diff --git a/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui b/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui index 3382102c..fcf763e1 100644 --- a/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui +++ b/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui @@ -286,7 +286,7 @@ </image> </images> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcurve.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcurve.h</include> +</includes> </UI> diff --git a/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui b/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui index 7f413abc..05525256 100644 --- a/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui +++ b/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui @@ -184,7 +184,7 @@ </image> </images> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcurve.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcurve.h</include> +</includes> </UI> diff --git a/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui b/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui index 97379cea..b720d6ad 100644 --- a/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui +++ b/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui @@ -67,9 +67,9 @@ <customwidgets> </customwidgets> <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">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui b/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui index 25705322..8510fdb4 100644 --- a/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui +++ b/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui @@ -214,16 +214,7 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <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>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/chalk/plugins/filters/levelfilter/wdg_level.ui b/chalk/plugins/filters/levelfilter/wdg_level.ui index f365e3d1..372e47fc 100644 --- a/chalk/plugins/filters/levelfilter/wdg_level.ui +++ b/chalk/plugins/filters/levelfilter/wdg_level.ui @@ -324,8 +324,7 @@ </image> </images> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kgradientslider.h</includehint> - <includehint>kgradientslider.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kgradientslider.h</include> +</includes> </UI> diff --git a/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui b/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui index 2741e116..10d187a9 100644 --- a/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui +++ b/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui @@ -102,10 +102,7 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui b/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui index 934d465f..1e849718 100644 --- a/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui +++ b/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui @@ -124,12 +124,7 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <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/chalk/plugins/filters/unsharp/wdgunsharp.ui b/chalk/plugins/filters/unsharp/wdgunsharp.ui index c2181eb8..096f3475 100644 --- a/chalk/plugins/filters/unsharp/wdgunsharp.ui +++ b/chalk/plugins/filters/unsharp/wdgunsharp.ui @@ -127,12 +127,7 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <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/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui b/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui index e56f4760..373df1d0 100644 --- a/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui +++ b/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui @@ -262,20 +262,8 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <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>kcombobox.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>kcombobox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui b/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui index e88ecbe3..3d7ef578 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui +++ b/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui @@ -263,9 +263,7 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcurve.h</includehint> - <includehint>kcurve.h</includehint> - <includehint>kcurve.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcurve.h</include> +</includes> </UI> diff --git a/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui b/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui index 5cbcd476..9d4ef3f0 100644 --- a/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui +++ b/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui @@ -205,12 +205,7 @@ <tabstop>bnCrop</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <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/chalk/plugins/tools/tool_curves/wdg_tool_example.ui b/chalk/plugins/tools/tool_curves/wdg_tool_example.ui index 1384ff58..6fca6b3e 100644 --- a/chalk/plugins/tools/tool_curves/wdg_tool_example.ui +++ b/chalk/plugins/tools/tool_curves/wdg_tool_example.ui @@ -121,8 +121,7 @@ </image> </images> <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/chalk/plugins/tools/tool_star/wdg_tool_star.ui b/chalk/plugins/tools/tool_star/wdg_tool_star.ui index a6395037..304b4f3d 100644 --- a/chalk/plugins/tools/tool_star/wdg_tool_star.ui +++ b/chalk/plugins/tools/tool_star/wdg_tool_star.ui @@ -121,8 +121,7 @@ </image> </images> <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/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui b/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui index 5375d564..e98284aa 100644 --- a/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui +++ b/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui @@ -236,8 +236,8 @@ <tabstop>intEndY</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>kis_cmb_idlist.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kis_cmb_idlist.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui b/chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui index 2354cfbc..594c77e6 100644 --- a/chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui +++ b/chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui @@ -229,7 +229,7 @@ <tabstop>allowResizingCheckBox</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcolorbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> +</includes> </UI> diff --git a/chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui b/chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui index 8ea8cfe4..ad020e85 100644 --- a/chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui +++ b/chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui @@ -116,8 +116,8 @@ </image> </images> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kis_previewwidget.h</includehint> - <includehint>kis_filters_listview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kis_filters_listview.h</include> + <include location="global" impldecl="in implementation">kis_previewwidget.h</include> +</includes> </UI> diff --git a/chalk/plugins/viewplugins/histogram/wdghistogram.ui b/chalk/plugins/viewplugins/histogram/wdghistogram.ui index be6f9552..0c0bdf3e 100644 --- a/chalk/plugins/viewplugins/histogram/wdghistogram.ui +++ b/chalk/plugins/viewplugins/histogram/wdghistogram.ui @@ -223,7 +223,7 @@ </image> </images> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kis_histogram_view.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kis_histogram_view.h</include> +</includes> </UI> diff --git a/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui b/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui index 8e8ca43d..a1270718 100644 --- a/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui +++ b/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui @@ -359,7 +359,7 @@ <tabstop>radioScale</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui b/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui index b9b3e400..1b2812f6 100644 --- a/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui +++ b/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui @@ -228,7 +228,7 @@ <tabstop>chkConstrain</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui b/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui index 72a70c8a..ae960fbf 100644 --- a/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui +++ b/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui @@ -139,14 +139,7 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <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> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui b/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui index b019e9e1..630c4c1f 100644 --- a/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui +++ b/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui @@ -276,8 +276,7 @@ <tabstop>intTestCount</tabstop> </tabstops> <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/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui b/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui index af18881a..885697ca 100644 --- a/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui +++ b/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui @@ -239,7 +239,7 @@ </image> </images> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui b/chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui index 6facd42a..ec8728bc 100644 --- a/chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui +++ b/chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui @@ -93,10 +93,7 @@ <tabstop>shearAngleX</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui b/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui index de5850d6..df3d62cf 100644 --- a/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui +++ b/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui @@ -215,7 +215,7 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcolorbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> +</includes> </UI> diff --git a/chalk/ui/kis_previewwidgetbase.ui b/chalk/ui/kis_previewwidgetbase.ui index 2653a625..672b13c4 100644 --- a/chalk/ui/kis_previewwidgetbase.ui +++ b/chalk/ui/kis_previewwidgetbase.ui @@ -261,11 +261,8 @@ </image> </images> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>imageviewer.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">imageviewer.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/chalk/ui/wdgautogradient.ui b/chalk/ui/wdgautogradient.ui index aec6907d..2db08d5b 100644 --- a/chalk/ui/wdgautogradient.ui +++ b/chalk/ui/wdgautogradient.ui @@ -393,7 +393,7 @@ </image> </images> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcolorbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> +</includes> </UI> diff --git a/chalk/ui/wdgbirdeye.ui b/chalk/ui/wdgbirdeye.ui index fcc464a9..ff8bcfbf 100644 --- a/chalk/ui/wdgbirdeye.ui +++ b/chalk/ui/wdgbirdeye.ui @@ -287,9 +287,6 @@ <data format="PNG" length="730">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000002a149444154388db595df4b536118c73f3bdbecf8036c4e41f2c6695022045e486e90b721e4ba126f1a0966627f4108512004a197fd0586588220980a9a068be63abaa884cc1f6d30a7e29cfb216dceb39d9d2e2cf3c74997e417de97972fbc9fe77d1e789e57e772b9384d369b4d3deab95c2edd497784b3404ff20f460650fff732fc0ee0f5bc241298252dc710f4174e4be4908cb9661439cefa7c0fb71eee79fbe0486096b5af3d644e4e50537a3de880b4f2c7db07a7e51819156e77fe3b1860b4bb1095d871f0c1f4239108068381f84e9cc58545c6c7c78946a3d45dafa3b4b414511411f34456d756e9eded65706090924a076bdf9e1f071fd4c0c000c15010f7b49bc93793b4de6ba5abab0bd3451300bbbbbb783e7a08ac04d858dfd0cc4013dcdedebe7f368a462449a2ff553fcd4dcdf87c3eba7bba71bbdcf8fd7e8a8a8ab20703d4d6d6d2f1a00383d180b9c84c85a58282fc027c3e1ff537ea71dc71303a36caf6f6367d2ffab203773eeaa4e1660336ab8db49226c798839c9211f402b22c53535383cd6ac35261c1eff76b82353b4fafd7a3a80a899d048220904aa588842324779278bd5e9cef9cc41371ca2e9511de0a675f8ae1a161cc2633e5e5e5980a4d0882c06678133157243f2f9f85a50526a62698fb32c78c674613acf962dfb28fd05688443c41329944de95997e3fcdc8e8088b4b8bb85d6e42c110f6463b5557aab207c77ec458febe8c3fe067657585542a85d566c5bbecc5fdc18de5b285603088925168b9db927d294451c4e9745275b50a7ba39dc44e8292e212daeeb7517dad9aa9b7534833129224d1d4d4a409de9f6e9fc61eabaf9f9d7d9a7d1e7ba20e3dd5986e8a1c47c75ecf97543ab45ff117e5e416138f7af790474bb13edf435a0195d8a19ecf46eaaf2d9339609ed7a03ff56b3aabce0dfc13238259bff00a6d890000000049454e44ae426082</data> </image> </images> -<includes> - <include location="local" impldecl="in declaration">kiconloader.h</include> -</includes> <Q_SLOTS> <slot>zoomChanged(int)</slot> <slot>zoomMinus()</slot> @@ -297,8 +294,9 @@ </Q_SLOTS> <pixmapfunction>BarIcon</pixmapfunction> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdetoolbar.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> + <include location="global" impldecl="in implementation">tdetoolbar.h</include> + <include location="local" impldecl="in declaration">kiconloader.h</include> +</includes> </UI> diff --git a/chalk/ui/wdgcolorsettings.ui b/chalk/ui/wdgcolorsettings.ui index f4a0f695..1029c28a 100644 --- a/chalk/ui/wdgcolorsettings.ui +++ b/chalk/ui/wdgcolorsettings.ui @@ -347,11 +347,9 @@ The different rendering intent methods will affect only what is shown on screen, </image> </images> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kis_cmb_idlist.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>squeezedcombobox.h</includehint> - <includehint>kis_cmb_idlist.h</includehint> - <includehint>kcombobox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">kis_cmb_idlist.h</include> + <include location="global" impldecl="in implementation">squeezedcombobox.h</include> +</includes> </UI> diff --git a/chalk/ui/wdgcustompalette.ui b/chalk/ui/wdgcustompalette.ui index ec0881bc..d496ac7a 100644 --- a/chalk/ui/wdgcustompalette.ui +++ b/chalk/ui/wdgcustompalette.ui @@ -82,7 +82,7 @@ </image> </images> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kis_palette_view.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kis_palette_view.h</include> +</includes> </UI> diff --git a/chalk/ui/wdggeneralsettings.ui b/chalk/ui/wdggeneralsettings.ui index 9383fbfd..953b5a96 100644 --- a/chalk/ui/wdggeneralsettings.ui +++ b/chalk/ui/wdggeneralsettings.ui @@ -177,7 +177,7 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/chalk/ui/wdggridsettings.ui b/chalk/ui/wdggridsettings.ui index dbb90e0a..9103460a 100644 --- a/chalk/ui/wdggridsettings.ui +++ b/chalk/ui/wdggridsettings.ui @@ -449,20 +449,9 @@ </image> </images> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kcombobox.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>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/chalk/ui/wdgnewimage.ui b/chalk/ui/wdgnewimage.ui index 82548e11..07ce9d63 100644 --- a/chalk/ui/wdgnewimage.ui +++ b/chalk/ui/wdgnewimage.ui @@ -422,14 +422,10 @@ <tabstop>txtDescription</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>kis_cmb_idlist.h</includehint> - <includehint>squeezedcombobox.h</includehint> - <includehint>kcolorcombo.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcolorcombo.h</include> + <include location="global" impldecl="in implementation">kis_cmb_idlist.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> + <include location="global" impldecl="in implementation">squeezedcombobox.h</include> +</includes> </UI> diff --git a/chalk/ui/wdgperformancesettings.ui b/chalk/ui/wdgperformancesettings.ui index 82deb5b9..b3976f30 100644 --- a/chalk/ui/wdgperformancesettings.ui +++ b/chalk/ui/wdgperformancesettings.ui @@ -139,8 +139,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be <customwidgets> </customwidgets> <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/chalk/ui/wdgtextbrush.ui b/chalk/ui/wdgtextbrush.ui index e51a4d6c..dfb5b2c6 100644 --- a/chalk/ui/wdgtextbrush.ui +++ b/chalk/ui/wdgtextbrush.ui @@ -152,7 +152,7 @@ <slot access="private">boldButtonClicked()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/filters/chalk/pdf/pdfimportwidgetbase.ui b/filters/chalk/pdf/pdfimportwidgetbase.ui index 7c6c74c8..17b3125d 100644 --- a/filters/chalk/pdf/pdfimportwidgetbase.ui +++ b/filters/chalk/pdf/pdfimportwidgetbase.ui @@ -309,13 +309,9 @@ <tabstop>intHeight</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcombobox.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>tdelistbox.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">tdelistbox.h</include> +</includes> </UI> diff --git a/filters/chalk/tiff/kis_wdg_options_tiff.ui b/filters/chalk/tiff/kis_wdg_options_tiff.ui index c1a48bd0..745f70ca 100644 --- a/filters/chalk/tiff/kis_wdg_options_tiff.ui +++ b/filters/chalk/tiff/kis_wdg_options_tiff.ui @@ -733,9 +733,7 @@ You can uncheck the box if you are not using transparancy and you want to make t <tabstop>compressionLevelPixarLog</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcombobox.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kcombobox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/filters/kivio/imageexport/kivio_imageexportwidget.ui b/filters/kivio/imageexport/kivio_imageexportwidget.ui index 34feba57..4398795d 100644 --- a/filters/kivio/imageexport/kivio_imageexportwidget.ui +++ b/filters/kivio/imageexport/kivio_imageexportwidget.ui @@ -196,8 +196,7 @@ </customwidgets> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>kcombobox.h</includehint> - <includehint>kcombobox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/filters/kspread/csv/dialogui.ui b/filters/kspread/csv/dialogui.ui index f8960f4b..0be85172 100644 --- a/filters/kspread/csv/dialogui.ui +++ b/filters/kspread/csv/dialogui.ui @@ -546,9 +546,8 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kcombobox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/filters/kspread/csv/exportdialogui.ui b/filters/kspread/csv/exportdialogui.ui index f6a552e1..351058aa 100644 --- a/filters/kspread/csv/exportdialogui.ui +++ b/filters/kspread/csv/exportdialogui.ui @@ -503,8 +503,8 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcombobox.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> +</includes> </UI> diff --git a/filters/kspread/html/exportwidget.ui b/filters/kspread/html/exportwidget.ui index 1b6ad59b..9a77277c 100644 --- a/filters/kspread/html/exportwidget.ui +++ b/filters/kspread/html/exportwidget.ui @@ -302,9 +302,9 @@ </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">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/filters/kspread/kexi/kspread_kexiimportdialogbase.ui b/filters/kspread/kexi/kspread_kexiimportdialogbase.ui index 2286506e..644d15d1 100644 --- a/filters/kspread/kexi/kspread_kexiimportdialogbase.ui +++ b/filters/kspread/kexi/kspread_kexiimportdialogbase.ui @@ -238,7 +238,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/filters/kspread/latex/export/latexexportdia.ui b/filters/kspread/latex/export/latexexportdia.ui index 530ec8ca..0d06f034 100644 --- a/filters/kspread/latex/export/latexexportdia.ui +++ b/filters/kspread/latex/export/latexexportdia.ui @@ -660,15 +660,12 @@ <slot>removeLanguage()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>tdelistbox.h</includehint> - <includehint>tdelistbox.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">kpushbutton.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/filters/kword/ascii/ExportDialogUI.ui b/filters/kword/ascii/ExportDialogUI.ui index 9345a64c..861c63cc 100644 --- a/filters/kword/ascii/ExportDialogUI.ui +++ b/filters/kword/ascii/ExportDialogUI.ui @@ -153,8 +153,8 @@ <tabstop>radioEndOfLineCR</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcombobox.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> +</includes> </UI> diff --git a/filters/kword/ascii/ImportDialogUI.ui b/filters/kword/ascii/ImportDialogUI.ui index 4b32a441..91c81aca 100644 --- a/filters/kword/ascii/ImportDialogUI.ui +++ b/filters/kword/ascii/ImportDialogUI.ui @@ -142,8 +142,8 @@ </vbox> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcombobox.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> +</includes> </UI> diff --git a/filters/kword/html/export/ExportDialogUI.ui b/filters/kword/html/export/ExportDialogUI.ui index a6683c04..b93cf139 100644 --- a/filters/kword/html/export/ExportDialogUI.ui +++ b/filters/kword/html/export/ExportDialogUI.ui @@ -280,11 +280,10 @@ <tabstop>radioModeEnhanced</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcombobox.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">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/filters/kword/latex/export/latexexportdia.ui b/filters/kword/latex/export/latexexportdia.ui index 530ec8ca..0d06f034 100644 --- a/filters/kword/latex/export/latexexportdia.ui +++ b/filters/kword/latex/export/latexexportdia.ui @@ -660,15 +660,12 @@ <slot>removeLanguage()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>tdelistbox.h</includehint> - <includehint>tdelistbox.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">kpushbutton.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/kchart/csvimportdialogui.ui b/kchart/csvimportdialogui.ui index 4e53b54d..8ed6ca6f 100644 --- a/kchart/csvimportdialogui.ui +++ b/kchart/csvimportdialogui.ui @@ -596,9 +596,8 @@ </widget> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kcombobox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kexi/examples/Simple_Database.kexi.sql b/kexi/examples/Simple_Database.kexi.sql index 7ac415e1..27ee93c3 100644 --- a/kexi/examples/Simple_Database.kexi.sql +++ b/kexi/examples/Simple_Database.kexi.sql @@ -603,10 +603,10 @@ INSERT INTO "kexi__objectdata" VALUES(105, '<!DOCTYPE UI> </property> </widget> </widget> -<includehints> -<includehint>kcombobox.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> +</includes> <layoutDefaults spacing="6" margin="11" /> <tabstops> <tabstop>TextLabel1</tabstop> diff --git a/kexi/main/kexifinddialogbase.ui b/kexi/main/kexifinddialogbase.ui index 133570e7..8bc457b2 100644 --- a/kexi/main/kexifinddialogbase.ui +++ b/kexi/main/kexifinddialogbase.ui @@ -341,17 +341,9 @@ <tabstop>m_promptOnReplace</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcombobox.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/kexi/main/printing/kexisimpleprintingpagesetupbase.ui b/kexi/main/printing/kexisimpleprintingpagesetupbase.ui index ff46ee7a..9e9edf6f 100644 --- a/kexi/main/printing/kexisimpleprintingpagesetupbase.ui +++ b/kexi/main/printing/kexisimpleprintingpagesetupbase.ui @@ -435,13 +435,9 @@ <tabstop>saveSetupLink</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kurllabel.h</includehint> - <includehint>kurllabel.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kurllabel.h</include> +</includes> </UI> diff --git a/kexi/main/startup/KexiDBTitlePageBase.ui b/kexi/main/startup/KexiDBTitlePageBase.ui index e8a00ef9..65d3000c 100644 --- a/kexi/main/startup/KexiDBTitlePageBase.ui +++ b/kexi/main/startup/KexiDBTitlePageBase.ui @@ -88,7 +88,7 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kexi/main/startup/KexiNewPrjTypeSelector.ui b/kexi/main/startup/KexiNewPrjTypeSelector.ui index 5e4e0283..3f3582a0 100644 --- a/kexi/main/startup/KexiNewPrjTypeSelector.ui +++ b/kexi/main/startup/KexiNewPrjTypeSelector.ui @@ -88,7 +88,7 @@ <function access="private" specifier="non virtual">init()</function> </functions> <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/kexi/plugins/macros/kexipart/keximacroerrorbase.ui b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui index f03c6aca..1f2dee5e 100644 --- a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui +++ b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui @@ -207,7 +207,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/kexi/plugins/queries/kexiaddparamwidget.ui b/kexi/plugins/queries/kexiaddparamwidget.ui index 01a3ee3c..ffaee5e5 100644 --- a/kexi/plugins/queries/kexiaddparamwidget.ui +++ b/kexi/plugins/queries/kexiaddparamwidget.ui @@ -129,7 +129,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/kexi/plugins/queries/kexiparameterlisteditor.ui b/kexi/plugins/queries/kexiparameterlisteditor.ui index d0077120..7eecdfb0 100644 --- a/kexi/plugins/queries/kexiparameterlisteditor.ui +++ b/kexi/plugins/queries/kexiparameterlisteditor.ui @@ -80,9 +80,8 @@ </vbox> </widget> <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/kexi/tests/gui/finddialog/kexifinddialogbase.ui b/kexi/tests/gui/finddialog/kexifinddialogbase.ui index bf5fcd32..2908b0ec 100644 --- a/kexi/tests/gui/finddialog/kexifinddialogbase.ui +++ b/kexi/tests/gui/finddialog/kexifinddialogbase.ui @@ -310,17 +310,9 @@ <tabstop>m_wholeWords</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kcombobox.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">kcombobox.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/kexi/widget/kexidbconnectionwidgetbase.ui b/kexi/widget/kexidbconnectionwidgetbase.ui index d121f1b7..e11f7b07 100644 --- a/kexi/widget/kexidbconnectionwidgetbase.ui +++ b/kexi/widget/kexidbconnectionwidgetbase.ui @@ -450,15 +450,10 @@ <tabstop>frmEngine</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kcombobox.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">kpushbutton.h</include> +</includes> </UI> diff --git a/kexi/widget/kexidbconnectionwidgetdetailsbase.ui b/kexi/widget/kexidbconnectionwidgetdetailsbase.ui index 46d2dfac..81bb39a9 100644 --- a/kexi/widget/kexidbconnectionwidgetdetailsbase.ui +++ b/kexi/widget/kexidbconnectionwidgetdetailsbase.ui @@ -179,16 +179,14 @@ <tabstop>chkUseSocket</tabstop> <tabstop>chkSocketDefault</tabstop> </tabstops> -<includes> - <include location="local" impldecl="in implementation">kexidbconnectionwidgetdetailsbase.ui.h</include> -</includes> <Q_SLOTS> <slot access="protected">slotCBToggled( bool on )</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">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> + <include location="local" impldecl="in implementation">kexidbconnectionwidgetdetailsbase.ui.h</include> +</includes> </UI> diff --git a/kivio/kiviopart/ui/kivio_layer_panel_base.ui b/kivio/kiviopart/ui/kivio_layer_panel_base.ui index 8777bf6e..24a86417 100644 --- a/kivio/kiviopart/ui/kivio_layer_panel_base.ui +++ b/kivio/kiviopart/ui/kivio_layer_panel_base.ui @@ -93,7 +93,7 @@ <slot access="protected">updateButtons(TQListViewItem*)</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdetoolbar.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">tdetoolbar.h</include> +</includes> </UI> diff --git a/kivio/kiviopart/ui/kiviostencilsetwidget.ui b/kivio/kiviopart/ui/kiviostencilsetwidget.ui index 13204c7e..841c569f 100644 --- a/kivio/kiviopart/ui/kiviostencilsetwidget.ui +++ b/kivio/kiviopart/ui/kiviostencilsetwidget.ui @@ -154,12 +154,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </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">tdelistview.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>tdelistview.h</includehint> -</includehints> </UI> diff --git a/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui b/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui index 85814b45..6a9f03ae 100644 --- a/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui +++ b/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui @@ -245,12 +245,11 @@ You should have received a copy of the GNU General Public License along with thi </tabstops> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>tdefontcombo.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>ktextedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">ktextedit.h</include> + <include location="global" impldecl="in implementation">tdefontcombo.h</include> +</includes> </UI> diff --git a/kplato/kptaccountspanelbase.ui b/kplato/kptaccountspanelbase.ui index a8f05d68..4c56e60e 100644 --- a/kplato/kptaccountspanelbase.ui +++ b/kplato/kptaccountspanelbase.ui @@ -124,7 +124,7 @@ <customwidgets> </customwidgets> <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/kplato/kptaccountsviewconfigurepanelbase.ui b/kplato/kptaccountsviewconfigurepanelbase.ui index 61e55316..903e6b80 100644 --- a/kplato/kptaccountsviewconfigurepanelbase.ui +++ b/kplato/kptaccountsviewconfigurepanelbase.ui @@ -62,7 +62,7 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kdatewidget.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kdatewidget.h</include> +</includes> </UI> diff --git a/kplato/kptcalendarlistpanel.ui b/kplato/kptcalendarlistpanel.ui index 5c98c6b9..3c00f583 100644 --- a/kplato/kptcalendarlistpanel.ui +++ b/kplato/kptcalendarlistpanel.ui @@ -123,7 +123,7 @@ <tabstop>baseCalendar</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/kplato/kptconfigtaskpanelbase.ui b/kplato/kptconfigtaskpanelbase.ui index 178d1f08..2072f75a 100644 --- a/kplato/kptconfigtaskpanelbase.ui +++ b/kplato/kptconfigtaskpanelbase.ui @@ -349,13 +349,11 @@ The estimation can be either effort based or duration based. If it is effort bas <tabstop>descriptionfield</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kdatewidget.h</includehint> - <includehint>kdatewidget.h</includehint> - <includehint>kptdurationwidget.h</includehint> - <includehint>ktextedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">kdatewidget.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kptdurationwidget.h</include> + <include location="global" impldecl="in implementation">ktextedit.h</include> +</includes> </UI> diff --git a/kplato/kptmainprojectpanelbase.ui b/kplato/kptmainprojectpanelbase.ui index 5a0ccb9a..c1f803fe 100644 --- a/kplato/kptmainprojectpanelbase.ui +++ b/kplato/kptmainprojectpanelbase.ui @@ -276,12 +276,9 @@ Here you can enter any additional text you want to be stored with the project. T <tabstop>idfield</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kdatewidget.h</includehint> - <includehint>kdatewidget.h</includehint> - <includehint>ktextedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kdatewidget.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">ktextedit.h</include> +</includes> </UI> diff --git a/kplato/kptmilestoneprogresspanelbase.ui b/kplato/kptmilestoneprogresspanelbase.ui index 9856eca5..b162dfa3 100644 --- a/kplato/kptmilestoneprogresspanelbase.ui +++ b/kplato/kptmilestoneprogresspanelbase.ui @@ -55,9 +55,9 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kdatetimewidget.h</includehint> - <includehint>kdatewidget.h</includehint> - <includehint>ktimewidget.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kdatetimewidget.h</include> + <include location="global" impldecl="in implementation">kdatewidget.h</include> + <include location="global" impldecl="in implementation">ktimewidget.h</include> +</includes> </UI> diff --git a/kplato/kptprojectdialogbase.ui b/kplato/kptprojectdialogbase.ui index 8eb79e69..e4ad1e59 100644 --- a/kplato/kptprojectdialogbase.ui +++ b/kplato/kptprojectdialogbase.ui @@ -253,8 +253,8 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kdatepicker.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kdatepicker.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kplato/kptsummarytaskgeneralpanelbase.ui b/kplato/kptsummarytaskgeneralpanelbase.ui index afef245e..fdc98f83 100644 --- a/kplato/kptsummarytaskgeneralpanelbase.ui +++ b/kplato/kptsummarytaskgeneralpanelbase.ui @@ -241,8 +241,8 @@ This is not limited to persons available in a resource group but can be anyone. <tabstop>wbsfield</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>ktextedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">ktextedit.h</include> +</includes> </UI> diff --git a/kplato/kpttaskcostpanelbase.ui b/kplato/kpttaskcostpanelbase.ui index 9907a26a..2d7299c1 100644 --- a/kplato/kpttaskcostpanelbase.ui +++ b/kplato/kpttaskcostpanelbase.ui @@ -224,8 +224,7 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kplato/kpttaskgeneralpanelbase.ui b/kplato/kpttaskgeneralpanelbase.ui index 5d950f6b..44a590fd 100644 --- a/kplato/kpttaskgeneralpanelbase.ui +++ b/kplato/kpttaskgeneralpanelbase.ui @@ -538,10 +538,10 @@ The estimation can be either effort based or duration based. If it is effort bas <tabstop>wbsfield</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kdatewidget.h</includehint> - <includehint>ktextedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">kdatewidget.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">ktextedit.h</include> +</includes> </UI> diff --git a/kplato/kpttaskprogresspanelbase.ui b/kplato/kpttaskprogresspanelbase.ui index b4c5b24f..abc48707 100644 --- a/kplato/kpttaskprogresspanelbase.ui +++ b/kplato/kpttaskprogresspanelbase.ui @@ -412,20 +412,10 @@ <tabstop>startTime</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kdatetimewidget.h</includehint> - <includehint>kdatewidget.h</includehint> - <includehint>ktimewidget.h</includehint> - <includehint>kdatetimewidget.h</includehint> - <includehint>kdatewidget.h</includehint> - <includehint>ktimewidget.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>kdatetimewidget.h</includehint> - <includehint>kdatewidget.h</includehint> - <includehint>ktimewidget.h</includehint> - <includehint>kdatetimewidget.h</includehint> - <includehint>kdatewidget.h</includehint> - <includehint>ktimewidget.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kdatetimewidget.h</include> + <include location="global" impldecl="in implementation">kdatewidget.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> + <include location="global" impldecl="in implementation">ktimewidget.h</include> +</includes> </UI> diff --git a/kplato/relationpanel.ui b/kplato/relationpanel.ui index 2f7b904e..d9358693 100644 --- a/kplato/relationpanel.ui +++ b/kplato/relationpanel.ui @@ -278,7 +278,7 @@ </image> </images> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kptdurationwidget.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kptdurationwidget.h</include> +</includes> </UI> diff --git a/kplato/resourcedialogbase.ui b/kplato/resourcedialogbase.ui index f7b75137..6a4c21b2 100644 --- a/kplato/resourcedialogbase.ui +++ b/kplato/resourcedialogbase.ui @@ -386,12 +386,9 @@ <tabstop>overtimeEdit</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kdatetimewidget.h</includehint> - <includehint>kdatewidget.h</includehint> - <includehint>ktimewidget.h</includehint> - <includehint>kdatetimewidget.h</includehint> - <includehint>kdatewidget.h</includehint> - <includehint>ktimewidget.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kdatetimewidget.h</include> + <include location="global" impldecl="in implementation">kdatewidget.h</include> + <include location="global" impldecl="in implementation">ktimewidget.h</include> +</includes> </UI> diff --git a/kplato/resourcespanelbase.ui b/kplato/resourcespanelbase.ui index 8f897eb5..7a6e47f1 100644 --- a/kplato/resourcespanelbase.ui +++ b/kplato/resourcespanelbase.ui @@ -189,7 +189,7 @@ <customwidgets> </customwidgets> <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/kplato/standardworktimedialogbase.ui b/kplato/standardworktimedialogbase.ui index 46efac2c..e6298cfb 100644 --- a/kplato/standardworktimedialogbase.ui +++ b/kplato/standardworktimedialogbase.ui @@ -282,9 +282,9 @@ when there is no calendar defined for a resource.</string> <tabstop>week</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>tdelistview.h</includehint> - <includehint>kcombobox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/kpresenter/brushpropertyui.ui b/kpresenter/brushpropertyui.ui index 22ff0ef9..c4667d9f 100644 --- a/kpresenter/brushpropertyui.ui +++ b/kpresenter/brushpropertyui.ui @@ -79,8 +79,8 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcombobox.h</includehint> - <includehint>kcolorbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/kpresenter/gradientpropertyui.ui b/kpresenter/gradientpropertyui.ui index b0ccae0a..c1fb0dbe 100644 --- a/kpresenter/gradientpropertyui.ui +++ b/kpresenter/gradientpropertyui.ui @@ -170,9 +170,8 @@ <tabstop>ySlider</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcolorbutton.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kcolorbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/kpresenter/imageEffectBase.ui b/kpresenter/imageEffectBase.ui index ec1f9959..d781938d 100644 --- a/kpresenter/imageEffectBase.ui +++ b/kpresenter/imageEffectBase.ui @@ -1459,22 +1459,8 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcolorbutton.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.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>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/kpresenter/penstyle.ui b/kpresenter/penstyle.ui index 3e995463..25d43762 100644 --- a/kpresenter/penstyle.ui +++ b/kpresenter/penstyle.ui @@ -188,12 +188,9 @@ </tabstops> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>kcombobox.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/kpresenter/picturepropertyui.ui b/kpresenter/picturepropertyui.ui index b1df2a2f..7bf917ef 100644 --- a/kpresenter/picturepropertyui.ui +++ b/kpresenter/picturepropertyui.ui @@ -174,7 +174,7 @@ <tabstop>brightnessInput</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/kpresenter/piepropertyui.ui b/kpresenter/piepropertyui.ui index 39c77f24..dc5d162b 100644 --- a/kpresenter/piepropertyui.ui +++ b/kpresenter/piepropertyui.ui @@ -140,7 +140,7 @@ <tabstop>typeCombo</tabstop> </tabstops> <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/kpresenter/polygonpropertyui.ui b/kpresenter/polygonpropertyui.ui index 813215db..08ae829c 100644 --- a/kpresenter/polygonpropertyui.ui +++ b/kpresenter/polygonpropertyui.ui @@ -141,11 +141,8 @@ </image> </images> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcombobox.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.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> +</includes> </UI> diff --git a/kpresenter/rotationpropertyui.ui b/kpresenter/rotationpropertyui.ui index 3f604490..51c22a48 100644 --- a/kpresenter/rotationpropertyui.ui +++ b/kpresenter/rotationpropertyui.ui @@ -159,8 +159,7 @@ <customwidgets> </customwidgets> <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/kpresenter/shadowdialog.ui b/kpresenter/shadowdialog.ui index 5ca0f1c3..3c24676b 100644 --- a/kpresenter/shadowdialog.ui +++ b/kpresenter/shadowdialog.ui @@ -482,9 +482,6 @@ <tabstop>applyButton</tabstop> <tabstop>cancelButton</tabstop> </tabstops> -<includes> - <include location="local" impldecl="in implementation">kcolorbutton.h</include> -</includes> <Q_SLOTS> <slot access="protected">colorChanged( const TQColor & )</slot> <slot access="protected">directionChanged( int )</slot> @@ -493,7 +490,7 @@ <slot access="protected">okClicked()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcolorbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> +</includes> </UI> diff --git a/kpresenter/slidetransitionwidget.ui b/kpresenter/slidetransitionwidget.ui index b9774639..eb94f3df 100644 --- a/kpresenter/slidetransitionwidget.ui +++ b/kpresenter/slidetransitionwidget.ui @@ -300,9 +300,9 @@ <tabstop>automaticTransitionInput</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/kpresenter/textpropertyui.ui b/kpresenter/textpropertyui.ui index 0d10315c..5e966bab 100644 --- a/kpresenter/textpropertyui.ui +++ b/kpresenter/textpropertyui.ui @@ -55,7 +55,7 @@ </image> </images> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpmarginwidget.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpmarginwidget.h</include> +</includes> </UI> diff --git a/kspread/dialogs/SheetSelectWidget.ui b/kspread/dialogs/SheetSelectWidget.ui index c4f4db58..3f7c7497 100644 --- a/kspread/dialogs/SheetSelectWidget.ui +++ b/kspread/dialogs/SheetSelectWidget.ui @@ -255,16 +255,8 @@ It is even possible to print a sheet more than once. Just insert the desired she <tabstop>ButtonMoveBottom</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>tdelistview.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>tdelistview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/kspread/dialogs/font_cell_format.ui b/kspread/dialogs/font_cell_format.ui index 946f1f6e..9048af9e 100644 --- a/kspread/dialogs/font_cell_format.ui +++ b/kspread/dialogs/font_cell_format.ui @@ -220,7 +220,7 @@ The default font is set for all cells in the Format -> Style Manager menu wit <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcolorbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> +</includes> </UI> diff --git a/kspread/dialogs/sheet_properties_base.ui b/kspread/dialogs/sheet_properties_base.ui index 7ff6bc0b..6dad8a76 100644 --- a/kspread/dialogs/sheet_properties_base.ui +++ b/kspread/dialogs/sheet_properties_base.ui @@ -247,12 +247,10 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> </widget> </vbox> </widget> +<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> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>kcombobox.h</includehint> -</includehints> </UI> diff --git a/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui b/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui index d2c8fc08..6d9d62ad 100644 --- a/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui +++ b/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui @@ -200,8 +200,7 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kdatewidget.h</includehint> - <includehint>kdatewidget.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kdatewidget.h</include> +</includes> </UI> diff --git a/kword/mailmerge/tdeabc/addresspicker.ui b/kword/mailmerge/tdeabc/addresspicker.ui index 44dc8c8f..afa0e7b7 100644 --- a/kword/mailmerge/tdeabc/addresspicker.ui +++ b/kword/mailmerge/tdeabc/addresspicker.ui @@ -288,10 +288,8 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>tdelistview.h</includehint> - <includehint>tdelistview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/lib/kofficecore/koDetailsPaneBase.ui b/lib/kofficecore/koDetailsPaneBase.ui index 79658b58..68a5a061 100644 --- a/lib/kofficecore/koDetailsPaneBase.ui +++ b/lib/kofficecore/koDetailsPaneBase.ui @@ -230,9 +230,9 @@ </tabstops> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>tdelistview.h</includehint> - <includehint>ktextbrowser.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">ktextbrowser.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/lib/kofficecore/koDocumentInfoAboutWidget.ui b/lib/kofficecore/koDocumentInfoAboutWidget.ui index 9e100ed2..b419fbd3 100644 --- a/lib/kofficecore/koDocumentInfoAboutWidget.ui +++ b/lib/kofficecore/koDocumentInfoAboutWidget.ui @@ -341,12 +341,9 @@ </tabstops> <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>ktextedit.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> + <include location="global" impldecl="in implementation">ktextedit.h</include> +</includes> </UI> diff --git a/lib/kofficecore/koDocumentInfoAuthorWidget.ui b/lib/kofficecore/koDocumentInfoAuthorWidget.ui index bce29446..c76d453d 100644 --- a/lib/kofficecore/koDocumentInfoAuthorWidget.ui +++ b/lib/kofficecore/koDocumentInfoAuthorWidget.ui @@ -291,21 +291,8 @@ </tabstops> <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>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>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/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui index 44dbc658..6fb39853 100644 --- a/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui +++ b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui @@ -218,16 +218,14 @@ </connections> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>tdelistview.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>ktimewidget.h</includehint> - <includehint>kdatetimewidget.h</includehint> - <includehint>kdatewidget.h</includehint> - <includehint>ktimewidget.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">kdatetimewidget.h</include> + <include location="global" impldecl="in implementation">kdatewidget.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">ktimewidget.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/lib/kofficecore/koOpenPaneBase.ui b/lib/kofficecore/koOpenPaneBase.ui index b1ec1984..8b40f878 100644 --- a/lib/kofficecore/koOpenPaneBase.ui +++ b/lib/kofficecore/koOpenPaneBase.ui @@ -137,8 +137,8 @@ </customwidgets> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<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/lib/kotext/KoParagDecorationTab.ui b/lib/kotext/KoParagDecorationTab.ui index 131e1b0c..886157f0 100644 --- a/lib/kotext/KoParagDecorationTab.ui +++ b/lib/kotext/KoParagDecorationTab.ui @@ -389,14 +389,9 @@ regardless of the style of the preceeding and subsequent paragraphs.</p></ </image> </images> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcolorbutton.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcombobox.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">kcolorbutton.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/lib/kotext/kodecorationtabbase.ui b/lib/kotext/kodecorationtabbase.ui index 7c8896b5..5d1301c9 100644 --- a/lib/kotext/kodecorationtabbase.ui +++ b/lib/kotext/kodecorationtabbase.ui @@ -342,19 +342,9 @@ </image> </images> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>kcolorbutton.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> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/lib/kotext/kofonttabbase.ui b/lib/kotext/kofonttabbase.ui index d6d0a2f6..1d05d2fb 100644 --- a/lib/kotext/kofonttabbase.ui +++ b/lib/kotext/kofonttabbase.ui @@ -20,9 +20,6 @@ </widget> <layoutdefaults spacing="6" margin="11"/> <includes> - <include location="local" impldecl="in declaration">TDEFontDialog_local.h</include> + <include location="global" impldecl="in implementation">TDEFontDialog_local.h</include> </includes> -<includehints> - <includehint>TDEFontDialog_local.h</includehint> -</includehints> </UI> diff --git a/lib/kotext/kohighlightingtabbase.ui b/lib/kotext/kohighlightingtabbase.ui index b2b4ce26..12e3903d 100644 --- a/lib/kotext/kohighlightingtabbase.ui +++ b/lib/kotext/kohighlightingtabbase.ui @@ -130,11 +130,8 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcolorbutton.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kcombobox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/lib/kotext/kolanguagetabbase.ui b/lib/kotext/kolanguagetabbase.ui index 0fbd5442..799ab09a 100644 --- a/lib/kotext/kolanguagetabbase.ui +++ b/lib/kotext/kolanguagetabbase.ui @@ -70,7 +70,7 @@ </vbox> </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/lib/kotext/kolayouttabbase.ui b/lib/kotext/kolayouttabbase.ui index cddc4798..2e05a707 100644 --- a/lib/kotext/kolayouttabbase.ui +++ b/lib/kotext/kolayouttabbase.ui @@ -285,11 +285,10 @@ </connection> </connections> <includes> +</includes> +<layoutdefaults spacing="6" margin="11"/> +<includes> <include location="global" impldecl="in declaration">knuminput.h</include> <include location="global" impldecl="in declaration">tdelocale.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> -</includehints> </UI> diff --git a/lib/kotext/timedateformatwidget.ui b/lib/kotext/timedateformatwidget.ui index b298d4da..baf0e1a3 100644 --- a/lib/kotext/timedateformatwidget.ui +++ b/lib/kotext/timedateformatwidget.ui @@ -203,16 +203,13 @@ <tabstops> <tabstop>combo1</tabstop> </tabstops> -<includes> - <include location="local" impldecl="in implementation">timedateformatwidget.ui.h</include> -</includes> <Q_SLOTS> <slot>comboActivated()</slot> <slot>updateLabel()</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> + <include location="local" impldecl="in implementation">timedateformatwidget.ui.h</include> +</includes> </UI> diff --git a/lib/kross/main/wdgscriptsmanagerbase.ui b/lib/kross/main/wdgscriptsmanagerbase.ui index 1c9e7247..f6740cf9 100644 --- a/lib/kross/main/wdgscriptsmanagerbase.ui +++ b/lib/kross/main/wdgscriptsmanagerbase.ui @@ -234,14 +234,9 @@ </image> </images> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> - <includehint>tdetoolbar.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> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> + <include location="global" impldecl="in implementation">tdetoolbar.h</include> +</includes> </UI> |