Let KEduVocGrades have at least a constructor to set default values.

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

diff --git a/kdeeducore/keduvocgrade.cpp b/kdeeducore/keduvocgrade.cpp
index a1961f8e1ba5fb55ee8c4b1e7a1000a0226afb17..c0ecfa1dae597d65f22d70c681e29eebb9c2316b 100644 (file)
--- a/kdeeducore/keduvocgrade.cpp
+++ b/kdeeducore/keduvocgrade.cpp
@@ -15,12 +15,20 @@
 
 #include "keduvocgrade.h"
 
-// KEduVocGrade::KEduVocGrade()
-// {
-// }
-//
+KEduVocGrade::KEduVocGrade()
+{
+    m_grade = KV_NORM_GRADE;
+    m_queryCount = 0;
+    m_badCount = 0;
+
+    QDateTime dt;
+    dt.setTime_t(0);
+    m_queryDate = dt;
+}
+
 
 void KEduVocGrade::resetGrades()
 {
 
 }
+

diff --git a/kdeeducore/keduvocgrade.h b/kdeeducore/keduvocgrade.h
index 8fa2fcd588e4bacd446d431018e72a1dea51d00e..968f75e93e0b141adb2a2361fd5a64caffac3573 100644 (file)
--- a/kdeeducore/keduvocgrade.h
+++ b/kdeeducore/keduvocgrade.h
@@ -16,7 +16,36 @@
 #ifndef KEDUVOCGRADE_H
 #define KEDUVOCGRADE_H
 
-#include <QDateTime>
+#define KV_MAX_GRADE       7
+#define KV_MIN_GRADE       0
+
+#define KV_NORM_GRADE      0       // not queried yet
+#define KV_NORM_COLOR      Qt::black
+#define KV_NORM_TEXT       I18N_NOOP("Not Queried Yet")
+
+#define KV_LEV1_GRADE      1
+#define KV_LEV1_TEXT       I18N_NOOP("Level 1")
+
+#define KV_LEV2_GRADE      2
+#define KV_LEV2_TEXT       I18N_NOOP("Level 2")
+
+#define KV_LEV3_GRADE      3
+#define KV_LEV3_TEXT       I18N_NOOP("Level 3")
+
+#define KV_LEV4_GRADE      4
+#define KV_LEV4_TEXT       I18N_NOOP("Level 4")
+
+#define KV_LEV5_GRADE      5
+#define KV_LEV5_TEXT       I18N_NOOP("Level 5")
+
+#define KV_LEV6_GRADE      6
+#define KV_LEV6_TEXT       I18N_NOOP("Level 6")
+
+#define KV_LEV7_GRADE      7
+#define KV_LEV7_TEXT       I18N_NOOP("Level 7")
+
+
+#include <QtCore/QDateTime>
 
 typedef signed char grade_t;
 typedef unsigned short count_t;
@@ -29,6 +58,7 @@ Contains grading information (query date, bad count) for one language with respe
 class KEduVocGrade
 {
 public:
+    KEduVocGrade();
     void resetGrades();
 
 /// @todo make these private and write the according functions like updateQueryDate, increaseGrade, decreaseGrade etc.

diff --git a/kdeeducore/keduvoctranslation.h b/kdeeducore/keduvoctranslation.h
index 1be478d02acf6bdad3cdbc899ceb6feffe1deb38..e05c84f8d0bec7fd98783a9f632dd4b0b6085e7a 100644 (file)
--- a/kdeeducore/keduvoctranslation.h
+++ b/kdeeducore/keduvoctranslation.h
@@ -20,37 +20,6 @@
 
 #include <libkdeedu_core_export.h>
 
-
-#define KV_MAX_GRADE       7
-#define KV_MIN_GRADE       0
-
-#define KV_NORM_GRADE      0       // not queried yet
-#define KV_NORM_COLOR      Qt::black
-#define KV_NORM_TEXT       I18N_NOOP("Not Queried Yet")
-
-#define KV_LEV1_GRADE      1
-#define KV_LEV1_TEXT       I18N_NOOP("Level 1")
-
-#define KV_LEV2_GRADE      2
-#define KV_LEV2_TEXT       I18N_NOOP("Level 2")
-
-#define KV_LEV3_GRADE      3
-#define KV_LEV3_TEXT       I18N_NOOP("Level 3")
-
-#define KV_LEV4_GRADE      4
-#define KV_LEV4_TEXT       I18N_NOOP("Level 4")
-
-#define KV_LEV5_GRADE      5
-#define KV_LEV5_TEXT       I18N_NOOP("Level 5")
-
-#define KV_LEV6_GRADE      6
-#define KV_LEV6_TEXT       I18N_NOOP("Level 6")
-
-#define KV_LEV7_GRADE      7
-#define KV_LEV7_TEXT       I18N_NOOP("Level 7")
-
-
-#include <QtCore/QDateTime>
 #include <QMap>
 #include <QString>