[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeedu/kwordquiz/src
From: Peter Hedlund <peter () peterandlinda ! com>
Date: 2008-01-25 21:48:37
Message-ID: 1201297717.517059.25659.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 766448 by hedlund:
Use the new enum from Prefs
M +3 -3 kwordquiz.cpp
M +10 -10 kwqquiz.cpp
M +5 -4 kwqquiz.h
--- trunk/KDE/kdeedu/kwordquiz/src/kwordquiz.cpp #766447:766448
@@ -1111,7 +1111,7 @@
m_quiz = new KWQQuiz(this);
m_quiz->setModel(m_sortFilterModel);
connect(m_quiz, SIGNAL(checkingAnswer(int )), m_tableView, \
SLOT(slotCheckedAnswer(int )));
- m_quiz ->setQuizType(KWQQuiz::QuizFlashCard);
+ m_quiz ->setQuizType(Prefs::EnumStartSession::Flashcard);
m_quiz->setQuizMode(Prefs::mode());
if (m_quiz->init())
{
@@ -1142,7 +1142,7 @@
m_quiz = new KWQQuiz(this);
m_quiz->setModel(m_sortFilterModel);
connect(m_quiz, SIGNAL(checkingAnswer(int )), m_tableView, \
SLOT(slotCheckedAnswer(int )));
- m_quiz ->setQuizType(KWQQuiz::QuizMultipleChoice);
+ m_quiz ->setQuizType(Prefs::EnumStartSession::MultipleChoice);
m_quiz->setQuizMode(Prefs::mode());
if (m_quiz->init())
{
@@ -1171,7 +1171,7 @@
m_quiz = new KWQQuiz(this);
m_quiz->setModel(m_sortFilterModel);
connect(m_quiz, SIGNAL(checkingAnswer(int )), m_tableView, \
SLOT(slotCheckedAnswer(int )));
- m_quiz ->setQuizType(KWQQuiz::QuizQuestionAnswer);
+ m_quiz ->setQuizType(Prefs::EnumStartSession::QA);
m_quiz->setQuizMode(Prefs::mode());
if (m_quiz->init())
{
--- trunk/KDE/kdeedu/kwordquiz/src/kwqquiz.cpp #766447:766448
@@ -117,16 +117,16 @@
//check if enough in list
switch (m_quizType)
{
- case QuizEditor:
+ case Prefs::EnumStartSession::Editor:
//
break;
- case QuizFlashCard:
+ case Prefs::EnumStartSession::Flashcard:
result = (m_quizList.count() > 0);
break;
- case QuizQuestionAnswer:
+ case Prefs::EnumStartSession::QA:
result = (m_quizList.count() > 0);
break;
- case QuizMultipleChoice:
+ case Prefs::EnumStartSession::MultipleChoice:
result = (m_quizList.count() > 2);
break;
}
@@ -156,7 +156,7 @@
tTemp = tTemp.simplified();
ans = ans.simplified();
- if (m_quizType == QuizQuestionAnswer)
+ if (m_quizType == Prefs::EnumStartSession::QA)
{
if (QString(m_correctBlank).length() > 0)
{
@@ -189,7 +189,7 @@
}
else
{
- if (m_quizType == QuizMultipleChoice)
+ if (m_quizType == Prefs::EnumStartSession::MultipleChoice)
{
if (Prefs::enableBlanks())
{
@@ -316,7 +316,7 @@
}
-void KWQQuiz::setQuizType(QuizType qt)
+void KWQQuiz::setQuizType(Prefs::EnumStartSession::type qt)
{
m_quizType = qt;
}
@@ -338,7 +338,7 @@
s.remove("[");
s.remove("]");
}
- if (m_quizType != QuizFlashCard && i > 0)
+ if (m_quizType != Prefs::EnumStartSession::Flashcard && i > 0)
{
KWQListItem li2 = m_list.at(i - 1);
emit checkingAnswer(li2.firstChoice());
@@ -358,7 +358,7 @@
m_answerBlank = "";
QString tTemp;
- if (m_quizType == QuizQuestionAnswer && Prefs::enableBlanks())
+ if (m_quizType == Prefs::EnumStartSession::QA && Prefs::enableBlanks())
{
KWQListItem li = m_list.at(i);
tTemp = m_model->data(m_model->index(li.firstChoice(), li.question() ? 0 : 1, \
QModelIndex()), Qt::DisplayRole).toString(); @@ -396,7 +396,7 @@
QString s;
KWQListItem li = m_list.at(i);
- if (m_quizType == QuizQuestionAnswer)
+ if (m_quizType == Prefs::EnumStartSession::QA)
{
s = m_model->data(m_model->index(li.firstChoice(), li.question() ? 0 : 1, \
QModelIndex()), Qt::DisplayRole).toString(); if (Prefs::enableBlanks())
--- trunk/KDE/kdeedu/kwordquiz/src/kwqquiz.h #766447:766448
@@ -22,6 +22,8 @@
#include <QAbstractItemModel>
#include <QList>
+#include "prefs.h"
+
/**
@author Peter Hedlund
*/
@@ -59,7 +61,6 @@
{
Q_OBJECT
public:
- enum QuizType {QuizEditor, QuizFlashCard, QuizMultipleChoice, QuizQuestionAnswer};
enum QuizIcon {IconLeftCol, IconRightCol, IconQuestion, IconCorrect, IconError};
KWQQuiz(QObject *parent);
@@ -77,8 +78,8 @@
QString yourAnswer(const QString & s);
QString hint(int i);
- QuizType quizType() const {return m_quizType;}
- void setQuizType(QuizType qt);
+ Prefs::EnumStartSession::type quizType() const {return m_quizType;}
+ void setQuizType(Prefs::EnumStartSession::type qt);
int quizMode() const {return m_quizMode;}
void setQuizMode(int qm);
@@ -103,7 +104,7 @@
QList<KWQListItem> m_errorList;
QList<KWQListItem> m_quizList;
- QuizType m_quizType;
+ Prefs::EnumStartSession::type m_quizType;
QString m_correctBlank;
QString m_answerBlank;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic