diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2022-01-05 10:27:02 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2022-01-05 10:27:39 +0900 |
commit | efd6ed910de2bbeccdd76d88f8a82aa2e56a1382 (patch) | |
tree | 8609941a6a61ac53217d669a23fa0d04bd8a542f | |
parent | 66fde0cb70c6e238bf89b373636cbc4b499f02cd (diff) | |
download | tdebase-efd6ed910de2bbeccdd76d88f8a82aa2e56a1382.tar.gz tdebase-efd6ed910de2bbeccdd76d88f8a82aa2e56a1382.zip |
Replaced 'includehints' with 'includes' in *.ui files.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 3078b5fa12d8988c55fdb511682736daecbc1ff8)
-rw-r--r-- | kcontrol/background/bgdialog_ui.ui | 8 | ||||
-rw-r--r-- | kcontrol/componentchooser/componentchooser_ui.ui | 5 | ||||
-rw-r--r-- | kcontrol/css/cssconfig.ui | 10 | ||||
-rw-r--r-- | kcontrol/css/csscustom.ui | 4 | ||||
-rw-r--r-- | kcontrol/css/preview.ui | 3 | ||||
-rw-r--r-- | kcontrol/kicker/applettab.ui | 6 | ||||
-rw-r--r-- | kcontrol/kicker/hidingtab.ui | 5 | ||||
-rw-r--r-- | kcontrol/kicker/lookandfeeltab.ui | 8 | ||||
-rw-r--r-- | kcontrol/kicker/positiontab.ui | 8 | ||||
-rw-r--r-- | kcontrol/knotify/playersettings.ui | 6 | ||||
-rw-r--r-- | kcontrol/konqhtml/nsconfigwidget.ui | 14 | ||||
-rw-r--r-- | kcontrol/konsole/kcmkonsoledialog.ui | 12 | ||||
-rw-r--r-- | kcontrol/konsole/sessiondialog.ui | 6 | ||||
-rw-r--r-- | kcontrol/tdeio/kproxydlg_ui.ui | 4 | ||||
-rw-r--r-- | kdcop/kdcopview.ui | 4 | ||||
-rw-r--r-- | kdesktop/minicli_ui.ui | 11 | ||||
-rw-r--r-- | khotkeys/kcontrol/ui/command_url_widget_ui.ui | 6 | ||||
-rw-r--r-- | kicker/applets/swallow/prefwidgetbase.ui | 17 | ||||
-rw-r--r-- | kicker/kicker/ui/appletview.ui | 4 | ||||
-rw-r--r-- | ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui | 6 | ||||
-rw-r--r-- | twin/kcmtwin/twinrules/ruleswidgetbase.ui | 4 |
21 files changed, 41 insertions, 110 deletions
diff --git a/kcontrol/background/bgdialog_ui.ui b/kcontrol/background/bgdialog_ui.ui index f35e19f78..4334cbbaf 100644 --- a/kcontrol/background/bgdialog_ui.ui +++ b/kcontrol/background/bgdialog_ui.ui @@ -719,15 +719,9 @@ <includes> <include location="global" impldecl="in declaration">kcolorbutton.h</include> <include location="global" impldecl="in declaration">kcombobox.h</include> - <include location="global" impldecl="in implementation">kurlrequester.h</include> <include location="global" impldecl="in implementation">kdialog.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>kcombobox.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcombobox.h</includehint> -</includehints> </UI> diff --git a/kcontrol/componentchooser/componentchooser_ui.ui b/kcontrol/componentchooser/componentchooser_ui.ui index c810f1e31..9abdeec12 100644 --- a/kcontrol/componentchooser/componentchooser_ui.ui +++ b/kcontrol/componentchooser/componentchooser_ui.ui @@ -123,11 +123,8 @@ </widget> <includes> <include location="global" impldecl="in declaration">tdelistbox.h</include> - <include location="local" impldecl="in implementation">kdialog.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>tdelistbox.h</includehint> -</includehints> </UI> diff --git a/kcontrol/css/cssconfig.ui b/kcontrol/css/cssconfig.ui index f0baacb79..4566ba5c0 100644 --- a/kcontrol/css/cssconfig.ui +++ b/kcontrol/css/cssconfig.ui @@ -229,16 +229,12 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<includes> - <include location="global" impldecl="in implementation">kdialog.h</include> -</includes> <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">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/kcontrol/css/csscustom.ui b/kcontrol/css/csscustom.ui index 5074b8bab..cc69769b7 100644 --- a/kcontrol/css/csscustom.ui +++ b/kcontrol/css/csscustom.ui @@ -547,8 +547,4 @@ </includes> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> -</includehints> </UI> diff --git a/kcontrol/css/preview.ui b/kcontrol/css/preview.ui index 51bd26ad1..a4557c845 100644 --- a/kcontrol/css/preview.ui +++ b/kcontrol/css/preview.ui @@ -89,7 +89,4 @@ people.</p> </includes> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>kseparator.h</includehint> -</includehints> </UI> diff --git a/kcontrol/kicker/applettab.ui b/kcontrol/kicker/applettab.ui index bcdfef2f8..05549de36 100644 --- a/kcontrol/kicker/applettab.ui +++ b/kcontrol/kicker/applettab.ui @@ -217,11 +217,9 @@ </vbox> </widget> <includes> - <include location="local" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">qwidget.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>qwidget.h</includehint> -</includehints> </UI> diff --git a/kcontrol/kicker/hidingtab.ui b/kcontrol/kicker/hidingtab.ui index 542d66bd2..fae21c356 100644 --- a/kcontrol/kicker/hidingtab.ui +++ b/kcontrol/kicker/hidingtab.ui @@ -762,14 +762,11 @@ <includes> <include location="global" impldecl="in declaration">klineedit.h</include> <include location="global" impldecl="in implementation">knuminput.h</include> - <include location="local" impldecl="in implementation">kdialog.h</include> + <include location="local" impldecl="in implementation">kdialog.h</include> </includes> <Q_SLOTS> <slot specifier="pure virtual">switchPanel(int)</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>knuminput.h</includehint> -</includehints> </UI> diff --git a/kcontrol/kicker/lookandfeeltab.ui b/kcontrol/kicker/lookandfeeltab.ui index 7938f5f6c..803393e66 100644 --- a/kcontrol/kicker/lookandfeeltab.ui +++ b/kcontrol/kicker/lookandfeeltab.ui @@ -617,10 +617,12 @@ 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">kcolorbutton.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> </includes> <Q_SLOTS> <slot access="protected" specifier="pure virtual">launchAdvancedDialog()</slot> @@ -629,8 +631,4 @@ This option is only active if 'Enable background image' is selected.</string> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/kcontrol/kicker/positiontab.ui b/kcontrol/kicker/positiontab.ui index ac367a15f..6729d0cf2 100644 --- a/kcontrol/kicker/positiontab.ui +++ b/kcontrol/kicker/positiontab.ui @@ -1110,7 +1110,7 @@ how it is positioned on the screen and how much of the screen it should use.</st <includes> <include location="global" impldecl="in declaration">klineedit.h</include> <include location="global" impldecl="in implementation">knuminput.h</include> - <include location="local" impldecl="in implementation">kdialog.h</include> + <include location="local" impldecl="in implementation">kdialog.h</include> </includes> <Q_SLOTS> <slot access="protected" specifier="pure virtual">lengthenPanel( int )</slot> @@ -1120,10 +1120,4 @@ how it is positioned on the screen and how much of the screen it should use.</st </Q_SLOTS> <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> </UI> diff --git a/kcontrol/knotify/playersettings.ui b/kcontrol/knotify/playersettings.ui index def27d1fa..1397e2ebb 100644 --- a/kcontrol/knotify/playersettings.ui +++ b/kcontrol/knotify/playersettings.ui @@ -323,10 +323,8 @@ </tabstops> <layoutdefaults spacing="6" margin="11"/> <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> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/kcontrol/konqhtml/nsconfigwidget.ui b/kcontrol/konqhtml/nsconfigwidget.ui index f3525430e..e3abdbba9 100644 --- a/kcontrol/konqhtml/nsconfigwidget.ui +++ b/kcontrol/konqhtml/nsconfigwidget.ui @@ -256,18 +256,14 @@ </vbox> </widget> <includes> - <include location="global" impldecl="in declaration">tdelocale.h</include> <include location="global" impldecl="in declaration">kurlrequester.h</include> <include location="global" impldecl="in declaration">tdelistbox.h</include> - <include location="local" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in declaration">tdelocale.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">tqwidget.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>tqwidget.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>tdelistbox.h</includehint> -</includehints> </UI> diff --git a/kcontrol/konsole/kcmkonsoledialog.ui b/kcontrol/konsole/kcmkonsoledialog.ui index 5034b42c4..fea9ad139 100644 --- a/kcontrol/konsole/kcmkonsoledialog.ui +++ b/kcontrol/konsole/kcmkonsoledialog.ui @@ -386,16 +386,10 @@ <includes> <include location="global" impldecl="in declaration">kcolorbutton.h</include> <include location="global" impldecl="in declaration">knuminput.h</include> - <include location="local" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">schemaeditor.h</include> + <include location="global" impldecl="in implementation">sessioneditor.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>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>schemaeditor.h</includehint> - <includehint>sessioneditor.h</includehint> -</includehints> </UI> diff --git a/kcontrol/konsole/sessiondialog.ui b/kcontrol/konsole/sessiondialog.ui index 950ebe1a9..0244ab236 100644 --- a/kcontrol/konsole/sessiondialog.ui +++ b/kcontrol/konsole/sessiondialog.ui @@ -435,12 +435,10 @@ <include location="global" impldecl="in declaration">kcolorbutton.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">klineedit.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"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/kcontrol/tdeio/kproxydlg_ui.ui b/kcontrol/tdeio/kproxydlg_ui.ui index baf2141af..aed14c5dd 100644 --- a/kcontrol/tdeio/kproxydlg_ui.ui +++ b/kcontrol/tdeio/kproxydlg_ui.ui @@ -433,11 +433,9 @@ Although a persistent proxy connection is faster, note that it only works correc <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">kpushbutton.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/kdcop/kdcopview.ui b/kdcop/kdcopview.ui index 50a13ec4f..4faf2d876 100644 --- a/kdcop/kdcopview.ui +++ b/kdcop/kdcopview.ui @@ -137,13 +137,11 @@ </image> </images> <includes> + <include location="global" impldecl="in implementation">kdcoplistview.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">tdelistbox.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>kdcoplistview.h</includehint> -</includehints> </UI> diff --git a/kdesktop/minicli_ui.ui b/kdesktop/minicli_ui.ui index 13d3b9736..93c95c8f0 100644 --- a/kdesktop/minicli_ui.ui +++ b/kdesktop/minicli_ui.ui @@ -640,21 +640,14 @@ </tabstops> <includes> <include location="global" impldecl="in declaration">fixx11h.h</include> + <include location="local" impldecl="in implementation">kcombobox.h</include> <include location="local" impldecl="in implementation">kdialog.h</include> <include location="local" impldecl="in implementation">kiconloader.h</include> - <include location="local" impldecl="in implementation">kpassdlg.h</include> - <include location="local" impldecl="in implementation">kcombobox.h</include> <include location="local" impldecl="in implementation">klineedit.h</include> + <include location="local" impldecl="in implementation">kpassdlg.h</include> <include location="local" impldecl="in implementation">kpushbutton.h</include> </includes> <pixmapfunction>BarIcon</pixmapfunction> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpassdlg.h</includehint> - <includehint>kcombobox.h</includehint> -</includehints> </UI> diff --git a/khotkeys/kcontrol/ui/command_url_widget_ui.ui b/khotkeys/kcontrol/ui/command_url_widget_ui.ui index 6d571e699..5a285b32e 100644 --- a/khotkeys/kcontrol/ui/command_url_widget_ui.ui +++ b/khotkeys/kcontrol/ui/command_url_widget_ui.ui @@ -55,12 +55,10 @@ </Q_SLOTS> <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">kpushbutton.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/kicker/applets/swallow/prefwidgetbase.ui b/kicker/applets/swallow/prefwidgetbase.ui index bd2673efa..13f8aa300 100644 --- a/kicker/applets/swallow/prefwidgetbase.ui +++ b/kicker/applets/swallow/prefwidgetbase.ui @@ -119,16 +119,13 @@ </spacer> </grid> </widget> -<includes> - <include location="local" impldecl="in implementation">kdialog.h</include> -</includes> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>keditlistbox.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">keditlistbox.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> + <include location="local" impldecl="in implementation">kdialog.h</include> +</includes> </UI> diff --git a/kicker/kicker/ui/appletview.ui b/kicker/kicker/ui/appletview.ui index 5d92dab89..e61575a72 100644 --- a/kicker/kicker/ui/appletview.ui +++ b/kicker/kicker/ui/appletview.ui @@ -198,8 +198,6 @@ <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tqscrollview.h</include> </includes> -<includehints> - <includehint>tqscrollview.h</includehint> -</includehints> </UI> diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui index 4558e2374..fb265df74 100644 --- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui +++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui @@ -440,9 +440,10 @@ </connection> </connections> <includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">knumvalidator.h</include> - <include location="local" impldecl="in implementation">MultiMeterSettingsWidget.ui.h</include> + <include location="local" impldecl="in implementation">MultiMeterSettingsWidget.ui.h</include> </includes> <Q_SLOTS> <slot>setMeterBackgroundColor( const TQColor & c )</slot> @@ -469,7 +470,4 @@ </functions> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>kcolorbutton.h</includehint> -</includehints> </UI> diff --git a/twin/kcmtwin/twinrules/ruleswidgetbase.ui b/twin/kcmtwin/twinrules/ruleswidgetbase.ui index 21486c4be..352a26762 100644 --- a/twin/kcmtwin/twinrules/ruleswidgetbase.ui +++ b/twin/kcmtwin/twinrules/ruleswidgetbase.ui @@ -2546,8 +2546,6 @@ <include location="global" impldecl="in implementation">klineedit.h</include> <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">krestrictedline.h</include> + <include location="global" impldecl="in implementation">tdelistbox.h</include> </includes> -<includehints> - <includehint>tdelistbox.h</includehint> -</includehints> </UI> |