diff options
25 files changed, 96 insertions, 141 deletions
diff --git a/KMFSysTray/details_designer.ui b/KMFSysTray/details_designer.ui index 2c6a80c..47d4a81 100644 --- a/KMFSysTray/details_designer.ui +++ b/KMFSysTray/details_designer.ui @@ -476,9 +476,8 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kcombobox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/KMFSysTray/mainwidget_designer.ui b/KMFSysTray/mainwidget_designer.ui index bc32b8a..c544fd7 100644 --- a/KMFSysTray/mainwidget_designer.ui +++ b/KMFSysTray/mainwidget_designer.ui @@ -81,8 +81,8 @@ </hbox> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kled.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kled.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/kmyfirewall/genericinterface/kmyfirewallgenericinterfacehostwidget.ui b/kmyfirewall/genericinterface/kmyfirewallgenericinterfacehostwidget.ui index b935178..ae021ed 100644 --- a/kmyfirewall/genericinterface/kmyfirewallgenericinterfacehostwidget.ui +++ b/kmyfirewall/genericinterface/kmyfirewallgenericinterfacehostwidget.ui @@ -294,13 +294,9 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>tdelistview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/kmyfirewall/genericinterface/kmyfirewallgenericinterfacelogging.ui b/kmyfirewall/genericinterface/kmyfirewallgenericinterfacelogging.ui index 8a54f3a..e97149e 100644 --- a/kmyfirewall/genericinterface/kmyfirewallgenericinterfacelogging.ui +++ b/kmyfirewall/genericinterface/kmyfirewallgenericinterfacelogging.ui @@ -188,7 +188,7 @@ The entries are written to the system's main log file </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>krestrictedline.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">krestrictedline.h</include> +</includes> </UI> diff --git a/kmyfirewall/genericinterface/kmyfirewallgenericinterfacenatwidget.ui b/kmyfirewall/genericinterface/kmyfirewallgenericinterfacenatwidget.ui index 28871b0..77a7cbb 100644 --- a/kmyfirewall/genericinterface/kmyfirewallgenericinterfacenatwidget.ui +++ b/kmyfirewall/genericinterface/kmyfirewallgenericinterfacenatwidget.ui @@ -283,11 +283,8 @@ are using your computer a their default gateway.</p></string> </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <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/kmyfirewall/genericinterface/kmyfirewallgenericinterfaceprotocolwidget.ui b/kmyfirewall/genericinterface/kmyfirewallgenericinterfaceprotocolwidget.ui index e181965..fb314ed 100644 --- a/kmyfirewall/genericinterface/kmyfirewallgenericinterfaceprotocolwidget.ui +++ b/kmyfirewall/genericinterface/kmyfirewallgenericinterfaceprotocolwidget.ui @@ -209,7 +209,7 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/kmyfirewall/ipteditor/kmyfirewallchaineditor.ui b/kmyfirewall/ipteditor/kmyfirewallchaineditor.ui index 12d10b5..b0d6fec 100644 --- a/kmyfirewall/ipteditor/kmyfirewallchaineditor.ui +++ b/kmyfirewall/ipteditor/kmyfirewallchaineditor.ui @@ -887,7 +887,7 @@ <slot>reject()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/kmyfirewall/ipteditor/kmyfirewallruleeditor.ui b/kmyfirewall/ipteditor/kmyfirewallruleeditor.ui index 60f0cf5..e379f08 100644 --- a/kmyfirewall/ipteditor/kmyfirewallruleeditor.ui +++ b/kmyfirewall/ipteditor/kmyfirewallruleeditor.ui @@ -744,14 +744,9 @@ <slot>reject()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kled.h</includehint> - <includehint>kled.h</includehint> - <includehint>kled.h</includehint> - <includehint>kled.h</includehint> - <includehint>kled.h</includehint> - <includehint>kcombobox.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">kled.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/kmyfirewall/kmfwidgets/kmyfirewallgenericinterfaceeditprotocolwidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallgenericinterfaceeditprotocolwidget.ui index e592679..cfc0f7d 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallgenericinterfaceeditprotocolwidget.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallgenericinterfaceeditprotocolwidget.ui @@ -339,13 +339,9 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa </vbox> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>tdelistbox.h</includehint> - <includehint>tdelistbox.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">tdelistbox.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/kmyfirewall/kmfwidgets/kmyfirewallhostwidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallhostwidget.ui index c6a1882..d2b4950 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallhostwidget.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallhostwidget.ui @@ -424,14 +424,9 @@ </grid> </widget> <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>kcombobox.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kled.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">kled.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/kmyfirewall/kmfwidgets/kmyfirewallinterfacewidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallinterfacewidget.ui index b637295..dbc2420 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallinterfacewidget.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallinterfacewidget.ui @@ -144,9 +144,9 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>knuminput.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> +</includes> </UI> diff --git a/kmyfirewall/kmfwidgets/kmyfirewallipv4adddresswidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallipv4adddresswidget.ui index e41e933..9226f8e 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallipv4adddresswidget.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallipv4adddresswidget.ui @@ -152,10 +152,7 @@ </grid> </widget> <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/kmyfirewall/kmfwidgets/kmyfirewallmultiportwidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallmultiportwidget.ui index 5f134f6..a4f552f 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallmultiportwidget.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallmultiportwidget.ui @@ -223,7 +223,7 @@ Use this to avoid too large (slow) rulesets.</string> <signal>sigMultiPortChanged(bool)</signal> </Q_SIGNALS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tqwidget.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">tqwidget.h</include> +</includes> </UI> diff --git a/kmyfirewall/kmfwidgets/kmyfirewallmynetworkwidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallmynetworkwidget.ui index 7cb8dc7..be7f3a1 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallmynetworkwidget.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallmynetworkwidget.ui @@ -184,9 +184,8 @@ <forward>class TQListViewItem;</forward> </forwards> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> - <includehint>ktabwidget.h</includehint> - <includehint>ktabwidget.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">ktabwidget.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/kmyfirewall/kmfwidgets/kmyfirewallnetworkwidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallnetworkwidget.ui index cfa45fd..87cf907 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallnetworkwidget.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallnetworkwidget.ui @@ -320,11 +320,7 @@ </grid> </widget> <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> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/kmyfirewall/kmfwidgets/kmyfirewallprotocollistview.ui b/kmyfirewall/kmfwidgets/kmyfirewallprotocollistview.ui index fb0a2f9..c3b6e70 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallprotocollistview.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallprotocollistview.ui @@ -64,7 +64,7 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/kmyfirewall/kmfwidgets/kmyfirewallselectactivetarget.ui b/kmyfirewall/kmfwidgets/kmyfirewallselectactivetarget.ui index 381ce51..5664437 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallselectactivetarget.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallselectactivetarget.ui @@ -173,9 +173,8 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <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/kmyfirewall/kmfwidgets/kmyfirewallselectinterface.ui b/kmyfirewall/kmfwidgets/kmyfirewallselectinterface.ui index 9adcd5b..4bce668 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallselectinterface.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallselectinterface.ui @@ -385,8 +385,8 @@ </image> </images> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcombobox.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/kmyfirewall/kmfwidgets/kmyfirewallsystemsettingslinux.ui b/kmyfirewall/kmfwidgets/kmyfirewallsystemsettingslinux.ui index 0fb4ed1..550b3ae 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallsystemsettingslinux.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallsystemsettingslinux.ui @@ -184,19 +184,10 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcombobox.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<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/kmyfirewall/kmfwidgets/kmyfirewalltransactionlog.ui b/kmyfirewall/kmfwidgets/kmyfirewalltransactionlog.ui index 23b19bc..eeadc99 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewalltransactionlog.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewalltransactionlog.ui @@ -330,15 +330,10 @@ </widget> </grid> </widget> +<layoutdefaults spacing="6" margin="11"/> <includes> - <include location="local" impldecl="in implementation">kmyfirewalltransactionlog.ui.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> + <include location="local" impldecl="in implementation">kmyfirewalltransactionlog.ui.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> - <includehint>tdelistview.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/kmyfirewall/ruleoptionplugins/custom_option/kmyfirewallruleeditorcustomrule.ui b/kmyfirewall/ruleoptionplugins/custom_option/kmyfirewallruleeditorcustomrule.ui index f46d1a5..c913333 100644 --- a/kmyfirewall/ruleoptionplugins/custom_option/kmyfirewallruleeditorcustomrule.ui +++ b/kmyfirewall/ruleoptionplugins/custom_option/kmyfirewallruleeditorcustomrule.ui @@ -366,7 +366,7 @@ <slot>accept()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tqwidget.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">tqwidget.h</include> +</includes> </UI> diff --git a/kmyfirewall/ruleoptionplugins/interface_option/kmyfirewallruleeditorinterface.ui b/kmyfirewall/ruleoptionplugins/interface_option/kmyfirewallruleeditorinterface.ui index 954d3eb..73c5940 100644 --- a/kmyfirewall/ruleoptionplugins/interface_option/kmyfirewallruleeditorinterface.ui +++ b/kmyfirewall/ruleoptionplugins/interface_option/kmyfirewallruleeditorinterface.ui @@ -433,7 +433,7 @@ <slot>reject()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/kmyfirewall/ruleoptionplugins/ip_option/kmyfirewallruleeditorip.ui b/kmyfirewall/ruleoptionplugins/ip_option/kmyfirewallruleeditorip.ui index 7269736..c19645b 100644 --- a/kmyfirewall/ruleoptionplugins/ip_option/kmyfirewallruleeditorip.ui +++ b/kmyfirewall/ruleoptionplugins/ip_option/kmyfirewallruleeditorip.ui @@ -297,7 +297,7 @@ <slot>reject()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/kmyfirewall/ruleoptionplugins/limit_option/kmyfirewallruleeditorlimit.ui b/kmyfirewall/ruleoptionplugins/limit_option/kmyfirewallruleeditorlimit.ui index 084a88c..22216b7 100644 --- a/kmyfirewall/ruleoptionplugins/limit_option/kmyfirewallruleeditorlimit.ui +++ b/kmyfirewall/ruleoptionplugins/limit_option/kmyfirewallruleeditorlimit.ui @@ -436,8 +436,8 @@ <slot>reject()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tqwidget.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tqwidget.h</include> +</includes> </UI> diff --git a/kmyfirewall/ruleoptionplugins/mac_option/kmyfirewallruleeditormac.ui b/kmyfirewall/ruleoptionplugins/mac_option/kmyfirewallruleeditormac.ui index 41b9215..c2ddefc 100644 --- a/kmyfirewall/ruleoptionplugins/mac_option/kmyfirewallruleeditormac.ui +++ b/kmyfirewall/ruleoptionplugins/mac_option/kmyfirewallruleeditormac.ui @@ -496,7 +496,7 @@ <slot>reject()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> |