Conversion to the cmake building system.

Add includes to UI files to resolve FTBFS.

Signed-off-by: gregory guy <g-gregory@gmx.fr>
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

19 files changed, 188 insertions, 65 deletions

diff --git a/kmplot/CMakeLists.txt b/kmplot/CMakeLists.txt
new file mode 100644
index 00000000..265949c9
--- /dev/null
+++ b/kmplot/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory( kmplot )
+add_subdirectory( icons  )
diff --git a/kmplot/icons/CMakeLists.txt b/kmplot/icons/CMakeLists.txt
new file mode 100644
index 00000000..54771918
--- /dev/null
+++ b/kmplot/icons/CMakeLists.txt
@@ -0,0 +1,5 @@
+add_subdirectory( actions )
+
+##### icons
+
+tde_install_icons( )
diff --git a/kmplot/icons/actions/CMakeLists.txt b/kmplot/icons/actions/CMakeLists.txt
new file mode 100644
index 00000000..13e578aa
--- /dev/null
+++ b/kmplot/icons/actions/CMakeLists.txt
@@ -0,0 +1 @@
+tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kmplot/icons )
diff --git a/kmplot/kmplot/CMakeLists.txt b/kmplot/kmplot/CMakeLists.txt
new file mode 100644
index 00000000..0771413c
--- /dev/null
+++ b/kmplot/kmplot/CMakeLists.txt
@@ -0,0 +1,123 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+set_property(
+    SOURCE kmplot.cpp
+    APPEND PROPERTY OBJECT_DEPENDS
+        ${CMAKE_BINARY_DIR}/kmplot/kmplot/settings.cpp
+        ${CMAKE_BINARY_DIR}/kmplot/kmplot/FktDlgData.cpp
+        ${CMAKE_BINARY_DIR}/kmplot/kmplot/qminmax.cpp
+)
+
+
+##### kmplot (executable)
+
+tde_add_executable( kmplot AUTOMOC
+
+  SOURCES
+        main.cpp
+        kmplot.cpp
+        kmplotprogress.cpp
+        kmplotIface.skel
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     tdeparts-shared
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+##### libkmplotpart (kpart)
+
+tde_add_kpart( libkmplotpart AUTOMOC
+
+  SOURCES
+        settings.kcfgc
+        FktDlgData.ui
+        qminmax.ui
+        settingspagecolor.ui
+        settingspagecoords.ui
+        settingspagefonts.ui
+        settingspagescaling.ui
+        settingspageprecision.ui
+        qparametereditor.ui
+        qeditparametric.ui
+        qeditpolar.ui
+        editfunctionpage.ui
+        editderivativespage.ui
+        editintegralpage.ui
+        qeditconstant.ui
+        qconstanteditor.ui
+        sliderwindow.ui
+        parser.cpp
+        xparser.cpp
+        diagr.cpp
+        View.cpp
+        MainDlg.cpp
+        FktDlg.cpp
+        kprinterdlg.cpp
+        kconstanteditor.cpp
+        kparametereditor.cpp
+        keditparametric.cpp
+        keditpolar.cpp
+        editfunction.cpp
+        kminmax.cpp
+        keditconstant.cpp
+        kmplotio.cpp
+        ksliderwindow.cpp
+        coordsconfigdialog.cpp
+        MainDlgIface.skel
+        parseriface.skel
+        Viewiface.skel
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     tdeprint-shared
+     tdeparts-shared
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+##### other data
+
+install(
+    FILES kmplot_shell.rc
+    DESTINATION ${DATA_INSTALL_DIR}/kmplot
+)
+
+install(
+    FILES x-kmplot.desktop
+    DESTINATION ${MIME_INSTALL_DIR}/application
+)
+
+install(
+    FILES kmplot.desktop
+    DESTINATION ${XDG_APPS_INSTALL_DIR}
+)
+
+install(
+    FILES kmplot_part.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
+install(
+    FILES kmplot_part.rc kmplot_part_readonly.rc
+    DESTINATION ${DATA_INSTALL_DIR}/kmplot
+)
+
+install(
+    FILES kmplot.kcfg
+    DESTINATION ${KCFG_INSTALL_DIR}
+)
diff --git a/kmplot/kmplot/FktDlgData.ui b/kmplot/kmplot/FktDlgData.ui
index 0f91d5c7..75f0740c 100644
--- a/kmplot/kmplot/FktDlgData.ui
+++ b/kmplot/kmplot/FktDlgData.ui
@@ -418,7 +418,7 @@
     <slot>slotNewPrime()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/kmplot/kmplot/editderivativespage.ui b/kmplot/kmplot/editderivativespage.ui
index 235721f2..d6371498 100644
--- a/kmplot/kmplot/editderivativespage.ui
+++ b/kmplot/kmplot/editderivativespage.ui
@@ -269,8 +269,8 @@
     <tabstop>colorDerivative2</tabstop>
 </tabstops>
 <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>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+</includes>
 </UI>
diff --git a/kmplot/kmplot/editfunctionpage.ui b/kmplot/kmplot/editfunctionpage.ui
index 4683b7f6..dce7932c 100644
--- a/kmplot/kmplot/editfunctionpage.ui
+++ b/kmplot/kmplot/editfunctionpage.ui
@@ -898,11 +898,4 @@ Example: f(x)=x^2</string>
     <slot>customRange_toggled( bool )</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kmplot/kmplot/editintegralpage.ui b/kmplot/kmplot/editintegralpage.ui
index 70c63f6a..a26822c9 100644
--- a/kmplot/kmplot/editintegralpage.ui
+++ b/kmplot/kmplot/editintegralpage.ui
@@ -282,7 +282,9 @@
     <tabstop>color</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/kmplot/kmplot/qconstanteditor.ui b/kmplot/kmplot/qconstanteditor.ui
index 30bc937e..0dc8ab8b 100644
--- a/kmplot/kmplot/qconstanteditor.ui
+++ b/kmplot/kmplot/qconstanteditor.ui
@@ -197,7 +197,7 @@
     <slot>varlist_doubleClicked( TQListViewItem * )</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/kmplot/kmplot/qeditconstant.ui b/kmplot/kmplot/qeditconstant.ui
index 02d3273f..ffb66c43 100644
--- a/kmplot/kmplot/qeditconstant.ui
+++ b/kmplot/kmplot/qeditconstant.ui
@@ -132,8 +132,7 @@
     <slot>txtVariable_lostFocus()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/kmplot/kmplot/qeditparametric.ui b/kmplot/kmplot/qeditparametric.ui
index e22f6c19..1b7eaffb 100644
--- a/kmplot/kmplot/qeditparametric.ui
+++ b/kmplot/kmplot/qeditparametric.ui
@@ -532,14 +532,9 @@ Example: sin(t)</string>
     <slot>slotHelp()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>
diff --git a/kmplot/kmplot/qeditpolar.ui b/kmplot/kmplot/qeditpolar.ui
index 61624136..2d9a785c 100644
--- a/kmplot/kmplot/qeditpolar.ui
+++ b/kmplot/kmplot/qeditpolar.ui
@@ -396,12 +396,9 @@ Example: loop(angle)=ln(angle)</string>
     <slot>slotHelp()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>
diff --git a/kmplot/kmplot/qminmax.ui b/kmplot/kmplot/qminmax.ui
index 29a359f6..e837daa3 100644
--- a/kmplot/kmplot/qminmax.ui
+++ b/kmplot/kmplot/qminmax.ui
@@ -139,4 +139,9 @@
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
+<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">tdelistbox.h</include>
+</includes>
 </UI>
diff --git a/kmplot/kmplot/qparametereditor.ui b/kmplot/kmplot/qparametereditor.ui
index 675d2736..ad22b13d 100644
--- a/kmplot/kmplot/qparametereditor.ui
+++ b/kmplot/kmplot/qparametereditor.ui
@@ -182,4 +182,9 @@
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">tdelistbox.h</include>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+</includes>
 </UI>
diff --git a/kmplot/kmplot/settingspagecolor.ui b/kmplot/kmplot/settingspagecolor.ui
index 5b938c04..dff866d9 100644
--- a/kmplot/kmplot/settingspagecolor.ui
+++ b/kmplot/kmplot/settingspagecolor.ui
@@ -456,4 +456,7 @@
     <tabstop>kcfg_Color9</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+</includes>
 </UI>
diff --git a/kmplot/kmplot/settingspagecoords.ui b/kmplot/kmplot/settingspagecoords.ui
index 6293d0cd..d15f669f 100644
--- a/kmplot/kmplot/settingspagecoords.ui
+++ b/kmplot/kmplot/settingspagecoords.ui
@@ -752,18 +752,8 @@
     <tabstop>kcfg_GridLineWidth</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <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>
-</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/kmplot/kmplot/settingspagefonts.ui b/kmplot/kmplot/settingspagefonts.ui
index 18d6bb1b..663ab04c 100644
--- a/kmplot/kmplot/settingspagefonts.ui
+++ b/kmplot/kmplot/settingspagefonts.ui
@@ -120,9 +120,9 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdefontcombo.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>tdefontcombo.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">tdefontcombo.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+    <include location="global" impldecl="in implementation">tdefontcombo.h</include>
+</includes>
 </UI>
diff --git a/kmplot/kmplot/settingspageprecision.ui b/kmplot/kmplot/settingspageprecision.ui
index cafc3365..84156321 100644
--- a/kmplot/kmplot/settingspageprecision.ui
+++ b/kmplot/kmplot/settingspageprecision.ui
@@ -269,8 +269,8 @@
 <customwidgets>
 </customwidgets>
 <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>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+</includes>
 </UI>
diff --git a/kmplot/kmplot/settingspagescaling.ui b/kmplot/kmplot/settingspagescaling.ui
index eaaf0690..1802e00f 100644
--- a/kmplot/kmplot/settingspagescaling.ui
+++ b/kmplot/kmplot/settingspagescaling.ui
@@ -412,4 +412,7 @@
     <tabstop>kcfg_YPrinting</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
 </UI>