summaryrefslogtreecommitdiffstats
path: root/quanta
diff options
context:
space:
mode:
authorgregory guy <g-gregory@gmx.fr>2019-06-28 15:14:51 +0200
committergregory guy <gregory-tde@laposte.net>2021-03-11 15:04:14 +0100
commit4c43d1fbb66a296958ed1d0dbddf3f8ac4466130 (patch)
treee532b01e8168b2f849f8aaa3266a58b088705726 /quanta
parent10d21d001e92e653cec6b6d1c05983abd00a1195 (diff)
downloadtdewebdev-4c43d1fbb66a296958ed1d0dbddf3f8ac4466130.tar.gz
tdewebdev-4c43d1fbb66a296958ed1d0dbddf3f8ac4466130.zip
Conversion to the cmake building system.
Delete empty files (dummy.cpp, xsldbgconfig.h). Remove hard-coded path for the kmdr-executor executable. Replaced $TQTDIR/doc/html string path for TQTDOCDIR in kommander. Add man pages taken from the Debian packaging. Signed-off-by: gregory guy <gregory-tde@laposte.net> Fix linking - kxsldbgcommon-static and kimagemapeditorcommon-static needs to be embedded. Move the linking of xml and readline libraries to the appropriate static libraries. Add build option WITH_QUANTA_CVSSERVICE. Add a test whether the readline can be linked standalone or whether ncurses is needed. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'quanta')
-rw-r--r--quanta/components/CMakeLists.txt9
-rw-r--r--quanta/components/csseditor/csseditors.ui6
-rw-r--r--quanta/components/csseditor/cssselectors.ui11
-rw-r--r--quanta/components/csseditor/fontfamilychoosers.ui11
-rw-r--r--quanta/components/cvsservice/CMakeLists.txt21
-rw-r--r--quanta/components/cvsservice/cvscommitdlgs.ui8
-rw-r--r--quanta/components/cvsservice/cvsupdatetodlgs.ui5
-rw-r--r--quanta/components/debugger/conditionalbreakpointdialogs.ui10
-rw-r--r--quanta/components/debugger/dbgp/dbgpsettingss.ui6
-rw-r--r--quanta/components/debugger/gubed/gubedsettingss.ui6
-rw-r--r--quanta/components/debugger/pathmapperdialogs.ui6
-rw-r--r--quanta/components/framewizard/fmfpeditors.ui3
-rw-r--r--quanta/components/tableeditor/tableeditors.ui3
-rw-r--r--quanta/dialogs/actionconfigdialogs.ui19
-rw-r--r--quanta/dialogs/donationdialog.ui9
-rw-r--r--quanta/dialogs/dtepeditdlgs.ui5
-rw-r--r--quanta/dialogs/dtepstructureeditdlgs.ui8
-rw-r--r--quanta/dialogs/fourbuttonmessagebox.ui1
-rw-r--r--quanta/dialogs/loadentitydlgs.ui4
-rw-r--r--quanta/dialogs/settings/abbreviations.ui10
-rw-r--r--quanta/dialogs/specialchardialogs.ui8
-rw-r--r--quanta/dialogs/tagdialogs/tagmail.ui3
-rw-r--r--quanta/parsers/dtd/CMakeLists.txt4
-rw-r--r--quanta/parsers/dtd/dtdparser.cpp4
-rw-r--r--quanta/parts/kafka/CMakeLists.txt2
-rw-r--r--quanta/parts/kafka/htmldocumentpropertiesui.ui5
-rw-r--r--quanta/project/eventconfigurationdlgs.ui7
-rw-r--r--quanta/project/eventeditordlgs.ui3
-rw-r--r--quanta/project/membereditdlgs.ui16
-rw-r--r--quanta/project/projectnewwebs.ui9
-rw-r--r--quanta/project/projectuploads.ui9
-rw-r--r--quanta/project/rescanprjdir.ui8
-rw-r--r--quanta/project/subprojecteditdlgs.ui3
-rw-r--r--quanta/project/teammembersdlgs.ui13
-rw-r--r--quanta/project/uploadprofiledlgs.ui5
-rw-r--r--quanta/project/uploadprofilespage.ui3
-rw-r--r--quanta/src/CMakeLists.txt27
-rw-r--r--quanta/src/quanta.cpp4
-rw-r--r--quanta/src/quanta_init.cpp5
-rw-r--r--quanta/src/viewmanager.cpp4
-rw-r--r--quanta/treeviews/CMakeLists.txt5
-rw-r--r--quanta/treeviews/filestreeview.cpp3
-rw-r--r--quanta/treeviews/projecttreeview.cpp4
-rw-r--r--quanta/treeviews/quantapropertiespage.ui3
-rw-r--r--quanta/treeviews/templatedirform.ui6
45 files changed, 212 insertions, 112 deletions
diff --git a/quanta/components/CMakeLists.txt b/quanta/components/CMakeLists.txt
index 7e0cad97..34642e38 100644
--- a/quanta/components/CMakeLists.txt
+++ b/quanta/components/CMakeLists.txt
@@ -11,8 +11,11 @@
# FIXME cvsservice is not ported
-add_subdirectory( csseditor )
+add_subdirectory( csseditor )
add_subdirectory( framewizard )
add_subdirectory( tableeditor )
-add_subdirectory( debugger )
-# add_subdirectory( cvsservice )
+add_subdirectory( debugger )
+
+if( WITH_QUANTA_CVSSERVICE )
+add_subdirectory( cvsservice )
+endif()
diff --git a/quanta/components/csseditor/csseditors.ui b/quanta/components/csseditor/csseditors.ui
index 2661d75d..fe769a0e 100644
--- a/quanta/components/csseditor/csseditors.ui
+++ b/quanta/components/csseditor/csseditors.ui
@@ -405,7 +405,7 @@
</connection>
</connections>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
</UI>
diff --git a/quanta/components/csseditor/cssselectors.ui b/quanta/components/csseditor/cssselectors.ui
index cb4ed81b..b4062318 100644
--- a/quanta/components/csseditor/cssselectors.ui
+++ b/quanta/components/csseditor/cssselectors.ui
@@ -976,10 +976,9 @@
</connection>
</connections>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kurlrequester.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+ <include location="global" impldecl="in implementation">kurlrequester.h</include>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
</UI>
diff --git a/quanta/components/csseditor/fontfamilychoosers.ui b/quanta/components/csseditor/fontfamilychoosers.ui
index 7675741a..77a0f915 100644
--- a/quanta/components/csseditor/fontfamilychoosers.ui
+++ b/quanta/components/csseditor/fontfamilychoosers.ui
@@ -430,12 +430,7 @@
</connection>
</connections>
<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>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
</UI>
diff --git a/quanta/components/cvsservice/CMakeLists.txt b/quanta/components/cvsservice/CMakeLists.txt
new file mode 100644
index 00000000..7f2010ae
--- /dev/null
+++ b/quanta/components/cvsservice/CMakeLists.txt
@@ -0,0 +1,21 @@
+include_directories(
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_SOURCE_DIR}/lib
+ ${CMAKE_SOURCE_DIR}/quanta/src
+ ${CMAKE_SOURCE_DIR}/quanta/project
+ ${CMAKE_SOURCE_DIR}/quanta/parsers
+ ${CMAKE_SOURCE_DIR}/quanta/utility
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+)
+
+##### cvsservice (static)
+
+tde_add_library( cvsservice STATIC_PIC AUTOMOC
+
+ SOURCES
+ cvsservicedcopif.skel
+ cvscommitdlgs.ui
+ cvsupdatetodlgs.ui
+ cvsservice.cpp
+)
diff --git a/quanta/components/cvsservice/cvscommitdlgs.ui b/quanta/components/cvsservice/cvscommitdlgs.ui
index f63b910e..9ff2c938 100644
--- a/quanta/components/cvsservice/cvscommitdlgs.ui
+++ b/quanta/components/cvsservice/cvscommitdlgs.ui
@@ -144,7 +144,9 @@
<tabstop>cancelButton</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>tdelistbox.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">tdelistbox.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+ <include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
</UI>
diff --git a/quanta/components/cvsservice/cvsupdatetodlgs.ui b/quanta/components/cvsservice/cvsupdatetodlgs.ui
index d4d2dc7b..bdec051a 100644
--- a/quanta/components/cvsservice/cvsupdatetodlgs.ui
+++ b/quanta/components/cvsservice/cvsupdatetodlgs.ui
@@ -195,4 +195,9 @@
</connection>
</connections>
<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">kcombobox.h</include>
+</includes>
</UI>
diff --git a/quanta/components/debugger/conditionalbreakpointdialogs.ui b/quanta/components/debugger/conditionalbreakpointdialogs.ui
index fcd4b1db..221b5bcd 100644
--- a/quanta/components/debugger/conditionalbreakpointdialogs.ui
+++ b/quanta/components/debugger/conditionalbreakpointdialogs.ui
@@ -321,9 +321,9 @@
<tabstop>buttonCancel</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kcombobox.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>kled.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kled.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/quanta/components/debugger/dbgp/dbgpsettingss.ui b/quanta/components/debugger/dbgp/dbgpsettingss.ui
index 10888885..2f98a16b 100644
--- a/quanta/components/debugger/dbgp/dbgpsettingss.ui
+++ b/quanta/components/debugger/dbgp/dbgpsettingss.ui
@@ -722,7 +722,7 @@
<slot>slotLocalProjectToggle(bool)</slot>
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>ktextbrowser.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">ktextbrowser.h</include>
+</includes>
</UI>
diff --git a/quanta/components/debugger/gubed/gubedsettingss.ui b/quanta/components/debugger/gubed/gubedsettingss.ui
index c9caa54c..92e5efd1 100644
--- a/quanta/components/debugger/gubed/gubedsettingss.ui
+++ b/quanta/components/debugger/gubed/gubedsettingss.ui
@@ -756,7 +756,7 @@
<slot specifier="pure virtual">slotUseProxyToggle( bool )</slot>
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>ktextbrowser.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">ktextbrowser.h</include>
+</includes>
</UI>
diff --git a/quanta/components/debugger/pathmapperdialogs.ui b/quanta/components/debugger/pathmapperdialogs.ui
index 58a79167..266989b9 100644
--- a/quanta/components/debugger/pathmapperdialogs.ui
+++ b/quanta/components/debugger/pathmapperdialogs.ui
@@ -339,7 +339,7 @@ The quanta will know that files starting with "/home/user/project/" on the local
<slot>slotHistoryclicked()</slot>
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kled.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kled.h</include>
+</includes>
</UI>
diff --git a/quanta/components/framewizard/fmfpeditors.ui b/quanta/components/framewizard/fmfpeditors.ui
index 3e024de5..fbd189b5 100644
--- a/quanta/components/framewizard/fmfpeditors.ui
+++ b/quanta/components/framewizard/fmfpeditors.ui
@@ -538,4 +538,7 @@
</connections>
<pixmapinproject/>
<layoutdefaults spacing="6" margin="11"/>
+<includes>
+ <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
</UI>
diff --git a/quanta/components/tableeditor/tableeditors.ui b/quanta/components/tableeditor/tableeditors.ui
index 29511351..be3c7553 100644
--- a/quanta/components/tableeditor/tableeditors.ui
+++ b/quanta/components/tableeditor/tableeditors.ui
@@ -639,4 +639,7 @@
<tabstop>footerTableData</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
+<includes>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
</UI>
diff --git a/quanta/dialogs/actionconfigdialogs.ui b/quanta/dialogs/actionconfigdialogs.ui
index fae092c2..f9ecce1b 100644
--- a/quanta/dialogs/actionconfigdialogs.ui
+++ b/quanta/dialogs/actionconfigdialogs.ui
@@ -972,10 +972,6 @@
<tabstop>buttonApply</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops>
-<includes>
- <include location="global" impldecl="in implementation">kkeybutton.h</include>
- <include location="global" impldecl="in implementation">kpushbutton.h</include>
-</includes>
<Q_SLOTS>
<slot>buttonOk_clicked()</slot>
<slot>slotNewAction()</slot>
@@ -991,11 +987,12 @@
<slot>slotTextChanged()</slot>
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>tdelistview.h</includehint>
- <includehint>kicondialog.h</includehint>
- <includehint>kkeybutton.h</includehint>
- <includehint>tdelistbox.h</includehint>
- <includehint>filecombo.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kkeybutton.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
+ <include location="global" impldecl="in implementation">kicondialog.h</include>
+ <include location="global" impldecl="in implementation">tdelistbox.h</include>
+ <include location="global" impldecl="in implementation">filecombo.h</include>
+</includes>
</UI>
diff --git a/quanta/dialogs/donationdialog.ui b/quanta/dialogs/donationdialog.ui
index 2914bef2..c8a95785 100644
--- a/quanta/dialogs/donationdialog.ui
+++ b/quanta/dialogs/donationdialog.ui
@@ -147,9 +147,8 @@ is the future of software, but it is no guarantee of success. How many open sour
<slot>init()</slot>
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kpushbutton.h</includehint>
- <includehint>ktextbrowser.h</includehint>
- <includehint>ktextbrowser.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+ <include location="global" impldecl="in implementation">ktextbrowser.h</include>
+</includes>
</UI>
diff --git a/quanta/dialogs/dtepeditdlgs.ui b/quanta/dialogs/dtepeditdlgs.ui
index 32e6c8f7..6e38acd2 100644
--- a/quanta/dialogs/dtepeditdlgs.ui
+++ b/quanta/dialogs/dtepeditdlgs.ui
@@ -1964,4 +1964,9 @@ Example: &lt;b&gt;//&amp;nbsp;EOL,&amp;nbsp;/*&amp;nbsp;*/&lt;/b&gt;</string>
<slot>slotFamilyChanged(int)</slot>
</Q_SLOTS>
<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">kcombobox.h</include>
+</includes>
</UI>
diff --git a/quanta/dialogs/dtepstructureeditdlgs.ui b/quanta/dialogs/dtepstructureeditdlgs.ui
index ce90582b..0a8de386 100644
--- a/quanta/dialogs/dtepstructureeditdlgs.ui
+++ b/quanta/dialogs/dtepstructureeditdlgs.ui
@@ -640,7 +640,9 @@ The first captured area (between "&lt;b&gt;(&lt;/b&gt;" and "&lt;b&gt;)&lt;/b&gt
<tabstop>classGroup</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kicondialog.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kicondialog.h</include>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+ <include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
</UI>
diff --git a/quanta/dialogs/fourbuttonmessagebox.ui b/quanta/dialogs/fourbuttonmessagebox.ui
index ec85fa91..577f9ea9 100644
--- a/quanta/dialogs/fourbuttonmessagebox.ui
+++ b/quanta/dialogs/fourbuttonmessagebox.ui
@@ -147,6 +147,7 @@
</connections>
<includes>
<include location="local" impldecl="in implementation">fourbuttonmessagebox.ui.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
</includes>
<variables>
<variable>int m_status;</variable>
diff --git a/quanta/dialogs/loadentitydlgs.ui b/quanta/dialogs/loadentitydlgs.ui
index 10950ae7..d6adcd29 100644
--- a/quanta/dialogs/loadentitydlgs.ui
+++ b/quanta/dialogs/loadentitydlgs.ui
@@ -69,4 +69,8 @@
</grid>
</widget>
<layoutdefaults spacing="6" margin="11"/>
+<includes>
+ <include location="global" impldecl="in implementation">kurlrequester.h</include>
+ <include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
</UI>
diff --git a/quanta/dialogs/settings/abbreviations.ui b/quanta/dialogs/settings/abbreviations.ui
index fc53fe16..de8cbd6d 100644
--- a/quanta/dialogs/settings/abbreviations.ui
+++ b/quanta/dialogs/settings/abbreviations.ui
@@ -350,8 +350,10 @@
<slot>slotNewGroup()</slot>
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>tdelistview.h</includehint>
- <includehint>tdelistbox.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
+ <include location="global" impldecl="in implementation">tdelistbox.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+ <include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
</UI>
diff --git a/quanta/dialogs/specialchardialogs.ui b/quanta/dialogs/specialchardialogs.ui
index c10bc62e..a9a606bf 100644
--- a/quanta/dialogs/specialchardialogs.ui
+++ b/quanta/dialogs/specialchardialogs.ui
@@ -146,8 +146,8 @@
<tabstop>buttonCancel</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>klineedit.h</includehint>
- <includehint>tdelistbox.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+ <include location="global" impldecl="in implementation">tdelistbox.h</include>
+</includes>
</UI>
diff --git a/quanta/dialogs/tagdialogs/tagmail.ui b/quanta/dialogs/tagdialogs/tagmail.ui
index e7a71fa1..4072c177 100644
--- a/quanta/dialogs/tagdialogs/tagmail.ui
+++ b/quanta/dialogs/tagdialogs/tagmail.ui
@@ -127,4 +127,7 @@
</grid>
</widget>
<layoutdefaults spacing="6" margin="11"/>
+<includes>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
</UI>
diff --git a/quanta/parsers/dtd/CMakeLists.txt b/quanta/parsers/dtd/CMakeLists.txt
index 7997cc5a..405a4f5e 100644
--- a/quanta/parsers/dtd/CMakeLists.txt
+++ b/quanta/parsers/dtd/CMakeLists.txt
@@ -9,8 +9,12 @@
#
#################################################
+add_compile_options( ${ICU_CXXFLAGS} )
+
+
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/quanta/dialogs
${CMAKE_SOURCE_DIR}/lib
${CMAKE_SOURCE_DIR}/quanta/parsers
diff --git a/quanta/parsers/dtd/dtdparser.cpp b/quanta/parsers/dtd/dtdparser.cpp
index 502551fd..0562f61e 100644
--- a/quanta/parsers/dtd/dtdparser.cpp
+++ b/quanta/parsers/dtd/dtdparser.cpp
@@ -13,6 +13,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
//qt includes
#include <tqcheckbox.h>
#include <tqfile.h>
diff --git a/quanta/parts/kafka/CMakeLists.txt b/quanta/parts/kafka/CMakeLists.txt
index 19519b44..cf1b5775 100644
--- a/quanta/parts/kafka/CMakeLists.txt
+++ b/quanta/parts/kafka/CMakeLists.txt
@@ -9,7 +9,7 @@
#
#################################################
-# FIXME KDE_CXXFLAGS = $(USE_EXCEPTIONS)
+# FIXME KDE_CXXFLAGS = $(USE_EXCEPTIONS) # add_compile_options( -fexceptions )
add_subdirectory( pics )
diff --git a/quanta/parts/kafka/htmldocumentpropertiesui.ui b/quanta/parts/kafka/htmldocumentpropertiesui.ui
index c826dd73..baa146be 100644
--- a/quanta/parts/kafka/htmldocumentpropertiesui.ui
+++ b/quanta/parts/kafka/htmldocumentpropertiesui.ui
@@ -453,4 +453,9 @@
<slot access="protected" specifier="pure virtual">linkChanged( const TQString&amp; )</slot>
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
+<includes>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+ <include location="global" impldecl="in implementation">kurlrequester.h</include>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
</UI>
diff --git a/quanta/project/eventconfigurationdlgs.ui b/quanta/project/eventconfigurationdlgs.ui
index 73bb8666..6bdcfb37 100644
--- a/quanta/project/eventconfigurationdlgs.ui
+++ b/quanta/project/eventconfigurationdlgs.ui
@@ -217,7 +217,8 @@
<slot>slotDeleteEvent()</slot>
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
</UI>
diff --git a/quanta/project/eventeditordlgs.ui b/quanta/project/eventeditordlgs.ui
index 995aa1d4..50f01646 100644
--- a/quanta/project/eventeditordlgs.ui
+++ b/quanta/project/eventeditordlgs.ui
@@ -233,4 +233,7 @@
<slot>slotActionChanged(const TQString &amp;name)</slot>
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
+<includes>
+ <include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
</UI>
diff --git a/quanta/project/membereditdlgs.ui b/quanta/project/membereditdlgs.ui
index 1d972b7b..860167a0 100644
--- a/quanta/project/membereditdlgs.ui
+++ b/quanta/project/membereditdlgs.ui
@@ -182,15 +182,9 @@
<slot>slotSelectFromAddrBook()</slot>
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kcombobox.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>kcombobox.h</includehint>
- <includehint>klineedit.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">kcombobox.h</include>
+</includes>
</UI>
diff --git a/quanta/project/projectnewwebs.ui b/quanta/project/projectnewwebs.ui
index df0d8539..c499d194 100644
--- a/quanta/project/projectnewwebs.ui
+++ b/quanta/project/projectnewwebs.ui
@@ -284,9 +284,8 @@
<tabstop>button</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kled.h</includehint>
- <includehint>uploadtreeview.h</includehint>
- <includehint>kled.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">uploadtreeview.h</include>
+ <include location="global" impldecl="in implementation">kled.h</include>
+</includes>
</UI>
diff --git a/quanta/project/projectuploads.ui b/quanta/project/projectuploads.ui
index 5c91636f..d8900e5f 100644
--- a/quanta/project/projectuploads.ui
+++ b/quanta/project/projectuploads.ui
@@ -491,7 +491,10 @@
<slot>slotNewProfileSelected(const TQString&amp;)</slot>
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>uploadtreeview.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">uploadtreeview.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+ <include location="global" impldecl="in implementation">kcombobox.h</include>
+ <include location="global" impldecl="in implementation">kprogress.h</include>
+</includes>
</UI>
diff --git a/quanta/project/rescanprjdir.ui b/quanta/project/rescanprjdir.ui
index 8fb4b774..f35469e1 100644
--- a/quanta/project/rescanprjdir.ui
+++ b/quanta/project/rescanprjdir.ui
@@ -248,8 +248,8 @@
<tabstop>buttonHelp</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kprogress.h</includehint>
- <includehint>uploadtreeview.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kprogress.h</include>
+ <include location="global" impldecl="in implementation">uploadtreeview.h</include>
+</includes>
</UI>
diff --git a/quanta/project/subprojecteditdlgs.ui b/quanta/project/subprojecteditdlgs.ui
index d1a0a168..dd60b002 100644
--- a/quanta/project/subprojecteditdlgs.ui
+++ b/quanta/project/subprojecteditdlgs.ui
@@ -70,4 +70,7 @@
<tabstop>createNew</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
+<includes>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
</UI>
diff --git a/quanta/project/teammembersdlgs.ui b/quanta/project/teammembersdlgs.ui
index 512c02ca..de4abff8 100644
--- a/quanta/project/teammembersdlgs.ui
+++ b/quanta/project/teammembersdlgs.ui
@@ -238,12 +238,9 @@
<slot>slotSetToYourself()</slot>
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>klineedit.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>tdelistview.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.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">tdelistview.h</include>
+</includes>
</UI>
diff --git a/quanta/project/uploadprofiledlgs.ui b/quanta/project/uploadprofiledlgs.ui
index de6521e6..9830013f 100644
--- a/quanta/project/uploadprofiledlgs.ui
+++ b/quanta/project/uploadprofiledlgs.ui
@@ -307,4 +307,9 @@ is obscured, saving the password in any file is a security risk. Use this option
<tabstop>cancelButton</tabstop>
</tabstops>
<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">kpassdlg.h</include>
+</includes>
</UI>
diff --git a/quanta/project/uploadprofilespage.ui b/quanta/project/uploadprofilespage.ui
index a5a87110..50e676c0 100644
--- a/quanta/project/uploadprofilespage.ui
+++ b/quanta/project/uploadprofilespage.ui
@@ -122,4 +122,7 @@
<slot>buttonEditProfiles_clicked()</slot>
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
+<includes>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
</UI>
diff --git a/quanta/src/CMakeLists.txt b/quanta/src/CMakeLists.txt
index ff7d5d4c..dfd385f1 100644
--- a/quanta/src/CMakeLists.txt
+++ b/quanta/src/CMakeLists.txt
@@ -19,6 +19,7 @@ include_directories(
${CMAKE_BINARY_DIR}/quanta/components/tableeditor
${CMAKE_BINARY_DIR}/quanta/components/csseditor
${CMAKE_BINARY_DIR}/quanta/components/framewizard
+ ${CMAKE_BINARY_DIR}/quanta/components/cvsservice
${CMAKE_SOURCE_DIR}/lib
${CMAKE_SOURCE_DIR}/quanta/src
${CMAKE_SOURCE_DIR}/quanta/project
@@ -31,6 +32,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/quanta/components/tableeditor
${CMAKE_SOURCE_DIR}/quanta/components/csseditor
${CMAKE_SOURCE_DIR}/quanta/components/framewizard
+ ${CMAKE_SOURCE_DIR}/quanta/components/cvsservice
${CMAKE_SOURCE_DIR}/quanta/messages
${CMAKE_SOURCE_DIR}/quanta/treeviews
${CMAKE_SOURCE_DIR}/quanta/plugins
@@ -57,6 +59,7 @@ install( FILES x-webprj.desktop DESTINATION ${MIME_INSTALL_DIR}/application )
set_property( SOURCE kqapp.cpp APPEND PROPERTY COMPILE_DEFINITIONS PREFIX="${CMAKE_INSTALL_PREFIX}" )
tde_add_executable( quanta AUTOMOC
+
SOURCES
quanta_init.cpp quantaview.cpp quantadoc.cpp
main.cpp document.cpp kqapp.cpp quanta.cpp
@@ -64,15 +67,19 @@ tde_add_executable( quanta AUTOMOC
dcopquantaif.skel dcopsettings.cpp dtds.cpp
dcopquanta.cpp viewmanager.cpp
LINK
- project-static plugins-static parser-static
- dtdparser-static treeviews-static dialogs-static
- debuggermanager-static tagdialogs-static
- settingsdialogs-static messages-static
- framewizard-static csseditor-static
- tableeditor-static preview-static
- utility-static quantamodule-static
- kafkalibrary-static tdemdi-shared tdehtml-shared
- tdenewstuff-shared tdeabc-shared tdetexteditor-shared
- ${LIBXML_LIBRARIES} ${LIBXSLT_LIBRARIES}
+ tdecore-shared tdeui-shared tdeio-shared
+ katepartinterfaces-shared tdenewstuff-shared
+ tdeabc-shared tdetexteditor-shared
+ tdemdi-shared tdehtml-shared tdespell-shared
+ kafkalibrary-static project-static
+ plugins-static parser-static
+ dtdparser-static treeviews-static
+ dialogs-static debuggermanager-static
+ tagdialogs-static settingsdialogs-static
+ messages-static framewizard-static
+ csseditor-static tableeditor-static
+ preview-static utility-static quantamodule-static
+ ${LIBXML_LIBRARIES} ${LIBXSLT_LIBRARIES} ${CVSSERVICE_LIBRARIES}
+
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp
index d72cce65..ada70492 100644
--- a/quanta/src/quanta.cpp
+++ b/quanta/src/quanta.cpp
@@ -15,6 +15,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <time.h>
// include files for QT
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index f01f22d7..62931561 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -16,6 +16,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
// include files for QT
#include <tqdir.h>
#include <tqprinter.h>
@@ -1348,6 +1352,7 @@ TQString QuantaInit::retrievePID(const TQString& filename)
TQString strPID = TQString();
strPID = filename.mid(filename.findRev("P") + 1);
+
if (strPID.isEmpty())
strPID = filename.mid(filename.findRev("N") + 1);
diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp
index 831b81f0..92e502a2 100644
--- a/quanta/src/viewmanager.cpp
+++ b/quanta/src/viewmanager.cpp
@@ -12,6 +12,10 @@
*
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
//qt includes
#include <tqdir.h>
diff --git a/quanta/treeviews/CMakeLists.txt b/quanta/treeviews/CMakeLists.txt
index 094ab227..e5b8d6a3 100644
--- a/quanta/treeviews/CMakeLists.txt
+++ b/quanta/treeviews/CMakeLists.txt
@@ -9,8 +9,11 @@
#
#################################################
+add_compile_options( ${ICU_CXXFLAGS} )
+
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/quanta/dialogs/tagdialogs
${CMAKE_SOURCE_DIR}/lib
${CMAKE_SOURCE_DIR}/quanta/src
@@ -22,9 +25,11 @@ include_directories(
${CMAKE_SOURCE_DIR}/quanta/messages
${CMAKE_SOURCE_DIR}/quanta/parts/kafka
${CMAKE_SOURCE_DIR}/quanta/components/csseditor
+ ${CMAKE_SOURCE_DIR}/quanta/components/cvsservice
${CMAKE_SOURCE_DIR}/quanta/plugins
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
+ ${X11_INCLUDE_DIR}
${LIBXML_INCLUDE_DIRS}
)
diff --git a/quanta/treeviews/filestreeview.cpp b/quanta/treeviews/filestreeview.cpp
index 1de8333b..444bbc0c 100644
--- a/quanta/treeviews/filestreeview.cpp
+++ b/quanta/treeviews/filestreeview.cpp
@@ -15,6 +15,9 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
// KDE includes
#include <kdebug.h>
diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp
index 1bb822b3..c07a7183 100644
--- a/quanta/treeviews/projecttreeview.cpp
+++ b/quanta/treeviews/projecttreeview.cpp
@@ -15,6 +15,10 @@
* *
***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
// QT includes
#include <tqpainter.h>
#include <tqlabel.h>
diff --git a/quanta/treeviews/quantapropertiespage.ui b/quanta/treeviews/quantapropertiespage.ui
index d70a6f6e..78a63b0d 100644
--- a/quanta/treeviews/quantapropertiespage.ui
+++ b/quanta/treeviews/quantapropertiespage.ui
@@ -244,4 +244,7 @@
<tabstop>parentAttr</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
+<includes>
+ <include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
</UI>
diff --git a/quanta/treeviews/templatedirform.ui b/quanta/treeviews/templatedirform.ui
index a8cb7705..b1b80b41 100644
--- a/quanta/treeviews/templatedirform.ui
+++ b/quanta/treeviews/templatedirform.ui
@@ -164,7 +164,7 @@
<slot>okBtn_clicked()</slot>
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kcombobox.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
</UI>