From 0f79ac4c5b0786ab77bb65752774ecf6e3d33587 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Thu, 6 Jan 2022 10:41:28 +0900
Subject: Replaced 'includehints' with 'includes' in *.ui files.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 626ab354f942f2ecc4e576720387fc1e131e3e29)
---
 kgpg/conf_gpg.ui         | 4 +---
 kgpg/keyexport.ui        | 6 ++----
 kgpg/kgpgrevokewidget.ui | 6 ++----
 kgpg/kgpgwizard.ui       | 4 +---
 kgpg/sourceselect.ui     | 6 ++----
 5 files changed, 8 insertions(+), 18 deletions(-)

(limited to 'kgpg')

diff --git a/kgpg/conf_gpg.ui b/kgpg/conf_gpg.ui
index ed91a8a..dea46e2 100644
--- a/kgpg/conf_gpg.ui
+++ b/kgpg/conf_gpg.ui
@@ -208,9 +208,7 @@
 <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>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kgpg/keyexport.ui b/kgpg/keyexport.ui
index 94f4573..2dffb81 100644
--- a/kgpg/keyexport.ui
+++ b/kgpg/keyexport.ui
@@ -130,14 +130,12 @@
     </connection>
 </connections>
 <includes>
-    <include location="local" impldecl="in implementation">keyexport.ui.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">keyexport.ui.h</include>
 </includes>
 <Q_SLOTS>
     <slot>checkFile_toggled( bool isOn )</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kgpg/kgpgrevokewidget.ui b/kgpg/kgpgrevokewidget.ui
index c5cd4af..325c1cf 100644
--- a/kgpg/kgpgrevokewidget.ui
+++ b/kgpg/kgpgrevokewidget.ui
@@ -140,14 +140,12 @@
     <tabstop>kURLRequester1</tabstop>
 </tabstops>
 <includes>
-    <include location="local" impldecl="in implementation">kgpgrevokewidget.ui.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">kgpgrevokewidget.ui.h</include>
 </includes>
 <Q_SLOTS>
     <slot>cbSave_toggled( bool isOn )</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kgpg/kgpgwizard.ui b/kgpg/kgpgwizard.ui
index fe4167c..d0fa62d 100644
--- a/kgpg/kgpgwizard.ui
+++ b/kgpg/kgpgwizard.ui
@@ -401,9 +401,7 @@ Remember that if you download a file or open one in an editor, parts of the file
 <includes>
     <include location="global" impldecl="in implementation">kactivelabel.h</include>
     <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
     <include location="global" impldecl="in implementation">kurlrequester.h</include>
 </includes>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kgpg/sourceselect.ui b/kgpg/sourceselect.ui
index 2dc9c38..65a821b 100644
--- a/kgpg/sourceselect.ui
+++ b/kgpg/sourceselect.ui
@@ -105,10 +105,8 @@
 </Q_SLOTS>
 <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>
-- 
cgit v1.2.1