From 7327bdf7579cb4a2ae45de262290396b2b13c800 Mon Sep 17 00:00:00 2001 From: Jeremy Paul Whiting Date: Sun, 5 Aug 2007 20:51:41 +0000 Subject: [PATCH] moved kdeeducore to keduvocdocument, since thats what its about anyway svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=696754 --- CMakeLists.txt | 2 +- {kdeeducore => keduvocdocument}/CMakeLists.txt | 12 ++++++------ .../keduvoccsvreader.cpp | 0 {kdeeducore => keduvocdocument}/keduvoccsvreader.h | 0 .../keduvoccsvwriter.cpp | 0 {kdeeducore => keduvocdocument}/keduvoccsvwriter.h | 0 .../keduvocdocument.cpp | 0 {kdeeducore => keduvocdocument}/keduvocdocument.h | 2 +- .../keduvocexpression.cpp | 0 .../keduvocexpression.h | 2 +- {kdeeducore => keduvocdocument}/keduvocgrade.cpp | 0 {kdeeducore => keduvocdocument}/keduvocgrade.h | 2 +- {kdeeducore => keduvocdocument}/keduvocgrammar.cpp | 0 {kdeeducore => keduvocdocument}/keduvocgrammar.h | 8 ++++---- .../keduvockvtml2reader.cpp | 0 .../keduvockvtml2reader.h | 0 .../keduvockvtml2writer.cpp | 0 .../keduvockvtml2writer.h | 0 .../keduvockvtmlreader.cpp | 0 .../keduvockvtmlreader.h | 0 .../keduvockvtmlwriter.cpp | 0 .../keduvockvtmlwriter.h | 0 .../keduvocmultiplechoice.cpp | 0 .../keduvocmultiplechoice.h | 2 +- .../keduvocpaukerreader.cpp | 0 .../keduvocpaukerreader.h | 0 .../keduvoctranslation.cpp | 0 .../keduvoctranslation.h | 2 +- .../keduvocvokabelnreader.cpp | 0 .../keduvocvokabelnreader.h | 0 .../keduvocwqlreader.cpp | 0 {kdeeducore => keduvocdocument}/keduvocwqlreader.h | 0 .../keduvocxdxfreader.cpp | 0 .../keduvocxdxfreader.h | 0 {kdeeducore => keduvocdocument}/kvtml2.dtd | 0 {kdeeducore => keduvocdocument}/kvtml2defs.h | 0 {kdeeducore => keduvocdocument}/kvtml2todo | 0 .../kvtml_empty_sample.kvtml | 0 {kdeeducore => keduvocdocument}/kvtmldefs.h | 0 {kdeeducore => keduvocdocument}/leitnerbox.cpp | 0 {kdeeducore => keduvocdocument}/leitnerbox.h | 2 +- {kdeeducore => keduvocdocument}/leitnersystem.cpp | 0 {kdeeducore => keduvocdocument}/leitnersystem.h | 2 +- .../leitnersystemview.cpp | 0 .../leitnersystemview.h | 2 +- .../libkdeedu_core_export.h | 14 +++++++------- {kdeeducore => keduvocdocument}/prefleitner.cpp | 0 {kdeeducore => keduvocdocument}/prefleitner.h | 2 +- {kdeeducore => keduvocdocument}/prefleitnerbase.ui | 0 .../sharedkvtmlfiles.cpp | 0 {kdeeducore => keduvocdocument}/sharedkvtmlfiles.h | 10 +++++----- .../tests/CMakeLists.txt | 2 +- .../tests/converter.cpp | 0 {kdeeducore => keduvocdocument}/tests/loader.cpp | 0 54 files changed, 33 insertions(+), 33 deletions(-) rename {kdeeducore => keduvocdocument}/CMakeLists.txt (70%) rename {kdeeducore => keduvocdocument}/keduvoccsvreader.cpp (100%) rename {kdeeducore => keduvocdocument}/keduvoccsvreader.h (100%) rename {kdeeducore => keduvocdocument}/keduvoccsvwriter.cpp (100%) rename {kdeeducore => keduvocdocument}/keduvoccsvwriter.h (100%) rename {kdeeducore => keduvocdocument}/keduvocdocument.cpp (100%) rename {kdeeducore => keduvocdocument}/keduvocdocument.h (99%) rename {kdeeducore => keduvocdocument}/keduvocexpression.cpp (100%) rename {kdeeducore => keduvocdocument}/keduvocexpression.h (99%) rename {kdeeducore => keduvocdocument}/keduvocgrade.cpp (100%) rename {kdeeducore => keduvocdocument}/keduvocgrade.h (99%) rename {kdeeducore => keduvocdocument}/keduvocgrammar.cpp (100%) rename {kdeeducore => keduvocdocument}/keduvocgrammar.h (97%) rename {kdeeducore => keduvocdocument}/keduvockvtml2reader.cpp (100%) rename {kdeeducore => keduvocdocument}/keduvockvtml2reader.h (100%) rename {kdeeducore => keduvocdocument}/keduvockvtml2writer.cpp (100%) rename {kdeeducore => keduvocdocument}/keduvockvtml2writer.h (100%) rename {kdeeducore => keduvocdocument}/keduvockvtmlreader.cpp (100%) rename {kdeeducore => keduvocdocument}/keduvockvtmlreader.h (100%) rename {kdeeducore => keduvocdocument}/keduvockvtmlwriter.cpp (100%) rename {kdeeducore => keduvocdocument}/keduvockvtmlwriter.h (100%) rename {kdeeducore => keduvocdocument}/keduvocmultiplechoice.cpp (100%) rename {kdeeducore => keduvocdocument}/keduvocmultiplechoice.h (97%) rename {kdeeducore => keduvocdocument}/keduvocpaukerreader.cpp (100%) rename {kdeeducore => keduvocdocument}/keduvocpaukerreader.h (100%) rename {kdeeducore => keduvocdocument}/keduvoctranslation.cpp (100%) rename {kdeeducore => keduvocdocument}/keduvoctranslation.h (99%) rename {kdeeducore => keduvocdocument}/keduvocvokabelnreader.cpp (100%) rename {kdeeducore => keduvocdocument}/keduvocvokabelnreader.h (100%) rename {kdeeducore => keduvocdocument}/keduvocwqlreader.cpp (100%) rename {kdeeducore => keduvocdocument}/keduvocwqlreader.h (100%) rename {kdeeducore => keduvocdocument}/keduvocxdxfreader.cpp (100%) rename {kdeeducore => keduvocdocument}/keduvocxdxfreader.h (100%) rename {kdeeducore => keduvocdocument}/kvtml2.dtd (100%) rename {kdeeducore => keduvocdocument}/kvtml2defs.h (100%) rename {kdeeducore => keduvocdocument}/kvtml2todo (100%) rename {kdeeducore => keduvocdocument}/kvtml_empty_sample.kvtml (100%) rename {kdeeducore => keduvocdocument}/kvtmldefs.h (100%) rename {kdeeducore => keduvocdocument}/leitnerbox.cpp (100%) rename {kdeeducore => keduvocdocument}/leitnerbox.h (98%) rename {kdeeducore => keduvocdocument}/leitnersystem.cpp (100%) rename {kdeeducore => keduvocdocument}/leitnersystem.h (99%) rename {kdeeducore => keduvocdocument}/leitnersystemview.cpp (100%) rename {kdeeducore => keduvocdocument}/leitnersystemview.h (97%) rename {kdeeducore => keduvocdocument}/libkdeedu_core_export.h (79%) rename {kdeeducore => keduvocdocument}/prefleitner.cpp (100%) rename {kdeeducore => keduvocdocument}/prefleitner.h (98%) rename {kdeeducore => keduvocdocument}/prefleitnerbase.ui (100%) rename {kdeeducore => keduvocdocument}/sharedkvtmlfiles.cpp (100%) rename {kdeeducore => keduvocdocument}/sharedkvtmlfiles.h (85%) rename {kdeeducore => keduvocdocument}/tests/CMakeLists.txt (71%) rename {kdeeducore => keduvocdocument}/tests/converter.cpp (100%) rename {kdeeducore => keduvocdocument}/tests/loader.cpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 120e4b2..77cba9f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ project(libkdeedu) -add_subdirectory(kdeeducore) +add_subdirectory(keduvocdocument) add_subdirectory(kdeeduui) add_subdirectory(extdate) add_subdirectory(libscience) diff --git a/kdeeducore/CMakeLists.txt b/keduvocdocument/CMakeLists.txt similarity index 70% rename from kdeeducore/CMakeLists.txt rename to keduvocdocument/CMakeLists.txt index acd25a8..d6aeb7d 100644 --- a/kdeeducore/CMakeLists.txt +++ b/keduvocdocument/CMakeLists.txt @@ -2,7 +2,7 @@ add_subdirectory(tests) ########### next target ############### -set(kdeeducore_LIB_SRCS +set(keduvocdocument_LIB_SRCS keduvoccsvreader.cpp keduvoccsvwriter.cpp keduvocdocument.cpp @@ -26,16 +26,16 @@ set(kdeeducore_LIB_SRCS prefleitner.cpp ) -kde4_add_ui_files(kdeeducore_LIB_SRCS +kde4_add_ui_files(keduvocdocument_LIB_SRCS prefleitnerbase.ui ) -kde4_add_library(kdeeducore SHARED ${kdeeducore_LIB_SRCS}) +kde4_add_library(keduvocdocument SHARED ${keduvocdocument_LIB_SRCS}) -target_link_libraries(kdeeducore ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY}) +target_link_libraries(keduvocdocument ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY}) -set_target_properties(kdeeducore PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) -install(TARGETS kdeeducore DESTINATION ${LIB_INSTALL_DIR} ) +set_target_properties(keduvocdocument PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) +install(TARGETS keduvocdocument DESTINATION ${LIB_INSTALL_DIR} ) ########### install files ############### diff --git a/kdeeducore/keduvoccsvreader.cpp b/keduvocdocument/keduvoccsvreader.cpp similarity index 100% rename from kdeeducore/keduvoccsvreader.cpp rename to keduvocdocument/keduvoccsvreader.cpp diff --git a/kdeeducore/keduvoccsvreader.h b/keduvocdocument/keduvoccsvreader.h similarity index 100% rename from kdeeducore/keduvoccsvreader.h rename to keduvocdocument/keduvoccsvreader.h diff --git a/kdeeducore/keduvoccsvwriter.cpp b/keduvocdocument/keduvoccsvwriter.cpp similarity index 100% rename from kdeeducore/keduvoccsvwriter.cpp rename to keduvocdocument/keduvoccsvwriter.cpp diff --git a/kdeeducore/keduvoccsvwriter.h b/keduvocdocument/keduvoccsvwriter.h similarity index 100% rename from kdeeducore/keduvoccsvwriter.h rename to keduvocdocument/keduvoccsvwriter.h diff --git a/kdeeducore/keduvocdocument.cpp b/keduvocdocument/keduvocdocument.cpp similarity index 100% rename from kdeeducore/keduvocdocument.cpp rename to keduvocdocument/keduvocdocument.cpp diff --git a/kdeeducore/keduvocdocument.h b/keduvocdocument/keduvocdocument.h similarity index 99% rename from kdeeducore/keduvocdocument.h rename to keduvocdocument/keduvocdocument.h index 42cc38e..c8be198 100644 --- a/kdeeducore/keduvocdocument.h +++ b/keduvocdocument/keduvocdocument.h @@ -44,7 +44,7 @@ class LeitnerSystem; * This class contains the expressions of your vocabulary * as well as other information about the vocabulary */ -class KDEEDUCORE_EXPORT KEduVocDocument : public QObject +class KEDUVOCDOCUMENT_EXPORT KEduVocDocument : public QObject { Q_OBJECT public: diff --git a/kdeeducore/keduvocexpression.cpp b/keduvocdocument/keduvocexpression.cpp similarity index 100% rename from kdeeducore/keduvocexpression.cpp rename to keduvocdocument/keduvocexpression.cpp diff --git a/kdeeducore/keduvocexpression.h b/keduvocdocument/keduvocexpression.h similarity index 99% rename from kdeeducore/keduvocexpression.h rename to keduvocdocument/keduvocexpression.h index d262616..af9df35 100644 --- a/kdeeducore/keduvocexpression.h +++ b/keduvocdocument/keduvocexpression.h @@ -30,7 +30,7 @@ This class contains one vocabulary expression as an original with one or more translations */ -class KDEEDUCORE_EXPORT KEduVocExpression +class KEDUVOCDOCUMENT_EXPORT KEduVocExpression { public: diff --git a/kdeeducore/keduvocgrade.cpp b/keduvocdocument/keduvocgrade.cpp similarity index 100% rename from kdeeducore/keduvocgrade.cpp rename to keduvocdocument/keduvocgrade.cpp diff --git a/kdeeducore/keduvocgrade.h b/keduvocdocument/keduvocgrade.h similarity index 99% rename from kdeeducore/keduvocgrade.h rename to keduvocdocument/keduvocgrade.h index a3018cd..fb869d3 100644 --- a/kdeeducore/keduvocgrade.h +++ b/keduvocdocument/keduvocgrade.h @@ -58,7 +58,7 @@ Contains grading information (query date, bad count) for one language with respe @author Frederik Gladhorn */ -class KDEEDUCORE_EXPORT KEduVocGrade +class KEDUVOCDOCUMENT_EXPORT KEduVocGrade { public: KEduVocGrade(); diff --git a/kdeeducore/keduvocgrammar.cpp b/keduvocdocument/keduvocgrammar.cpp similarity index 100% rename from kdeeducore/keduvocgrammar.cpp rename to keduvocdocument/keduvocgrammar.cpp diff --git a/kdeeducore/keduvocgrammar.h b/keduvocdocument/keduvocgrammar.h similarity index 97% rename from kdeeducore/keduvocgrammar.h rename to keduvocdocument/keduvocgrammar.h index 8721404..9b1800c 100644 --- a/kdeeducore/keduvocgrammar.h +++ b/keduvocdocument/keduvocgrammar.h @@ -49,7 +49,7 @@ * * It contains all available articles of the language as QString */ -class KDEEDUCORE_EXPORT KEduVocArticle +class KEDUVOCDOCUMENT_EXPORT KEduVocArticle { public: @@ -113,7 +113,7 @@ private: }; -class KDEEDUCORE_EXPORT KEduVocComparison +class KEDUVOCDOCUMENT_EXPORT KEduVocComparison { public: @@ -160,7 +160,7 @@ private: }; -class KDEEDUCORE_EXPORT KEduVocTenseRelation +class KEDUVOCDOCUMENT_EXPORT KEduVocTenseRelation { public: /** default constructor */ @@ -183,7 +183,7 @@ private: /** * The conjugation of a verb */ -class KDEEDUCORE_EXPORT KEduVocConjugation +class KEDUVOCDOCUMENT_EXPORT KEduVocConjugation { public: diff --git a/kdeeducore/keduvockvtml2reader.cpp b/keduvocdocument/keduvockvtml2reader.cpp similarity index 100% rename from kdeeducore/keduvockvtml2reader.cpp rename to keduvocdocument/keduvockvtml2reader.cpp diff --git a/kdeeducore/keduvockvtml2reader.h b/keduvocdocument/keduvockvtml2reader.h similarity index 100% rename from kdeeducore/keduvockvtml2reader.h rename to keduvocdocument/keduvockvtml2reader.h diff --git a/kdeeducore/keduvockvtml2writer.cpp b/keduvocdocument/keduvockvtml2writer.cpp similarity index 100% rename from kdeeducore/keduvockvtml2writer.cpp rename to keduvocdocument/keduvockvtml2writer.cpp diff --git a/kdeeducore/keduvockvtml2writer.h b/keduvocdocument/keduvockvtml2writer.h similarity index 100% rename from kdeeducore/keduvockvtml2writer.h rename to keduvocdocument/keduvockvtml2writer.h diff --git a/kdeeducore/keduvockvtmlreader.cpp b/keduvocdocument/keduvockvtmlreader.cpp similarity index 100% rename from kdeeducore/keduvockvtmlreader.cpp rename to keduvocdocument/keduvockvtmlreader.cpp diff --git a/kdeeducore/keduvockvtmlreader.h b/keduvocdocument/keduvockvtmlreader.h similarity index 100% rename from kdeeducore/keduvockvtmlreader.h rename to keduvocdocument/keduvockvtmlreader.h diff --git a/kdeeducore/keduvockvtmlwriter.cpp b/keduvocdocument/keduvockvtmlwriter.cpp similarity index 100% rename from kdeeducore/keduvockvtmlwriter.cpp rename to keduvocdocument/keduvockvtmlwriter.cpp diff --git a/kdeeducore/keduvockvtmlwriter.h b/keduvocdocument/keduvockvtmlwriter.h similarity index 100% rename from kdeeducore/keduvockvtmlwriter.h rename to keduvocdocument/keduvockvtmlwriter.h diff --git a/kdeeducore/keduvocmultiplechoice.cpp b/keduvocdocument/keduvocmultiplechoice.cpp similarity index 100% rename from kdeeducore/keduvocmultiplechoice.cpp rename to keduvocdocument/keduvocmultiplechoice.cpp diff --git a/kdeeducore/keduvocmultiplechoice.h b/keduvocdocument/keduvocmultiplechoice.h similarity index 97% rename from kdeeducore/keduvocmultiplechoice.h rename to keduvocdocument/keduvocmultiplechoice.h index 3017f72..f2fb669 100644 --- a/kdeeducore/keduvocmultiplechoice.h +++ b/keduvocdocument/keduvocmultiplechoice.h @@ -36,7 +36,7 @@ class KEduVocMultipleChoicePrivate; -class KDEEDUCORE_EXPORT KEduVocMultipleChoice +class KEDUVOCDOCUMENT_EXPORT KEduVocMultipleChoice { public: diff --git a/kdeeducore/keduvocpaukerreader.cpp b/keduvocdocument/keduvocpaukerreader.cpp similarity index 100% rename from kdeeducore/keduvocpaukerreader.cpp rename to keduvocdocument/keduvocpaukerreader.cpp diff --git a/kdeeducore/keduvocpaukerreader.h b/keduvocdocument/keduvocpaukerreader.h similarity index 100% rename from kdeeducore/keduvocpaukerreader.h rename to keduvocdocument/keduvocpaukerreader.h diff --git a/kdeeducore/keduvoctranslation.cpp b/keduvocdocument/keduvoctranslation.cpp similarity index 100% rename from kdeeducore/keduvoctranslation.cpp rename to keduvocdocument/keduvoctranslation.cpp diff --git a/kdeeducore/keduvoctranslation.h b/keduvocdocument/keduvoctranslation.h similarity index 99% rename from kdeeducore/keduvoctranslation.h rename to keduvocdocument/keduvoctranslation.h index ede9b54..07c534e 100644 --- a/kdeeducore/keduvoctranslation.h +++ b/keduvocdocument/keduvoctranslation.h @@ -32,7 +32,7 @@ @author Frederik Gladhorn */ -class KDEEDUCORE_EXPORT KEduVocTranslation +class KEDUVOCDOCUMENT_EXPORT KEduVocTranslation { public: /** diff --git a/kdeeducore/keduvocvokabelnreader.cpp b/keduvocdocument/keduvocvokabelnreader.cpp similarity index 100% rename from kdeeducore/keduvocvokabelnreader.cpp rename to keduvocdocument/keduvocvokabelnreader.cpp diff --git a/kdeeducore/keduvocvokabelnreader.h b/keduvocdocument/keduvocvokabelnreader.h similarity index 100% rename from kdeeducore/keduvocvokabelnreader.h rename to keduvocdocument/keduvocvokabelnreader.h diff --git a/kdeeducore/keduvocwqlreader.cpp b/keduvocdocument/keduvocwqlreader.cpp similarity index 100% rename from kdeeducore/keduvocwqlreader.cpp rename to keduvocdocument/keduvocwqlreader.cpp diff --git a/kdeeducore/keduvocwqlreader.h b/keduvocdocument/keduvocwqlreader.h similarity index 100% rename from kdeeducore/keduvocwqlreader.h rename to keduvocdocument/keduvocwqlreader.h diff --git a/kdeeducore/keduvocxdxfreader.cpp b/keduvocdocument/keduvocxdxfreader.cpp similarity index 100% rename from kdeeducore/keduvocxdxfreader.cpp rename to keduvocdocument/keduvocxdxfreader.cpp diff --git a/kdeeducore/keduvocxdxfreader.h b/keduvocdocument/keduvocxdxfreader.h similarity index 100% rename from kdeeducore/keduvocxdxfreader.h rename to keduvocdocument/keduvocxdxfreader.h diff --git a/kdeeducore/kvtml2.dtd b/keduvocdocument/kvtml2.dtd similarity index 100% rename from kdeeducore/kvtml2.dtd rename to keduvocdocument/kvtml2.dtd diff --git a/kdeeducore/kvtml2defs.h b/keduvocdocument/kvtml2defs.h similarity index 100% rename from kdeeducore/kvtml2defs.h rename to keduvocdocument/kvtml2defs.h diff --git a/kdeeducore/kvtml2todo b/keduvocdocument/kvtml2todo similarity index 100% rename from kdeeducore/kvtml2todo rename to keduvocdocument/kvtml2todo diff --git a/kdeeducore/kvtml_empty_sample.kvtml b/keduvocdocument/kvtml_empty_sample.kvtml similarity index 100% rename from kdeeducore/kvtml_empty_sample.kvtml rename to keduvocdocument/kvtml_empty_sample.kvtml diff --git a/kdeeducore/kvtmldefs.h b/keduvocdocument/kvtmldefs.h similarity index 100% rename from kdeeducore/kvtmldefs.h rename to keduvocdocument/kvtmldefs.h diff --git a/kdeeducore/leitnerbox.cpp b/keduvocdocument/leitnerbox.cpp similarity index 100% rename from kdeeducore/leitnerbox.cpp rename to keduvocdocument/leitnerbox.cpp diff --git a/kdeeducore/leitnerbox.h b/keduvocdocument/leitnerbox.h similarity index 98% rename from kdeeducore/leitnerbox.h rename to keduvocdocument/leitnerbox.h index 6773f87..16a12f4 100644 --- a/kdeeducore/leitnerbox.h +++ b/keduvocdocument/leitnerbox.h @@ -33,7 +33,7 @@ * cards of this LeitnerBox * @author Martin Pfeiffer */ -class KDEEDUCORE_EXPORT LeitnerBox +class KEDUVOCDOCUMENT_EXPORT LeitnerBox { public: /** diff --git a/kdeeducore/leitnersystem.cpp b/keduvocdocument/leitnersystem.cpp similarity index 100% rename from kdeeducore/leitnersystem.cpp rename to keduvocdocument/leitnersystem.cpp diff --git a/kdeeducore/leitnersystem.h b/keduvocdocument/leitnersystem.h similarity index 99% rename from kdeeducore/leitnersystem.h rename to keduvocdocument/leitnersystem.h index f0db9a0..cfa23fa 100644 --- a/kdeeducore/leitnersystem.h +++ b/keduvocdocument/leitnersystem.h @@ -30,7 +30,7 @@ @author Martin Pfeiffer */ -class KDEEDUCORE_EXPORT LeitnerSystem +class KEDUVOCDOCUMENT_EXPORT LeitnerSystem { public: /**Constructor without arguments*/ diff --git a/kdeeducore/leitnersystemview.cpp b/keduvocdocument/leitnersystemview.cpp similarity index 100% rename from kdeeducore/leitnersystemview.cpp rename to keduvocdocument/leitnersystemview.cpp diff --git a/kdeeducore/leitnersystemview.h b/keduvocdocument/leitnersystemview.h similarity index 97% rename from kdeeducore/leitnersystemview.h rename to keduvocdocument/leitnersystemview.h index 724c226..e9419a9 100644 --- a/kdeeducore/leitnersystemview.h +++ b/keduvocdocument/leitnersystemview.h @@ -32,7 +32,7 @@ class LeitnerSystem; * and add boxes within a GUI. * @author Martin Pfeiffer */ -class KDEEDUCORE_EXPORT LeitnerSystemView : public QWidget +class KEDUVOCDOCUMENT_EXPORT LeitnerSystemView : public QWidget { Q_OBJECT diff --git a/kdeeducore/libkdeedu_core_export.h b/keduvocdocument/libkdeedu_core_export.h similarity index 79% rename from kdeeducore/libkdeedu_core_export.h rename to keduvocdocument/libkdeedu_core_export.h index a3e1508..e95eead 100644 --- a/kdeeducore/libkdeedu_core_export.h +++ b/keduvocdocument/libkdeedu_core_export.h @@ -18,23 +18,23 @@ Boston, MA 02110-1301, USA. */ -#ifndef KDEEDU_CORE_EXPORT_H -#define KDEEDU_CORE_EXPORT_H +#ifndef KEDUVOCDOCUMENT_EXPORT_H +#define KEDUVOCDOCUMENT_EXPORT_H /* needed for KDE_EXPORT macros */ #include #if defined Q_OS_WIN -#ifndef KDEEDUCORE_EXPORT -# ifdef MAKE_KDEEDUCORE_LIB -# define KDEEDUCORE_EXPORT KDE_EXPORT +#ifndef KEDUVOCDOCUMENT_EXPORT +# ifdef MAKE_KEDUVOCDOCUMENT_LIB +# define KEDUVOCDOCUMENT_EXPORT KDE_EXPORT # else -# define KDEEDUCORE_EXPORT KDE_IMPORT +# define KEDUVOCDOCUMENT_EXPORT KDE_IMPORT # endif #endif #else /* UNIX */ -#define KDEEDUCORE_EXPORT KDE_EXPORT +#define KEDUVOCDOCUMENT_EXPORT KDE_EXPORT #endif #endif diff --git a/kdeeducore/prefleitner.cpp b/keduvocdocument/prefleitner.cpp similarity index 100% rename from kdeeducore/prefleitner.cpp rename to keduvocdocument/prefleitner.cpp diff --git a/kdeeducore/prefleitner.h b/keduvocdocument/prefleitner.h similarity index 98% rename from kdeeducore/prefleitner.h rename to keduvocdocument/prefleitner.h index 5ad30ee..4ce2753 100644 --- a/kdeeducore/prefleitner.h +++ b/keduvocdocument/prefleitner.h @@ -31,7 +31,7 @@ class LeitnerSystem; * This class is a dialog for configuring a LeitnerSystem * @author Martin Pfeiffer */ -class KDEEDUCORE_EXPORT PrefLeitner : public QDialog +class KEDUVOCDOCUMENT_EXPORT PrefLeitner : public QDialog { Q_OBJECT diff --git a/kdeeducore/prefleitnerbase.ui b/keduvocdocument/prefleitnerbase.ui similarity index 100% rename from kdeeducore/prefleitnerbase.ui rename to keduvocdocument/prefleitnerbase.ui diff --git a/kdeeducore/sharedkvtmlfiles.cpp b/keduvocdocument/sharedkvtmlfiles.cpp similarity index 100% rename from kdeeducore/sharedkvtmlfiles.cpp rename to keduvocdocument/sharedkvtmlfiles.cpp diff --git a/kdeeducore/sharedkvtmlfiles.h b/keduvocdocument/sharedkvtmlfiles.h similarity index 85% rename from kdeeducore/sharedkvtmlfiles.h rename to keduvocdocument/sharedkvtmlfiles.h index 9527514..ca04b11 100644 --- a/kdeeducore/sharedkvtmlfiles.h +++ b/keduvocdocument/sharedkvtmlfiles.h @@ -29,28 +29,28 @@ namespace SharedKvtmlFiles { /** get list of all languages found in any files */ - KDEEDUCORE_EXPORT QStringList languages(); + KEDUVOCDOCUMENT_EXPORT QStringList languages(); /** get list of filenames found of given language *@param language language requested QString() for all languages *@return a list of filenames with words in language */ - KDEEDUCORE_EXPORT QStringList fileNames(const QString &language = QString()); + KEDUVOCDOCUMENT_EXPORT QStringList fileNames(const QString &language = QString()); /** get the list of document titles found of a given language *@param language requested language QString() for all titles *@return a list of document titles with words in language */ - KDEEDUCORE_EXPORT QStringList titles(const QString &language = QString()); + KEDUVOCDOCUMENT_EXPORT QStringList titles(const QString &language = QString()); /** get the list of document remarts found of a given language *@param language requested language QString() for all comments *@return a list of document remarks with words in language */ - KDEEDUCORE_EXPORT QStringList comments(const QString &language = QString()); + KEDUVOCDOCUMENT_EXPORT QStringList comments(const QString &language = QString()); /** rescan the shared kvtml locations */ - KDEEDUCORE_EXPORT void rescan(); + KEDUVOCDOCUMENT_EXPORT void rescan(); } #endif diff --git a/kdeeducore/tests/CMakeLists.txt b/keduvocdocument/tests/CMakeLists.txt similarity index 71% rename from kdeeducore/tests/CMakeLists.txt rename to keduvocdocument/tests/CMakeLists.txt index c449b3e..fcd0e6f 100644 --- a/kdeeducore/tests/CMakeLists.txt +++ b/keduvocdocument/tests/CMakeLists.txt @@ -1,5 +1,5 @@ -include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/kdeeducore/ ) +include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/keduvocdocument/ ) ########### next target ############### diff --git a/kdeeducore/tests/converter.cpp b/keduvocdocument/tests/converter.cpp similarity index 100% rename from kdeeducore/tests/converter.cpp rename to keduvocdocument/tests/converter.cpp diff --git a/kdeeducore/tests/loader.cpp b/keduvocdocument/tests/loader.cpp similarity index 100% rename from kdeeducore/tests/loader.cpp rename to keduvocdocument/tests/loader.cpp -- 2.47.3