From: Frederik Gladhorn Date: Tue, 12 Jun 2007 19:47:39 +0000 (+0000) Subject: Let KEduVocGrades have at least a constructor to set default values. X-Git-Tag: v3.91.0~21 X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=ad733a9656bee375a5222c2fff9eb14215c40725;p=libqmvoc.git 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 a1961f8..c0ecfa1 100644 --- 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 8fa2fcd..968f75e 100644 --- a/kdeeducore/keduvocgrade.h +++ b/kdeeducore/keduvocgrade.h @@ -16,7 +16,36 @@ #ifndef KEDUVOCGRADE_H #define KEDUVOCGRADE_H -#include +#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 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 1be478d..e05c84f 100644 --- a/kdeeducore/keduvoctranslation.h +++ b/kdeeducore/keduvoctranslation.h @@ -20,37 +20,6 @@ #include - -#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 #include #include