minor cleanup

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=1115926

diff --git a/keduvocdocument/CMakeLists.txt b/keduvocdocument/CMakeLists.txt
index bcaf2df5a1a367042c2a5a103bfae223fb114440..df3a8f3b6e644dca33222f4675121958faa3f4a8 100644 (file)
--- a/keduvocdocument/CMakeLists.txt
+++ b/keduvocdocument/CMakeLists.txt
@@ -3,60 +3,71 @@ add_subdirectory(tests)
 ########### next target ###############
 
 set(keduvocdocument_LIB_SRCS
-keduvocdocument.cpp
-   keduvocidentifier.cpp
-   keduvocexpression.cpp
-   keduvoctranslation.cpp
-   keduvoccontainer.cpp
-   keduvoclesson.cpp
-   keduvocleitnerbox.cpp
-   keduvoctext.cpp
-   keduvocarticle.cpp
-   keduvocconjugation.cpp
-   keduvocpersonalpronoun.cpp
-   keduvocdeclension.cpp
-   keduvocwordtype.cpp
-   keduvockvtmlcompability.cpp
-   keduvockvtmlreader.cpp
-   keduvockvtml2reader.cpp
-   #keduvockvtmlwriter.cpp
-   keduvockvtml2writer.cpp
-   keduvoccsvreader.cpp
-   keduvoccsvwriter.cpp
-   keduvocpaukerreader.cpp
-   keduvocvokabelnreader.cpp
-   keduvocwqlreader.cpp
-   keduvocxdxfreader.cpp
-   sharedkvtmlfiles.cpp
-    )
+    keduvocdocument.cpp
+    keduvocidentifier.cpp
+    keduvocexpression.cpp
+    keduvoctranslation.cpp
+    keduvoccontainer.cpp
+    keduvoclesson.cpp
+    keduvocleitnerbox.cpp
+    keduvoctext.cpp
+    keduvocarticle.cpp
+    keduvocconjugation.cpp
+    keduvocpersonalpronoun.cpp
+    keduvocdeclension.cpp
+    keduvocwordtype.cpp
+    keduvockvtmlcompability.cpp
+    keduvockvtmlreader.cpp
+    keduvockvtml2reader.cpp
+    keduvockvtml2writer.cpp
+    keduvoccsvreader.cpp
+    keduvoccsvwriter.cpp
+    keduvocpaukerreader.cpp
+    keduvocvokabelnreader.cpp
+    keduvocwqlreader.cpp
+    keduvocxdxfreader.cpp
+    sharedkvtmlfiles.cpp
+)
 
 kde4_add_library(keduvocdocument SHARED ${keduvocdocument_LIB_SRCS})
 
 target_link_libraries(keduvocdocument  ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY})
 
-set_target_properties(keduvocdocument PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS keduvocdocument  ${INSTALL_TARGETS_DEFAULT_ARGS})
+set_target_properties(keduvocdocument
+    PROPERTIES VERSION ${GENERIC_LIB_VERSION}
+    SOVERSION ${GENERIC_LIB_SOVERSION}
+)
+
+# if we want to set our own version instead of following kde generic
+#set(LIB_KEDUVOCDOCUMENT_VERSION "5.0.0")
+#set(LIB_KEDUVOCDOCUMENT_SOVERSION "5")
+#set_target_properties(keduvocdocument
+#    PROPERTIES VERSION ${LIB_KEDUVOCDOCUMENT_VERSION}
+#    SOVERSION ${LIB_KEDUVOCDOCUMENT_SOVERSION}
+#)
+
+install(TARGETS keduvocdocument ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 
 ########### install files ###############
 
 install(FILES
-   libkeduvocdocument_export.h
-   keduvocdocument.h
-   keduvocidentifier.h
-   keduvocexpression.h
-   keduvoctext.h
-   keduvocarticle.h
-   keduvocconjugation.h
-   keduvoclesson.h
-   keduvocleitnerbox.h
-   keduvoccontainer.h
-   keduvocwordflags.h
-   keduvocmultiplechoice.h
-   keduvoctranslation.h
-   keduvocwordtype.h
-   keduvocpersonalpronoun.h
-   sharedkvtmlfiles.h
-   DESTINATION ${INCLUDE_INSTALL_DIR}/libkdeedu  COMPONENT Devel
+    libkeduvocdocument_export.h
+    keduvocdocument.h
+    keduvocidentifier.h
+    keduvocexpression.h
+    keduvoctext.h
+    keduvocarticle.h
+    keduvocconjugation.h
+    keduvoclesson.h
+    keduvocleitnerbox.h
+    keduvoccontainer.h
+    keduvocwordflags.h
+    keduvocmultiplechoice.h
+    keduvoctranslation.h
+    keduvocwordtype.h
+    keduvocpersonalpronoun.h
+    sharedkvtmlfiles.h
+    DESTINATION ${INCLUDE_INSTALL_DIR}/libkdeedu  COMPONENT Devel
 )
 

diff --git a/keduvocdocument/keduvocconjugation.h b/keduvocdocument/keduvocconjugation.h
index c384cfe9d423aff400567c3a53604115b149f035..8777e86622c838172fad9fc52d613e173bc4d703 100644 (file)
--- a/keduvocdocument/keduvocconjugation.h
+++ b/keduvocdocument/keduvocconjugation.h
@@ -76,6 +76,5 @@ private:
 };
 
 
-
 #endif // KEDUVOCCONJUGATION_H
 

diff --git a/keduvocdocument/keduvoccontainer.cpp b/keduvocdocument/keduvoccontainer.cpp
index 6b259deee5e755ce71eb45d76a9fd040c91957c4..5bcbf1f764b47b58f8f88b2665d2e57825eee1e7 100644 (file)
--- a/keduvocdocument/keduvoccontainer.cpp
+++ b/keduvocdocument/keduvoccontainer.cpp
@@ -44,7 +44,7 @@ public:
     KUrl m_imageUrl;
 };
 
-KEduVocContainer::Private::~ Private()
+KEduVocContainer::Private::~Private()
 {
     qDeleteAll(m_childContainers);
 }

diff --git a/keduvocdocument/keduvocexpression.cpp b/keduvocdocument/keduvocexpression.cpp
index efb5fea84432b4d963cc3b0c44086649b77b6c59..343bc737174f0d33aa41f0f089d9c9e6afa2e277 100644 (file)
--- a/keduvocdocument/keduvocexpression.cpp
+++ b/keduvocdocument/keduvocexpression.cpp
@@ -70,7 +70,6 @@ bool KEduVocExpression::KEduVocExpressionPrivate::operator== ( const KEduVocExpr
         m_active == p.m_active;
 }
 
-
 KEduVocExpression::KEduVocExpression()
         : d( new KEduVocExpressionPrivate )
 {}

diff --git a/keduvocdocument/keduvockvtml2reader.cpp b/keduvocdocument/keduvockvtml2reader.cpp
index 74234ccd729d0fa1a5cdfdbc6a5fa97773edb617..df212d838069276224492c9acba7dfeed58e0190 100644 (file)
--- a/keduvocdocument/keduvockvtml2reader.cpp
+++ b/keduvocdocument/keduvockvtml2reader.cpp
@@ -334,14 +334,6 @@ bool KEduVocKvtml2Reader::readTranslation( QDomElement &translationElement,
     expr->translation(index)->fromKVTML2(translationElement);
     QDomElement currentElement;
 
-    //<falsefriend fromid="1"></falsefriend>
-    /// @todo false friends
-//     currentElement = translationElement.firstChildElement( KVTML_FALSEFRIEND );
-//     if ( !currentElement.isNull() ) {
-//         int fromid = currentElement.attribute( KVTML_FROMID ).toInt();
-//         expr->translation(index)->setFalseFriend( fromid, currentElement.text() );
-//     }
-
     // comparisons
     currentElement = translationElement.firstChildElement( KVTML_COMPARISON );
     if ( !currentElement.isNull() ) {

diff --git a/keduvocdocument/keduvocwordflags.h b/keduvocdocument/keduvocwordflags.h
index e6bb939bd35ff9b7863df0bcef05b4053c0023d9..886a8007a353d09f75972591c9b9cbc549ba94b0 100644 (file)
--- a/keduvocdocument/keduvocwordflags.h
+++ b/keduvocdocument/keduvocwordflags.h
@@ -69,10 +69,10 @@ public:
     static const Flags numbers = (Flags)(Singular | Plural | Dual);
     static const Flags cases = (Flags)(Nominative|Genitive|Dative|Accusative|Ablative|Locative|Vocative);
     static const Flags persons = (Flags)(First | Second | Third);
+
 };
 
 Q_DECLARE_FLAGS(KEduVocWordFlags, KEduVocWordFlag::Flags)
 Q_DECLARE_OPERATORS_FOR_FLAGS(KEduVocWordFlags)
 
-
 #endif