From 661ed658b788d6b4bee973d0fceeb7cd86be3162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Wed, 19 Sep 2018 03:15:53 +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>
---
 kicker/applets/clock/analog.ui           | 10 +++-------
 kicker/applets/clock/digital.ui          | 10 +++-------
 kicker/applets/clock/fuzzy.ui            | 10 +++-------
 kicker/applets/clock/settings.ui         | 17 +++++------------
 kicker/applets/launcher/configdlgbase.ui |  7 +++----
 kicker/kicker/core/kmenubase.ui          |  4 +---
 kicker/kicker/ui/appletview.ui           |  5 +++--
 kicker/kicker/ui/nonKDEButtonSettings.ui |  4 ++++
 8 files changed, 25 insertions(+), 42 deletions(-)

(limited to 'kicker')

diff --git a/kicker/applets/clock/analog.ui b/kicker/applets/clock/analog.ui
index e7181c521..e362ef8cc 100644
--- a/kicker/applets/clock/analog.ui
+++ b/kicker/applets/clock/analog.ui
@@ -331,14 +331,10 @@
     <tabstop>kcfg_AnalogBackgroundColor</tabstop>
 </tabstops>
 <includes>
-    <include location="local" impldecl="in implementation">kdialog.h</include>
-    <include location="local" impldecl="in implementation">tdefontrequester.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">tdefontrequester.h</include>
 </includes>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kicker/applets/clock/digital.ui b/kicker/applets/clock/digital.ui
index 7fad42834..e8ced7f2d 100644
--- a/kicker/applets/clock/digital.ui
+++ b/kicker/applets/clock/digital.ui
@@ -288,18 +288,14 @@
     <tabstop>kcfg_DigitalBackgroundColor</tabstop>
 </tabstops>
 <includes>
-    <include location="local" impldecl="in implementation">kdialog.h</include>
-    <include location="local" impldecl="in implementation">tdefontrequester.h</include>
     <include location="local" impldecl="in implementation">digital.ui.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">tdefontrequester.h</include>
 </includes>
 <Q_SLOTS>
     <slot>kcfg_DigitalLCDStyle_stateChanged( int )</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kicker/applets/clock/fuzzy.ui b/kicker/applets/clock/fuzzy.ui
index 386315bc2..1233f4fbb 100644
--- a/kicker/applets/clock/fuzzy.ui
+++ b/kicker/applets/clock/fuzzy.ui
@@ -274,14 +274,10 @@
     <tabstop>kcfg_FuzzyBackgroundColor</tabstop>
 </tabstops>
 <includes>
-    <include location="local" impldecl="in implementation">kdialog.h</include>
-    <include location="local" impldecl="in implementation">tdefontrequester.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">tdefontrequester.h</include>
 </includes>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>tdefontrequester.h</includehint>
-</includehints>
 </UI>
diff --git a/kicker/applets/clock/settings.ui b/kicker/applets/clock/settings.ui
index 0be13e9a9..81e126560 100644
--- a/kicker/applets/clock/settings.ui
+++ b/kicker/applets/clock/settings.ui
@@ -503,22 +503,15 @@
     <tabstop>tzListView</tabstop>
 </tabstops>
 <includes>
-    <include location="local" impldecl="in implementation">tqheader.h</include>
-    <include location="local" impldecl="in implementation">kdialog.h</include>
-    <include location="local" impldecl="in implementation">tdefontrequester.h</include>
+    <include location="global" impldecl="in implementation">tqheader.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">tdefontrequester.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
 </includes>
 <Q_SLOTS>
     <slot>configureType()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>tdefontrequester.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>tdefontrequester.h</includehint>
-    <includehint>tdelistview.h</includehint>
-</includehints>
 </UI>
diff --git a/kicker/applets/launcher/configdlgbase.ui b/kicker/applets/launcher/configdlgbase.ui
index edfa6f02f..026019742 100644
--- a/kicker/applets/launcher/configdlgbase.ui
+++ b/kicker/applets/launcher/configdlgbase.ui
@@ -274,8 +274,7 @@
     </connection>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>
diff --git a/kicker/kicker/core/kmenubase.ui b/kicker/kicker/core/kmenubase.ui
index 68c82dc7e..7c740d63b 100644
--- a/kicker/kicker/core/kmenubase.ui
+++ b/kicker/kicker/core/kmenubase.ui
@@ -283,12 +283,10 @@
 </images>
 <includes>
     <include location="local" impldecl="in implementation">kmenubase.ui.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
 </includes>
 <functions>
     <function access="private" specifier="non virtual">init()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-</includehints>
 </UI>
diff --git a/kicker/kicker/ui/appletview.ui b/kicker/kicker/ui/appletview.ui
index f5a32651b..5d92dab89 100644
--- a/kicker/kicker/ui/appletview.ui
+++ b/kicker/kicker/ui/appletview.ui
@@ -196,9 +196,10 @@
     <tabstop>appletFilter</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 <includehints>
     <includehint>tqscrollview.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
 </includehints>
 </UI>
diff --git a/kicker/kicker/ui/nonKDEButtonSettings.ui b/kicker/kicker/ui/nonKDEButtonSettings.ui
index cbd85b4d0..59976b484 100644
--- a/kicker/kicker/ui/nonKDEButtonSettings.ui
+++ b/kicker/kicker/ui/nonKDEButtonSettings.ui
@@ -218,4 +218,8 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<includes>
+    <include location="global" impldecl="in implementation">kicondialog.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>
-- 
cgit v1.2.3