From cee429821aa6f1acc97fb482d325fb4eb37376ca Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:44:46 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kwordquiz/src/qaview.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'kwordquiz/src/qaview.cpp') diff --git a/kwordquiz/src/qaview.cpp b/kwordquiz/src/qaview.cpp index 141873ec..049b4e19 100644 --- a/kwordquiz/src/qaview.cpp +++ b/kwordquiz/src/qaview.cpp @@ -150,7 +150,7 @@ void QAView::slotCheck() if (fIsCorrect) { - picYourAnswer->setPixmap(KGlobal::iconLoader()->loadIcon("check", KIcon::Panel)); + picYourAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", KIcon::Panel)); lblYourAnswer->setText(m_quiz->yourAnswer(m_question, txtAnswer->text())); lblCorrectHeader->clear(); picCorrectAnswer->clear(); @@ -163,10 +163,10 @@ void QAView::slotCheck() { m_error++; - picYourAnswer->setPixmap(KGlobal::iconLoader()->loadIcon("error", KIcon::Panel)); + picYourAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("error", KIcon::Panel)); lblYourAnswer->setText(highlightError(m_quiz->answer(m_question), m_quiz->yourAnswer(m_question, txtAnswer->text()))); lblCorrect->setText(m_quiz->answer(m_question)); - picCorrectAnswer->setPixmap(KGlobal::iconLoader()->loadIcon("check", KIcon::Panel)); + picCorrectAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", KIcon::Panel)); lblCorrectHeader->setText(i18n("Correct Answer")); m_score->countIncrement(WTQScore::cdError); updateScore(); @@ -175,7 +175,7 @@ void QAView::slotCheck() lblPreviousQuestionHeader->setText(i18n("Previous Question")); lblPreviousQuestion->setText(m_quiz->question(m_question)); - picPrevious->setPixmap(KGlobal::iconLoader()->loadIcon("question", KIcon::Panel)); + picPrevious->setPixmap(TDEGlobal::iconLoader()->loadIcon("question", KIcon::Panel)); lblYourAnswerHeader->setText(i18n("Your Answer")); if (++m_question < m_quiz->questionCount()) @@ -194,7 +194,7 @@ void QAView::slotCheck() lblAnswerLanguage->clear(); lblAnswerBlank->hide(); txtAnswer->hide(); - picQuestion->setPixmap(KGlobal::iconLoader()->loadIcon("kwordquiz", KIcon::Panel)); + picQuestion->setPixmap(TDEGlobal::iconLoader()->loadIcon("kwordquiz", KIcon::Panel)); picAnswer->clear(); } } @@ -245,22 +245,22 @@ void QAView::updateScore() TQString s; s = s.setNum(m_quiz->questionCount(), 10); lblScoreCount->setText(s); - picCount->setPixmap(KGlobal::iconLoader()->loadIcon("kwordquiz", KIcon::Panel)); + picCount->setPixmap(TDEGlobal::iconLoader()->loadIcon("kwordquiz", KIcon::Panel)); s = m_score->answerText(); lblScoreAnswered->setText(s); if (!s.isEmpty()) - picAnswered->setPixmap(KGlobal::iconLoader()->loadIcon("question", KIcon::Panel)); + picAnswered->setPixmap(TDEGlobal::iconLoader()->loadIcon("question", KIcon::Panel)); s = m_score->correctText(); lblScoreCorrect->setText(s); if (!s.isEmpty()) - picCorrect->setPixmap(KGlobal::iconLoader()->loadIcon("check", KIcon::Panel)); + picCorrect->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", KIcon::Panel)); s = m_score->errorText(); lblScoreError->setText(s); if (!s.isEmpty()) - picError->setPixmap(KGlobal::iconLoader()->loadIcon("error", KIcon::Panel)); + picError->setPixmap(TDEGlobal::iconLoader()->loadIcon("error", KIcon::Panel)); } @@ -274,7 +274,7 @@ void QAView::showQuestion(int i) lblQuestion -> setText(m_quiz ->question(i)); //lblQuestion -> setFont(m_quiz->fontQuestion(i)); - picQuestion->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiLeftCol), KIcon::Panel)); + picQuestion->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiLeftCol), KIcon::Panel)); lblAnswerLanguage -> setText(m_quiz ->langAnswer(i)); @@ -290,7 +290,7 @@ void QAView::showQuestion(int i) //txtAnswer->setFont(m_quiz->fontAnswer(i)); txtAnswer -> setText(""); - picAnswer->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiRightCol), KIcon::Panel)); + picAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiRightCol), KIcon::Panel)); //@todo handle keyboard layouts } -- cgit v1.2.1