From 32c2f01b4aa642ebad9805e974aceca9a0760593 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sat, 22 Sep 2018 12:47:40 +0200
Subject: Add includes to UI files to resolve FTBFS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit fa8da6b1ca1c6cdd5cab8b5c7f4a0cc1e65250a8)
---
 kgpg/adduid.ui           |  3 +++
 kgpg/conf_decryption.ui  |  3 +++
 kgpg/conf_encryption.ui  |  6 ++----
 kgpg/conf_gpg.ui         | 11 ++++-------
 kgpg/conf_misc.ui        |  3 +++
 kgpg/conf_servers.ui     |  8 ++++----
 kgpg/conf_ui2.ui         |  9 +++------
 kgpg/groupedit.ui        |  7 ++++---
 kgpg/keyexport.ui        |  1 +
 kgpg/keyproperties.ui    | 13 +++++--------
 kgpg/keyserver.ui        |  4 ++++
 kgpg/kgpgrevokewidget.ui |  1 +
 kgpg/kgpgwizard.ui       |  6 +++++-
 kgpg/newkey.ui           |  2 ++
 kgpg/searchres.ui        |  8 ++++----
 kgpg/sourceselect.ui     |  4 +++-
 16 files changed, 51 insertions(+), 38 deletions(-)

(limited to 'kgpg')

diff --git a/kgpg/adduid.ui b/kgpg/adduid.ui
index 0bf4537..3454ade 100644
--- a/kgpg/adduid.ui
+++ b/kgpg/adduid.ui
@@ -61,4 +61,7 @@
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/kgpg/conf_decryption.ui b/kgpg/conf_decryption.ui
index b604046..9cdee30 100644
--- a/kgpg/conf_decryption.ui
+++ b/kgpg/conf_decryption.ui
@@ -66,4 +66,7 @@
     <slot>use_agent_toggled( bool isOn )</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/kgpg/conf_encryption.ui b/kgpg/conf_encryption.ui
index ff807aa..f64556a 100644
--- a/kgpg/conf_encryption.ui
+++ b/kgpg/conf_encryption.ui
@@ -309,13 +309,11 @@
 </tabstops>
 <includes>
     <include location="local" impldecl="in implementation">conf_encryption.ui.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
 </includes>
 <Q_SLOTS>
     <slot>allow_custom_option_toggled( bool isOn )</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kgpg/conf_gpg.ui b/kgpg/conf_gpg.ui
index 8a7f14a..ed91a8a 100644
--- a/kgpg/conf_gpg.ui
+++ b/kgpg/conf_gpg.ui
@@ -206,14 +206,11 @@
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 <includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>
 </UI>
diff --git a/kgpg/conf_misc.ui b/kgpg/conf_misc.ui
index f0f1e14..e551d85 100644
--- a/kgpg/conf_misc.ui
+++ b/kgpg/conf_misc.ui
@@ -410,4 +410,7 @@ the original file.</string>
     </vbox>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
 </UI>
diff --git a/kgpg/conf_servers.ui b/kgpg/conf_servers.ui
index 677f561..a8594e3 100644
--- a/kgpg/conf_servers.ui
+++ b/kgpg/conf_servers.ui
@@ -111,8 +111,8 @@ all others will be stored for use by KGpg only.</string>
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistbox.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">tdelistbox.h</include>
+</includes>
 </UI>
diff --git a/kgpg/conf_ui2.ui b/kgpg/conf_ui2.ui
index 1344d26..467c001 100644
--- a/kgpg/conf_ui2.ui
+++ b/kgpg/conf_ui2.ui
@@ -169,10 +169,7 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+</includes>
 </UI>
diff --git a/kgpg/groupedit.ui b/kgpg/groupedit.ui
index 794a310..0f5be01 100644
--- a/kgpg/groupedit.ui
+++ b/kgpg/groupedit.ui
@@ -206,7 +206,8 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/kgpg/keyexport.ui b/kgpg/keyexport.ui
index 4daae5b..94f4573 100644
--- a/kgpg/keyexport.ui
+++ b/kgpg/keyexport.ui
@@ -131,6 +131,7 @@
 </connections>
 <includes>
     <include location="local" impldecl="in implementation">keyexport.ui.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
 </includes>
 <Q_SLOTS>
     <slot>checkFile_toggled( bool isOn )</slot>
diff --git a/kgpg/keyproperties.ui b/kgpg/keyproperties.ui
index 7dce70b..2d845f2 100644
--- a/kgpg/keyproperties.ui
+++ b/kgpg/keyproperties.ui
@@ -496,12 +496,9 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kactivelabel.h</includehint>
-</includehints>
+<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">klineedit.h</include>
+</includes>
 </UI>
diff --git a/kgpg/keyserver.ui b/kgpg/keyserver.ui
index 4087bde..036d75f 100644
--- a/kgpg/keyserver.ui
+++ b/kgpg/keyserver.ui
@@ -333,4 +333,8 @@ Allows the user to select the Key Server which will be used to import PGP/GnuPG
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/kgpg/kgpgrevokewidget.ui b/kgpg/kgpgrevokewidget.ui
index e4f30ff..c5cd4af 100644
--- a/kgpg/kgpgrevokewidget.ui
+++ b/kgpg/kgpgrevokewidget.ui
@@ -141,6 +141,7 @@
 </tabstops>
 <includes>
     <include location="local" impldecl="in implementation">kgpgrevokewidget.ui.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
 </includes>
 <Q_SLOTS>
     <slot>cbSave_toggled( bool isOn )</slot>
diff --git a/kgpg/kgpgwizard.ui b/kgpg/kgpgwizard.ui
index 75a6ef5..fe4167c 100644
--- a/kgpg/kgpgwizard.ui
+++ b/kgpg/kgpgwizard.ui
@@ -398,8 +398,12 @@ Remember that if you download a file or open one in an editor, parts of the file
     <slot>finishButton_clicked()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
+<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">kurlrequester.h</include>
+</includes>
 <includehints>
-    <includehint>kactivelabel.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>
 </UI>
diff --git a/kgpg/newkey.ui b/kgpg/newkey.ui
index fe978df..7793d74 100644
--- a/kgpg/newkey.ui
+++ b/kgpg/newkey.ui
@@ -188,6 +188,8 @@
 </connections>
 <includes>
     <include location="local" impldecl="in implementation">newkey.ui.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
 </includes>
 <Q_SLOTS>
     <slot>CBsave_toggled( bool isOn )</slot>
diff --git a/kgpg/searchres.ui b/kgpg/searchres.ui
index 3a9a325..d704647 100644
--- a/kgpg/searchres.ui
+++ b/kgpg/searchres.ui
@@ -117,8 +117,8 @@
     <tabstop>kLEID</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/kgpg/sourceselect.ui b/kgpg/sourceselect.ui
index b974eb7..2dc9c38 100644
--- a/kgpg/sourceselect.ui
+++ b/kgpg/sourceselect.ui
@@ -104,8 +104,10 @@
     <slot>checkFile_toggled( bool isOn )</slot>
 </Q_SLOTS>
 <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>
-- 
cgit v1.2.1