[kde-edu]: KDE/kdeedu

[Peter Hedlund]

SVN commit 476300 by hedlund:

This moves the new KEduVocDocument class and related classes to libkdeedu/kdeeducore. Currently used by KWordQuiz, but other applications using kvtml files are encouraged to use theses classes to prevent data loss for the user when using the same vocabulary file in different programs.

All are encouraged to help refine the code and provide comments.

CCMAIL:kde-edu at kde.org

 M  +6 -11     kwordquiz/src/Makefile.am  
 D             kwordquiz/src/keduvocdocument.cpp  
 D             kwordquiz/src/keduvocdocument.h  
 D             kwordquiz/src/keduvocexpression.cpp  
 D             kwordquiz/src/keduvocexpression.h  
 D             kwordquiz/src/keduvocgrammar.cpp  
 D             kwordquiz/src/keduvocgrammar.h  
 D             kwordquiz/src/keduvockvtmlreader.cpp  
 D             kwordquiz/src/keduvockvtmlreader.h  
 D             kwordquiz/src/keduvockvtmlwriter.cpp  
 D             kwordquiz/src/keduvockvtmlwriter.h  
 D             kwordquiz/src/keduvocmultiplechoice.cpp  
 D             kwordquiz/src/keduvocmultiplechoice.h  
 D             kwordquiz/src/keduvocwqlreader.cpp  
 D             kwordquiz/src/keduvocwqlreader.h  
 D             kwordquiz/src/keduvocwqlwriter.cpp  
 D             kwordquiz/src/keduvocwqlwriter.h  
 D             kwordquiz/src/leitnerbox.cpp  
 D             kwordquiz/src/leitnerbox.h  
 D             kwordquiz/src/leitnersystem.cpp  
 D             kwordquiz/src/leitnersystem.h  
 D             kwordquiz/src/leitnersystemview.cpp  
 D             kwordquiz/src/leitnersystemview.h  
 D             kwordquiz/src/prefleitner.cpp  
 D             kwordquiz/src/prefleitner.h  
 D             kwordquiz/src/prefleitnerbase.ui  
 M  +12 -6     libkdeedu/kdeeducore/Makefile.am  
 A             libkdeedu/kdeeducore/keduvocdocument.cpp   kwordquiz/src/keduvocdocument.cpp#475901 [License: GPL (v2+)]
 A             libkdeedu/kdeeducore/keduvocdocument.h   kwordquiz/src/keduvocdocument.h#475901
 A             libkdeedu/kdeeducore/keduvocexpression.cpp   kwordquiz/src/keduvocexpression.cpp#475901
 A             libkdeedu/kdeeducore/keduvocexpression.h   kwordquiz/src/keduvocexpression.h#475901
 A             libkdeedu/kdeeducore/keduvocgrammar.cpp   kwordquiz/src/keduvocgrammar.cpp#475901
 A             libkdeedu/kdeeducore/keduvocgrammar.h   kwordquiz/src/keduvocgrammar.h#475901
 A             libkdeedu/kdeeducore/keduvockvtmlreader.cpp   kwordquiz/src/keduvockvtmlreader.cpp#475901
 A             libkdeedu/kdeeducore/keduvockvtmlreader.h   kwordquiz/src/keduvockvtmlreader.h#475901
 A             libkdeedu/kdeeducore/keduvockvtmlwriter.cpp   kwordquiz/src/keduvockvtmlwriter.cpp#475901
 A             libkdeedu/kdeeducore/keduvockvtmlwriter.h   kwordquiz/src/keduvockvtmlwriter.h#475901
 A             libkdeedu/kdeeducore/keduvocmultiplechoice.cpp   kwordquiz/src/keduvocmultiplechoice.cpp#475901
 A             libkdeedu/kdeeducore/keduvocmultiplechoice.h   kwordquiz/src/keduvocmultiplechoice.h#475901
 A             libkdeedu/kdeeducore/keduvocwqlreader.cpp   kwordquiz/src/keduvocwqlreader.cpp#475901
 A             libkdeedu/kdeeducore/keduvocwqlreader.h   kwordquiz/src/keduvocwqlreader.h#475901
 A             libkdeedu/kdeeducore/keduvocwqlwriter.cpp   kwordquiz/src/keduvocwqlwriter.cpp#475901
 A             libkdeedu/kdeeducore/keduvocwqlwriter.h   kwordquiz/src/keduvocwqlwriter.h#475901
 A             libkdeedu/kdeeducore/keduvowqlreader.cpp   kwordquiz/src/keduvocwqlreader.cpp#475901
 A             libkdeedu/kdeeducore/keduvowqlreader.h   kwordquiz/src/keduvocwqlreader.h#475901
 A             libkdeedu/kdeeducore/keduvowqlwriter.cpp   kwordquiz/src/keduvocwqlwriter.cpp#475901
 A             libkdeedu/kdeeducore/keduvowqlwriter.h   kwordquiz/src/keduvocwqlwriter.h#475901
 A             libkdeedu/kdeeducore/leitnerbox.cpp   kwordquiz/src/leitnerbox.cpp#475901
 A             libkdeedu/kdeeducore/leitnerbox.h   kwordquiz/src/leitnerbox.h#475901
 A             libkdeedu/kdeeducore/leitnersystem.cpp   kwordquiz/src/leitnersystem.cpp#475901
 A             libkdeedu/kdeeducore/leitnersystem.h   kwordquiz/src/leitnersystem.h#475901
 A             libkdeedu/kdeeducore/leitnersystemview.cpp   kwordquiz/src/leitnersystemview.cpp#475901 [License: UNKNOWN]
 A             libkdeedu/kdeeducore/leitnersystemview.h   kwordquiz/src/leitnersystemview.h#475901
 A             libkdeedu/kdeeducore/prefleitner.cpp   kwordquiz/src/prefleitner.cpp#475901
 A             libkdeedu/kdeeducore/prefleitner.h   kwordquiz/src/prefleitner.h#475901 [License: UNKNOWN]
 A             libkdeedu/kdeeducore/prefleitnerbase.ui   kwordquiz/src/prefleitnerbase.ui#475901


--- trunk/KDE/kdeedu/kwordquiz/src/Makefile.am #476299:476300
@@ -9,12 +9,9 @@
 	prefeditorbase.ui prefquizbase.ui prefeditor.cpp prefquiz.cpp dlgsortbase.ui dlgsort.cpp \
 	dlgrcbase.ui dlgrc.cpp dlgspecchar.cpp dlglanguage.cpp wqprintdialogpage.cpp \
 	prefcharacter.cpp prefcharacterbase.ui wqundo.cpp prefs.kcfgc prefcardappearance.cpp \
-	prefcardappearancebase.ui kwqnewstuff.cpp kwqnewstuff.h keduvocdocument.cpp keduvocexpression.cpp \
-	keduvockvtmlreader.cpp keduvockvtmlwriter.cpp prefleitnerbase.ui leitnersystem.cpp \
-	leitnerbox.cpp leitnersystemview.cpp prefleitner.cpp keduvocwqlwriter.cpp \
-	keduvocwqlreader.cpp keduvocgrammar.cpp keduvocmultiplechoice.cpp
-kwordquiz_LDADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \
-	$(LIBSOCKET) $(LIB_KDEPRINT) -lknewstuff
+	prefcardappearancebase.ui kwqnewstuff.cpp kwqnewstuff.h
+kwordquiz_LDADD = ../../libkdeedu/kdeeducore/libkdeeducore.la $(LIB_QT) \
+	$(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) $(LIBSOCKET) $(LIB_KDEPRINT) -lknewstuff
 
 
 EXTRA_DIST = main.cpp kwordquiz.cpp kwordquiz.h kwordquizdoc.cpp kwordquizdoc.h kwordquizview.cpp kwordquizview.h kwordquizui.rc kwordquiz.desktop kwordquizprefs.cpp kwordquizprefs.h
@@ -47,7 +44,8 @@
 # kde_designerdir     Where Qt Designer plugins should go to (new in KDE 3).
 
 # set the include path for X, qt and KDE
-INCLUDES = -I$(top_srcdir)/kwordquiz/icons $(all_includes)
+INCLUDES = -I$(top_builddir)/libkdeedu/kdeeducore \
+	-I$(srcdir)/../../libkdeedu/kdeeducore -I$(top_srcdir)/kwordquiz/icons $(all_includes)
 SUBDIRS = . pics examples
 METASOURCES = AUTO
 
@@ -69,7 +67,4 @@
 
 noinst_HEADERS = qaview.h flashview.h multipleview.h wqquiz.h wqlistitem.h \
 	wqscore.h prefeditor.h prefquiz.h dlgsort.h dlgrc.h dlgspecchar.h dlglanguage.h \
-	dlglanguage.h wqprintdialogpage.h prefcharacter.h wqundo.h prefcardappearance.h \
-	keduvocdocument.h keduvocexpression.h keduvockvtmlreader.h keduvockvtmlwriter.h \
-	leitnersystem.h leitnerbox.h prefleitner.h leitnersystemview.h keduvocwqlreader.h \
-	keduvocwqlwriter.h
+	dlglanguage.h wqprintdialogpage.h prefcharacter.h wqundo.h prefcardappearance.h
--- trunk/KDE/kdeedu/libkdeedu/kdeeducore/Makefile.am #476299:476300
@@ -1,17 +1,23 @@
-INCLUDES= $(all_includes)
+INCLUDES = $(all_includes)
 # there's nothing in tests for the moment, so I'm removing it from the compilation
 #SUBDIRS = . tests
 SUBDIRS = .
 
 lib_LTLIBRARIES = libkdeeducore.la
 
-libkdeeducore_la_SOURCES = keduvocdata.cpp
-libkdeeducore_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
+libkdeeducore_la_SOURCES = keduvocdata.cpp keduvocdocument.cpp \
+	keduvocexpression.cpp keduvocgrammar.cpp keduvockvtmlreader.cpp keduvockvtmlwriter.cpp \
+	keduvocmultiplechoice.cpp keduvowqlreader.cpp keduvowqlwriter.cpp leitnerbox.cpp \
+	leitnersystem.cpp leitnersystemview.cpp prefleitner.cpp prefleitnerbase.ui
+libkdeeducore_la_LDFLAGS = -no-undefined $(all_libraries) -version-info 3:0:2
 
-libkdeeducode_includedir = $(includedir)/libkdeedu
-libkdeeducode_include_HEADERS = keduvocdata.h
+libkdeeducore_includedir = $(includedir)/libkdeedu
+libkdeeducore_include_HEADERS = keduvocdata.h keduvocdocument.h \
+	keduvocexpression.h keduvocgrammar.h keduvockvtmlreader.h keduvockvtmlwriter.h \
+	keduvocmultiplechoice.h keduvowqlreader.h keduvowqlwriter.h leitnerbox.h leitnersystem.h \
+	leitnersystemview.h prefleitner.h
 
-libkdeeducore_la_LIBADD = $(LIB_KDECORE)
+libkdeeducore_la_LIBADD = $(LIB_KDECORE) $(LIB_KFILE)
 
 METASOURCES = AUTO