From e81150b9a05511335d58a7d0e3906531b417bd8c Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 16 Jun 2011 03:40:30 +0000 Subject: Fix kwordquiz compilation git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1236956 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kwordquiz/src/kwordquiz.cpp | 2 +- kwordquiz/src/kwordquiz.h | 4 ++-- kwordquiz/src/qaview.cpp | 26 +++++++++++++------------- kwordquiz/src/qaview.h | 6 +++--- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/kwordquiz/src/kwordquiz.cpp b/kwordquiz/src/kwordquiz.cpp index 32995aa7..5169921b 100644 --- a/kwordquiz/src/kwordquiz.cpp +++ b/kwordquiz/src/kwordquiz.cpp @@ -1018,7 +1018,7 @@ void KWordQuizApp::updateSession(WQQuiz::QuizType qt) { m_editView->saveCurrentSelection(true); m_editView->hide(); - m_qaView = new TQAView(this); + m_qaView = new QAView(this); connect(quizCheck, TQT_SIGNAL(activated()), m_qaView, TQT_SLOT(slotCheck())); connect(qaHint, TQT_SIGNAL(activated()), m_qaView, TQT_SLOT(slotHint())); connect(quizRestart, TQT_SIGNAL(activated()), m_qaView, TQT_SLOT(slotRestart())); diff --git a/kwordquiz/src/kwordquiz.h b/kwordquiz/src/kwordquiz.h index eb715906..bcef3211 100644 --- a/kwordquiz/src/kwordquiz.h +++ b/kwordquiz/src/kwordquiz.h @@ -38,7 +38,7 @@ class KWordQuizDoc; class KWordQuizView; class KWordQuizPrefs; -class TQAView; +class QAView; class MultipleView; class FlashView; class KWQNewStuff; @@ -239,7 +239,7 @@ class KWordQuizApp : public KMainWindow KWordQuizView *m_editView; FlashView *m_flashView; MultipleView *m_multipleView; - TQAView *m_qaView; + QAView *m_qaView; KWordQuizPrefs *m_prefDialog; diff --git a/kwordquiz/src/qaview.cpp b/kwordquiz/src/qaview.cpp index c1339f75..4d7a23b0 100644 --- a/kwordquiz/src/qaview.cpp +++ b/kwordquiz/src/qaview.cpp @@ -63,23 +63,23 @@ TQString highlightError(const TQString & c, const TQString & e) } -TQAView::TQAView(TQWidget *tqparent, const char *name, WFlags f):QAViewBase(tqparent, name, f) +QAView::QAView(TQWidget *tqparent, const char *name, WFlags f):QAViewBase(tqparent, name, f) { m_score = new WTQScore(); } -TQAView::~TQAView() +QAView::~QAView() { delete txtAnswer; //Fixes #122110 on PCLOS and Ubuntu } -void TQAView::setQuiz(WQQuiz *quiz) +void QAView::setQuiz(WQQuiz *quiz) { m_quiz = quiz; } -void TQAView::init() +void QAView::init() { m_score -> setQuestionCount(m_quiz->questionCount()); m_score -> setAsPercent(Prefs::percent()); @@ -127,7 +127,7 @@ void TQAView::init() txtAnswer->setFocus(); } -void TQAView::slotCheck() +void QAView::slotCheck() { KWordQuizApp *win=(KWordQuizApp *) tqparent(); if (win->actionCollection()->action("quiz_check")->isEnabled()) @@ -200,7 +200,7 @@ void TQAView::slotCheck() } } -void TQAView::slotHint() +void QAView::slotHint() { TQString answer = txtAnswer->text(); TQString correctAnswer = m_quiz->hint(m_question); @@ -228,19 +228,19 @@ void TQAView::slotHint() m_hintUsed = true; } -void TQAView::slotRestart() +void QAView::slotRestart() { m_quiz->activateBaseList(); init(); } -void TQAView::slotRepeat() +void QAView::slotRepeat() { m_quiz->activateErrorList(); init(); } -void TQAView::updateScore() +void QAView::updateScore() { TQString s; s = s.setNum(m_quiz->questionCount(), 10); @@ -265,9 +265,9 @@ void TQAView::updateScore() /*! - \fn TQAView::showQuestion(int i) + \fn QAView::showQuestion(int i) */ -void TQAView::showQuestion(int i) +void QAView::showQuestion(int i) { //m_quiz->setColumn(i); lblQuestionLanguage -> setText(m_quiz ->langQuestion(i)); @@ -295,13 +295,13 @@ void TQAView::showQuestion(int i) //@todo handle keyboard tqlayouts } -void TQAView::slotApplySettings( ) +void QAView::slotApplySettings( ) { m_score ->setAsPercent(Prefs::percent()); updateScore(); } -void TQAView::slotSpecChar( const TQChar & c) +void QAView::slotSpecChar( const TQChar & c) { if (txtAnswer->hasFocus()) { diff --git a/kwordquiz/src/qaview.h b/kwordquiz/src/qaview.h index 656eec83..fce3e461 100644 --- a/kwordquiz/src/qaview.h +++ b/kwordquiz/src/qaview.h @@ -29,14 +29,14 @@ /** @author Peter Hedlund */ -class TQAView : public QAViewBase +class QAView : public QAViewBase { Q_OBJECT TQ_OBJECT public: - TQAView(TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0); + QAView(TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0); - ~TQAView(); + ~QAView(); void setQuiz(WQQuiz *quiz); void init(); -- cgit v1.2.1