From f51a21902a30dae6b2ba0a721e63ee6ebdaf57ae Mon Sep 17 00:00:00 2001 From: Peter Hedlund Date: Thu, 14 Jul 2005 02:45:52 +0000 Subject: [PATCH] Change function names from getMyProperty() to myProperty() per Qt/KDE standards. CCMAIL:eric@erixpage.com svn path=/branches/work/kwordquiz/src/keduvocdocument.h; revision=434427 --- kwordquiz/keduvocdocument.cpp | 152 +++++++++++++-------------- kwordquiz/keduvocdocument.h | 60 +++++------ kwordquiz/keduvocexpression.cpp | 130 +++++++++++------------ kwordquiz/keduvocexpression.h | 56 +++++----- kwordquiz/keduvockvtmlreader.cpp | 8 +- kwordquiz/keduvockvtmlwriter.cpp | 172 +++++++++++++++---------------- kwordquiz/keduvocwqlwriter.cpp | 14 +-- 7 files changed, 297 insertions(+), 295 deletions(-) diff --git a/kwordquiz/keduvocdocument.cpp b/kwordquiz/keduvocdocument.cpp index c2798a6..454042c 100644 --- a/kwordquiz/keduvocdocument.cpp +++ b/kwordquiz/keduvocdocument.cpp @@ -54,7 +54,7 @@ KEduVocDocument::KEduVocDocument(QObject *parent) KEduVocDocument::~KEduVocDocument() { - delete font; + delete m_font; } @@ -64,7 +64,7 @@ void KEduVocDocument::setVersion (const QString & vers) } -void KEduVocDocument::getVersion(int &, int &, int &) +void KEduVocDocument::version(int &, int &, int &) { } @@ -89,10 +89,10 @@ void KEduVocDocument::Init () querytrans = ""; doc_url.setFileName(i18n("Untitled")); doctitle = ""; - author = ""; + m_author = ""; doc_remark = ""; doc_version = ""; - font = NULL; + m_font = NULL; activeLeitnerSystem = false; leitnerSystem = NULL; @@ -288,7 +288,7 @@ bool KEduVocDocument::saveAs(QObject *parent, const KURL & url, FileType ft, con } -KEduVocExpression *KEduVocDocument::getEntry(int index) +KEduVocExpression *KEduVocDocument::entry(int index) { if (index < 0 || index >= (int)vocabulary.size() ) return 0; @@ -318,7 +318,7 @@ int KEduVocDocument::findIdent (const QString &lang) const } -QString KEduVocDocument::getIdent (int index) const +QString KEduVocDocument::ident (int index) const { if (index >= (int)langs.size() || index < 1 ) return ""; @@ -335,7 +335,7 @@ void KEduVocDocument::setIdent (int idx, const QString &id) } -QString KEduVocDocument::getTypeName (int index) const +QString KEduVocDocument::typeName (int index) const { if (index >= (int)type_descr.size()) return ""; @@ -354,7 +354,7 @@ void KEduVocDocument::setTypeName (int idx, QString &id) } -QString KEduVocDocument::getTenseName (int index) const +QString KEduVocDocument::tenseName (int index) const { if (index >= (int)tense_descr.size()) return ""; @@ -373,7 +373,7 @@ void KEduVocDocument::setTenseName (int idx, QString &id) } -QString KEduVocDocument::getUsageName (int index) const +QString KEduVocDocument::usageName (int index) const { if (index >= (int)usage_descr.size()) return ""; @@ -405,7 +405,7 @@ void KEduVocDocument::setConjugation (int idx, const Conjugation &con) } -Conjugation KEduVocDocument::getConjugation (int idx) const +Conjugation KEduVocDocument::conjugation (int idx) const { if (idx >= (int)conjugations.size() || idx < 0) { return Conjugation(); @@ -429,7 +429,7 @@ void KEduVocDocument::setArticle (int idx, const Article &art) } -Article KEduVocDocument::getArticle (int idx) const +Article KEduVocDocument::article (int idx) const { if (idx >= (int)articles.size() || idx < 0) { return Article(); @@ -440,7 +440,7 @@ Article KEduVocDocument::getArticle (int idx) const } -int KEduVocDocument::getSizeHint (int idx) const +int KEduVocDocument::sizeHint (int idx) const { if (idx < 0) { idx = -idx; @@ -511,7 +511,7 @@ void KEduVocDocument::removeIdent (int index) } -QString KEduVocDocument::getOriginalIdent () const +QString KEduVocDocument::originalIdent () const { if (langs.size() > 0) return langs[0]; @@ -540,10 +540,10 @@ public: { return !dir - ? (QString::compare(x.getOriginal().upper(), - y.getOriginal().upper() ) < 0) - : (QString::compare(x.getOriginal().upper(), - y.getOriginal().upper() ) > 0); + ? (QString::compare(x.original().upper(), + y.original().upper() ) < 0) + : (QString::compare(x.original().upper(), + y.original().upper() ) > 0); } private: @@ -562,20 +562,20 @@ public: bool operator() (const KEduVocExpression& x, const KEduVocExpression& y) const { - if (x.getLesson() != y.getLesson() ) + if (x.lesson() != y.lesson() ) return !dir - ? (QString::compare(doc.getLessonDescr(x.getLesson()).upper(), - doc.getLessonDescr(y.getLesson()).upper() ) < 0) - : (QString::compare(doc.getLessonDescr(x.getLesson()).upper(), - doc.getLessonDescr(y.getLesson()).upper() ) > 0); + ? (QString::compare(doc.lessonDescr(x.lesson()).upper(), + doc.lessonDescr(y.lesson()).upper() ) < 0) + : (QString::compare(doc.lessonDescr(x.lesson()).upper(), + doc.lessonDescr(y.lesson()).upper() ) > 0); else return !dir - ? (QString::compare(x.getOriginal().upper(), - y.getOriginal().upper() ) < 0) - : (QString::compare(x.getOriginal().upper(), - y.getOriginal().upper() ) > 0); + ? (QString::compare(x.original().upper(), + y.original().upper() ) < 0) + : (QString::compare(x.original().upper(), + y.original().upper() ) > 0); } private: @@ -595,18 +595,18 @@ public: bool operator() (const KEduVocExpression& x, const KEduVocExpression& y) const { - if (x.getLesson() != y.getLesson() ) + if (x.lesson() != y.lesson() ) return !dir - ? x.getLesson() < y.getLesson() - : y.getLesson() < x.getLesson(); + ? x.lesson() < y.lesson() + : y.lesson() < x.lesson(); else return !dir - ? (QString::compare(x.getOriginal().upper(), - y.getOriginal().upper() ) < 0) - : (QString::compare(x.getOriginal().upper(), - y.getOriginal().upper() ) > 0); + ? (QString::compare(x.original().upper(), + y.original().upper() ) < 0) + : (QString::compare(x.original().upper(), + y.original().upper() ) > 0); } private: @@ -627,10 +627,10 @@ public: { return !dir - ? (QString::compare(x.getTranslation(index).upper(), - y.getTranslation(index).upper() ) < 0) - : (QString::compare(x.getTranslation(index).upper(), - y.getTranslation(index).upper() ) > 0); + ? (QString::compare(x.translation(index).upper(), + y.translation(index).upper() ) < 0) + : (QString::compare(x.translation(index).upper(), + y.translation(index).upper() ) > 0); } private: @@ -701,43 +701,43 @@ void KEduVocDocument::setLeitnerSystemActive( bool yes ) activeLeitnerSystem = true; } else if( !yes ) - activeLeitnerSystem = false; + activeLeitnerSystem = false; } void KEduVocDocument::createStandardLeitnerSystem() { LeitnerSystem* tmpSystem = new LeitnerSystem(); QString name = "Standard"; - + tmpSystem->setSystemName( name ); tmpSystem->insertBox( "Box 1" ); tmpSystem->insertBox( "Box 2" ); tmpSystem->insertBox( "Box 3" ); tmpSystem->insertBox( "Box 4" ); tmpSystem->insertBox( "Box 5" ); - + tmpSystem->setCorrectBox( "Box 1", "Box 2" ); tmpSystem->setWrongBox( "Box 1", "Box 1" ); - + tmpSystem->setCorrectBox( "Box 2", "Box 3" ); tmpSystem->setWrongBox( "Box 2", "Box 1" ); - + tmpSystem->setCorrectBox( "Box 3", "Box 4" ); tmpSystem->setWrongBox( "Box 3", "Box 1" ); - + tmpSystem->setCorrectBox( "Box 4", "Box 5" ); tmpSystem->setWrongBox( "Box 4", "Box 1" ); - + tmpSystem->setCorrectBox( "Box 5", "Box 1" ); tmpSystem->setWrongBox( "Box 5", "Box 1" ); - + leitnerSystem = tmpSystem; } void KEduVocDocument::setLeitnerSystem( LeitnerSystem* system ) { leitnerSystem = system; - + /*KWordQuizApp* app = (KWordQuizApp*) parent(); app->slotLeitnerSystem();*/ } @@ -759,7 +759,8 @@ public: void operator() (KEduVocExpression& x) { for (int i = 0; i <= x.numTranslations(); i++) { - if (lesson == 0 || lesson == x.getLesson() ) { + if (lesson == 0 || lesson == x.lesson()) + { x.setGrade(i, KV_NORM_GRADE, false); x.setGrade(i, KV_NORM_GRADE, true); x.setQueryCount (i, 0, true); @@ -786,7 +787,8 @@ public: void operator() (KEduVocExpression& x) { - if (lesson == 0 || lesson == x.getLesson() ) { + if (lesson == 0 || lesson == x.lesson()) + { x.setGrade(index, KV_NORM_GRADE, false); x.setGrade(index, KV_NORM_GRADE, true); x.setQueryCount (index, 0, true); @@ -813,7 +815,7 @@ void KEduVocDocument::resetEntry (int index, int lesson) } -QString KEduVocDocument::getLessonDescr(int idx) const +QString KEduVocDocument::lessonDescr(int idx) const { if (idx == 0) return i18n(""); @@ -825,7 +827,7 @@ QString KEduVocDocument::getLessonDescr(int idx) const } -vector KEduVocDocument::getLessonsInQuery() const +vector KEduVocDocument::lessonsInQuery() const { vector iqvec; for (unsigned i = 0; i < lessons_in_query.size(); i++) @@ -851,7 +853,7 @@ void KEduVocDocument::setLessonsInQuery(vector lesson_iq) } -QString KEduVocDocument::getTitle() const +QString KEduVocDocument::title() const { if (doctitle.isEmpty()) return doc_url.fileName(); @@ -860,27 +862,27 @@ QString KEduVocDocument::getTitle() const } -QString KEduVocDocument::getAuthor() const +QString KEduVocDocument::author() const { - return author; + return m_author; } -QString KEduVocDocument::getLicense() const +QString KEduVocDocument::license() const { - return license; + return m_license; } -QString KEduVocDocument::getDocRemark() const +QString KEduVocDocument::docRemark() const { return doc_remark; } -QFont* KEduVocDocument::getFont() const +QFont* KEduVocDocument::font() const { - return font; + return m_font; } @@ -892,13 +894,13 @@ void KEduVocDocument::setTitle(const QString & title) void KEduVocDocument::setAuthor(const QString & s) { - author = s.stripWhiteSpace(); + m_author = s.stripWhiteSpace(); } void KEduVocDocument::setLicense(const QString & s) { - license = s.stripWhiteSpace(); + m_license = s.stripWhiteSpace(); } @@ -910,8 +912,8 @@ void KEduVocDocument::setDocRemark(const QString & s) void KEduVocDocument::setFont(QFont* font) { - delete this->font; - this->font = font; + delete this->m_font; + this->m_font = font; } @@ -935,11 +937,11 @@ int KEduVocDocument::search(QString substr, int id, if (id == 0) { for (int i = first; i < last; i++) { if (word_start) { - if (getEntry(i)->getOriginal().find (substr, 0, false) == 0) // case insensitive + if (entry(i)->original().find (substr, 0, false) == 0) // case insensitive return i; } else { - if (getEntry(i)->getOriginal().find (substr, 0, false) > -1) // case insensitive + if (entry(i)->original().find (substr, 0, false) > -1) // case insensitive return i; } } @@ -947,11 +949,11 @@ int KEduVocDocument::search(QString substr, int id, else { for (int i = first; i < last; i++) { if (word_start) { - if (getEntry(i)->getTranslation(id).find (substr, 0, false) == 0) // case insensitive + if (entry(i)->translation(id).find (substr, 0, false) == 0) // case insensitive return i; } else { - if (getEntry(i)->getTranslation(id).find (substr, 0, false) > -1) // case insensitive + if (entry(i)->translation(id).find (substr, 0, false) > -1) // case insensitive return i; } } @@ -1054,16 +1056,16 @@ public: bool operator< (const expRef& y) const { - QString s1 = exp->getOriginal(); - QString s2 = y.exp->getOriginal(); + QString s1 = exp->original(); + QString s2 = y.exp->original(); int cmp = QString::compare(s1.upper(), s2.upper()); if (cmp != 0) return cmp < 0; for (int i = 1; i < (int) exp->numTranslations(); i++) { - s1 = exp->getTranslation(i); - s2 = y.exp->getTranslation(i); + s1 = exp->translation(i); + s2 = y.exp->translation(i); cmp = QString::compare(s1.upper(), s2.upper() ); if (cmp != 0) return cmp < 0; @@ -1084,16 +1086,16 @@ int KEduVocDocument::cleanUp() vector to_delete; for (int i = 0; i < (int) vocabulary.size(); i++) - shadow.push_back (expRef (getEntry(i), i)); + shadow.push_back (expRef (entry(i), i)); std::sort(shadow.begin(), shadow.end()); #ifdef CLEAN_BUG ofstream sso ("shadow.out"); for (int i = shadow.size()-1; i > 0; i--) { kve1 = shadow[i].exp; - sso << kve1->getOriginal() << " "; + sso << kve1->original() << " "; for (int l = 1; l < (int) numLangs(); l++ ) - sso << kve1->getTranslation(l) << " "; + sso << kve1->translation(l) << " "; sso << endl; } #endif @@ -1112,9 +1114,9 @@ int KEduVocDocument::cleanUp() emit progressChanged(this, (int)((ent_no / f_ent_percent) / 2.0)); bool equal = true; - if (kve1->getOriginal() == kve2->getOriginal() ) { + if (kve1->original() == kve2->original() ) { for (int l = 1; equal && l < (int) numLangs(); l++ ) - if (kve1->getTranslation(l) != kve2->getTranslation(l)) + if (kve1->translation(l) != kve2->translation(l)) equal = false; if (equal) { diff --git a/kwordquiz/keduvocdocument.h b/kwordquiz/keduvocdocument.h index 5e91379..70d90b1 100644 --- a/kwordquiz/keduvocdocument.h +++ b/kwordquiz/keduvocdocument.h @@ -257,7 +257,7 @@ class KEduVocDocument : public QObject friend class KEduVocKvtmlWriter; friend class KEduVocKvtmlReader; friend class KEduVocWqlReader; - + public: enum FileType { kvd_none, automatic, @@ -343,7 +343,7 @@ class KEduVocDocument : public QObject /** returns originals identifier */ - QString getOriginalIdent () const; + QString originalIdent () const; /** set originals identifier */ @@ -354,7 +354,7 @@ class KEduVocDocument : public QObject * @param index number of translation 1..x * @result ident string: de=german, en=englisch, .. */ - QString getIdent (int index) const; + QString ident (int index) const; /** sets identifier of translation * @@ -381,7 +381,7 @@ class KEduVocDocument : public QObject * @param index number of attribute * @result string */ - QString getTypeName (int index) const; + QString typeName (int index) const; /** sets attribute string * @@ -391,7 +391,7 @@ class KEduVocDocument : public QObject void setTypeName (int index, QString &str); /** gets descr of types */ - inline vector getTypeDescr() const { return type_descr; } + inline vector typeDescr() const { return type_descr; } /** sets descr of types */ inline void setTypeDescr(vector names) { type_descr = names; } @@ -401,7 +401,7 @@ class KEduVocDocument : public QObject * @param index number of tense * @result string */ - QString getTenseName (int index) const; + QString tenseName (int index) const; /** sets tense string * @@ -411,7 +411,7 @@ class KEduVocDocument : public QObject void setTenseName (int index, QString &str); /** gets descr of tenses */ - inline vector getTenseDescr() const { return tense_descr; } + inline vector tenseDescr() const { return tense_descr; } /** sets descr of tenses */ inline void setTenseDescr(vector names) { tense_descr = names; } @@ -421,7 +421,7 @@ class KEduVocDocument : public QObject * @param index number of usage * @result string */ - QString getUsageName (int index) const; + QString usageName (int index) const; /** sets usage string * @@ -431,14 +431,14 @@ class KEduVocDocument : public QObject void setUsageName (int index, QString &str); /** gets descr of usages */ - inline vector getUsageDescr() const { return usage_descr; } + inline vector usageDescr() const { return usage_descr; } /** sets descr of usages */ inline void setUsageDescr(vector names) { usage_descr = names; } /** open a document file * - * @param url + * @param url * @result true if successful */ bool open(const KURL& url, bool append); @@ -475,7 +475,7 @@ class KEduVocDocument : public QObject * @param index index of desired entry * @result pointer to object or NULL if index out of range */ - KEduVocExpression *getEntry(int index); + KEduVocExpression *entry(int index); /** search substring in vocabulary (case insensitive always) * @@ -498,21 +498,21 @@ class KEduVocDocument : public QObject inline void setURL(const KURL& url) {doc_url = url;} /** returns title of xml file */ - QString getTitle() const; + QString title() const; /** returns author of file */ - QString getAuthor() const; + QString author() const; /** returns license of file */ - QString getLicense() const; + QString license() const; /** returns remark of file */ - QString getDocRemark() const; + QString docRemark() const; /** returns font */ - QFont* getFont() const; + QFont* font() const; - inline void getQueryLang(QString &org, QString &trans) const + inline void queryLang(QString &org, QString &trans) const { org = queryorg; trans = querytrans; } inline void setQueryLang(const QString &org, const QString &trans) @@ -534,10 +534,10 @@ class KEduVocDocument : public QObject void setFont(QFont *font); /** gets version of loaded file */ - void getVersion(int &major, int &minor, int &patch); + void version(int &major, int &minor, int &patch); /** returns current lesson index */ - inline int getCurrentLesson() const { return current_lesson; } + inline int currentLesson() const { return current_lesson; } /** sets current lesson index * @param lesson index of lesson @@ -545,15 +545,15 @@ class KEduVocDocument : public QObject inline void setCurrentLesson(int lesson) { current_lesson = lesson; } /** returns descr of lesson */ - QString getLessonDescr(int index) const; + QString lessonDescr(int index) const; /** returns lessons in current query */ - vector getLessonsInQuery() const; + vector lessonsInQuery() const; /** sets lessons in current query */ void setLessonsInQuery(vector); - inline vector getLessonDescr() const { return lesson_descr; } + inline vector lessonDescr() const { return lesson_descr; } inline int numLessons () const {return (int) lesson_descr.size(); } @@ -564,7 +564,7 @@ class KEduVocDocument : public QObject * * @param index index of translation */ - Conjugation getConjugation(int index) const; + Conjugation conjugation(int index) const; /** sets conjugations * @@ -577,7 +577,7 @@ class KEduVocDocument : public QObject * * @param index index of translation */ - Article getArticle(int index) const; + Article article(int index) const; /** sets articles * @@ -597,7 +597,7 @@ class KEduVocDocument : public QObject * @param index number of expr, -1 = lesson * @result width of column */ - int getSizeHint (int index) const; + int sizeHint (int index) const; /** sets recommended size * @@ -676,7 +676,7 @@ protected: int current_lesson; vector extraSizehints; vector sizehints; - QFont* font; + QFont* m_font; QString generator; QString queryorg, @@ -688,16 +688,16 @@ protected: vector tense_descr; vector usage_descr; QString doctitle; - QString author; - QString license; + QString m_author; + QString m_license; QString doc_remark; QString doc_version; vector
articles; vector conjugations; - LeitnerSystem* leitnerSystem; - bool activeLeitnerSystem; + LeitnerSystem* leitnerSystem; + bool activeLeitnerSystem; }; diff --git a/kwordquiz/keduvocexpression.cpp b/kwordquiz/keduvocexpression.cpp index a46a65e..384b636 100644 --- a/kwordquiz/keduvocexpression.cpp +++ b/kwordquiz/keduvocexpression.cpp @@ -30,7 +30,7 @@ void KEduVocExpression::Init() rev_bcounts.push_back(0); qdates.push_back(0); rev_qdates.push_back(0); - lesson = 0; + m_lesson = 0; } @@ -38,7 +38,7 @@ KEduVocExpression::KEduVocExpression (QString &expr, int _lesson) { Init(); setOriginal(expr.stripWhiteSpace() ); - lesson = _lesson; + m_lesson = _lesson; } @@ -52,7 +52,7 @@ KEduVocExpression::KEduVocExpression (QString &s, QString separator, int _lesson { Init(); QString se; - lesson = _lesson; + m_lesson = _lesson; if (separator.length() ) { int pos = s.find(separator); @@ -90,7 +90,7 @@ int KEduVocExpression::numTranslations() const } -QString KEduVocExpression::getRemark (int idx) const +QString KEduVocExpression::remark (int idx) const { if (idx >= (int)remarks.size() || idx < 0) { return ""; @@ -129,16 +129,16 @@ void KEduVocExpression::setFauxAmi (int idx, const QString & expr, bool rev_ami) } else { // extend friend with empty strings if necessary - if ((int)fauxAmi.size() <= idx ) - for (int i = fauxAmi.size(); i < idx+1; i++) - fauxAmi.push_back (""); + if ((int)m_fauxAmi.size() <= idx ) + for (int i = m_fauxAmi.size(); i < idx+1; i++) + m_fauxAmi.push_back (""); - fauxAmi[idx] = expr.stripWhiteSpace(); + m_fauxAmi[idx] = expr.stripWhiteSpace(); } } -QString KEduVocExpression::getFauxAmi (int idx, bool rev_ami) const +QString KEduVocExpression::fauxAmi (int idx, bool rev_ami) const { if (rev_ami) { if (idx >= (int)rev_fauxAmi.size() || idx < 1 ) { @@ -148,11 +148,11 @@ QString KEduVocExpression::getFauxAmi (int idx, bool rev_ami) const return rev_fauxAmi[idx]; } - if (idx >= (int)fauxAmi.size() || idx < 1 ) { + if (idx >= (int)m_fauxAmi.size() || idx < 1 ) { return ""; } - return fauxAmi[idx]; + return m_fauxAmi[idx]; } @@ -161,21 +161,21 @@ void KEduVocExpression::setSynonym (int idx, const QString & expr) if ( idx < 0) return; // extend synonym with empty strings if necessary - if ((int)synonym.size() <= idx ) - for (int i = synonym.size(); i < idx+1; i++) - synonym.push_back ("-"); + if ((int)m_synonym.size() <= idx ) + for (int i = m_synonym.size(); i < idx+1; i++) + m_synonym.push_back ("-"); - synonym[idx] = expr.stripWhiteSpace(); + m_synonym[idx] = expr.stripWhiteSpace(); } -QString KEduVocExpression::getSynonym (int idx) const +QString KEduVocExpression::synonym (int idx) const { - if (idx >= (int)synonym.size() || idx < 0) { + if (idx >= (int)m_synonym.size() || idx < 0) { return ""; } else { - return synonym[idx]; + return m_synonym[idx]; } } @@ -185,21 +185,21 @@ void KEduVocExpression::setExample (int idx, const QString & expr) if ( idx < 0) return; // extend exampls with empty strings if necessary - if ((int)example.size() <= idx ) - for (int i = example.size(); i < idx+1; i++) - example.push_back (""); + if ((int)m_example.size() <= idx ) + for (int i = m_example.size(); i < idx+1; i++) + m_example.push_back (""); - example[idx] = expr.stripWhiteSpace(); + m_example[idx] = expr.stripWhiteSpace(); } -QString KEduVocExpression::getExample (int idx) const +QString KEduVocExpression::example (int idx) const { - if (idx >= (int)example.size() || idx < 0) { + if (idx >= (int)m_example.size() || idx < 0) { return ""; } else { - return example[idx]; + return m_example[idx]; } } @@ -217,7 +217,7 @@ void KEduVocExpression::setUsageLabel (int idx, const QString & expr) } -QString KEduVocExpression::getUsageLabel (int idx) const +QString KEduVocExpression::usageLabel (int idx) const { if (idx >= (int)usageLabels.size() || idx < 0) { return ""; @@ -241,7 +241,7 @@ void KEduVocExpression::setParaphrase (int idx, const QString & expr) } -QString KEduVocExpression::getParaphrase (int idx) const +QString KEduVocExpression::paraphrase (int idx) const { if (idx >= (int)paraphrases.size() || idx < 0) { return ""; @@ -257,21 +257,21 @@ void KEduVocExpression::setAntonym (int idx, const QString & expr) if ( idx < 0) return; // extend antonym with empty strings if necessary - if ((int)antonym.size() <= idx ) - for (int i = antonym.size(); i < idx+1; i++) - antonym.push_back (""); + if ((int)m_antonym.size() <= idx ) + for (int i = m_antonym.size(); i < idx+1; i++) + m_antonym.push_back (""); - antonym[idx] = expr.stripWhiteSpace(); + m_antonym[idx] = expr.stripWhiteSpace(); } -QString KEduVocExpression::getAntonym (int idx) const +QString KEduVocExpression::antonym (int idx) const { - if (idx >= (int)antonym.size() || idx < 0) { + if (idx >= (int)m_antonym.size() || idx < 0) { return ""; } else { - return antonym[idx]; + return m_antonym[idx]; } } @@ -289,7 +289,7 @@ void KEduVocExpression::setConjugation (int idx, const Conjugation &con) } -Conjugation KEduVocExpression::getConjugation (int idx) const +Conjugation KEduVocExpression::conjugation (int idx) const { if (idx >= (int)conjugations.size() || idx < 0) { return Conjugation(); @@ -313,7 +313,7 @@ void KEduVocExpression::setComparison (int idx, const Comparison &con) } -Comparison KEduVocExpression::getComparison (int idx) const +Comparison KEduVocExpression::comparison (int idx) const { if (idx >= (int)comparisons.size() || idx < 0) { return Comparison(); @@ -337,7 +337,7 @@ void KEduVocExpression::setMultipleChoice (int idx, const MultipleChoice &mc) } -MultipleChoice KEduVocExpression::getMultipleChoice (int idx) const +MultipleChoice KEduVocExpression::multipleChoice (int idx) const { if (idx >= (int)mcs.size() || idx < 0) { return MultipleChoice(); @@ -348,7 +348,7 @@ MultipleChoice KEduVocExpression::getMultipleChoice (int idx) const } -QString KEduVocExpression::getPronunce (int idx) const +QString KEduVocExpression::pronounce (int idx) const { if (idx >= (int)pronunces.size() || idx < 0) { return ""; @@ -387,7 +387,7 @@ void KEduVocExpression::addTranslation (QString expr, } -QString KEduVocExpression::getTranslation (int idx) const +QString KEduVocExpression::translation (int idx) const { if (idx > (int)translations.size() || idx < 1) return ""; @@ -413,17 +413,17 @@ void KEduVocExpression::removeTranslation (int idx) if (idx < (int)comparisons.size() ) comparisons.erase (comparisons.begin() + idx); - if (idx < (int)fauxAmi.size() ) - fauxAmi.erase (fauxAmi.begin() + idx); + if (idx < (int)m_fauxAmi.size() ) + m_fauxAmi.erase (m_fauxAmi.begin() + idx); if (idx < (int)rev_fauxAmi.size() ) rev_fauxAmi.erase (rev_fauxAmi.begin() + idx); - if (idx < (int)synonym.size() ) - synonym.erase (synonym.begin() + idx); + if (idx < (int)m_synonym.size() ) + m_synonym.erase (m_synonym.begin() + idx); - if (idx < (int)example.size() ) - example.erase (example.begin() + idx); + if (idx < (int)m_example.size() ) + m_example.erase (m_example.begin() + idx); if (idx < (int)usageLabels.size() ) usageLabels.erase (usageLabels.begin() + idx); @@ -431,8 +431,8 @@ void KEduVocExpression::removeTranslation (int idx) if (idx < (int)paraphrases.size() ) paraphrases.erase (paraphrases.begin() + idx); - if (idx < (int)antonym.size() ) - antonym.erase (antonym.begin() + idx); + if (idx < (int)m_antonym.size() ) + m_antonym.erase (m_antonym.begin() + idx); if (idx < (int)exprtypes.size() ) exprtypes.erase (exprtypes.begin() + idx); @@ -483,12 +483,12 @@ void KEduVocExpression::setTranslation (int idx, const QString & expr) QString KEduVocExpression::gradeStr (int idx, bool rev_grade) const { QString s; - s.setNum(getGrade(idx, rev_grade)); + s.setNum(grade(idx, rev_grade)); return s; } -grade_t KEduVocExpression::getGrade (int idx, bool rev_grade) const +grade_t KEduVocExpression::grade (int idx, bool rev_grade) const { if (rev_grade) { if (idx >= (int)rev_grades.size() || idx < 1 ) { @@ -592,7 +592,7 @@ void KEduVocExpression::decGrade (int idx, bool rev_grade) } -count_t KEduVocExpression::getQueryCount (int idx, bool rev_count) const +count_t KEduVocExpression::queryCount (int idx, bool rev_count) const { if (rev_count) { if (idx >= (int)rev_qcounts.size() || idx < 1 ) { @@ -635,7 +635,7 @@ void KEduVocExpression::setQueryCount (int idx, count_t count, bool rev_count) } -count_t KEduVocExpression::getBadCount (int idx, bool rev_count) const +count_t KEduVocExpression::badCount (int idx, bool rev_count) const { if (rev_count) { if (idx >= (int)rev_bcounts.size() || idx < 1 ) { @@ -678,7 +678,7 @@ void KEduVocExpression::setBadCount (int idx, count_t count, bool rev_count) } -time_t KEduVocExpression::getQueryDate (int idx, bool rev_date) const +time_t KEduVocExpression::queryDate (int idx, bool rev_date) const { if (rev_date) { if (idx >= (int)rev_qdates.size() || idx < 1 ) { @@ -724,15 +724,15 @@ void KEduVocExpression::setQueryDate (int idx, time_t date, bool rev_date) bool KEduVocExpression::uniqueType () const { bool unique = true; - QString type0 = getType(0); + QString type0 = type(0); for (int i = 1; i < numTranslations(); i++) - if (type0 != getType(i) ) + if (type0 != type(i) ) unique = false; return unique; } -QString KEduVocExpression::getType (int idx) const +QString KEduVocExpression::type (int idx) const { if (idx >= (int)exprtypes.size() || idx < 0) { return ""; @@ -743,20 +743,20 @@ QString KEduVocExpression::getType (int idx) const } -int KEduVocExpression::getLesson () const +int KEduVocExpression::lesson () const { - return lesson; + return m_lesson; } void KEduVocExpression::incQueryCount (int index, bool rev_count) { - setQueryCount (index, getQueryCount(index, rev_count)+1, rev_count); + setQueryCount (index, queryCount(index, rev_count)+1, rev_count); } void KEduVocExpression::incBadCount (int index, bool rev_count) { - setBadCount (index, getBadCount(index, rev_count)+1, rev_count); + setBadCount (index, badCount(index, rev_count)+1, rev_count); } @@ -766,7 +766,7 @@ void KEduVocExpression::setOriginal ( const QString & expr) } -QString KEduVocExpression::getOriginal () const +QString KEduVocExpression::original () const { return origin; } @@ -774,7 +774,7 @@ QString KEduVocExpression::getOriginal () const void KEduVocExpression::setLesson (int l) { - lesson = l; + m_lesson = l; } @@ -792,11 +792,11 @@ void KEduVocExpression::setType (int idx, const QString &type) void KEduVocExpression::setLeitnerBox( const QString& box ) { - leitnerBox = box; + m_leitnerBox = box; } -QString& KEduVocExpression::getLeitnerBox() -{ - return leitnerBox; +QString& KEduVocExpression::leitnerBox() +{ + return m_leitnerBox; } diff --git a/kwordquiz/keduvocexpression.h b/kwordquiz/keduvocexpression.h index 3f120ac..89b1e76 100644 --- a/kwordquiz/keduvocexpression.h +++ b/kwordquiz/keduvocexpression.h @@ -98,7 +98,7 @@ class KEduVocExpression /** returns index of lesson (0 = none) */ - int getLesson () const; + int lesson () const; /** sets index of lesson (0 = none) */ @@ -106,7 +106,7 @@ class KEduVocExpression /** returns original expression of this entry */ - QString getOriginal () const; + QString original () const; /** sets original expression of this entry */ @@ -137,7 +137,7 @@ class KEduVocExpression * @param index number of translation * @result expression or "" if no translation available */ - QString getTranslation (int index) const; + QString translation (int index) const; /** sets translation of this expression * @@ -158,14 +158,14 @@ class KEduVocExpression * @param index index of expression * @result pronunciation or "" if none available */ - QString getPronunce (int index) const; + QString pronounce (int index) const; /** returns remarks of this expression * * @param index index of expression * @result remark or "" if no remark available */ - QString getRemark (int index) const; + QString remark (int index) const; /** sets remark of this expression * @@ -190,7 +190,7 @@ class KEduVocExpression * @param rev_grade dito, in opposite direction * @result false friend or "" if no string available */ - QString getFauxAmi (int index, bool rev_ami = false) const; + QString fauxAmi (int index, bool rev_ami = false) const; /** sets synonym this expression * @@ -205,7 +205,7 @@ class KEduVocExpression * @param index index of expression * @result synonym or "" if no string available */ - QString getSynonym (int index) const; + QString synonym (int index) const; /** sets example this expression * @@ -220,7 +220,7 @@ class KEduVocExpression * @param index index of expression * @result example or "" if no string available */ - QString getExample (int index) const; + QString example (int index) const; /** sets usage label this expression * @@ -235,7 +235,7 @@ class KEduVocExpression * @param index index of expression * @result usage or "" if no string available */ - QString getUsageLabel (int index) const; + QString usageLabel (int index) const; /** sets paraphrase of this expression * @@ -250,7 +250,7 @@ class KEduVocExpression * @param index index of expression * @result paraphrase or "" if no string available */ - QString getParaphrase (int index) const; + QString paraphrase (int index) const; /** sets antonym this expression * @@ -265,13 +265,13 @@ class KEduVocExpression * @param index index of expression * @result antonym or "" if no string available */ - QString getAntonym (int index) const; + QString antonym (int index) const; /** returns type of this expression * * @result type or "" if no type available */ - QString getType (int index) const; + QString type (int index) const; /** all langs have same type ? * @@ -307,7 +307,7 @@ class KEduVocExpression * @param rev_grade dito, in opposite direction * @result number of knowlegde: 0=known, x=numbers not knows */ - grade_t getGrade (int index, bool rev_grade = false) const; + grade_t grade (int index, bool rev_grade = false) const; /** increments grade of given translation * @@ -328,7 +328,7 @@ class KEduVocExpression * @param index index of translation * @param rev_date dito, in opposite direction */ - time_t getQueryDate (int index, bool rev_date = false) const; + time_t queryDate (int index, bool rev_date = false) const; /** set last query date of given translation as int * @@ -341,7 +341,7 @@ class KEduVocExpression * * @param index index of translation */ - Conjugation getConjugation(int index) const; + Conjugation conjugation(int index) const; /** sets conjugations * @@ -354,7 +354,7 @@ class KEduVocExpression * * @param index index of translation */ - Comparison getComparison(int index) const; + Comparison comparison(int index) const; /** sets comparison * @@ -367,7 +367,7 @@ class KEduVocExpression * * @param index index of multiple choice */ - MultipleChoice getMultipleChoice(int index) const; + MultipleChoice multipleChoice(int index) const; /** sets multiple choice * @@ -381,7 +381,7 @@ class KEduVocExpression * @param index index of translation * @param rev_count dito, in opposite direction */ - count_t getQueryCount (int index, bool rev_count = false) const; + count_t queryCount (int index, bool rev_count = false) const; /** set query count of given translation as int * @@ -395,7 +395,7 @@ class KEduVocExpression * @param index index of translation * @param rev_count dito, in opposite direction */ - count_t getBadCount (int index, bool rev_count = false) const; + count_t badCount (int index, bool rev_count = false) const; /** set bad query count of given translation as int * @@ -428,7 +428,7 @@ class KEduVocExpression * * @result the box's name */ - QString& getLeitnerBox(); + QString& leitnerBox(); protected: @@ -443,11 +443,11 @@ class KEduVocExpression vector remarks; vector usageLabels; vector paraphrases; - vector fauxAmi; + vector m_fauxAmi; vector rev_fauxAmi; - vector synonym; - vector example; - vector antonym; + vector m_synonym; + vector m_example; + vector m_antonym; vector pronunces; vector grades; vector rev_grades; @@ -461,10 +461,10 @@ class KEduVocExpression vector comparisons; vector mcs; - QString leitnerBox; - int lesson; - bool inquery; - bool active; + QString m_leitnerBox; + int m_lesson; + bool inquery; + bool active; }; #endif // KEduVocExpression_H diff --git a/kwordquiz/keduvockvtmlreader.cpp b/kwordquiz/keduvockvtmlreader.cpp index bade16f..b8674cb 100644 --- a/kwordquiz/keduvockvtmlreader.cpp +++ b/kwordquiz/keduvockvtmlreader.cpp @@ -1577,8 +1577,8 @@ bool KEduVocKvtmlReader::readDoc(KEduVocDocument *doc) m_doc->cols = 0; m_doc->lines = 0; m_doc->doctitle = ""; - m_doc->author = ""; - m_doc->license = ""; + m_doc->m_author = ""; + m_doc->m_license = ""; m_doc->doc_remark = ""; @@ -1610,13 +1610,13 @@ bool KEduVocKvtmlReader::readDoc(KEduVocDocument *doc) QDomAttr domAttrAuthor = domElementKvtml.attributeNode(KV_AUTHOR); if (!domAttrAuthor.isNull()) { - m_doc->author = domAttrAuthor.value(); + m_doc->m_author = domAttrAuthor.value(); } QDomAttr domAttrLicence = domElementKvtml.attributeNode(KV_LICENSE); if (!domAttrLicence.isNull()) { - m_doc->license = domAttrLicence.value(); + m_doc->m_license = domAttrLicence.value(); } QDomAttr domAttrRemark = domElementKvtml.attributeNode(KV_DOC_REM); diff --git a/kwordquiz/keduvockvtmlwriter.cpp b/kwordquiz/keduvockvtmlwriter.cpp index 3a5c7ce..52d58c2 100644 --- a/kwordquiz/keduvockvtmlwriter.cpp +++ b/kwordquiz/keduvockvtmlwriter.cpp @@ -113,7 +113,7 @@ bool KEduVocKvtmlWriter::saveLessonKvtMl (QDomDocument &domDoc, QDomElement &dom return true; QDomElement domElementLesson = domDoc.createElement(KV_LESS_GRP); - domElementLesson.setAttribute(KV_SIZEHINT, m_doc->getSizeHint(-1)); + domElementLesson.setAttribute(KV_SIZEHINT, m_doc->sizeHint(-1)); for (int lfn = 0; lfn < (int) m_doc->lesson_descr.size(); lfn++) { @@ -123,7 +123,7 @@ bool KEduVocKvtmlWriter::saveLessonKvtMl (QDomDocument &domDoc, QDomElement &dom QDomText domTextDesc = domDoc.createTextNode(m_doc->lesson_descr[lfn]); domElementDesc.setAttribute(KV_LESS_NO, lfn+1); - if (m_doc->getCurrentLesson() == lfn+1) + if (m_doc->currentLesson() == lfn+1) domElementDesc.setAttribute (KV_LESS_CURR, 1); if (lfn < (int) m_doc->lessons_in_query.size() && m_doc->lessons_in_query[lfn]) domElementDesc.setAttribute (KV_LESS_QUERY, 1); @@ -274,13 +274,13 @@ bool KEduVocKvtmlWriter::saveConjugHeader(QDomDocument &domDoc, QDomElement &dom if (ent == 0) { - s = m_doc->getOriginalIdent().stripWhiteSpace(); //EPT le Ident doit �re superflu + s = m_doc->originalIdent().stripWhiteSpace(); //EPT le Ident doit �re superflu if (s.isEmpty() ) s = "original"; } else { - s = m_doc->getIdent(ent).stripWhiteSpace(); + s = m_doc->ident(ent).stripWhiteSpace(); if (s.isEmpty() ) { s.setNum(ent); @@ -446,7 +446,7 @@ bool KEduVocKvtmlWriter::saveConjugEntry( QDomDocument &domDoc, QDomElement &dom type = curr_conjug.getType(lfn); domElementType.setAttribute(KV_CON_NAME, type); - + if (!saveConjug (domDoc, domElementType, curr_conjug, curr_conjug.getType(lfn)) ) return false; @@ -483,13 +483,13 @@ bool KEduVocKvtmlWriter::saveArticleKvtMl(QDomDocument &domDoc, QDomElement &dom QDomElement domElementEntry = domDoc.createElement(KV_ART_ENTRY); if (lfn == 0) { - s = m_doc->getOriginalIdent().stripWhiteSpace(); + s = m_doc->originalIdent().stripWhiteSpace(); if (s.isEmpty() ) s = "original"; } else { - s = m_doc->getIdent(lfn).stripWhiteSpace(); + s = m_doc->ident(lfn).stripWhiteSpace(); if (s.isEmpty() ) { s.setNum(lfn); @@ -650,18 +650,18 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const QString &generator domElementKvtml.setAttribute(KV_GENERATOR, generator); domElementKvtml.setAttribute(KV_COLS, m_doc->numLangs() ); domElementKvtml.setAttribute(KV_LINES, m_doc->numEntries() ); - + if (!m_doc->doctitle.isEmpty()) domElementKvtml.setAttribute(KV_TITLE, m_doc->doctitle); - if (!m_doc->author.isEmpty()) - domElementKvtml.setAttribute(KV_AUTHOR, m_doc->getAuthor() ); + if (!m_doc->m_author.isEmpty()) + domElementKvtml.setAttribute(KV_AUTHOR, m_doc->author() ); - if (!m_doc->license.isEmpty()) - domElementKvtml.setAttribute(KV_LICENSE, m_doc->getLicense() ); + if (!m_doc->m_license.isEmpty()) + domElementKvtml.setAttribute(KV_LICENSE, m_doc->license() ); if (!m_doc->doc_remark.isEmpty()) - domElementKvtml.setAttribute(KV_DOC_REM, m_doc->getDocRemark() ); + domElementKvtml.setAttribute(KV_DOC_REM, m_doc->docRemark() ); if (!saveLessonKvtMl(domDoc, domElementKvtml)) return false; @@ -686,7 +686,7 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const QString &generator QString q_org, q_trans; vector::const_iterator first = m_doc->vocabulary.begin (); - m_doc->getQueryLang(q_org, q_trans); + m_doc->queryLang(q_org, q_trans); int ent_no = 0; int ent_percent = (int) m_doc->vocabulary.size () / 100; @@ -701,11 +701,11 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const QString &generator if (ent_percent != 0 && (ent_no % ent_percent) == 0 ) //TODO emit progressChanged(this, ent_no / (int) f_ent_percent); - if ((*first).getLesson() != 0) + if ((*first).lesson() != 0) { // entry belongs to lesson x QString ls; - int lm = (*first).getLesson(); + int lm = (*first).lesson(); if (lm > (int) m_doc->lesson_descr.size() ) { // should not be @@ -728,9 +728,9 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const QString &generator domElementExpression.setAttribute (KV_INACTIVE, (QString) "1"); } - if ((*first).uniqueType() && !(*first).getType(0).isEmpty()) + if ((*first).uniqueType() && !(*first).type(0).isEmpty()) { - domElementExpression.setAttribute (KV_EXPRTYPE, (*first).getType(0)); + domElementExpression.setAttribute (KV_EXPRTYPE, (*first).type(0)); } QDomElement domElementOriginal = domDoc.createElement(KV_ORG); @@ -738,10 +738,10 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const QString &generator { // save space, only tell language in first entry QString s; - s.setNum (m_doc->getSizeHint (0)); + s.setNum (m_doc->sizeHint (0)); domElementOriginal.setAttribute(KV_SIZEHINT, s); - s = m_doc->getOriginalIdent().stripWhiteSpace(); + s = m_doc->originalIdent().stripWhiteSpace(); if (s.isEmpty() ) s = "original"; domElementOriginal.setAttribute (KV_LANG, s); @@ -752,35 +752,35 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const QString &generator } - if (!(*first).getRemark(0).isEmpty() ) - domElementOriginal.setAttribute(KV_REMARK, (*first).getRemark(0)); + if (!(*first).remark(0).isEmpty() ) + domElementOriginal.setAttribute(KV_REMARK, (*first).remark(0)); - if (!(*first).getSynonym(0).isEmpty() ) - domElementOriginal.setAttribute(KV_SYNONYM, (*first).getSynonym(0)); + if (!(*first).synonym(0).isEmpty() ) + domElementOriginal.setAttribute(KV_SYNONYM, (*first).synonym(0)); - if (!(*first).getExample(0).isEmpty() ) - domElementOriginal.setAttribute(KV_EXAMPLE, (*first).getExample(0)); + if (!(*first).example(0).isEmpty() ) + domElementOriginal.setAttribute(KV_EXAMPLE, (*first).example(0)); - if (!(*first).getUsageLabel(0).isEmpty() ) - domElementOriginal.setAttribute(KV_USAGE, (*first).getUsageLabel(0)); + if (!(*first).usageLabel(0).isEmpty() ) + domElementOriginal.setAttribute(KV_USAGE, (*first).usageLabel(0)); - if (!(*first).getParaphrase(0).isEmpty() ) - domElementOriginal.setAttribute(KV_PARAPHRASE, (*first).getParaphrase(0)); + if (!(*first).paraphrase(0).isEmpty() ) + domElementOriginal.setAttribute(KV_PARAPHRASE, (*first).paraphrase(0)); - if (!(*first).getAntonym(0).isEmpty() ) - domElementOriginal.setAttribute(KV_ANTONYM, (*first).getAntonym(0)); + if (!(*first).antonym(0).isEmpty() ) + domElementOriginal.setAttribute(KV_ANTONYM, (*first).antonym(0)); - if (!(*first).getPronunce(0).isEmpty() ) - domElementOriginal.setAttribute(KV_PRONUNCE, (*first).getPronunce(0)); + if (!(*first).pronounce(0).isEmpty() ) + domElementOriginal.setAttribute(KV_PRONUNCE, (*first).pronounce(0)); - if (!(*first).uniqueType() && !(*first).getType(0).isEmpty()) - domElementOriginal.setAttribute(KV_EXPRTYPE, (*first).getType(0)); + if (!(*first).uniqueType() && !(*first).type(0).isEmpty()) + domElementOriginal.setAttribute(KV_EXPRTYPE, (*first).type(0)); - if (!saveMultipleChoice(domDoc, domElementOriginal, (*first).getMultipleChoice(0))) + if (!saveMultipleChoice(domDoc, domElementOriginal, (*first).multipleChoice(0))) return false; QString s; - QString entype = s = (*first).getType(0); + QString entype = s = (*first).type(0); int pos = s.find (QM_TYPE_DIV); if (pos >= 0) entype = s.left (pos); @@ -788,21 +788,21 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const QString &generator entype = s; if (entype == QM_VERB - && (*first).getConjugation(0).numEntries() > 0) + && (*first).conjugation(0).numEntries() > 0) { - Conjugation conj = (*first).getConjugation(0); + Conjugation conj = (*first).conjugation(0); if (!saveConjugEntry(domDoc, domElementOriginal, conj)) return false; } else if (entype == QM_ADJ - && !(*first).getComparison(0).isEmpty()) + && !(*first).comparison(0).isEmpty()) { - Comparison comp = (*first).getComparison(0); + Comparison comp = (*first).comparison(0); if (!saveComparison(domDoc, domElementOriginal, comp)) return false; } - QDomText domTextOriginal = domDoc.createTextNode((*first).getOriginal()); + QDomText domTextOriginal = domDoc.createTextNode((*first).original()); domElementOriginal.appendChild(domTextOriginal); domElementExpression.appendChild(domElementOriginal); @@ -814,10 +814,10 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const QString &generator { // save space, only tell language in first entry QString s; - s.setNum (m_doc->getSizeHint (trans)); + s.setNum (m_doc->sizeHint (trans)); domElementTranslation.setAttribute(KV_SIZEHINT, s); - s = m_doc->getIdent(trans).stripWhiteSpace(); + s = m_doc->ident(trans).stripWhiteSpace(); if (s.isEmpty() ) { s.setNum (trans); @@ -832,75 +832,75 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const QString &generator QString s1, s2; - if ((*first).getGrade(trans, false) != 0 - ||(*first).getGrade(trans, true) != 0) + if ((*first).grade(trans, false) != 0 + ||(*first).grade(trans, true) != 0) { domElementTranslation.setAttribute(KV_GRADE, (*first).gradeStr(trans, false) +';' +(*first).gradeStr(trans, true)); } - if ((*first).getQueryCount(trans, false) != 0 - ||(*first).getQueryCount(trans, true) != 0) + if ((*first).queryCount(trans, false) != 0 + ||(*first).queryCount(trans, true) != 0) { - s1.setNum((*first).getQueryCount(trans, false)); - s2.setNum((*first).getQueryCount(trans, true)); + s1.setNum((*first).queryCount(trans, false)); + s2.setNum((*first).queryCount(trans, true)); domElementTranslation.setAttribute(KV_COUNT, s1 +';' +s2); } - if ((*first).getBadCount(trans, false) != 0 - ||(*first).getBadCount(trans, true) != 0) + if ((*first).badCount(trans, false) != 0 + ||(*first).badCount(trans, true) != 0) { - s1.setNum((*first).getBadCount(trans, false)); - s2.setNum((*first).getBadCount(trans, true)); + s1.setNum((*first).badCount(trans, false)); + s2.setNum((*first).badCount(trans, true)); domElementTranslation.setAttribute(KV_BAD, s1 +';' +s2); } - if ((*first).getQueryDate(trans, false) != 0 - ||(*first).getQueryDate(trans, true) != 0) + if ((*first).queryDate(trans, false) != 0 + ||(*first).queryDate(trans, true) != 0) { - s1.setNum((*first).getQueryDate(trans, false)); - s2.setNum((*first).getQueryDate(trans, true)); + s1.setNum((*first).queryDate(trans, false)); + s2.setNum((*first).queryDate(trans, true)); domElementTranslation.setAttribute(KV_DATE, s1 +';' +s2); } - if (!(*first).getRemark(trans).isEmpty() ) - domElementTranslation.setAttribute(KV_REMARK, (*first).getRemark(trans)); + if (!(*first).remark(trans).isEmpty() ) + domElementTranslation.setAttribute(KV_REMARK, (*first).remark(trans)); - if (!(*first).getFauxAmi(trans, false).isEmpty() ) - domElementTranslation.setAttribute(KV_FAUX_AMI_F, (*first).getFauxAmi(trans, false)); + if (!(*first).fauxAmi(trans, false).isEmpty() ) + domElementTranslation.setAttribute(KV_FAUX_AMI_F, (*first).fauxAmi(trans, false)); - if (!(*first).getFauxAmi(trans, true).isEmpty() ) - domElementTranslation.setAttribute(KV_FAUX_AMI_T, (*first).getFauxAmi(trans, true)); + if (!(*first).fauxAmi(trans, true).isEmpty() ) + domElementTranslation.setAttribute(KV_FAUX_AMI_T, (*first).fauxAmi(trans, true)); - if (!(*first).getSynonym(trans).isEmpty() ) - domElementTranslation.setAttribute(KV_SYNONYM, (*first).getSynonym(trans)); + if (!(*first).synonym(trans).isEmpty() ) + domElementTranslation.setAttribute(KV_SYNONYM, (*first).synonym(trans)); - if (!(*first).getExample(trans).isEmpty() ) - domElementTranslation.setAttribute(KV_EXAMPLE, (*first).getExample(trans)); + if (!(*first).example(trans).isEmpty() ) + domElementTranslation.setAttribute(KV_EXAMPLE, (*first).example(trans)); - if (!(*first).getUsageLabel(trans).isEmpty() ) - domElementTranslation.setAttribute(KV_USAGE, (*first).getUsageLabel(trans)); + if (!(*first).usageLabel(trans).isEmpty() ) + domElementTranslation.setAttribute(KV_USAGE, (*first).usageLabel(trans)); - if (!(*first).getParaphrase(trans).isEmpty() ) - domElementTranslation.setAttribute(KV_PARAPHRASE, (*first).getParaphrase(trans)); + if (!(*first).paraphrase(trans).isEmpty() ) + domElementTranslation.setAttribute(KV_PARAPHRASE, (*first).paraphrase(trans)); - if (!(*first).getAntonym(trans).isEmpty() ) - domElementTranslation.setAttribute(KV_ANTONYM, (*first).getAntonym(trans)); + if (!(*first).antonym(trans).isEmpty() ) + domElementTranslation.setAttribute(KV_ANTONYM, (*first).antonym(trans)); - if (!(*first).getPronunce(trans).isEmpty() ) - domElementTranslation.setAttribute(KV_PRONUNCE, (*first).getPronunce(trans)); + if (!(*first).pronounce(trans).isEmpty() ) + domElementTranslation.setAttribute(KV_PRONUNCE, (*first).pronounce(trans)); - if (!(*first).uniqueType() && !(*first).getType(trans).isEmpty()) - domElementTranslation.setAttribute(KV_EXPRTYPE, (*first).getType(trans)); + if (!(*first).uniqueType() && !(*first).type(trans).isEmpty()) + domElementTranslation.setAttribute(KV_EXPRTYPE, (*first).type(trans)); // only save conjugations when type == verb - if (!saveMultipleChoice(domDoc, domElementTranslation, (*first).getMultipleChoice(trans))) + if (!saveMultipleChoice(domDoc, domElementTranslation, (*first).multipleChoice(trans))) return false; QString s; - QString entype = s = (*first).getType(0); + QString entype = s = (*first).type(0); int pos = s.find (QM_TYPE_DIV); if (pos >= 0) entype = s.left (pos); @@ -908,22 +908,22 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const QString &generator entype = s; if (entype == QM_VERB - && (*first).getConjugation(trans).numEntries() > 0) + && (*first).conjugation(trans).numEntries() > 0) { - Conjugation conj = (*first).getConjugation(trans); + Conjugation conj = (*first).conjugation(trans); if (!saveConjugEntry(domDoc, domElementTranslation, conj)) return false; } if (entype == QM_ADJ - && !(*first).getComparison(trans).isEmpty()) + && !(*first).comparison(trans).isEmpty()) { - Comparison comp = (*first).getComparison(trans); + Comparison comp = (*first).comparison(trans); if (!saveComparison(domDoc, domElementTranslation, comp)) return false; } - QDomText domTextTranslation = domDoc.createTextNode((*first).getTranslation(trans)); + QDomText domTextTranslation = domDoc.createTextNode((*first).translation(trans)); domElementTranslation.appendChild(domTextTranslation); domElementExpression.appendChild(domElementTranslation); diff --git a/kwordquiz/keduvocwqlwriter.cpp b/kwordquiz/keduvocwqlwriter.cpp index f780d38..26ca3d8 100644 --- a/kwordquiz/keduvocwqlwriter.cpp +++ b/kwordquiz/keduvocwqlwriter.cpp @@ -43,13 +43,13 @@ bool KEduVocWqlWriter::writeDoc(KEduVocDocument *doc) m_outputStream.setEncoding(QTextStream::Latin1); m_outputStream << "WordQuiz" << winendl; - m_outputStream << "5.9.0" << winendl << winendl; + m_outputStream << "5.9.0" << winendl << winendl; - if (doc->getFont() != NULL) - writeFont(*(doc->getFont())); + if (doc->font() != NULL) + writeFont(*(doc->font())); // TODO writeCharacters(Prefs::specialCharacters()); // TODO Find the vertical header width, handle the case where there are not exactly two languages - writeGridInfo(10, m_doc->getSizeHint(0), m_doc->getSizeHint(1), m_doc->numEntries()); + writeGridInfo(10, m_doc->sizeHint(0), m_doc->sizeHint(1), m_doc->numEntries()); /* TODO Find the selected cells if (g->numSelections() > 0) { @@ -60,12 +60,12 @@ bool KEduVocWqlWriter::writeDoc(KEduVocDocument *doc) { writeSelection(g->currentColumn(), g->currentRow(), g->currentColumn(), g->currentRow()); }*/ - writeFirstItem(m_doc->getOriginalIdent(), m_doc->getIdent(1)); + writeFirstItem(m_doc->originalIdent(), m_doc->ident(1)); int r = m_doc->numEntries(); for (int w=0; w < r; w++) { // TODO Find the row height (g->rowHeight(w)) - writeItem(m_doc->getEntry(w)->getOriginal(), m_doc->getEntry(w)->getTranslation(1), 30); + writeItem(m_doc->entry(w)->original(), m_doc->entry(w)->translation(1), 30); } } @@ -79,7 +79,7 @@ void KEduVocWqlWriter::writeFont( const QFont & font ) m_outputStream << "FontColor1=0" << winendl; m_outputStream << "CharSet1=0" << winendl; m_outputStream << "Layout1=0" << winendl; - + m_outputStream << "FontName2=\"" << font.family() << "\"" << winendl; m_outputStream << "FontSize2=" << QString::number(font.pointSize()) << winendl; m_outputStream << QString("FontBold2=%1").arg(font.bold() ? "1" : "0") <