From aca01d5a8b7d3de53fa34696e18c91db720a5ab6 Mon Sep 17 00:00:00 2001
From: gregory guy <g-gregory@gmx.fr>
Date: Thu, 27 Jun 2019 16:35:25 +0200
Subject: Conversion to the cmake building system. 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: gregory guy <g-gregory@gmx.fr>
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit d4a1613e9f119ae68c695ab60f8d9856d1a54a52)
---
 ktouch/src/CMakeLists.txt              | 71 ++++++++++++++++++++++++++++++++++
 ktouch/src/ktouchcoloreditor_dlg.ui    | 33 +++-------------
 ktouch/src/ktouchkeyboardeditor_dlg.ui | 18 +++------
 ktouch/src/ktouchlectureeditor_dlg.ui  | 22 +++--------
 ktouch/src/ktouchopenrequest_dlg.ui    | 12 +++---
 ktouch/src/ktouchprefcolorslayout.ui   | 11 ++----
 ktouch/src/ktouchprefgenerallayout.ui  |  6 +--
 ktouch/src/ktouchprefkeyboardlayout.ui |  6 +--
 ktouch/src/ktouchpreftraininglayout.ui |  9 ++---
 ktouch/src/ktouchstatistics_dlg.ui     | 12 +++---
 10 files changed, 110 insertions(+), 90 deletions(-)
 create mode 100644 ktouch/src/CMakeLists.txt

(limited to 'ktouch/src')

diff --git a/ktouch/src/CMakeLists.txt b/ktouch/src/CMakeLists.txt
new file mode 100644
index 00000000..26dacfc2
--- /dev/null
+++ b/ktouch/src/CMakeLists.txt
@@ -0,0 +1,71 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### ktouch (executable)
+
+tde_add_executable( ktouch AUTOMOC
+
+  SOURCES
+        ktouchcoloreditor_dlg.ui
+        ktouchlectureeditor_dlg.ui
+        ktouchopenrequest_dlg.ui
+        ktouchprefcolorslayout.ui
+        ktouchprefgenerallayout.ui
+        ktouchprefkeyboardlayout.ui
+        ktouchpreftraininglayout.ui
+        ktouchstatistics_dlg.ui
+        ktouchstatuslayout.ui
+        prefs.kcfgc
+        ktouchchartwidget.cpp
+        ktouchcolorscheme.cpp
+        ktouch.cpp
+        ktouchdefaults.cpp
+        ktouchkeyboardwidget.cpp
+        ktouchkeyconnector.cpp
+        ktouchkey.cpp
+        ktouchkeys.cpp
+        ktouchlecture.cpp
+        ktouchlectureeditor.cpp
+        ktouchleveldata.cpp
+        ktouchopenrequest.cpp
+        ktouchslideline.cpp
+        ktouchstatistics.cpp
+        ktouchstatisticsdata.cpp
+        ktouchstatus.cpp
+        ktouchtrainer.cpp
+        ktouchutils.cpp
+        main.cpp
+        ktouchcoloreditor.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     tdeeduplot-shared
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+    FILES ktouchui.rc
+    DESTINATION ${DATA_INSTALL_DIR}/ktouch
+)
+
+install(
+    FILES ktouch.kcfg
+    DESTINATION ${KCFG_INSTALL_DIR}
+)
diff --git a/ktouch/src/ktouchcoloreditor_dlg.ui b/ktouch/src/ktouchcoloreditor_dlg.ui
index 38245a56..5f1918c3 100644
--- a/ktouch/src/ktouchcoloreditor_dlg.ui
+++ b/ktouch/src/ktouchcoloreditor_dlg.ui
@@ -793,32 +793,9 @@
     <slot>colorSchemeChanged(TQListBoxItem * item)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.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">kcolorbutton.h</include>
+</includes>
 </UI>
diff --git a/ktouch/src/ktouchkeyboardeditor_dlg.ui b/ktouch/src/ktouchkeyboardeditor_dlg.ui
index 81d532a7..741f4e20 100644
--- a/ktouch/src/ktouchkeyboardeditor_dlg.ui
+++ b/ktouch/src/ktouchkeyboardeditor_dlg.ui
@@ -390,17 +390,9 @@
     <slot>keySelectionChanged(TQListBoxItem*)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>ktextedit.h</includehint>
-    <includehint>klineedit.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">ktextedit.h</include>
+</includes>
 </UI>
diff --git a/ktouch/src/ktouchlectureeditor_dlg.ui b/ktouch/src/ktouchlectureeditor_dlg.ui
index 83105f4c..d5f0f888 100644
--- a/ktouch/src/ktouchlectureeditor_dlg.ui
+++ b/ktouch/src/ktouchlectureeditor_dlg.ui
@@ -665,20 +665,10 @@
     <slot>fontBtnClicked()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>ktextedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<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">ktextedit.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/ktouch/src/ktouchopenrequest_dlg.ui b/ktouch/src/ktouchopenrequest_dlg.ui
index 4da33c33..410353dc 100644
--- a/ktouch/src/ktouchopenrequest_dlg.ui
+++ b/ktouch/src/ktouchopenrequest_dlg.ui
@@ -279,11 +279,9 @@
     <slot>browseBtnClicked()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>ksqueezedtextlabel.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<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">ksqueezedtextlabel.h</include>
+</includes>
 </UI>
diff --git a/ktouch/src/ktouchprefcolorslayout.ui b/ktouch/src/ktouchprefcolorslayout.ui
index 6fd8eeea..debe5f46 100644
--- a/ktouch/src/ktouchprefcolorslayout.ui
+++ b/ktouch/src/ktouchprefcolorslayout.ui
@@ -505,12 +505,7 @@
     <tabstop>kcfg_CurrentColorScheme</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <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/ktouch/src/ktouchprefgenerallayout.ui b/ktouch/src/ktouchprefgenerallayout.ui
index 96ed2bff..6bbc0d4c 100644
--- a/ktouch/src/ktouchprefgenerallayout.ui
+++ b/ktouch/src/ktouchprefgenerallayout.ui
@@ -335,7 +335,7 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdefontrequester.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">tdefontrequester.h</include>
+</includes>
 </UI>
diff --git a/ktouch/src/ktouchprefkeyboardlayout.ui b/ktouch/src/ktouchprefkeyboardlayout.ui
index 949207cc..75cef9e1 100644
--- a/ktouch/src/ktouchprefkeyboardlayout.ui
+++ b/ktouch/src/ktouchprefkeyboardlayout.ui
@@ -136,7 +136,7 @@
     <slot>fontChooseBtnClicked()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdefontrequester.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">tdefontrequester.h</include>
+</includes>
 </UI>
diff --git a/ktouch/src/ktouchpreftraininglayout.ui b/ktouch/src/ktouchpreftraininglayout.ui
index 3c6a1c8d..f36a6a80 100644
--- a/ktouch/src/ktouchpreftraininglayout.ui
+++ b/ktouch/src/ktouchpreftraininglayout.ui
@@ -322,10 +322,7 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>
diff --git a/ktouch/src/ktouchstatistics_dlg.ui b/ktouch/src/ktouchstatistics_dlg.ui
index a254c9af..bcfeb9fd 100644
--- a/ktouch/src/ktouchstatistics_dlg.ui
+++ b/ktouch/src/ktouchstatistics_dlg.ui
@@ -1278,10 +1278,10 @@
     </image>
 </images>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>ktouchchartwidget.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">ktouchchartwidget.h</include>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
-- 
cgit v1.2.1