Give KEduVocGrade proper operator= and operator== functions.

Use these in KEduVocTranslation.
Remove lots of comments and methods that can never be called.

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

diff --git a/keduvocdocument/keduvocgrade.cpp b/keduvocdocument/keduvocgrade.cpp
index df99b7a3a8c3498db00ff80f96ac818438a8aa66..398f346bfaa34106a52abad35aedb056b751005d 100644 (file)
--- a/keduvocdocument/keduvocgrade.cpp
+++ b/keduvocdocument/keduvocgrade.cpp
@@ -128,3 +128,19 @@ void KEduVocGrade::setQueryDate( const QDateTime & date )
 {
     d->m_queryDate = date;
 }
+
+KEduVocGrade & KEduVocGrade::operator =(const KEduVocGrade & other)
+{
+    d->m_grade = other.d->m_grade;
+    d->m_queryCount = other.d->m_queryCount;
+    d->m_badCount = other.d->m_badCount;
+    d->m_queryDate = other.d->m_queryDate;
+}
+
+bool KEduVocGrade::operator ==(const KEduVocGrade & other) const
+{
+    return d->m_grade == other.d->m_grade &&
+        d->m_queryCount == other.d->m_queryCount &&
+        d->m_badCount == other.d->m_badCount &&
+        d->m_queryDate == other.d->m_queryDate;
+}

diff --git a/keduvocdocument/keduvocgrade.h b/keduvocdocument/keduvocgrade.h
index 680e27f23ab50b03e14283f5cf60489e434241c7..15d66f42d9a4764780e0d800be7017fa0e39ea4f 100644 (file)
--- a/keduvocdocument/keduvocgrade.h
+++ b/keduvocdocument/keduvocgrade.h
@@ -71,6 +71,20 @@ public:
     /** default destructor */
     ~KEduVocGrade();
 
+    /**
+     * Equal operator to copy grades.
+     * @param other grades copied
+     * @return reference to the new grades
+     */
+    KEduVocGrade& operator= ( const KEduVocGrade &other );
+    /**
+     * Compare two sets of grades.
+     * @param other
+     * @return true if equal
+     */
+    bool operator== ( const KEduVocGrade &other ) const;
+
+
     /** returns query count as int
     * @returns query count
     */

diff --git a/keduvocdocument/keduvoctranslation.cpp b/keduvocdocument/keduvoctranslation.cpp
index a844541490a3aebc96c6120261add99b7a14cf60..0e933158467e8f2728e08718ac6d92d3a8d9e31a 100644 (file)
--- a/keduvocdocument/keduvoctranslation.cpp
+++ b/keduvocdocument/keduvoctranslation.cpp
@@ -25,20 +25,6 @@
 class KEduVocTranslation::KEduVocTranslationPrivate
 {
 public:
-
-    KEduVocTranslationPrivate()  // ( KEduVocTranslation* qq )
-    //: q ( qq )
-    {
-        init();
-    }
-
-    void init();
-
-    KEduVocTranslationPrivate& operator= ( const KEduVocTranslationPrivate &translation );
-    bool operator== ( const KEduVocTranslationPrivate &p ) const;
-
-    //KEduVocTranslation* q;
-
     /// This is the word itself. The vocabulary. This is what it is all about.
     QString m_translation;
     /// Some languages (german) have irregular plurals. Kept here.
@@ -83,34 +69,6 @@ public:
 };
 
 
-
-void KEduVocTranslation::KEduVocTranslationPrivate::init()
-{
-    m_translation = QString();
-}
-
-
-bool KEduVocTranslation::KEduVocTranslationPrivate::operator== ( const KEduVocTranslation::KEduVocTranslationPrivate &other ) const
-{
-    return  m_translation == other.m_translation &&
-            m_type == other.m_type &&
-            m_subType == other.m_subType &&
-            m_usages == other.m_usages &&
-            m_comment == other.m_comment &&
-            m_irregularPlural == other.m_irregularPlural &&
-            m_paraphrase == other.m_paraphrase &&
-            m_synonym == other.m_synonym &&
-            m_example == other.m_example &&
-            m_antonym == other.m_antonym &&
-            m_pronunciation == other.m_pronunciation &&
-            m_conjugations == other.m_conjugations &&
-            m_comparison == other.m_comparison &&
-            m_multipleChoice == other.m_multipleChoice &&
-//             m_grades == other.m_grades &&
-            m_falseFriends.keys() == other.m_falseFriends.keys() &&
-            m_falseFriends.values() == other.m_falseFriends.values();
-}
-
 KEduVocTranslation::KEduVocTranslation() : d( new KEduVocTranslationPrivate )
 {}
 
@@ -136,7 +94,7 @@ KEduVocTranslation::KEduVocTranslation( const KEduVocTranslation &other ) : d( n
     d->m_conjugations = other.d->m_conjugations;
     d->m_comparison = other.d->m_comparison;
     d->m_multipleChoice = other.d->m_multipleChoice;
-//     d->m_grades = other.d->m_grades;
+    d->m_grades = other.d->m_grades;
     d->m_falseFriends = other.d->m_falseFriends;
 }
 
@@ -145,6 +103,48 @@ KEduVocTranslation::~KEduVocTranslation()
     delete d;
 }
 
+
+bool KEduVocTranslation::operator == ( const KEduVocTranslation & translation ) const
+{
+    return d->m_translation == translation.d->m_translation &&
+           d->m_type == translation.d->m_type &&
+           d->m_subType == translation.d->m_subType &&
+           d->m_usages == translation.d->m_usages &&
+           d->m_comment == translation.d->m_comment &&
+           d->m_paraphrase == translation.d->m_paraphrase &&
+           d->m_synonym == translation.d->m_synonym &&
+           d->m_example == translation.d->m_example &&
+           d->m_antonym == translation.d->m_antonym &&
+           d->m_pronunciation == translation.d->m_pronunciation &&
+           d->m_comparison == translation.d->m_comparison &&
+           d->m_multipleChoice == translation.d->m_multipleChoice &&
+           d->m_falseFriends == translation.d->m_falseFriends &&
+           d->m_conjugations == translation.d->m_conjugations &&
+           d->m_grades == translation.d->m_grades;
+}
+
+
+KEduVocTranslation & KEduVocTranslation::operator = ( const KEduVocTranslation & translation )
+{
+    d->m_translation = translation.d->m_translation;
+    d->m_type = translation.d->m_type;
+    d->m_subType = translation.d->m_subType;
+    d->m_usages = translation.d->m_usages;
+    d->m_comment = translation.d->m_comment;
+    d->m_paraphrase = translation.d->m_paraphrase;
+    d->m_synonym = translation.d->m_synonym;
+    d->m_example = translation.d->m_example;
+    d->m_antonym = translation.d->m_antonym;
+    d->m_pronunciation = translation.d->m_pronunciation;
+    d->m_comparison = translation.d->m_comparison;
+    d->m_multipleChoice = translation.d->m_multipleChoice;
+    d->m_falseFriends = translation.d->m_falseFriends;
+    d->m_grades == translation.d->m_grades;
+    d->m_conjugations = translation.d->m_conjugations;
+    return *this;
+}
+
+
 QString KEduVocTranslation::text() const
 {
     return d->m_translation;
@@ -316,53 +316,6 @@ void KEduVocTranslation::resetGrades()
     d->m_grades.clear();
 }
 
-/*
-QList< int > KEduVocTranslation::conjugationTenses() const
-{
-    return m_conjugations.keys();
-}*/
-
-bool KEduVocTranslation::operator == ( const KEduVocTranslation & translation ) const
-{
-    return d->m_translation == translation.d->m_translation &&
-           d->m_type == translation.d->m_type &&
-           d->m_subType == translation.d->m_subType &&
-           d->m_usages == translation.d->m_usages &&
-           d->m_comment == translation.d->m_comment &&
-           d->m_paraphrase == translation.d->m_paraphrase &&
-           d->m_synonym == translation.d->m_synonym &&
-           d->m_example == translation.d->m_example &&
-           d->m_antonym == translation.d->m_antonym &&
-           d->m_pronunciation == translation.d->m_pronunciation &&
-           d->m_comparison == translation.d->m_comparison &&
-           d->m_multipleChoice == translation.d->m_multipleChoice &&
-           d->m_falseFriends == translation.d->m_falseFriends &&
-           d->m_conjugations == translation.d->m_conjugations
-           /// @todo d->m_grades == translation.d->m_grades &&
-           ;
-}
-
-
-KEduVocTranslation & KEduVocTranslation::operator = ( const KEduVocTranslation & translation )
-{
-    d->m_translation = translation.d->m_translation;
-    d->m_type = translation.d->m_type;
-    d->m_subType = translation.d->m_subType;
-    d->m_usages = translation.d->m_usages;
-    d->m_comment = translation.d->m_comment;
-    d->m_paraphrase = translation.d->m_paraphrase;
-    d->m_synonym = translation.d->m_synonym;
-    d->m_example = translation.d->m_example;
-    d->m_antonym = translation.d->m_antonym;
-    d->m_pronunciation = translation.d->m_pronunciation;
-    d->m_comparison = translation.d->m_comparison;
-    d->m_multipleChoice = translation.d->m_multipleChoice;
-    d->m_falseFriends = translation.d->m_falseFriends;
-    /// @todo d->m_grades == translation.d->m_grades;
-    d->m_conjugations = translation.d->m_conjugations;
-    return *this;
-}
-
 KEduVocGrade & KEduVocTranslation::gradeFrom( int indexFrom )
 {
     return d->m_grades[indexFrom];