From b4a5c0a167522ed4aa987fb1d65e6b58333b1363 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Fri, 21 Sep 2018 15:57:05 +0900
Subject: Add includes to UI files to resolve FTBFS. Partially cherry-picked
 from 661ed658.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 kicker/applets/clock/analog.ui   | 10 +++-------
 kicker/applets/clock/digital.ui  | 10 +++-------
 kicker/applets/clock/fuzzy.ui    | 10 +++-------
 kicker/applets/clock/settings.ui | 17 +++++------------
 4 files changed, 14 insertions(+), 33 deletions(-)

(limited to 'kicker/applets/clock')

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>
-- 
cgit v1.2.1