From d594eed362834450bad889b50ada138b52fe17f1 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Sat, 1 Sep 2007 09:59:20 +0000 Subject: [PATCH] Get rid of conjugation cleanup function. svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=707228 --- keduvocdocument/keduvocconjugation.cpp | 39 -------------------------- keduvocdocument/keduvocconjugation.h | 2 -- keduvocdocument/keduvockvtmlwriter.cpp | 6 ++-- 3 files changed, 4 insertions(+), 43 deletions(-) diff --git a/keduvocdocument/keduvocconjugation.cpp b/keduvocdocument/keduvocconjugation.cpp index 2d6c0dc..da91c99 100644 --- 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 c73fa8b..c4b75c8 100644 --- 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 a83872a..dc3e310 100644 --- a/keduvocdocument/keduvockvtmlwriter.cpp +++ b/keduvocdocument/keduvockvtmlwriter.cpp @@ -653,9 +653,11 @@ bool KEduVocKvtmlWriter::writeConjugEntry( QDomDocument &domDoc, QDomElement &do */ { - 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; -- 2.47.3