diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-26 23:47:54 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-26 23:48:34 +0900 |
| commit | f88c4d1eadaf2cca16d9c055882a215083bfd8d3 (patch) | |
| tree | 269a4dde53adc30182767b80f570db91bce63eb8 | |
| parent | 635ff0f8fe89487ae4e0b9a4b566a9df3db801ab (diff) | |
| download | konversation-f88c4d1eadaf2cca16d9c055882a215083bfd8d3.tar.gz konversation-f88c4d1eadaf2cca16d9c055882a215083bfd8d3.zip | |
Add includes to UI files to resolve FTBFS.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 19b2b09d395a043345a9b8f1686e417c1096911e)
25 files changed, 99 insertions, 185 deletions
diff --git a/konversation/src/alias_preferencesui.ui b/konversation/src/alias_preferencesui.ui index 9f86107..33ee9f0 100644 --- a/konversation/src/alias_preferencesui.ui +++ b/konversation/src/alias_preferencesui.ui @@ -166,9 +166,8 @@ </tabstops> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>tdelistview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/konversation/src/autoreplace_preferencesui.ui b/konversation/src/autoreplace_preferencesui.ui index b19f5eb..d40c078 100644 --- a/konversation/src/autoreplace_preferencesui.ui +++ b/konversation/src/autoreplace_preferencesui.ui @@ -284,9 +284,8 @@ <tabstop>removeButton</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/konversation/src/channeloptionsui.ui b/konversation/src/channeloptionsui.ui index aa54230..3c68f89 100644 --- a/konversation/src/channeloptionsui.ui +++ b/konversation/src/channeloptionsui.ui @@ -545,15 +545,11 @@ the Free Software Foundation; either version 2 of the License, or </connections> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>tdelistview.h</includehint> - <includehint>ktextedit.h</includehint> - <includehint>ktextedit.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>tdelistview.h</includehint> - <includehint>tdelistview.h</includehint> - <includehint>tdelistviewsearchline.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">ktextedit.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> + <include location="global" impldecl="in implementation">tdelistviewsearchline.h</include> +</includes> </UI> diff --git a/konversation/src/chatwindowappearance_preferences.ui b/konversation/src/chatwindowappearance_preferences.ui index c1c152c..5a7e050 100644 --- a/konversation/src/chatwindowappearance_preferences.ui +++ b/konversation/src/chatwindowappearance_preferences.ui @@ -369,10 +369,8 @@ the Free Software Foundation; either version 2 of the License, or <tabstop>kcfg_ShowBacklog</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/konversation/src/colorsappearance_preferences.ui b/konversation/src/colorsappearance_preferences.ui index b0e9c1e..1ef6b61 100644 --- a/konversation/src/colorsappearance_preferences.ui +++ b/konversation/src/colorsappearance_preferences.ui @@ -1347,43 +1347,6 @@ the Free Software Foundation; either version 2 of the License, or </tabstops> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> -</includehints> <connections> <connection> <sender>kcfg_InputFieldsBackgroundColor</sender> @@ -1392,4 +1355,7 @@ the Free Software Foundation; either version 2 of the License, or <slot>setEnabled(bool)</slot> </connection> </connections> +<includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> +</includes> </UI> diff --git a/konversation/src/connectionbehavior_preferences.ui b/konversation/src/connectionbehavior_preferences.ui index 752c26c..0354ad8 100644 --- a/konversation/src/connectionbehavior_preferences.ui +++ b/konversation/src/connectionbehavior_preferences.ui @@ -178,10 +178,7 @@ the Free Software Foundation; either version 2 of the License, or </tabstops> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/konversation/src/dcc_preferencesui.ui b/konversation/src/dcc_preferencesui.ui index a1a4da2..584cc62 100644 --- a/konversation/src/dcc_preferencesui.ui +++ b/konversation/src/dcc_preferencesui.ui @@ -518,10 +518,8 @@ the Free Software Foundation; either version 2 of the License, or <tabstop>kcfg_DccChatPortsLast</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/konversation/src/dcctransferdetailedinfopanelui.ui b/konversation/src/dcctransferdetailedinfopanelui.ui index ea04cf8..72dc797 100644 --- a/konversation/src/dcctransferdetailedinfopanelui.ui +++ b/konversation/src/dcctransferdetailedinfopanelui.ui @@ -482,11 +482,9 @@ </vbox> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kprogress.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>ksqueezedtextlabel.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kprogress.h</include> + <include location="global" impldecl="in implementation">ksqueezedtextlabel.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/konversation/src/fontappearance_preferences.ui b/konversation/src/fontappearance_preferences.ui index 5813b14..7575ab3 100644 --- a/konversation/src/fontappearance_preferences.ui +++ b/konversation/src/fontappearance_preferences.ui @@ -152,9 +152,7 @@ the Free Software Foundation; either version 2 of the License, or </tabstops> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>tdefontrequester.h</includehint> - <includehint>tdefontrequester.h</includehint> - <includehint>tdefontrequester.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">tdefontrequester.h</include> +</includes> </UI> diff --git a/konversation/src/generalbehavior_preferences.ui b/konversation/src/generalbehavior_preferences.ui index 0354e67..a042e48 100644 --- a/konversation/src/generalbehavior_preferences.ui +++ b/konversation/src/generalbehavior_preferences.ui @@ -350,11 +350,7 @@ the Free Software Foundation; either version 2 of the License, or </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> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/konversation/src/highlight_preferencesui.ui b/konversation/src/highlight_preferencesui.ui index a37ca8b..2897e69 100644 --- a/konversation/src/highlight_preferencesui.ui +++ b/konversation/src/highlight_preferencesui.ui @@ -436,18 +436,11 @@ <tabstop>removeButton</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kurlrequester.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/konversation/src/ignore_preferencesui.ui b/konversation/src/ignore_preferencesui.ui index 0ec6558..74b4ed7 100644 --- a/konversation/src/ignore_preferencesui.ui +++ b/konversation/src/ignore_preferencesui.ui @@ -210,10 +210,8 @@ the Free Software Foundation; either version 2 of the License, or </tabstops> <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>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/konversation/src/irccolorchooserui.ui b/konversation/src/irccolorchooserui.ui index 3bfd4f7..3fc5efb 100644 --- a/konversation/src/irccolorchooserui.ui +++ b/konversation/src/irccolorchooserui.ui @@ -141,8 +141,7 @@ Choosing the default "<i>None</i>" will not change the background co </widget> <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/konversation/src/joinchannelui.ui b/konversation/src/joinchannelui.ui index 7e88f74..a2d77a3 100644 --- a/konversation/src/joinchannelui.ui +++ b/konversation/src/joinchannelui.ui @@ -102,9 +102,8 @@ the Free Software Foundation; either version 2 of the License, or </widget> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/konversation/src/linkaddressbook/linkaddressbookui_base.ui b/konversation/src/linkaddressbook/linkaddressbookui_base.ui index ee1334f..7ed2877 100644 --- a/konversation/src/linkaddressbook/linkaddressbookui_base.ui +++ b/konversation/src/linkaddressbook/linkaddressbookui_base.ui @@ -163,12 +163,9 @@ </customwidgets> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>kactivelabel.h</includehint> - <includehint>tdelistview.h</includehint> - <includehint>tdelistviewsearchline.h</includehint> -</includehints> <includes> - <include>tdelistviewsearchline.h</include> + <include location="global" impldecl="in implementation">kactivelabel.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> + <include location="global" impldecl="in implementation">tdelistviewsearchline.h</include> </includes> </UI> diff --git a/konversation/src/log_preferences.ui b/konversation/src/log_preferences.ui index 13326e6..1c2eb51 100644 --- a/konversation/src/log_preferences.ui +++ b/konversation/src/log_preferences.ui @@ -108,9 +108,7 @@ the Free Software Foundation; either version 2 of the License, or </tabstops> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/konversation/src/nicklistbehavior_preferencesui.ui b/konversation/src/nicklistbehavior_preferencesui.ui index 1b0b673..eb7d6c2 100644 --- a/konversation/src/nicklistbehavior_preferencesui.ui +++ b/konversation/src/nicklistbehavior_preferencesui.ui @@ -153,8 +153,8 @@ the Free Software Foundation; either version 2 of the License, or </tabstops> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>tdelistview.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/konversation/src/osd_preferencesui.ui b/konversation/src/osd_preferencesui.ui index 1601314..177f349 100644 --- a/konversation/src/osd_preferencesui.ui +++ b/konversation/src/osd_preferencesui.ui @@ -415,10 +415,9 @@ </tabstops> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>kcombobox.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>tdefontrequester.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">tdefontrequester.h</include> +</includes> </UI> diff --git a/konversation/src/quickbuttons_preferencesui.ui b/konversation/src/quickbuttons_preferencesui.ui index a17197d..d0a2e2c 100644 --- a/konversation/src/quickbuttons_preferencesui.ui +++ b/konversation/src/quickbuttons_preferencesui.ui @@ -214,9 +214,8 @@ <tabstop>removeButton</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/konversation/src/searchbarbase.ui b/konversation/src/searchbarbase.ui index 64fae5f..5fd645e 100644 --- a/konversation/src/searchbarbase.ui +++ b/konversation/src/searchbarbase.ui @@ -123,9 +123,8 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY </customwidgets> <layoutdefaults spacing="6" margin="4"/> <layoutfunctions spacing="KDialog::spacingHint"/> -<includehints> - <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/konversation/src/servergroupdialogui.ui b/konversation/src/servergroupdialogui.ui index 882102a..68d520a 100644 --- a/konversation/src/servergroupdialogui.ui +++ b/konversation/src/servergroupdialogui.ui @@ -306,13 +306,8 @@ </customwidgets> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>kpushbutton.h</includehint> - <includehint>tdelistbox.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.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> +</includes> </UI> diff --git a/konversation/src/tabnotifications_preferences.ui b/konversation/src/tabnotifications_preferences.ui index 3b62feb..5734903 100644 --- a/konversation/src/tabnotifications_preferences.ui +++ b/konversation/src/tabnotifications_preferences.ui @@ -396,12 +396,7 @@ <tabstop>kcfg_TabNotificationsOverride</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> +</includes> </UI> diff --git a/konversation/src/theme_preferencesui.ui b/konversation/src/theme_preferencesui.ui index a6e6402..b287881 100644 --- a/konversation/src/theme_preferencesui.ui +++ b/konversation/src/theme_preferencesui.ui @@ -216,7 +216,7 @@ </widget> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>tdelistbox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">tdelistbox.h</include> +</includes> </UI> diff --git a/konversation/src/warnings_preferencesui.ui b/konversation/src/warnings_preferencesui.ui index 26cbd16..353088a 100644 --- a/konversation/src/warnings_preferencesui.ui +++ b/konversation/src/warnings_preferencesui.ui @@ -44,7 +44,7 @@ <tabstop>dialogListView</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/konversation/src/watchednicknames_preferencesui.ui b/konversation/src/watchednicknames_preferencesui.ui index ac4e486..dd8fcc8 100644 --- a/konversation/src/watchednicknames_preferencesui.ui +++ b/konversation/src/watchednicknames_preferencesui.ui @@ -405,11 +405,9 @@ When the nickname watcher is turned on, you will be notified when the nicknames </tabstops> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>tdelistview.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> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> |