From 56a9ebb65c99f639320c13148fe85d2b1e2a7562 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 16 Jun 2011 03:11:24 +0000 Subject: Fix kwordquiz FTBFS git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1236955 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kwordquiz/src/flashview.cpp | 2 +- kwordquiz/src/flashview.h | 6 ++-- kwordquiz/src/kwordquiz.cpp | 68 ++++++++++++++++++------------------- kwordquiz/src/kwordquiz.h | 12 +++---- kwordquiz/src/kwqnewstuff.cpp | 10 +++--- kwordquiz/src/kwqnewstuff.h | 4 +-- kwordquiz/src/multipleview.cpp | 6 ++-- kwordquiz/src/multipleview.h | 4 +-- kwordquiz/src/qaview.cpp | 6 ++-- kwordquiz/src/qaview.h | 4 +-- kwordquiz/src/wqprintdialogpage.cpp | 10 +++--- kwordquiz/src/wqprintdialogpage.h | 6 ++-- kwordquiz/src/wqquiz.cpp | 42 +++++++++++------------ kwordquiz/src/wqquiz.h | 4 +-- 14 files changed, 92 insertions(+), 92 deletions(-) diff --git a/kwordquiz/src/flashview.cpp b/kwordquiz/src/flashview.cpp index 6db1916f..eb29cb62 100644 --- a/kwordquiz/src/flashview.cpp +++ b/kwordquiz/src/flashview.cpp @@ -39,7 +39,7 @@ FlashView::~FlashView() } -void FlashView::setQuiz(WTQQuiz *quiz) +void FlashView::setQuiz(WQQuiz *quiz) { m_quiz = quiz; } diff --git a/kwordquiz/src/flashview.h b/kwordquiz/src/flashview.h index 02a20177..96e69d3d 100644 --- a/kwordquiz/src/flashview.h +++ b/kwordquiz/src/flashview.h @@ -23,7 +23,7 @@ #include "wqscore.h" -class WTQQuiz; +class WQQuiz; /** @author Peter Hedlund @@ -37,7 +37,7 @@ public: ~FlashView(); - void setQuiz(WTQQuiz *quiz); + void setQuiz(WQQuiz *quiz); void init(); private slots: @@ -52,7 +52,7 @@ public slots: void slotApplySettings(); private: - WTQQuiz *m_quiz; + WQQuiz *m_quiz; WTQScore *m_score; KAction* actFlip; diff --git a/kwordquiz/src/kwordquiz.cpp b/kwordquiz/src/kwordquiz.cpp index a13b0aa0..32995aa7 100644 --- a/kwordquiz/src/kwordquiz.cpp +++ b/kwordquiz/src/kwordquiz.cpp @@ -68,7 +68,7 @@ KWordQuizApp::KWordQuizApp(TQWidget* , const char* name):KMainWindow(0, name) initView(); m_dirWatch = KDirWatch::self(); - m_quizType = WTQQuiz::qtEditor; + m_quizType = WQQuiz::qtEditor; m_quiz = 0; m_flashView = 0; m_multipleView = 0; @@ -568,7 +568,7 @@ void KWordQuizApp::slotFileSave() void KWordQuizApp::slotFileGHNS() { if (!m_newStuff) - m_newStuff = new KWTQNewStuff(this); + m_newStuff = new KWQNewStuff(this); m_newStuff->download(); } @@ -660,7 +660,7 @@ void KWordQuizApp::slotFileClose() void KWordQuizApp::slotFilePrint() { slotStatusMsg(i18n("Printing...")); - WTQPrintDialogPage * p = new WTQPrintDialogPage(this); + WQPrintDialogPage * p = new WQPrintDialogPage(this); KPrinter printer; printer.addDialogPage(p); printer.setFullPage(true); @@ -885,32 +885,32 @@ void KWordQuizApp::slotMode5() void KWordQuizApp::slotQuizEditor() { slotStatusMsg(i18n("Starting editor session...")); - updateSession(WTQQuiz::qtEditor); + updateSession(WQQuiz::qtEditor); slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotQuizFlash() { slotStatusMsg(i18n("Starting flashcard session...")); - updateSession(WTQQuiz::qtFlash); + updateSession(WQQuiz::qtFlash); slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotQuizMultiple() { slotStatusMsg(i18n("Starting multiple choice session...")); - updateSession(WTQQuiz::qtMultiple); + updateSession(WQQuiz::qtMultiple); slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotQuizQA() { slotStatusMsg(i18n("Starting question & answer session...")); - updateSession(WTQQuiz::qtQA); + updateSession(WQQuiz::qtQA); slotStatusMsg(i18n("Ready")); } -void KWordQuizApp::updateSession(WTQQuiz::QuizType qt) +void KWordQuizApp::updateSession(WQQuiz::QuizType qt) { if (m_quiz != 0) { @@ -919,24 +919,24 @@ void KWordQuizApp::updateSession(WTQQuiz::QuizType qt) } switch( m_quizType ){ - case WTQQuiz::qtEditor: + case WQQuiz::qtEditor: // break; - case WTQQuiz::qtFlash: + case WQQuiz::qtFlash: if (m_flashView != 0) { delete(m_flashView); m_flashView = 0; } break; - case WTQQuiz::qtMultiple: + case WQQuiz::qtMultiple: if (m_multipleView != 0) { delete(m_multipleView); m_multipleView = 0; } break; - case WTQQuiz::qtQA: + case WQQuiz::qtQA: if (m_qaView != 0) { delete(m_qaView); @@ -949,15 +949,15 @@ void KWordQuizApp::updateSession(WTQQuiz::QuizType qt) updateActions(qt); switch( m_quizType ){ - case WTQQuiz::qtEditor: + case WQQuiz::qtEditor: m_editView->show(); setCentralWidget(m_editView); m_editView -> setFocus(); break; - case WTQQuiz::qtFlash: - m_quiz = new WTQQuiz(m_editView); + case WQQuiz::qtFlash: + m_quiz = new WQQuiz(m_editView); connect(m_quiz, TQT_SIGNAL(checkingAnswer(int )), m_editView, TQT_SLOT(slotCheckedAnswer(int ))); - m_quiz ->setQuizType(WTQQuiz::qtFlash); + m_quiz ->setQuizType(WQQuiz::qtFlash); m_quiz->setQuizMode(Prefs::mode()); if (m_quiz -> init()) { @@ -982,10 +982,10 @@ void KWordQuizApp::updateSession(WTQQuiz::QuizType qt) m_quiz = 0; } break; - case WTQQuiz::qtMultiple: - m_quiz = new WTQQuiz(m_editView); + case WQQuiz::qtMultiple: + m_quiz = new WQQuiz(m_editView); connect(m_quiz, TQT_SIGNAL(checkingAnswer(int )), m_editView, TQT_SLOT(slotCheckedAnswer(int ))); - m_quiz ->setQuizType(WTQQuiz::qtMultiple); + m_quiz ->setQuizType(WQQuiz::qtMultiple); m_quiz->setQuizMode(Prefs::mode()); if (m_quiz -> init()) { @@ -1009,10 +1009,10 @@ void KWordQuizApp::updateSession(WTQQuiz::QuizType qt) m_quiz = 0; } break; - case WTQQuiz::qtQA: - m_quiz = new WTQQuiz(m_editView); + case WQQuiz::qtQA: + m_quiz = new WQQuiz(m_editView); connect(m_quiz, TQT_SIGNAL(checkingAnswer(int )), m_editView, TQT_SLOT(slotCheckedAnswer(int ))); - m_quiz ->setQuizType(WTQQuiz::qtQA); + m_quiz ->setQuizType(WQQuiz::qtQA); m_quiz->setQuizMode(Prefs::mode()); if (m_quiz -> init()) { @@ -1217,9 +1217,9 @@ void KWordQuizApp::slotContextMenuRequested(int row, int col, const TQPoint & po popup->exec(pos); } -void KWordQuizApp::updateActions( WTQQuiz::QuizType qt ) +void KWordQuizApp::updateActions( WQQuiz::QuizType qt ) { - bool fEdit = (qt == WTQQuiz::qtEditor); + bool fEdit = (qt == WQQuiz::qtEditor); fileSave->setEnabled(fEdit); fileSaveAs->setEnabled(fEdit); @@ -1237,21 +1237,21 @@ void KWordQuizApp::updateActions( WTQQuiz::QuizType qt ) vocabSort->setEnabled(fEdit); vocabShuffle->setEnabled(fEdit); - quizEditor->setEnabled(qt != WTQQuiz::qtEditor); - quizFlash->setEnabled(qt != WTQQuiz::qtFlash); - quizMultiple->setEnabled(qt != WTQQuiz::qtMultiple); - quizQA->setEnabled(qt != WTQQuiz::qtQA); + quizEditor->setEnabled(qt != WQQuiz::qtEditor); + quizFlash->setEnabled(qt != WQQuiz::qtFlash); + quizMultiple->setEnabled(qt != WQQuiz::qtMultiple); + quizQA->setEnabled(qt != WQQuiz::qtQA); - quizCheck->setEnabled(qt != WTQQuiz::qtEditor); - quizRestart->setEnabled(qt != WTQQuiz::qtEditor); + quizCheck->setEnabled(qt != WQQuiz::qtEditor); + quizRestart->setEnabled(qt != WQQuiz::qtEditor); quizRepeatErrors->setEnabled(false); - flashKnow->setEnabled(qt == WTQQuiz::qtFlash); - flashDontKnow->setEnabled(qt == WTQQuiz::qtFlash); + flashKnow->setEnabled(qt == WQQuiz::qtFlash); + flashDontKnow->setEnabled(qt == WQQuiz::qtFlash); - qaHint->setEnabled(qt == WTQQuiz::qtQA); + qaHint->setEnabled(qt == WQQuiz::qtQA); - toolBar("quizToolBar")->setHidden(qt == WTQQuiz::qtEditor); + toolBar("quizToolBar")->setHidden(qt == WQQuiz::qtEditor); } diff --git a/kwordquiz/src/kwordquiz.h b/kwordquiz/src/kwordquiz.h index 7b038b11..eb715906 100644 --- a/kwordquiz/src/kwordquiz.h +++ b/kwordquiz/src/kwordquiz.h @@ -41,7 +41,7 @@ class KWordQuizPrefs; class TQAView; class MultipleView; class FlashView; -class KWTQNewStuff; +class KWQNewStuff; /** * The base class for KWordQuiz application windows. It sets up the main @@ -227,9 +227,9 @@ class KWordQuizApp : public KMainWindow void slotContextMenuRequested(int, int, const TQPoint &); private: - WTQQuiz::QuizType m_quizType; + WQQuiz::QuizType m_quizType; - WTQQuiz *m_quiz; + WQQuiz *m_quiz; /** view is the main widget which represents your working area. The View * class should handle all events of the view widget. It is kept empty so @@ -310,11 +310,11 @@ class KWordQuizApp : public KMainWindow KAction* specialChar9; KDirWatch * m_dirWatch; - KWTQNewStuff * m_newStuff; + KWQNewStuff * m_newStuff; void updateMode(int m); - void updateSession(WTQQuiz::QuizType qt); - void updateActions(WTQQuiz::QuizType qt); + void updateSession(WQQuiz::QuizType qt); + void updateActions(WQQuiz::QuizType qt); void updateSpecialCharIcons(); TQString charIcon(const TQChar &); void openURL(const KURL& url); diff --git a/kwordquiz/src/kwqnewstuff.cpp b/kwordquiz/src/kwqnewstuff.cpp index 0d7fb1de..6aeca50d 100644 --- a/kwordquiz/src/kwqnewstuff.cpp +++ b/kwordquiz/src/kwqnewstuff.cpp @@ -27,26 +27,26 @@ #include "kwqnewstuff.h" #include "prefs.h" -KWTQNewStuff::KWTQNewStuff(TQWidget *tqparent, const char *name) : TQObject(), KNewStuff("kdeedu/vocabulary", tqparent) +KWQNewStuff::KWQNewStuff(TQWidget *tqparent, const char *name) : TQObject(), KNewStuff("kdeedu/vocabulary", tqparent) { m_app = (KWordQuizApp *) tqparent; } -bool KWTQNewStuff::install(const TQString & fileName) +bool KWQNewStuff::install(const TQString & fileName) { m_app->slotFileOpenRecent(KURL(fileName)); return true; } -bool KWTQNewStuff::createUploadFile(const TQString & fileName) +bool KWQNewStuff::createUploadFile(const TQString & fileName) { return true; } -TQString KWTQNewStuff::destinationPath(KNS::Entry * entry) +TQString KWQNewStuff::destinationPath(KNS::Entry * entry) { if (entry) { @@ -71,7 +71,7 @@ TQString KWTQNewStuff::destinationPath(KNS::Entry * entry) } -TQString KWTQNewStuff::downloadDestination(KNS::Entry * entry) +TQString KWQNewStuff::downloadDestination(KNS::Entry * entry) { TQString file = destinationPath(entry); diff --git a/kwordquiz/src/kwqnewstuff.h b/kwordquiz/src/kwqnewstuff.h index 81d3c9e1..87c825f1 100644 --- a/kwordquiz/src/kwqnewstuff.h +++ b/kwordquiz/src/kwqnewstuff.h @@ -25,12 +25,12 @@ class KWordQuizApp; /** @author Peter Hedlund */ -class KWTQNewStuff : public TQObject, public KNewStuff +class KWQNewStuff : public TQObject, public KNewStuff { Q_OBJECT TQ_OBJECT public: - KWTQNewStuff(TQWidget *tqparent = 0, const char *name = 0); + KWQNewStuff(TQWidget *tqparent = 0, const char *name = 0); /** Installs a downloaded file according to the application's configuration. diff --git a/kwordquiz/src/multipleview.cpp b/kwordquiz/src/multipleview.cpp index e61097ef..850aef33 100644 --- a/kwordquiz/src/multipleview.cpp +++ b/kwordquiz/src/multipleview.cpp @@ -37,7 +37,7 @@ MultipleView::MultipleView(TQWidget *tqparent, const char *name, WFlags f) MultipleView::~MultipleView() {} -void MultipleView::setQuiz(WTQQuiz *quiz) +void MultipleView::setQuiz(WQQuiz *quiz) { m_quiz = quiz; } @@ -253,7 +253,7 @@ void MultipleView::showQuestion(int i) lblQuestion -> setText(m_quiz ->question(i)); //lblQuestion -> setFont(m_quiz->fontQuestion(i)); - picQuestion->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WTQQuiz::qiLeftCol), KIcon::Panel)); + picQuestion->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiLeftCol), KIcon::Panel)); lblAnswerLanguage -> setText(m_quiz ->langAnswer(i)); @@ -278,7 +278,7 @@ void MultipleView::showQuestion(int i) opt2->setChecked(false); opt3->setChecked(false); - picAnswer->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WTQQuiz::qiRightCol), KIcon::Panel)); + picAnswer->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiRightCol), KIcon::Panel)); } void MultipleView::slotApplySettings( ) diff --git a/kwordquiz/src/multipleview.h b/kwordquiz/src/multipleview.h index d2bfe843..01414599 100644 --- a/kwordquiz/src/multipleview.h +++ b/kwordquiz/src/multipleview.h @@ -35,7 +35,7 @@ public: ~MultipleView(); - void setQuiz(WTQQuiz *quiz); + void setQuiz(WQQuiz *quiz); void init(); public slots: @@ -48,7 +48,7 @@ public slots: void slotApplySettings(); private: - WTQQuiz *m_quiz; + WQQuiz *m_quiz; WTQScore *m_score; int m_question; diff --git a/kwordquiz/src/qaview.cpp b/kwordquiz/src/qaview.cpp index b67e176b..c1339f75 100644 --- a/kwordquiz/src/qaview.cpp +++ b/kwordquiz/src/qaview.cpp @@ -74,7 +74,7 @@ TQAView::~TQAView() delete txtAnswer; //Fixes #122110 on PCLOS and Ubuntu } -void TQAView::setQuiz(WTQQuiz *quiz) +void TQAView::setQuiz(WQQuiz *quiz) { m_quiz = quiz; } @@ -274,7 +274,7 @@ void TQAView::showQuestion(int i) lblQuestion -> setText(m_quiz ->question(i)); //lblQuestion -> setFont(m_quiz->fontQuestion(i)); - picQuestion->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WTQQuiz::qiLeftCol), KIcon::Panel)); + picQuestion->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiLeftCol), KIcon::Panel)); lblAnswerLanguage -> setText(m_quiz ->langAnswer(i)); @@ -290,7 +290,7 @@ void TQAView::showQuestion(int i) //txtAnswer->setFont(m_quiz->fontAnswer(i)); txtAnswer -> setText(""); - picAnswer->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WTQQuiz::qiRightCol), KIcon::Panel)); + picAnswer->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiRightCol), KIcon::Panel)); //@todo handle keyboard tqlayouts } diff --git a/kwordquiz/src/qaview.h b/kwordquiz/src/qaview.h index ecd7cfff..656eec83 100644 --- a/kwordquiz/src/qaview.h +++ b/kwordquiz/src/qaview.h @@ -38,7 +38,7 @@ public: ~TQAView(); - void setQuiz(WTQQuiz *quiz); + void setQuiz(WQQuiz *quiz); void init(); public slots: @@ -50,7 +50,7 @@ public slots: void slotSpecChar(const TQChar &); private: - WTQQuiz *m_quiz; + WQQuiz *m_quiz; WTQScore *m_score; KAction* actCheck; diff --git a/kwordquiz/src/wqprintdialogpage.cpp b/kwordquiz/src/wqprintdialogpage.cpp index bcc721b5..833e6729 100644 --- a/kwordquiz/src/wqprintdialogpage.cpp +++ b/kwordquiz/src/wqprintdialogpage.cpp @@ -25,7 +25,7 @@ #include "wqprintdialogpage.h" -WTQPrintDialogPage::WTQPrintDialogPage(TQWidget *tqparent, const char *name ) +WQPrintDialogPage::WQPrintDialogPage(TQWidget *tqparent, const char *name ) : KPrintDialogPage( tqparent, name ) { setTitle(i18n("Vocabulary Options")); @@ -54,16 +54,16 @@ WTQPrintDialogPage::WTQPrintDialogPage(TQWidget *tqparent, const char *name ) } -WTQPrintDialogPage::~WTQPrintDialogPage() +WQPrintDialogPage::~WQPrintDialogPage() { } -void WTQPrintDialogPage::getOptions(TQMap< TQString, TQString > & opts, bool incldef) +void WQPrintDialogPage::getOptions(TQMap< TQString, TQString > & opts, bool incldef) { opts[ "kde-kwordquiz-type" ] = TQString::number(g->selectedId()); } -void WTQPrintDialogPage::setOptions(const TQMap< TQString, TQString > & opts ) +void WQPrintDialogPage::setOptions(const TQMap< TQString, TQString > & opts ) { TQString type = opts[ "kde-kwordquiz-type" ]; switch (type.toInt()) @@ -74,7 +74,7 @@ void WTQPrintDialogPage::setOptions(const TQMap< TQString, TQString > & opts ) } } -bool WTQPrintDialogPage::isValid(const TQString & msg ) +bool WQPrintDialogPage::isValid(const TQString & msg ) { return true; } diff --git a/kwordquiz/src/wqprintdialogpage.h b/kwordquiz/src/wqprintdialogpage.h index ffb10c27..c4252dd9 100644 --- a/kwordquiz/src/wqprintdialogpage.h +++ b/kwordquiz/src/wqprintdialogpage.h @@ -27,14 +27,14 @@ Print dialog page to provide specific print options for KWordQuiz @author Peter Hedlund */ -class WTQPrintDialogPage : public KPrintDialogPage +class WQPrintDialogPage : public KPrintDialogPage { Q_OBJECT TQ_OBJECT public: - WTQPrintDialogPage( TQWidget *tqparent = 0, const char *name = 0 ); + WQPrintDialogPage( TQWidget *tqparent = 0, const char *name = 0 ); - ~WTQPrintDialogPage(); + ~WQPrintDialogPage(); //reimplement virtual functions void getOptions(TQMap& opts, bool incldef = false); void setOptions(const TQMap& opts); diff --git a/kwordquiz/src/wqquiz.cpp b/kwordquiz/src/wqquiz.cpp index 1ba46076..4e1fb4cc 100644 --- a/kwordquiz/src/wqquiz.cpp +++ b/kwordquiz/src/wqquiz.cpp @@ -23,7 +23,7 @@ #include "wqquiz.h" #include "prefs.h" -WTQQuiz::WTQQuiz(KWordQuizView * tqparent, const char *name) : TQObject(tqparent, name) +WQQuiz::WQQuiz(KWordQuizView * tqparent, const char *name) : TQObject(tqparent, name) { m_table = tqparent; @@ -32,7 +32,7 @@ WTQQuiz::WTQQuiz(KWordQuizView * tqparent, const char *name) : TQObject(tqparent m_quizList.clear(); } -void WTQQuiz::activateErrorList() +void WQQuiz::activateErrorList() { m_list.clear(); @@ -47,7 +47,7 @@ void WTQQuiz::activateErrorList() } -void WTQQuiz::activateBaseList() +void WQQuiz::activateBaseList() { m_list.clear(); @@ -64,7 +64,7 @@ void WTQQuiz::activateBaseList() } -void WTQQuiz::addToList(int aCol, int bCol) +void WQQuiz::addToList(int aCol, int bCol) { //build a list of row numbers containing text in both columns @@ -114,7 +114,7 @@ void WTQQuiz::addToList(int aCol, int bCol) } -bool WTQQuiz::init() +bool WQQuiz::init() { bool result = false; @@ -196,7 +196,7 @@ bool WTQQuiz::init() return true; } -void WTQQuiz::listRandom() +void WQQuiz::listRandom() { TQPtrList list; @@ -216,7 +216,7 @@ void WTQQuiz::listRandom() m_quizList.append(items[i]); } -bool WTQQuiz::checkAnswer(int i, const TQString & a) +bool WQQuiz::checkAnswer(int i, const TQString & a) { bool result = false; WTQListItem li = m_list[i]; @@ -292,7 +292,7 @@ bool WTQQuiz::checkAnswer(int i, const TQString & a) return result; } -TQStringList WTQQuiz::multiOptions(int i) +TQStringList WQQuiz::multiOptions(int i) { TQString *s; TQStringList Result; @@ -347,7 +347,7 @@ TQStringList WTQQuiz::multiOptions(int i) return Result; } -TQString WTQQuiz::quizIcon(int i, QuizIcon ico) +TQString WQQuiz::quizIcon(int i, QuizIcon ico) { TQString s; WTQListItem li = m_list[i]; @@ -369,7 +369,7 @@ TQString WTQQuiz::quizIcon(int i, QuizIcon ico) return s; } -TQString WTQQuiz::yourAnswer(int i, const TQString & s) +TQString WQQuiz::yourAnswer(int i, const TQString & s) { TQString result =""; @@ -405,7 +405,7 @@ TQString WTQQuiz::yourAnswer(int i, const TQString & s) return result; } -TQString WTQQuiz::hint(int i) +TQString WQQuiz::hint(int i) { if (TQString(m_correctBlank).length() > 0) { @@ -417,18 +417,18 @@ TQString WTQQuiz::hint(int i) } } -void WTQQuiz::setQuizType(QuizType qt) +void WQQuiz::setQuizType(QuizType qt) { m_quizType = qt; } -void WTQQuiz::setQuizMode(int qm) +void WQQuiz::setQuizMode(int qm) { m_quizMode = qm; } -TQString WTQQuiz::question(int i) +TQString WQQuiz::question(int i) { WTQListItem li = m_list[i]; TQString s = m_table->text(li.oneOp(), li.question()); @@ -448,7 +448,7 @@ TQString WTQQuiz::question(int i) return s; } -TQString WTQQuiz::blankAnswer(int i) +TQString WQQuiz::blankAnswer(int i) { TQString r = ""; @@ -497,7 +497,7 @@ TQString WTQQuiz::blankAnswer(int i) return m_answerBlank; } -TQString WTQQuiz::answer(int i) +TQString WQQuiz::answer(int i) { TQString s; WTQListItem li = m_list[i]; @@ -535,13 +535,13 @@ TQString WTQQuiz::answer(int i) return s; } -TQString WTQQuiz::langQuestion(int i) +TQString WQQuiz::langQuestion(int i) { WTQListItem li = m_list[i]; return m_table->horizontalHeader()->label(li.question()); } -TQString WTQQuiz::langAnswer(int i) +TQString WQQuiz::langAnswer(int i) { WTQListItem li = m_list[i]; @@ -559,7 +559,7 @@ TQString WTQQuiz::langAnswer(int i) return m_table->horizontalHeader()->label(j); } -int WTQQuiz::kbAnswer(int i) +int WQQuiz::kbAnswer(int i) { /* WTQListItem *li = m_list->at(i); if (li->question() == 0) @@ -573,12 +573,12 @@ int WTQQuiz::kbAnswer(int i) return 0; } -int WTQQuiz::questionCount() +int WQQuiz::questionCount() { return m_questionCount; } -void WTQQuiz::finish() +void WQQuiz::finish() { emit checkingAnswer(-1); } diff --git a/kwordquiz/src/wqquiz.h b/kwordquiz/src/wqquiz.h index a9d0c93d..1f3581d1 100644 --- a/kwordquiz/src/wqquiz.h +++ b/kwordquiz/src/wqquiz.h @@ -30,7 +30,7 @@ typedef TQValueList QuizList; -class WTQQuiz : public TQObject +class WQQuiz : public TQObject { Q_OBJECT TQ_OBJECT @@ -38,7 +38,7 @@ class WTQQuiz : public TQObject enum QuizType {qtEditor, qtFlash, qtMultiple, qtQA}; enum QuizIcon {qiLeftCol, qiRightCol, qiQuestion, qiCorrect, qiError}; - WTQQuiz(KWordQuizView * tqparent, const char * name=0); + WQQuiz(KWordQuizView * tqparent, const char * name=0); void activateErrorList(); void activateBaseList(); -- cgit v1.2.1