From a5bb6fd19c165061460268f86e6fb164f9313e2b Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Sat, 8 Jan 2022 11:52:43 +0900
Subject: [PATCH] Replaced 'includehints' with 'includes' in *.ui files.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit b5fad55e8b099df4aa97a9a7b089882f56e42803)
---
 kdeui/kshortcutdialog_advanced.ui           | 6 +-----
 kdeui/kshortcutdialog_simple.ui             | 5 +----
 khtml/htmlpageinfo.ui                       | 6 +-----
 khtml/kjserrordlg.ui                        | 4 +---
 kio/misc/kwalletd/kbetterthankdialogbase.ui | 3 ---
 kspell2/ui/configui.ui                      | 8 ++------
 6 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/kdeui/kshortcutdialog_advanced.ui b/kdeui/kshortcutdialog_advanced.ui
index 6466174d2..639c43e82 100644
--- a/kdeui/kshortcutdialog_advanced.ui
+++ b/kdeui/kshortcutdialog_advanced.ui
@@ -238,8 +238,8 @@
     </connection>
 </connections>
 <includes>
-    <include location="global" impldecl="in declaration">kshortcut.h</include>
     <include location="global" impldecl="in declaration">kdialog.h</include>
+    <include location="global" impldecl="in declaration">kshortcut.h</include>
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
 </includes>
 <forwards>
@@ -247,8 +247,4 @@
 </forwards>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kdeui/kshortcutdialog_simple.ui b/kdeui/kshortcutdialog_simple.ui
index 97d87b582..5576fef72 100644
--- a/kdeui/kshortcutdialog_simple.ui
+++ b/kdeui/kshortcutdialog_simple.ui
@@ -105,8 +105,8 @@
     </grid>
 </widget>
 <includes>
-    <include location="global" impldecl="in declaration">kshortcut.h</include>
     <include location="global" impldecl="in declaration">kdialog.h</include>
+    <include location="global" impldecl="in declaration">kshortcut.h</include>
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
 </includes>
 <forwards>
@@ -114,7 +114,4 @@
 </forwards>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/khtml/htmlpageinfo.ui b/khtml/htmlpageinfo.ui
index 5dd21cd6f..e2d4b57db 100644
--- a/khtml/htmlpageinfo.ui
+++ b/khtml/htmlpageinfo.ui
@@ -286,16 +286,12 @@
     <tabstop>_headers</tabstop>
 </tabstops>
 <includes>
+    <include location="global" impldecl="in declaration">kactivelabel.h</include>
     <include location="global" impldecl="in declaration">kpushbutton.h</include>
     <include location="global" impldecl="in declaration">tqlabel.h</include>
-    <include location="global" impldecl="in declaration">kactivelabel.h</include>
     <include location="global" impldecl="in declaration">tqlistview.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/khtml/kjserrordlg.ui b/khtml/kjserrordlg.ui
index da653c016..1c105d937 100644
--- a/khtml/kjserrordlg.ui
+++ b/khtml/kjserrordlg.ui
@@ -118,6 +118,7 @@
 <includes>
     <include location="global" impldecl="in declaration">kdialog.h</include>
     <include location="global" impldecl="in declaration">ksqueezedtextlabel.h</include>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
 </includes>
 <Q_SLOTS>
     <slot>init()</slot>
@@ -127,7 +128,4 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-</includehints>
 </UI>
diff --git a/kio/misc/kwalletd/kbetterthankdialogbase.ui b/kio/misc/kwalletd/kbetterthankdialogbase.ui
index a02d5def7..ae52f96e0 100644
--- a/kio/misc/kwalletd/kbetterthankdialogbase.ui
+++ b/kio/misc/kwalletd/kbetterthankdialogbase.ui
@@ -148,7 +148,4 @@
     <slot access="protected">reject()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-</includehints>
 </UI>
diff --git a/kspell2/ui/configui.ui b/kspell2/ui/configui.ui
index d6f6e596b..d998ff737 100644
--- a/kspell2/ui/configui.ui
+++ b/kspell2/ui/configui.ui
@@ -102,13 +102,9 @@
 <customwidgets>
 </customwidgets>
 <includes>
-    <include location="global" impldecl="in implementation">keditlistbox.h</include>
     <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">keditlistbox.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>keditlistbox.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
 </UI>