From 55e944d70a1f6a36fb32403a3cc41471e2aad555 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Sun, 21 Oct 2007 18:42:42 +0000 Subject: [PATCH] Give slightly more sane names to the grade class function. --query svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=727783 --- keduvocdocument/keduvocgrade.cpp | 40 ++++++++++++------------- keduvocdocument/keduvocgrade.h | 36 +++++++++++----------- keduvocdocument/keduvockvtml2reader.cpp | 5 ++-- keduvocdocument/keduvockvtml2writer.cpp | 6 ++-- keduvocdocument/keduvockvtmlreader.cpp | 8 ++--- keduvocdocument/keduvockvtmlwriter.cpp | 8 ++--- 6 files changed, 51 insertions(+), 52 deletions(-) diff --git a/keduvocdocument/keduvocgrade.cpp b/keduvocdocument/keduvocgrade.cpp index b5a132c..c78e850 100644 --- a/keduvocdocument/keduvocgrade.cpp +++ b/keduvocdocument/keduvocgrade.cpp @@ -19,9 +19,9 @@ class KEduVocGrade::KEduVocGradePrivate { public: grade_t m_grade; - count_t m_queryCount; + count_t m_totalPracticeCount; count_t m_badCount; - QDateTime m_queryDate; + QDateTime m_practiceDate; }; KEduVocGrade::KEduVocGrade() @@ -34,9 +34,9 @@ KEduVocGrade::KEduVocGrade( const KEduVocGrade &other ) :d( new KEduVocGradePrivate ) { setGrade( other.grade() ); - setQueryCount( other.queryCount() ); + setPracticeCount( other.practiceCount() ); setBadCount( other.badCount() ); - setQueryDate( other.queryDate() ); + setPracticeDate( other.practiceDate() ); } KEduVocGrade::~KEduVocGrade() @@ -47,12 +47,12 @@ KEduVocGrade::~KEduVocGrade() void KEduVocGrade::resetGrades() { d->m_grade = KV_NORM_GRADE; - d->m_queryCount = 0; + d->m_totalPracticeCount = 0; d->m_badCount = 0; QDateTime dt; dt.setTime_t( 0 ); - d->m_queryDate = dt; + d->m_practiceDate = dt; } @@ -86,15 +86,15 @@ void KEduVocGrade::decGrade() } -count_t KEduVocGrade::queryCount() const +count_t KEduVocGrade::practiceCount() const { - return d->m_queryCount; + return d->m_totalPracticeCount; } -void KEduVocGrade::incQueryCount() +void KEduVocGrade::incPracticeCount() { - setQueryCount( queryCount() + 1 ); + setPracticeCount( practiceCount() + 1 ); } @@ -104,9 +104,9 @@ void KEduVocGrade::incBadCount() } -void KEduVocGrade::setQueryCount( count_t count ) +void KEduVocGrade::setPracticeCount( count_t count ) { - d->m_queryCount = count; + d->m_totalPracticeCount = count; } @@ -122,23 +122,23 @@ void KEduVocGrade::setBadCount( count_t count ) } -QDateTime KEduVocGrade::queryDate() const +QDateTime KEduVocGrade::practiceDate() const { - return d->m_queryDate; + return d->m_practiceDate; } -void KEduVocGrade::setQueryDate( const QDateTime & date ) +void KEduVocGrade::setPracticeDate( const QDateTime & date ) { - d->m_queryDate = date; + d->m_practiceDate = date; } KEduVocGrade & KEduVocGrade::operator =(const KEduVocGrade & other) { d->m_grade = other.d->m_grade; - d->m_queryCount = other.d->m_queryCount; + d->m_totalPracticeCount = other.d->m_totalPracticeCount; d->m_badCount = other.d->m_badCount; - d->m_queryDate = other.d->m_queryDate; + d->m_practiceDate = other.d->m_practiceDate; return *this; } @@ -146,7 +146,7 @@ KEduVocGrade & KEduVocGrade::operator =(const KEduVocGrade & other) bool KEduVocGrade::operator ==(const KEduVocGrade & other) const { return d->m_grade == other.d->m_grade && - d->m_queryCount == other.d->m_queryCount && + d->m_totalPracticeCount == other.d->m_totalPracticeCount && d->m_badCount == other.d->m_badCount && - d->m_queryDate == other.d->m_queryDate; + d->m_practiceDate == other.d->m_practiceDate; } diff --git a/keduvocdocument/keduvocgrade.h b/keduvocdocument/keduvocgrade.h index 15d66f4..11f8f6c 100644 --- a/keduvocdocument/keduvocgrade.h +++ b/keduvocdocument/keduvocgrade.h @@ -16,11 +16,15 @@ #ifndef KEDUVOCGRADE_H #define KEDUVOCGRADE_H +#include "libkeduvocdocument_export.h" +#include + + #define KV_MAX_GRADE 7 #define KV_MIN_GRADE 0 -#define KV_NORM_GRADE 0 // not queried yet -#define KV_NORM_TEXT I18N_NOOP("Not Queried Yet") +#define KV_NORM_GRADE 0 // not practiced yet +#define KV_NORM_TEXT I18N_NOOP("Not Practiced Yet") #define KV_LEV1_GRADE 1 #define KV_LEV1_TEXT I18N_NOOP("Level 1") @@ -43,9 +47,6 @@ #define KV_LEV7_GRADE 7 #define KV_LEV7_TEXT I18N_NOOP("Level 7") -#include "libkeduvocdocument_export.h" - -#include typedef unsigned short grade_t; typedef unsigned short count_t; @@ -85,15 +86,15 @@ public: bool operator== ( const KEduVocGrade &other ) const; - /** returns query count as int - * @returns query count + /** returns how often this entry has been practiced as int + * @returns total count */ - count_t queryCount() const; + count_t practiceCount() const; - /** set query count as int + /** set how often this entry has been practiced as int * @param count the new count */ - void setQueryCount( count_t count ); + void setPracticeCount( count_t count ); /** returns bad query count as int * @returns bad query count @@ -109,7 +110,7 @@ public: void incBadCount(); /** increment query count of given translation by 1 */ - void incQueryCount(); + void incPracticeCount(); /** @@ -122,26 +123,25 @@ public: */ void setGrade( grade_t grade ); - /** returns grade of given translation as int + /** returns grade as int * @returns number of knowlegde: 0=known, x=numbers not knows */ grade_t grade() const; - /** increments grade of given translation */ + /** increments grade */ void incGrade(); - /** decrements grade of given translation */ + /** decrements grade */ void decGrade(); - /** returns last query date of given translation as int + /** returns last practice date as int */ - QDateTime queryDate() const; - + QDateTime practiceDate() const; /** Set last query date * @param date the new date */ - void setQueryDate( const QDateTime & date ); + void setPracticeDate( const QDateTime & date ); private: class KEduVocGradePrivate; diff --git a/keduvocdocument/keduvockvtml2reader.cpp b/keduvocdocument/keduvockvtml2reader.cpp index 01ef2f9..bcfa036 100644 --- a/keduvocdocument/keduvockvtml2reader.cpp +++ b/keduvocdocument/keduvockvtml2reader.cpp @@ -706,7 +706,7 @@ bool KEduVocKvtml2Reader::readGrade( QDomElement &gradeElement, KEduVocExpressio currentElement = gradeElement.firstChildElement( KVTML_COUNT ); if ( !currentElement.isNull() ) { int value = currentElement.text().toInt(); - expr.translation( index ).gradeFrom( id ).setQueryCount( value ); + expr.translation( index ).gradeFrom( id ).setPracticeCount( value ); } currentElement = gradeElement.firstChildElement( KVTML_ERRORCOUNT ); @@ -720,7 +720,7 @@ bool KEduVocKvtml2Reader::readGrade( QDomElement &gradeElement, KEduVocExpressio QString dateString = currentElement.text(); if ( !dateString.isEmpty() ) { QDateTime value = QDateTime::fromString( dateString, Qt::ISODate ); - expr.translation( index ).gradeFrom( id ).setQueryDate( value ); + expr.translation( index ).gradeFrom( id ).setPracticeDate( value ); } } @@ -728,7 +728,6 @@ bool KEduVocKvtml2Reader::readGrade( QDomElement &gradeElement, KEduVocExpressio } - bool KEduVocKvtml2Reader::readConjugation( QDomElement &conjugElement, KEduVocConjugation &conjugation ) /* diff --git a/keduvocdocument/keduvockvtml2writer.cpp b/keduvocdocument/keduvockvtml2writer.cpp index cec8e42..a65542e 100644 --- a/keduvocdocument/keduvockvtml2writer.cpp +++ b/keduvocdocument/keduvockvtml2writer.cpp @@ -442,20 +442,20 @@ bool KEduVocKvtml2Writer::writeTranslation( QDomElement &translationElement, KEd // grades for ( int i = 0; i < m_doc->identifierCount(); ++i ) { KEduVocGrade thisGrade = translation.gradeFrom( i ); - if ( thisGrade.queryCount() > 0 ) { + if ( thisGrade.practiceCount() > 0 ) { QDomElement gradeElement = m_domDoc.createElement( KVTML_GRADE ); gradeElement.setAttribute( KVTML_FROMID, QString::number( i ) ); //2 gradeElement.appendChild( newTextElement( KVTML_CURRENTGRADE, QString::number( thisGrade.grade() ) ) ); //6 - gradeElement.appendChild( newTextElement( KVTML_COUNT, QString::number( thisGrade.queryCount() ) ) ); + gradeElement.appendChild( newTextElement( KVTML_COUNT, QString::number( thisGrade.practiceCount() ) ) ); //1 gradeElement.appendChild( newTextElement( KVTML_ERRORCOUNT, QString::number( thisGrade.badCount() ) ) ); //949757271 - gradeElement.appendChild( newTextElement( KVTML_DATE, thisGrade.queryDate().toString( Qt::ISODate ) ) ); + gradeElement.appendChild( newTextElement( KVTML_DATE, thisGrade.practiceDate().toString( Qt::ISODate ) ) ); translationElement.appendChild( gradeElement ); } diff --git a/keduvocdocument/keduvockvtmlreader.cpp b/keduvocdocument/keduvockvtmlreader.cpp index cece426..65d7971 100644 --- a/keduvocdocument/keduvockvtmlreader.cpp +++ b/keduvocdocument/keduvockvtmlreader.cpp @@ -1185,12 +1185,12 @@ bool KEduVocKvtmlReader::readExpression( QDomElement &domElementParent ) if ( i != 0 ) { expr.translation( i ).gradeFrom( 0 ).setGrade( grade ); expr.translation( 0 ).gradeFrom( i ).setGrade( r_grade ); - expr.translation( i ).gradeFrom( 0 ).setQueryCount( qcount ); - expr.translation( 0 ).gradeFrom( i ).setQueryCount( r_qcount ); + expr.translation( i ).gradeFrom( 0 ).setPracticeCount( qcount ); + expr.translation( 0 ).gradeFrom( i ).setPracticeCount( r_qcount ); expr.translation( i ).gradeFrom( 0 ).setBadCount( bcount ); expr.translation( 0 ).gradeFrom( i ).setBadCount( r_bcount ); - expr.translation( i ).gradeFrom( 0 ).setQueryDate( qdate ); - expr.translation( 0 ).gradeFrom( i ).setQueryDate( r_qdate ); + expr.translation( i ).gradeFrom( 0 ).setPracticeDate( qdate ); + expr.translation( 0 ).gradeFrom( i ).setPracticeDate( r_qdate ); } // Next translation diff --git a/keduvocdocument/keduvockvtmlwriter.cpp b/keduvocdocument/keduvockvtmlwriter.cpp index 04e0584..1be5b88 100644 --- a/keduvocdocument/keduvockvtmlwriter.cpp +++ b/keduvocdocument/keduvockvtmlwriter.cpp @@ -207,14 +207,14 @@ bool KEduVocKvtmlWriter::writeDoc( KEduVocDocument *doc, const QString &generato if ( entry->translation( trans ).gradeFrom( 0 ).grade() != 0 || entry->translation( 0 ).gradeFrom( trans ).grade() != 0 ) domElementTranslation.setAttribute( KV_GRADE, QString::number( entry->translation( trans ).gradeFrom( 0 ).grade() ) + ';' + QString::number( entry->translation( 0 ).gradeFrom( trans ).grade() ) ); - if ( entry->translation( trans ).gradeFrom( 0 ).queryCount() != 0 || entry->translation( 0 ).gradeFrom( trans ).queryCount() != 0 ) - domElementTranslation.setAttribute( KV_COUNT, QString::number( entry->translation( trans ).gradeFrom( 0 ).queryCount() ) + ';' + QString::number( entry->translation( 0 ).gradeFrom( trans ).queryCount() ) ); + if ( entry->translation( trans ).gradeFrom( 0 ).practiceCount() != 0 || entry->translation( 0 ).gradeFrom( trans ).practiceCount() != 0 ) + domElementTranslation.setAttribute( KV_COUNT, QString::number( entry->translation( trans ).gradeFrom( 0 ).practiceCount() ) + ';' + QString::number( entry->translation( 0 ).gradeFrom( trans ).practiceCount() ) ); if ( entry->translation( trans ).gradeFrom( 0 ).badCount() != 0 || entry->translation( 0 ).gradeFrom( trans ).badCount() != 0 ) domElementTranslation.setAttribute( KV_BAD, QString::number( entry->translation( trans ).gradeFrom( 0 ).badCount() ) + ';' + QString::number( entry->translation( 0 ).gradeFrom( trans ).badCount() ) ); - if ( entry->translation( trans ).gradeFrom( 0 ).queryDate().toTime_t() != 0 || entry->translation( 0 ).gradeFrom( trans ).queryDate().toTime_t() != 0 ) - domElementTranslation.setAttribute( KV_DATE, QString::number( entry->translation( trans ).gradeFrom( 0 ).queryDate().toTime_t() ) + ';' + QString::number( entry->translation( 0 ).gradeFrom( trans ).queryDate().toTime_t() ) ); + if ( entry->translation( trans ).gradeFrom( 0 ).practiceDate().toTime_t() != 0 || entry->translation( 0 ).gradeFrom( trans ).practiceDate().toTime_t() != 0 ) + domElementTranslation.setAttribute( KV_DATE, QString::number( entry->translation( trans ).gradeFrom( 0 ).practiceDate().toTime_t() ) + ';' + QString::number( entry->translation( 0 ).gradeFrom( trans ).practiceDate().toTime_t() ) ); if ( !entry->translation( trans ).comment().isEmpty() ) domElementTranslation.setAttribute( KV_REMARK, entry->translation( trans ).comment() ); -- 2.47.3