diff options
19 files changed, 73 insertions, 99 deletions
diff --git a/k3bsetup/base_k3bsetup2.ui b/k3bsetup/base_k3bsetup2.ui index 9ad2b87..0764b25 100644 --- a/k3bsetup/base_k3bsetup2.ui +++ b/k3bsetup/base_k3bsetup2.ui @@ -371,10 +371,8 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> - <includehint>tdelistview.h</includehint> - <includehint>keditlistbox.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">keditlistbox.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui b/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui index 1f61071..7d731b4 100644 --- a/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui +++ b/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui @@ -142,7 +142,7 @@ </vbox> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kactivelabel.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kactivelabel.h</include> +</includes> </UI> diff --git a/plugins/encoder/external/base_k3bexternalencodereditwidget.ui b/plugins/encoder/external/base_k3bexternalencodereditwidget.ui index 415147a..781c95f 100644 --- a/plugins/encoder/external/base_k3bexternalencodereditwidget.ui +++ b/plugins/encoder/external/base_k3bexternalencodereditwidget.ui @@ -155,10 +155,8 @@ Please insert the command used to encode the audio data. The command has to read <tabstop>m_editCommand</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kactivelabel.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kactivelabel.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/plugins/encoder/lame/base_k3blameencodersettingswidget.ui b/plugins/encoder/lame/base_k3blameencodersettingswidget.ui index a874760..7348e18 100644 --- a/plugins/encoder/lame/base_k3blameencodersettingswidget.ui +++ b/plugins/encoder/lame/base_k3blameencodersettingswidget.ui @@ -474,7 +474,7 @@ This results in many wasted bits for high bitrate encodings but will ensure </connection> </connections> <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/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui b/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui index 9df1c17..47b9d84 100644 --- a/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui +++ b/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui @@ -270,4 +270,7 @@ The input will be encoded as a mono signal. If it was a stereo signal, it will b </connection> </connections> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui b/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui index a76c3c5..5e3e5dc 100644 --- a/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui +++ b/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui @@ -384,9 +384,7 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <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/src/option/base_k3bcddboptiontab.ui b/src/option/base_k3bcddboptiontab.ui index 0c15130..23a6398 100644 --- a/src/option/base_k3bcddboptiontab.ui +++ b/src/option/base_k3bcddboptiontab.ui @@ -552,9 +552,9 @@ <tabstop>m_editManualCgiPath</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> - <includehint>tdelistview.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">tdelistview.h</include> +</includes> </UI> diff --git a/src/option/base_k3bmiscoptiontab.ui b/src/option/base_k3bmiscoptiontab.ui index 89a20cf..dc207b1 100644 --- a/src/option/base_k3bmiscoptiontab.ui +++ b/src/option/base_k3bmiscoptiontab.ui @@ -274,11 +274,9 @@ </image> </images> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>k3bintmapcombobox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">k3bintmapcombobox.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/src/option/base_k3bpluginoptiontab.ui b/src/option/base_k3bpluginoptiontab.ui index 1278f80..64cbfdd 100644 --- a/src/option/base_k3bpluginoptiontab.ui +++ b/src/option/base_k3bpluginoptiontab.ui @@ -84,7 +84,7 @@ </image> </images> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>k3blistview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">k3blistview.h</include> +</includes> </UI> diff --git a/src/option/base_k3bthemeoptiontab.ui b/src/option/base_k3bthemeoptiontab.ui index f1eab04..83fda44 100644 --- a/src/option/base_k3bthemeoptiontab.ui +++ b/src/option/base_k3bthemeoptiontab.ui @@ -202,7 +202,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/src/projects/base_k3badvanceddataimagesettings.ui b/src/projects/base_k3badvanceddataimagesettings.ui index 0bfefa5..7efbe42 100644 --- a/src/projects/base_k3badvanceddataimagesettings.ui +++ b/src/projects/base_k3badvanceddataimagesettings.ui @@ -185,9 +185,8 @@ <tabstop>m_checkJoliet</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.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">tdelistview.h</include> +</includes> </UI> diff --git a/src/projects/base_k3baudiocdtextallfieldswidget.ui b/src/projects/base_k3baudiocdtextallfieldswidget.ui index c0e2556..7a84853 100644 --- a/src/projects/base_k3baudiocdtextallfieldswidget.ui +++ b/src/projects/base_k3baudiocdtextallfieldswidget.ui @@ -262,14 +262,7 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<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> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/src/projects/base_k3baudiocdtextwidget.ui b/src/projects/base_k3baudiocdtextwidget.ui index 4010416..b0870b8 100644 --- a/src/projects/base_k3baudiocdtextwidget.ui +++ b/src/projects/base_k3baudiocdtextwidget.ui @@ -215,8 +215,7 @@ <slot access="protected" specifier="pure virtual">slotCopySongwriter()</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">klineedit.h</include> +</includes> </UI> diff --git a/src/projects/base_k3baudiotrackwidget.ui b/src/projects/base_k3baudiotrackwidget.ui index ce969da..f944926 100644 --- a/src/projects/base_k3baudiotrackwidget.ui +++ b/src/projects/base_k3baudiotrackwidget.ui @@ -323,14 +323,8 @@ This does not mean that K3b adds an additional gap of silence to the track. This <tabstop>m_checkCopyPermitted</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<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>k3bmsfedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">k3bmsfedit.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/src/projects/base_k3bbootimageview.ui b/src/projects/base_k3bbootimageview.ui index f0e5f27..3811f86 100644 --- a/src/projects/base_k3bbootimageview.ui +++ b/src/projects/base_k3bbootimageview.ui @@ -388,7 +388,7 @@ <slot access="protected">slotOptionsChanged()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/src/projects/base_k3bmovixoptionswidget.ui b/src/projects/base_k3bmovixoptionswidget.ui index 293ca92..1e6cc09 100644 --- a/src/projects/base_k3bmovixoptionswidget.ui +++ b/src/projects/base_k3bmovixoptionswidget.ui @@ -327,11 +327,7 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcombobox.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">kcombobox.h</include> +</includes> </UI> diff --git a/src/rip/base_k3baudiorippingoptionwidget.ui b/src/rip/base_k3baudiorippingoptionwidget.ui index 66d34ea..86be04b 100644 --- a/src/rip/base_k3baudiorippingoptionwidget.ui +++ b/src/rip/base_k3baudiorippingoptionwidget.ui @@ -275,8 +275,8 @@ file will contain all tracks one after the other. </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kurlrequester.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/src/rip/base_k3bcddbpatternwidget.ui b/src/rip/base_k3bcddbpatternwidget.ui index 09d8062..ed12ed5 100644 --- a/src/rip/base_k3bcddbpatternwidget.ui +++ b/src/rip/base_k3bcddbpatternwidget.ui @@ -173,8 +173,9 @@ <tabstop>m_editBlankReplace</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kurllabel.h</includehint> - <includehint>kurllabel.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">kurllabel.h</include> +</includes> </UI> diff --git a/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui b/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui index c4bc79b..e6c35c0 100644 --- a/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui +++ b/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui @@ -707,15 +707,12 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kactivelabel.h</includehint> - <includehint>k3bintmapcombobox.h</includehint> - <includehint>k3bintmapcombobox.h</includehint> - <includehint>kurllabel.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">k3bintmapcombobox.h</include> + <include location="global" impldecl="in implementation">kactivelabel.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kurllabel.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> |