Get rid of conjugation cleanup function.

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

diff --git a/keduvocdocument/keduvocconjugation.cpp b/keduvocdocument/keduvocconjugation.cpp
index 2d6c0dc73f2395fd720f4e8e29f8b5c901d32def..da91c999022410ee5e22f9f2e5056ce154243346 100644 (file)
--- a/keduvocdocument/keduvocconjugation.cpp
+++ b/keduvocdocument/keduvocconjugation.cpp
@@ -116,45 +116,6 @@ void KEduVocConjugation::setType( int idx, const QString & type )
 }
 
 
-void KEduVocConjugation::cleanUp()
-{
-    for ( int i = d->m_conjugations.count() - 1; i >= 0; i-- ) {
-        const Private::conjug_t *ctp = &d->m_conjugations[i];
-        if ( ctp->pers1_sing.simplified().isEmpty()
-                && ctp->pers2_sing.simplified().isEmpty()
-                && ctp->pers3_m_sing.simplified().isEmpty()
-                && ctp->pers3_f_sing.simplified().isEmpty()
-                && ctp->pers3_n_sing.simplified().isEmpty()
-                && ctp->pers1_plur.simplified().isEmpty()
-                && ctp->pers2_plur.simplified().isEmpty()
-                && ctp->pers3_m_plur.simplified().isEmpty()
-                && ctp->pers3_f_plur.simplified().isEmpty()
-                && ctp->pers3_n_plur.simplified().isEmpty()
-           )
-            d->m_conjugations.removeAt( i );
-    }
-}
-
-
-bool KEduVocConjugation::isEmpty( int idx )
-{
-    if ( idx < d->m_conjugations.count() ) {
-        const Private::conjug_t *ctp = &d->m_conjugations[idx];
-        return ctp->pers1_sing.simplified().isEmpty()
-               && ctp->pers2_sing.simplified().isEmpty()
-               && ctp->pers3_m_sing.simplified().isEmpty()
-               && ctp->pers3_f_sing.simplified().isEmpty()
-               && ctp->pers3_n_sing.simplified().isEmpty()
-               && ctp->pers1_plur.simplified().isEmpty()
-               && ctp->pers2_plur.simplified().isEmpty()
-               && ctp->pers3_m_plur.simplified().isEmpty()
-               && ctp->pers3_f_plur.simplified().isEmpty()
-               && ctp->pers3_n_plur.simplified().isEmpty();
-    }
-    return true;
-}
-
-
 #define _GET_CON_(elem, type, default) \
    for (int i = 0; i < d->m_conjugations.size(); i++) \
      if (d->m_conjugations[i].type == type) \

diff --git a/keduvocdocument/keduvocconjugation.h b/keduvocdocument/keduvocconjugation.h
index c73fa8b527225c2f948f81cd78591db7a032536f..c4b75c8e588df0b6f7783d677cdfe9f095026dee 100644 (file)
--- a/keduvocdocument/keduvocconjugation.h
+++ b/keduvocdocument/keduvocconjugation.h
@@ -74,8 +74,6 @@ public:
 
     QString getType( int index );
     void setType( int index, const QString & type );
-    void cleanUp();
-    bool isEmpty( int idx );
 
     QString pers1Singular( const QString &type ) const;
     QString pers2Singular( const QString &type ) const;

diff --git a/keduvocdocument/keduvockvtmlwriter.cpp b/keduvocdocument/keduvockvtmlwriter.cpp
index a83872a40966b514fe11cd21439c40b3fa60cf04..dc3e31021383262032ba7cba558d9c1aabf58bdc 100644 (file)
--- a/keduvocdocument/keduvockvtmlwriter.cpp
+++ b/keduvocdocument/keduvockvtmlwriter.cpp
@@ -653,9 +653,11 @@ bool KEduVocKvtmlWriter::writeConjugEntry( QDomDocument &domDoc, QDomElement &do
  </conjugation>
 */
 {
-    curr_conjug.cleanUp();
-    if ( curr_conjug.entryCount() == 0 )
+
+//     curr_conjug.cleanUp();
+    if ( curr_conjug.entryCount() == 0 ) {
         return true;
+    }
 
     QDomElement domElementConjug = domDoc.createElement( KV_CONJUG_GRP );
     QString type;