summaryrefslogtreecommitdiffstats
path: root/kvoctrain
diff options
context:
space:
mode:
Diffstat (limited to 'kvoctrain')
-rw-r--r--kvoctrain/CMakeLists.txt1
-rw-r--r--kvoctrain/kvoctrain/CMakeLists.txt105
-rw-r--r--kvoctrain/kvoctrain/common-dialogs/CMakeLists.txt56
-rw-r--r--kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui6
-rw-r--r--kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui7
-rw-r--r--kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui6
-rw-r--r--kvoctrain/kvoctrain/common-dialogs/profilesdialog.h4
-rw-r--r--kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui9
-rw-r--r--kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui13
-rw-r--r--kvoctrain/kvoctrain/docprop-dialogs/CMakeLists.txt41
-rw-r--r--kvoctrain/kvoctrain/entry-dialogs/CMakeLists.txt44
-rw-r--r--kvoctrain/kvoctrain/examples/CMakeLists.txt4
-rw-r--r--kvoctrain/kvoctrain/kvt-core/CMakeLists.txt57
-rw-r--r--kvoctrain/kvoctrain/kvt-core/LineList.h3
-rw-r--r--kvoctrain/kvoctrain/kvt-core/MultipleChoice.h3
-rw-r--r--kvoctrain/kvoctrain/kvt-core/QueryManager.h2
-rw-r--r--kvoctrain/kvoctrain/kvt-core/UsageManager.h2
-rw-r--r--kvoctrain/kvoctrain/kvt-core/grammarmanager.h9
-rw-r--r--kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp2
-rw-r--r--kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h2
-rw-r--r--kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h2
-rw-r--r--kvoctrain/kvoctrain/kvt-core/kvt-xml/CMakeLists.txt25
-rw-r--r--kvoctrain/kvoctrain/kvt-core/langset.h3
-rw-r--r--kvoctrain/kvoctrain/pics/CMakeLists.txt3
-rw-r--r--kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui7
-rw-r--r--kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui7
-rw-r--r--kvoctrain/kvoctrain/query-dialogs/CMakeLists.txt39
-rw-r--r--kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui7
-rw-r--r--kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui7
-rw-r--r--kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui7
-rw-r--r--kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui7
-rw-r--r--kvoctrain/kvoctrain/statistik-dialogs/CMakeLists.txt30
-rw-r--r--kvoctrain/kvoctrain/tools/CMakeLists.txt25
33 files changed, 479 insertions, 66 deletions
diff --git a/kvoctrain/CMakeLists.txt b/kvoctrain/CMakeLists.txt
new file mode 100644
index 00000000..d69632d4
--- /dev/null
+++ b/kvoctrain/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory( kvoctrain )
diff --git a/kvoctrain/kvoctrain/CMakeLists.txt b/kvoctrain/kvoctrain/CMakeLists.txt
new file mode 100644
index 00000000..46b4f2cb
--- /dev/null
+++ b/kvoctrain/kvoctrain/CMakeLists.txt
@@ -0,0 +1,105 @@
+add_subdirectory( common-dialogs )
+add_subdirectory( kvt-core )
+add_subdirectory( query-dialogs )
+add_subdirectory( docprop-dialogs )
+add_subdirectory( entry-dialogs )
+add_subdirectory( statistik-dialogs )
+add_subdirectory( pics )
+add_subdirectory( examples )
+#add_subdirectory( tools )
+
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_CURRENT_SOURCE_DIR}/kvt-core
+ ${CMAKE_BINARY_DIR}/kvoctrain/kvoctrain/docprop-dialogs
+ ${CMAKE_BINARY_DIR}/kvoctrain/kvoctrain/entry-dialogs
+ ${CMAKE_BINARY_DIR}/kvoctrain/kvoctrain/common-dialogs
+ ${CMAKE_BINARY_DIR}/kvoctrain/kvoctrain/query-dialogs
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### kvoctrain (executable)
+
+tde_add_executable( kvoctrain AUTOMOC
+
+ SOURCES
+ kva_io.cpp
+ kvoctrain.cpp
+ kvoctrainview.cpp
+ main.cpp kva_init.cpp
+ kva_config.cpp
+ kva_header.cpp
+ kva_clip.cpp
+ kva_query.cpp
+ kvoctraintable.cpp
+ kvoctraintableitem.cpp
+ kvtnewstuff.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdeio-shared
+ tdeprint-shared
+ tdenewstuff-shared
+ querydlg-static
+ docpropdlg-static
+ kvtxml-static
+ kvoctraincore-shared
+ entrydlg-static
+ statdlg-static
+ commondlg-static
+
+ DEPENDENCIES
+ querydlg-static
+ docpropdlg-static
+ entrydlg-static
+ commondlg-static
+
+ DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### spotlight2kvtml (executable)
+
+tde_add_executable( spotlight2kvtml AUTOMOC
+
+ SOURCES
+ spotlight2kvtml.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdeio-shared
+
+ DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+ FILES x-kvtml.desktop
+ DESTINATION ${MIME_INSTALL_DIR}/text
+)
+
+install(
+ FILES kvoctrainui.rc
+ DESTINATION ${DATA_INSTALL_DIR}/kvoctrain
+)
+
+install(
+ FILES kvoctrain.desktop
+ DESTINATION ${XDG_APPS_INSTALL_DIR}
+)
+
+install(
+ FILES kvoctrainrc
+ DESTINATION ${CONFIG_INSTALL_DIR}
+)
diff --git a/kvoctrain/kvoctrain/common-dialogs/CMakeLists.txt b/kvoctrain/kvoctrain/common-dialogs/CMakeLists.txt
new file mode 100644
index 00000000..9905574b
--- /dev/null
+++ b/kvoctrain/kvoctrain/common-dialogs/CMakeLists.txt
@@ -0,0 +1,56 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/kvoctrain/kvoctrain/kvt-core
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### commondlg (static)
+
+tde_add_library( commondlg STATIC_PIC AUTOMOC
+
+ SOURCES
+ languagesettings.kcfgc
+ prefs.kcfgc
+ presettings.kcfgc
+ ProgressDlgForm.ui
+ generaloptionsbase.ui
+ viewoptionsbase.ui
+ pasteoptionsbase.ui
+ blockoptionsbase.ui
+ groupoptionsbase.ui
+ languageoptionsbase.ui
+ queryoptionsbase.ui
+ thresholdoptionsbase.ui
+ ProgressDlg.cpp
+ kvoctrainprefs.cpp
+ generaloptions.cpp
+ viewoptions.cpp
+ pasteoptions.cpp
+ blockoptions.cpp
+ groupoptions.cpp
+ languageoptions.cpp
+ queryoptions.cpp
+ thresholdoptions.cpp
+ profilesdialog.cpp
+)
+
+
+##### other data
+
+install(
+ FILES
+ kvoctrain.kcfg
+ languagesettings.kcfg
+ presettings.kcfg
+
+ DESTINATION ${KCFG_INSTALL_DIR}
+)
diff --git a/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui
index 48897be5..7d430017 100644
--- a/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui
@@ -183,7 +183,7 @@
</connection>
</connections>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
</UI>
diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui
index 59d4b034..070f3308 100644
--- a/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui
@@ -345,8 +345,7 @@
<tabstop>b_lang_iso1</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kcombobox.h</includehint>
- <includehint>kcombobox.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
</UI>
diff --git a/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui
index 2524dc71..b975c132 100644
--- a/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui
@@ -208,7 +208,7 @@
<tabstop>DownButton</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kcombobox.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
</UI>
diff --git a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h
index 292e7b82..6f00c0d3 100644
--- a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h
+++ b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h
@@ -31,7 +31,7 @@
class QueryManager;
class GroupOptions;
-class SettingsProfile
+class KDE_EXPORT SettingsProfile
{
public:
SettingsProfile();
@@ -43,7 +43,7 @@ public:
TQString block_set;
};
-class ProfilesDialog : public KDialogBase
+class KDE_EXPORT ProfilesDialog : public KDialogBase
{
Q_OBJECT
diff --git a/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui
index 73da961e..ef9221c5 100644
--- a/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui
@@ -564,10 +564,7 @@
<tabstop>kcfg_IKnow</tabstop>
</tabstops>
<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/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui
index 1891c80d..7e77e918 100644
--- a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui
@@ -519,18 +519,7 @@
</tabstops>
<includes>
<include location="global" impldecl="in declaration">kcolorbutton.h</include>
+ <include location="global" impldecl="in implementation">tdefontrequester.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>tdefontrequester.h</includehint>
- <includehint>tdefontrequester.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>
</UI>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/CMakeLists.txt b/kvoctrain/kvoctrain/docprop-dialogs/CMakeLists.txt
new file mode 100644
index 00000000..fd007452
--- /dev/null
+++ b/kvoctrain/kvoctrain/docprop-dialogs/CMakeLists.txt
@@ -0,0 +1,41 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/kvoctrain/kvoctrain/kvt-core
+ ${CMAKE_BINARY_DIR}/kvoctrain/kvoctrain/common-dialogs
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### docpropdlg (static)
+
+tde_add_library( docpropdlg STATIC_PIC AUTOMOC
+
+ SOURCES
+ TitlePageForm.ui
+ TypeOptPageForm.ui
+ TenseOptPageForm.ui
+ UsageOptPageForm.ui
+ LessOptPageForm.ui
+ DocOptionsPageForm.ui
+ LangPropPageForm.ui
+ TitlePage.cpp
+ TypeOptPage.cpp
+ TenseOptPage.cpp
+ UsageOptPage.cpp
+ LessOptPage.cpp
+ DocOptionsPage.cpp
+ LangPropPage.cpp
+ DocPropDlg.cpp
+ DocPropLangDlg.cpp
+
+ DEPENDENCIES
+ commondlg-static
+)
diff --git a/kvoctrain/kvoctrain/entry-dialogs/CMakeLists.txt b/kvoctrain/kvoctrain/entry-dialogs/CMakeLists.txt
new file mode 100644
index 00000000..ccab8469
--- /dev/null
+++ b/kvoctrain/kvoctrain/entry-dialogs/CMakeLists.txt
@@ -0,0 +1,44 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/kvoctrain/kvoctrain/kvt-core
+ ${CMAKE_SOURCE_DIR}/kvoctrain/kvoctrain/docprop-dialogs
+ ${CMAKE_BINARY_DIR}/kvoctrain/kvoctrain/common-dialogs
+ ${CMAKE_BINARY_DIR}/kvoctrain/kvoctrain/docprop-dialogs
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### entrydlg (static)
+
+tde_add_library( entrydlg STATIC_PIC AUTOMOC
+
+ SOURCES
+ FromToEntryPageForm.ui
+ CommonEntryPageForm.ui
+ AuxInfoEntryPageForm.ui
+ TenseEntryPageForm.ui
+ AdjEntryPageForm.ui
+ MCEntryPageForm.ui
+ PhoneticEntryPage.cpp
+ FromToEntryPage.cpp
+ CommonEntryPage.cpp
+ AuxInfoEntryPage.cpp
+ TenseEntryPage.cpp
+ AdjEntryPage.cpp
+ MCEntryPage.cpp
+ EntryDlg.cpp
+ MySpinBox.cpp
+ blockall.cpp
+
+ DEPENDENCIES
+ commondlg-static
+ docpropdlg-static
+)
diff --git a/kvoctrain/kvoctrain/examples/CMakeLists.txt b/kvoctrain/kvoctrain/examples/CMakeLists.txt
new file mode 100644
index 00000000..232b0500
--- /dev/null
+++ b/kvoctrain/kvoctrain/examples/CMakeLists.txt
@@ -0,0 +1,4 @@
+install(
+ FILES sample-de.kvtml sample-en.kvtml
+ DESTINATION ${DATA_INSTALL_DIR}/kvoctrain/examples
+)
diff --git a/kvoctrain/kvoctrain/kvt-core/CMakeLists.txt b/kvoctrain/kvoctrain/kvt-core/CMakeLists.txt
new file mode 100644
index 00000000..afdd7725
--- /dev/null
+++ b/kvoctrain/kvoctrain/kvt-core/CMakeLists.txt
@@ -0,0 +1,57 @@
+add_subdirectory( kvt-xml )
+
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_CURRENT_SOURCE_DIR}/kvt-xml
+ ${CMAKE_SOURCE_DIR}/kvoctrain/kvoctrain
+ ${CMAKE_BINARY_DIR}/kvoctrain/kvoctrain/common-dialogs
+
+
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### kvoctraincore (shared)
+
+tde_add_library( kvoctraincore SHARED AUTOMOC
+
+ SOURCES
+ langset.cpp
+ LineList.cpp
+ kvoctrainexpr.cpp
+ kvoctraindoc.cpp
+ kvd_rh_kvtml.cpp
+ kvd_rb_kvtml1.cpp
+ kvd_rb_kvtml2.cpp
+ kvd_wkvtml.cpp
+ kvd_csv.cpp
+ kvd_lex.cpp
+ kvd_vcb.cpp
+ UsageManager.cpp
+ QueryManager.cpp
+ MultipleChoice.cpp
+ grammarmanager.cpp
+ kvd_voc.cpp
+ LINK
+ tdecore-shared
+ tdeio-shared
+ tdeui-shared
+ kvtxml-static
+ commondlg-static
+
+ DEPENDENCIES
+ kvtxml-static
+ commondlg-static
+
+ VERSION 0.0.0
+
+ DESTINATION ${LIB_INSTALL_DIR}
+)
diff --git a/kvoctrain/kvoctrain/kvt-core/LineList.h b/kvoctrain/kvoctrain/kvt-core/LineList.h
index 028c9e64..a0bb1b24 100644
--- a/kvoctrain/kvoctrain/kvt-core/LineList.h
+++ b/kvoctrain/kvoctrain/kvt-core/LineList.h
@@ -28,11 +28,12 @@
#define LineList_h
#include <tqstring.h>
+#include <kdemacros.h>
#include <vector>
using namespace std;
-class LineList {
+class KDE_EXPORT LineList {
public:
LineList (const TQString &multilines = "");
diff --git a/kvoctrain/kvoctrain/kvt-core/MultipleChoice.h b/kvoctrain/kvoctrain/kvt-core/MultipleChoice.h
index 4d7fd029..c1fddd8c 100644
--- a/kvoctrain/kvoctrain/kvt-core/MultipleChoice.h
+++ b/kvoctrain/kvoctrain/kvt-core/MultipleChoice.h
@@ -28,10 +28,11 @@
#define MultipleChoice_included
#include <tqstring.h>
+#include <kdemacros.h>
#define MAX_MULTIPLE_CHOICE 5 // select one out of x
-class MultipleChoice
+class KDE_EXPORT MultipleChoice
{
public:
diff --git a/kvoctrain/kvoctrain/kvt-core/QueryManager.h b/kvoctrain/kvoctrain/kvt-core/QueryManager.h
index 52019689..4c2f2175 100644
--- a/kvoctrain/kvoctrain/kvt-core/QueryManager.h
+++ b/kvoctrain/kvoctrain/kvt-core/QueryManager.h
@@ -105,7 +105,7 @@ struct QueryEntryRef {
typedef vector<vector<QueryEntryRef> > QuerySelection;
-class QueryManager
+class KDE_EXPORT QueryManager
{
public:
// donīt change the order/remove one of these,
diff --git a/kvoctrain/kvoctrain/kvt-core/UsageManager.h b/kvoctrain/kvoctrain/kvt-core/UsageManager.h
index 23dec781..522c4ae8 100644
--- a/kvoctrain/kvoctrain/kvt-core/UsageManager.h
+++ b/kvoctrain/kvoctrain/kvt-core/UsageManager.h
@@ -108,7 +108,7 @@ struct UsageRelation
};
-class UsageManager
+class KDE_EXPORT UsageManager
{
public:
diff --git a/kvoctrain/kvoctrain/kvt-core/grammarmanager.h b/kvoctrain/kvoctrain/kvt-core/grammarmanager.h
index 01f020b9..c37b0dbb 100644
--- a/kvoctrain/kvoctrain/kvt-core/grammarmanager.h
+++ b/kvoctrain/kvoctrain/kvt-core/grammarmanager.h
@@ -28,6 +28,7 @@
#define grammarmanager_included
#include <tqstring.h>
+#include <kdemacros.h>
#include <vector>
using namespace std;
@@ -46,7 +47,7 @@ using namespace std;
#define UL_USER_TENSE "#" // designates number of user tense
-class Article
+class KDE_EXPORT Article
{
public:
@@ -75,7 +76,7 @@ protected:
};
-class Comparison
+class KDE_EXPORT Comparison
{
public:
@@ -105,7 +106,7 @@ protected:
};
-class TenseRelation
+class KDE_EXPORT TenseRelation
{
public:
@@ -121,7 +122,7 @@ class TenseRelation
};
-class Conjugation
+class KDE_EXPORT Conjugation
{
public:
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
index 3d3ed9bd..067fe6bd 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
@@ -33,7 +33,7 @@
#include <algorithm>
using namespace std;
-vector<int> getCsvOrderStatic(kvoctrainDoc *doc)
+KDE_EXPORT vector<int> getCsvOrderStatic(kvoctrainDoc *doc)
{
vector<int> csv_order;
TQStringList lang_order = Prefs::pasteOrder();
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h
index d92f6524..59c57986 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h
@@ -250,7 +250,7 @@ class MultipleChoice;
* This class contains the expressions of your vocabulary
************************************************************/
-class kvoctrainDoc : public TQObject
+class KDE_EXPORT kvoctrainDoc : public TQObject
{
Q_OBJECT
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h
index 42e47edc..72ff266f 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h
@@ -71,7 +71,7 @@ typedef unsigned short count_t;
* translations
**************************************************************/
-class kvoctrainExpr
+class KDE_EXPORT kvoctrainExpr
{
public:
diff --git a/kvoctrain/kvoctrain/kvt-core/kvt-xml/CMakeLists.txt b/kvoctrain/kvoctrain/kvt-core/kvt-xml/CMakeLists.txt
new file mode 100644
index 00000000..96199a4d
--- /dev/null
+++ b/kvoctrain/kvoctrain/kvt-core/kvt-xml/CMakeLists.txt
@@ -0,0 +1,25 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/kvoctrain/kvoctrain
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### kvtxml (static)
+
+tde_add_library( kvtxml STATIC_PIC AUTOMOC
+
+ SOURCES
+ XmlReader.cpp
+ XmlTokenizer.cpp
+ XmlElement.cpp
+ XmlWriter.cpp
+)
diff --git a/kvoctrain/kvoctrain/kvt-core/langset.h b/kvoctrain/kvoctrain/kvt-core/langset.h
index ac4e8ace..26935408 100644
--- a/kvoctrain/kvoctrain/kvt-core/langset.h
+++ b/kvoctrain/kvoctrain/kvt-core/langset.h
@@ -33,9 +33,10 @@
using namespace std;
#include <tqstring.h>
+#include <kdemacros.h>
-class LangSet
+class KDE_EXPORT LangSet
{
public:
diff --git a/kvoctrain/kvoctrain/pics/CMakeLists.txt b/kvoctrain/kvoctrain/pics/CMakeLists.txt
new file mode 100644
index 00000000..499ad4fc
--- /dev/null
+++ b/kvoctrain/kvoctrain/pics/CMakeLists.txt
@@ -0,0 +1,3 @@
+tde_install_icons( kvoctrain )
+
+tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kvoctrain/icons )
diff --git a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui
index d6197ea0..fc6176f5 100644
--- a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui
@@ -337,8 +337,7 @@
<tabstop>dont_know</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kprogress.h</includehint>
- <includehint>kprogress.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kprogress.h</include>
+</includes>
</UI>
diff --git a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui
index def5f384..18d895e6 100644
--- a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui
@@ -340,8 +340,7 @@
<tabstop>dont_know</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kprogress.h</includehint>
- <includehint>kprogress.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kprogress.h</include>
+</includes>
</UI>
diff --git a/kvoctrain/kvoctrain/query-dialogs/CMakeLists.txt b/kvoctrain/kvoctrain/query-dialogs/CMakeLists.txt
new file mode 100644
index 00000000..506b5531
--- /dev/null
+++ b/kvoctrain/kvoctrain/query-dialogs/CMakeLists.txt
@@ -0,0 +1,39 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/kvoctrain/kvoctrain/kvt-core
+ ${CMAKE_SOURCE_DIR}/kvoctrain/kvoctrain
+ ${CMAKE_BINARY_DIR}/kvoctrain/kvoctrain/common-dialogs
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### querydlg (static)
+
+tde_add_library( querydlg STATIC_PIC AUTOMOC
+
+ SOURCES
+ MCQueryDlgForm.ui
+ RandomQueryDlgForm.ui
+ SimpleQueryDlgForm.ui
+ VerbQueryDlgForm.ui
+ AdjQueryDlgForm.ui
+ ArtQueryDlgForm.ui
+ QueryDlgBase.cpp
+ MCQueryDlg.cpp
+ RandomQueryDlg.cpp
+ SimpleQueryDlg.cpp
+ VerbQueryDlg.cpp
+ AdjQueryDlg.cpp
+ ArtQueryDlg.cpp
+
+ DEPENDENCIES
+ commondlg-static
+)
diff --git a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui
index 4a46ac77..28c42351 100644
--- a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui
@@ -437,8 +437,7 @@
<tabstop>dont_know</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kprogress.h</includehint>
- <includehint>kprogress.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kprogress.h</include>
+</includes>
</UI>
diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui
index 7b35a6c2..980a1bf9 100644
--- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui
@@ -411,8 +411,7 @@
<tabstop>dont_know</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kprogress.h</includehint>
- <includehint>kprogress.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kprogress.h</include>
+</includes>
</UI>
diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui
index c20cd142..dbac2575 100644
--- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui
@@ -341,8 +341,7 @@
<tabstop>dont_know</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kprogress.h</includehint>
- <includehint>kprogress.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kprogress.h</include>
+</includes>
</UI>
diff --git a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui
index 7e28115d..9cbf332b 100644
--- a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui
@@ -542,8 +542,7 @@
<tabstop>dont_know</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kprogress.h</includehint>
- <includehint>kprogress.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kprogress.h</include>
+</includes>
</UI>
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/CMakeLists.txt b/kvoctrain/kvoctrain/statistik-dialogs/CMakeLists.txt
new file mode 100644
index 00000000..fb54592e
--- /dev/null
+++ b/kvoctrain/kvoctrain/statistik-dialogs/CMakeLists.txt
@@ -0,0 +1,30 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/kvoctrain/kvoctrain/kvt-core
+ ${CMAKE_BINARY_DIR}/kvoctrain/kvoctrain/common-dialogs
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### statdlg (static)
+
+tde_add_library( statdlg STATIC_PIC AUTOMOC
+
+ SOURCES
+ StatistikPageForm.ui
+ GenStatPageForm.ui
+ StatistikPage.cpp
+ GenStatPage.cpp
+ StatistikDlg.cpp
+
+ DEPENDENCIES
+ commondlg-static
+)
diff --git a/kvoctrain/kvoctrain/tools/CMakeLists.txt b/kvoctrain/kvoctrain/tools/CMakeLists.txt
new file mode 100644
index 00000000..fbe46907
--- /dev/null
+++ b/kvoctrain/kvoctrain/tools/CMakeLists.txt
@@ -0,0 +1,25 @@
+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}
+)
+
+
+##### extractlang (executable)
+
+tde_add_executable( extractlang AUTOMOC
+
+ SOURCES
+ extractlang.cpp
+ LINK
+ tdecore-shared
+
+ DESTINATION ${BIN_INSTALL_DIR}
+)