diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-21 15:57:05 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-21 15:57:05 +0900 |
| commit | b4a5c0a167522ed4aa987fb1d65e6b58333b1363 (patch) | |
| tree | 55a3c1bbeb771e16d631b916b75625eb96add9ed /kcontrol | |
| parent | 1bd64002944c6b6ec17f44066573e3c8e5b69cdf (diff) | |
| download | tdebase-b4a5c0a167522ed4aa987fb1d65e6b58333b1363.tar.gz tdebase-b4a5c0a167522ed4aa987fb1d65e6b58333b1363.zip | |
Add includes to UI files to resolve FTBFS.
Partially cherry-picked from 661ed658.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'kcontrol')
28 files changed, 74 insertions, 82 deletions
diff --git a/kcontrol/arts/generaltab.ui b/kcontrol/arts/generaltab.ui index 1de5b1e43..673beb852 100644 --- a/kcontrol/arts/generaltab.ui +++ b/kcontrol/arts/generaltab.ui @@ -320,11 +320,8 @@ Recommended if you want sound.</string> <customwidgets> </customwidgets> <includes> - <include location="local" impldecl="in implementation">krichtextlabel.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> + <include location="global" impldecl="in implementation">krichtextlabel.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> </UI> diff --git a/kcontrol/arts/hardwaretab.ui b/kcontrol/arts/hardwaretab.ui index ac20fdfe2..8064f8a3c 100644 --- a/kcontrol/arts/hardwaretab.ui +++ b/kcontrol/arts/hardwaretab.ui @@ -355,4 +355,7 @@ </vbox> </widget> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/kcontrol/background/bgadvanced_ui.ui b/kcontrol/background/bgadvanced_ui.ui index 34f8f9db5..948af353a 100644 --- a/kcontrol/background/bgadvanced_ui.ui +++ b/kcontrol/background/bgadvanced_ui.ui @@ -452,11 +452,8 @@ You can also remove programs from this list clicking on the <b>Remove</ </tabstops> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> </includes> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> -</includehints> </UI> diff --git a/kcontrol/css/cssconfig.ui b/kcontrol/css/cssconfig.ui index b974fa375..f0baacb79 100644 --- a/kcontrol/css/cssconfig.ui +++ b/kcontrol/css/cssconfig.ui @@ -234,8 +234,10 @@ </includes> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<includes> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> <includehints> - <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/kcontrol/dnssd/configdialog.ui b/kcontrol/dnssd/configdialog.ui index 0066f7d90..4a2ac2809 100644 --- a/kcontrol/dnssd/configdialog.ui +++ b/kcontrol/dnssd/configdialog.ui @@ -317,14 +317,9 @@ is configured with 'Browse local network' option above.</string> </Q_SLOTS> <includes> <include location="global" impldecl="in declaration">tdecmodule.h</include> + <include location="global" impldecl="in implementation">keditlistbox.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpassdlg.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdecmodule.h</includehint> - <includehint>keditlistbox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpassdlg.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> </UI> diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui b/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui index c823ad095..3c5fd2e3b 100644 --- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui +++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui @@ -255,4 +255,7 @@ Select the search engine to use for input boxes that provide automatic lookup se <tabstop>cmbDelimiter</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui index 84539366f..9fe898c83 100644 --- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui +++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui @@ -128,10 +128,8 @@ Recommended is \{@}, since it removes all query variables (name=value) from the <tabstop>cbCharset</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kcombobox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/kcontrol/hwmanager/devicepropsdlgbase.ui b/kcontrol/hwmanager/devicepropsdlgbase.ui index 7cfe80b68..60186ddd1 100644 --- a/kcontrol/hwmanager/devicepropsdlgbase.ui +++ b/kcontrol/hwmanager/devicepropsdlgbase.ui @@ -1538,7 +1538,12 @@ <slot>enableSupport_toggled(bool)</slot> </Q_SLOTS> <includes> - <include location="local" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">kactivelabel.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> + <include location="global" impldecl="in implementation">tdelistviewsearchline.h</include> </includes> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> diff --git a/kcontrol/hwmanager/hwmanagerbase.ui b/kcontrol/hwmanager/hwmanagerbase.ui index 47de4caf5..9a6ecef63 100644 --- a/kcontrol/hwmanager/hwmanagerbase.ui +++ b/kcontrol/hwmanager/hwmanagerbase.ui @@ -78,7 +78,8 @@ <slot>enableSupport_toggled(bool)</slot> </Q_SLOTS> <includes> - <include location="local" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">tdelistviewsearchline.h</include> </includes> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> diff --git a/kcontrol/iccconfig/iccconfigbase.ui b/kcontrol/iccconfig/iccconfigbase.ui index 0666c6e9f..980c62c01 100644 --- a/kcontrol/iccconfig/iccconfigbase.ui +++ b/kcontrol/iccconfig/iccconfigbase.ui @@ -187,7 +187,10 @@ <slot>enableSupport_toggled(bool)</slot> </Q_SLOTS> <includes> - <include location="local" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> diff --git a/kcontrol/kicker/advancedOptions.ui b/kcontrol/kicker/advancedOptions.ui index 5ba10dd75..23f004925 100644 --- a/kcontrol/kicker/advancedOptions.ui +++ b/kcontrol/kicker/advancedOptions.ui @@ -355,13 +355,10 @@ <tabstop>tintSlider</tabstop> </tabstops> <includes> + <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> <include location="global" impldecl="in declaration">knuminput.h</include> - <include location="local" impldecl="in implementation">kdialog.h</include> </includes> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>kcolorbutton.h</includehint> -</includehints> </UI> diff --git a/kcontrol/kicker/lookandfeeltab.ui b/kcontrol/kicker/lookandfeeltab.ui index 522548f40..7938f5f6c 100644 --- a/kcontrol/kicker/lookandfeeltab.ui +++ b/kcontrol/kicker/lookandfeeltab.ui @@ -617,6 +617,7 @@ This option is only active if 'Enable background image' is selected.</string> <tabstop>advancedOptionsButton</tabstop> </tabstops> <includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> <include location="global" impldecl="in declaration">kcombobox.h</include> <include location="global" impldecl="in declaration">kurlrequester.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> @@ -629,17 +630,6 @@ This option is only active if 'Enable background image' is selected.</string> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> - <includehint>kcombobox.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/kcontrol/kicker/menutab.ui b/kcontrol/kicker/menutab.ui index 5d3f8fcfe..2614a278a 100644 --- a/kcontrol/kicker/menutab.ui +++ b/kcontrol/kicker/menutab.ui @@ -729,14 +729,12 @@ <tabstop>kcfg_NumVisibleEntries</tabstop> </tabstops> <includes> - <include location="global" impldecl="in implementation">tdelistview.h</include> + <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">knuminput.h</include> - <include location="local" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tdefontrequester.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> - <includehint>knuminput.h</includehint> - </includehints> </UI> diff --git a/kcontrol/knotify/playersettings.ui b/kcontrol/knotify/playersettings.ui index 845377112..def27d1fa 100644 --- a/kcontrol/knotify/playersettings.ui +++ b/kcontrol/knotify/playersettings.ui @@ -322,8 +322,10 @@ <tabstop>cbNone</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> <includehints> - <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/kcontrol/konq/desktopbehavior.ui b/kcontrol/konq/desktopbehavior.ui index dc4907adf..c247ab354 100644 --- a/kcontrol/konq/desktopbehavior.ui +++ b/kcontrol/konq/desktopbehavior.ui @@ -419,8 +419,7 @@ <tabstop>mediaListView</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> - <includehint>tdelistview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/kcontrol/konsole/sessiondialog.ui b/kcontrol/konsole/sessiondialog.ui index 1f9eae293..950ebe1a9 100644 --- a/kcontrol/konsole/sessiondialog.ui +++ b/kcontrol/konsole/sessiondialog.ui @@ -433,13 +433,13 @@ </tabstops> <includes> <include location="global" impldecl="in declaration">kcolorbutton.h</include> - <include location="local" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">kicondialog.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> - <includehint>kicondialog.h</includehint> - <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/kcontrol/kthememanager/kthemedlg.ui b/kcontrol/kthememanager/kthemedlg.ui index 08812fd72..717f68e32 100644 --- a/kcontrol/kthememanager/kthemedlg.ui +++ b/kcontrol/kthememanager/kthemedlg.ui @@ -501,6 +501,7 @@ </tabstops> <includes> <include location="local" impldecl="in implementation">kthemedlg.ui.h</include> + <include location="global" impldecl="in implementation">kurllabel.h</include> </includes> <Q_SLOTS> <slot specifier="non virtual">startKonqui( const TQString & url )</slot> @@ -512,7 +513,4 @@ <slot specifier="non virtual">startSaver()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kurllabel.h</includehint> -</includehints> </UI> diff --git a/kcontrol/smserver/smserverconfigdlg.ui b/kcontrol/smserver/smserverconfigdlg.ui index 654156f20..1449e9d6f 100644 --- a/kcontrol/smserver/smserverconfigdlg.ui +++ b/kcontrol/smserver/smserverconfigdlg.ui @@ -317,6 +317,7 @@ </connections> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> </includes> <Q_SLOTS> <slot>configChanged()</slot> diff --git a/kcontrol/taskbar/kcmtaskbarui.ui b/kcontrol/taskbar/kcmtaskbarui.ui index 94f37f84e..2bf167183 100644 --- a/kcontrol/taskbar/kcmtaskbarui.ui +++ b/kcontrol/taskbar/kcmtaskbarui.ui @@ -595,13 +595,9 @@ By default the taskbar groups windows when it is full.</string> <tabstop>kcfg_RightButtonAction</tabstop> </tabstops> <includes> - <include location="local" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> + <include location="global" impldecl="in implementation">kdialog.h</include> </includes> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> -</includehints> </UI> diff --git a/kcontrol/tdeio/cache_ui.ui b/kcontrol/tdeio/cache_ui.ui index ce9aed797..7d4b718c5 100644 --- a/kcontrol/tdeio/cache_ui.ui +++ b/kcontrol/tdeio/cache_ui.ui @@ -184,4 +184,7 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/kcontrol/tdeio/envvarproxy_ui.ui b/kcontrol/tdeio/envvarproxy_ui.ui index 3e1babf90..2c1af5ee8 100644 --- a/kcontrol/tdeio/envvarproxy_ui.ui +++ b/kcontrol/tdeio/envvarproxy_ui.ui @@ -172,4 +172,7 @@ Alternatively, you can click on the <b>"Auto Detect"</b> button to a <tabstop>pbDetect</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kcontrol/tdeio/kcookiesmanagementdlg_ui.ui b/kcontrol/tdeio/kcookiesmanagementdlg_ui.ui index 724901ccd..37f6a94fa 100644 --- a/kcontrol/tdeio/kcookiesmanagementdlg_ui.ui +++ b/kcontrol/tdeio/kcookiesmanagementdlg_ui.ui @@ -314,10 +314,9 @@ </connections> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> + <include location="global" impldecl="in implementation">tdelistviewsearchline.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>tdelistviewsearchline.h</includehint> -</includehints> </UI> diff --git a/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui b/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui index f26173353..64f93206d 100644 --- a/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui +++ b/kcontrol/tdeio/kcookiespoliciesdlg_ui.ui @@ -313,11 +313,9 @@ List of sites for which you have set a specific cookie policy. Specific policies </connections> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> + <include location="global" impldecl="in implementation">tdelistviewsearchline.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>tdelistview.h</includehint> - <includehint>tdelistviewsearchline.h</includehint> -</includehints> </UI> diff --git a/kcontrol/tdeio/kproxydlg_ui.ui b/kcontrol/tdeio/kproxydlg_ui.ui index 9ab0cb3b5..baf2141af 100644 --- a/kcontrol/tdeio/kproxydlg_ui.ui +++ b/kcontrol/tdeio/kproxydlg_ui.ui @@ -432,6 +432,8 @@ Although a persistent proxy connection is faster, note that it only works correc </connections> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> diff --git a/kcontrol/tdeio/manualproxy_ui.ui b/kcontrol/tdeio/manualproxy_ui.ui index dec7e70d4..58a6f7496 100644 --- a/kcontrol/tdeio/manualproxy_ui.ui +++ b/kcontrol/tdeio/manualproxy_ui.ui @@ -314,4 +314,9 @@ Reverse the use of the exception list. Checking this box will result in the prox <tabstop>pbDeleteAll</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> +<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">tdelistbox.h</include> +</includes> </UI> diff --git a/kcontrol/tdeio/policydlg_ui.ui b/kcontrol/tdeio/policydlg_ui.ui index 2fecfa6d9..ed90e6ce5 100644 --- a/kcontrol/tdeio/policydlg_ui.ui +++ b/kcontrol/tdeio/policydlg_ui.ui @@ -100,6 +100,8 @@ Select the desired policy: </widget> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> diff --git a/kcontrol/tdeio/uagentproviderdlg_ui.ui b/kcontrol/tdeio/uagentproviderdlg_ui.ui index 578721596..9b15234d2 100644 --- a/kcontrol/tdeio/uagentproviderdlg_ui.ui +++ b/kcontrol/tdeio/uagentproviderdlg_ui.ui @@ -196,12 +196,9 @@ The actual browser identification text that will be sent to the remote machine. </widget> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> </UI> diff --git a/kcontrol/tdeio/useragentdlg_ui.ui b/kcontrol/tdeio/useragentdlg_ui.ui index c4e46d9c9..89919793c 100644 --- a/kcontrol/tdeio/useragentdlg_ui.ui +++ b/kcontrol/tdeio/useragentdlg_ui.ui @@ -345,11 +345,9 @@ By default, only minimal identification information is sent to remote sites. The </connections> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">klineedit.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>klineedit.h</includehint> - <includehint>tdelistview.h</includehint> -</includehints> </UI> |