From 71a8bf7029071e2c0f3506e6641c4b536e58544f Mon Sep 17 00:00:00 2001
From: gregory guy <gregory-tde@laposte.net>
Date: Fri, 10 Sep 2021 17:10:29 +0200
Subject: Cleanup headers in UI files to prevent potential FTBFS.

Signed-off-by: gregory guy <gregory-tde@laposte.net>
---
 kftpgrabber/src/ui/bookmark_properties.ui         | 20 +++++++-------------
 kftpgrabber/src/ui/checksum_verifier.ui           |  6 +++---
 kftpgrabber/src/ui/config_filters.ui              | 11 +++++------
 kftpgrabber/src/ui/config_general.ui              | 16 +++++++---------
 kftpgrabber/src/ui/config_log.ui                  | 16 ++++++----------
 kftpgrabber/src/ui/config_transfers.ui            | 17 ++++-------------
 kftpgrabber/src/ui/kftpbookmarkeditortlswidget.ui | 12 ++++++------
 kftpgrabber/src/ui/kftpbookmarkimportlayout.ui    | 10 +++++-----
 kftpgrabber/src/ui/kftpfilteraddpatternlayout.ui  |  8 ++++----
 kftpgrabber/src/ui/kftpqueueeditorlayout.ui       |  6 +++---
 kftpgrabber/src/ui/kftpquickconnectlayout.ui      | 17 ++++++-----------
 kftpgrabber/src/ui/kftpsearchlayout.ui            |  6 +++---
 12 files changed, 59 insertions(+), 86 deletions(-)

diff --git a/kftpgrabber/src/ui/bookmark_properties.ui b/kftpgrabber/src/ui/bookmark_properties.ui
index 7afe0a7..2042e6f 100644
--- a/kftpgrabber/src/ui/bookmark_properties.ui
+++ b/kftpgrabber/src/ui/bookmark_properties.ui
@@ -604,17 +604,11 @@
     <tabstop>pasvSiteIp</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpassdlg.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.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">kpassdlg.h</include>
+</includes>
 </UI>
diff --git a/kftpgrabber/src/ui/checksum_verifier.ui b/kftpgrabber/src/ui/checksum_verifier.ui
index e755bbb..2090a9f 100644
--- a/kftpgrabber/src/ui/checksum_verifier.ui
+++ b/kftpgrabber/src/ui/checksum_verifier.ui
@@ -334,7 +334,7 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kprogress.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kprogress.h</include>
+</includes>
 </UI>
diff --git a/kftpgrabber/src/ui/config_filters.ui b/kftpgrabber/src/ui/config_filters.ui
index ba7e8ca..805f093 100644
--- a/kftpgrabber/src/ui/config_filters.ui
+++ b/kftpgrabber/src/ui/config_filters.ui
@@ -128,10 +128,9 @@
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/kftpgrabber/src/ui/config_general.ui b/kftpgrabber/src/ui/config_general.ui
index 1a28094..53a2ef5 100644
--- a/kftpgrabber/src/ui/config_general.ui
+++ b/kftpgrabber/src/ui/config_general.ui
@@ -428,13 +428,11 @@
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
+<includes>
+    <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">knuminput.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
 </UI>
diff --git a/kftpgrabber/src/ui/config_log.ui b/kftpgrabber/src/ui/config_log.ui
index c2490db..67d9b0b 100644
--- a/kftpgrabber/src/ui/config_log.ui
+++ b/kftpgrabber/src/ui/config_log.ui
@@ -342,14 +342,10 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdefontrequester.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">tdefontrequester.h</include>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/kftpgrabber/src/ui/config_transfers.ui b/kftpgrabber/src/ui/config_transfers.ui
index 0ab693b..47c4786 100644
--- a/kftpgrabber/src/ui/config_transfers.ui
+++ b/kftpgrabber/src/ui/config_transfers.ui
@@ -718,17 +718,8 @@
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>
diff --git a/kftpgrabber/src/ui/kftpbookmarkeditortlswidget.ui b/kftpgrabber/src/ui/kftpbookmarkeditortlswidget.ui
index bfbc56d..9cff6b8 100644
--- a/kftpgrabber/src/ui/kftpbookmarkeditortlswidget.ui
+++ b/kftpgrabber/src/ui/kftpbookmarkeditortlswidget.ui
@@ -164,10 +164,10 @@
     </vbox>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/kftpgrabber/src/ui/kftpbookmarkimportlayout.ui b/kftpgrabber/src/ui/kftpbookmarkimportlayout.ui
index 8c771cd..0d102d4 100644
--- a/kftpgrabber/src/ui/kftpbookmarkimportlayout.ui
+++ b/kftpgrabber/src/ui/kftpbookmarkimportlayout.ui
@@ -272,9 +272,9 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kprogress.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">kprogress.h</include>
+</includes>
 </UI>
diff --git a/kftpgrabber/src/ui/kftpfilteraddpatternlayout.ui b/kftpgrabber/src/ui/kftpfilteraddpatternlayout.ui
index 29190f2..ca4978f 100644
--- a/kftpgrabber/src/ui/kftpfilteraddpatternlayout.ui
+++ b/kftpgrabber/src/ui/kftpfilteraddpatternlayout.ui
@@ -118,8 +118,8 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+</includes>
 </UI>
diff --git a/kftpgrabber/src/ui/kftpqueueeditorlayout.ui b/kftpgrabber/src/ui/kftpqueueeditorlayout.ui
index a6ac5bd..742c5d1 100644
--- a/kftpgrabber/src/ui/kftpqueueeditorlayout.ui
+++ b/kftpgrabber/src/ui/kftpqueueeditorlayout.ui
@@ -321,7 +321,7 @@
     </image>
 </images>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpassdlg.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kpassdlg.h</include>
+</includes>
 </UI>
diff --git a/kftpgrabber/src/ui/kftpquickconnectlayout.ui b/kftpgrabber/src/ui/kftpquickconnectlayout.ui
index 1888c34..a5f4c59 100644
--- a/kftpgrabber/src/ui/kftpquickconnectlayout.ui
+++ b/kftpgrabber/src/ui/kftpquickconnectlayout.ui
@@ -524,15 +524,10 @@
     <tabstop>serverEncoding</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpassdlg.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpassdlg.h</include>
+</includes>
 </UI>
diff --git a/kftpgrabber/src/ui/kftpsearchlayout.ui b/kftpgrabber/src/ui/kftpsearchlayout.ui
index ef1402a..225e8ec 100644
--- a/kftpgrabber/src/ui/kftpsearchlayout.ui
+++ b/kftpgrabber/src/ui/kftpsearchlayout.ui
@@ -239,7 +239,7 @@
     </image>
 </images>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpassdlg.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kpassdlg.h</include>
+</includes>
 </UI>
-- 
cgit v1.2.1