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/dlglanguage.cpp | 4 ++-- kwordquiz/src/flashview.cpp | 8 ++++---- kwordquiz/src/kwordquiz.cpp | 10 +++++----- kwordquiz/src/kwordquiz.kcfg | 6 +++--- kwordquiz/src/kwordquizview.cpp | 12 ++++++------ kwordquiz/src/multipleview.cpp | 22 +++++++++++----------- kwordquiz/src/qaview.cpp | 22 +++++++++++----------- 7 files changed, 42 insertions(+), 42 deletions(-) (limited to 'kwordquiz') diff --git a/kwordquiz/src/dlglanguage.cpp b/kwordquiz/src/dlglanguage.cpp index f142ee64..2b32ab6c 100644 --- a/kwordquiz/src/dlglanguage.cpp +++ b/kwordquiz/src/dlglanguage.cpp @@ -27,8 +27,8 @@ DlgLanguage::DlgLanguage(TQWidget *parent, const char *name, bool modal): KDialo { dlgBase = new DlgLanguageBase( this, "Dlg" ); setMainWidget(dlgBase); - dlgBase -> picLanguage1 -> setPixmap(KGlobal::iconLoader()->loadIcon("question", KIcon::Panel)); - dlgBase -> picLanguage2 -> setPixmap(KGlobal::iconLoader()->loadIcon("answer", KIcon::Panel)); + dlgBase -> picLanguage1 -> setPixmap(TDEGlobal::iconLoader()->loadIcon("question", KIcon::Panel)); + dlgBase -> picLanguage2 -> setPixmap(TDEGlobal::iconLoader()->loadIcon("answer", KIcon::Panel)); completion1 = new KCompletion(); completion1->setItems(Prefs::columnTitles1()); diff --git a/kwordquiz/src/flashview.cpp b/kwordquiz/src/flashview.cpp index a7561643..1daea15e 100644 --- a/kwordquiz/src/flashview.cpp +++ b/kwordquiz/src/flashview.cpp @@ -181,22 +181,22 @@ void FlashView::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)); } void FlashView::slotTimer( ) diff --git a/kwordquiz/src/kwordquiz.cpp b/kwordquiz/src/kwordquiz.cpp index a004094f..10dde982 100644 --- a/kwordquiz/src/kwordquiz.cpp +++ b/kwordquiz/src/kwordquiz.cpp @@ -205,11 +205,11 @@ void KWordQuizApp::initActions() KPopupMenu *popup = mode->popupMenu(); popup->clear(); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("mode1", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode1()), 0, 0); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("mode2", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode2()), 0, 1); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("mode3", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode3()), 0, 2); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("mode4", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode4()), 0, 3); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("mode5", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode5()), 0, 4); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode1", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode1()), 0, 0); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode2", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode2()), 0, 1); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode3", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode3()), 0, 2); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode4", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode4()), 0, 3); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode5", KIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode5()), 0, 4); mode1 = new KToggleAction("", "mode1", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode1()), actionCollection(),"mode_1"); mode2 = new KToggleAction("", "mode2", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode2()), actionCollection(),"mode_2"); diff --git a/kwordquiz/src/kwordquiz.kcfg b/kwordquiz/src/kwordquiz.kcfg index f4b5d6cb..18554adc 100644 --- a/kwordquiz/src/kwordquiz.kcfg +++ b/kwordquiz/src/kwordquiz.kcfg @@ -22,7 +22,7 @@ - KGlobalSettings::generalFont() + TDEGlobalSettings::generalFont() @@ -70,7 +70,7 @@ - KGlobalSettings::generalFont() + TDEGlobalSettings::generalFont() @@ -86,7 +86,7 @@ - KGlobalSettings::generalFont() + TDEGlobalSettings::generalFont() diff --git a/kwordquiz/src/kwordquizview.cpp b/kwordquiz/src/kwordquizview.cpp index bc6acc68..4b1f1cfc 100644 --- a/kwordquiz/src/kwordquizview.cpp +++ b/kwordquiz/src/kwordquizview.cpp @@ -141,7 +141,7 @@ void KWordQuizView::print(KPrinter *pPrinter) painter.drawLine(card_marg + card_width + card_text_marg, tPos + card_line_top, card_marg + card_width + card_width - card_text_marg, tPos + card_line_top); //draw headers - painter.setFont(KGlobalSettings::generalFont()); + painter.setFont(TDEGlobalSettings::generalFont()); painter.drawText(card_marg + card_text_marg, tPos, card_width, card_line_top, AlignAuto | AlignVCenter, horizontalHeader()->label(0)); painter.drawText(card_marg + card_width + card_text_marg, tPos, card_width, card_line_top, AlignAuto | AlignVCenter, horizontalHeader()->label(1)); //draw text @@ -167,7 +167,7 @@ void KWordQuizView::print(KPrinter *pPrinter) for (int rc = 0; rc < numRows(); ++rc) { painter.drawLine(lPos, tPos, lPos + gridWidth, tPos); - painter.setFont(KGlobalSettings::generalFont()); + painter.setFont(TDEGlobalSettings::generalFont()); painter.drawText(lPos, tPos, cw0 - pad, rowHeight(rc), AlignRight | AlignVCenter, TQString::number(rc + 1)); @@ -207,7 +207,7 @@ void KWordQuizView::doNewPage( TQPainter & painter, int res, int type ) TQRect w = painter.window(); - painter.setFont(KGlobalSettings::generalFont()); + painter.setFont(TDEGlobalSettings::generalFont()); if (type == 2) { @@ -238,7 +238,7 @@ void KWordQuizView::doNewPage( TQPainter & painter, int res, int type ) void KWordQuizView::doEndOfPage( TQPainter & painter, int vPos, int pageNum, int res, int type ) { int marg = res; - painter.setFont(KGlobalSettings::generalFont()); + painter.setFont(TDEGlobalSettings::generalFont()); TQRect w = painter.window(); TQRect r = painter.boundingRect(0, 0, 0, 0, AlignAuto, TQString::number(pageNum)); painter.drawText((w.width()/2) - (r.width()/2), w.height() - marg + 20, TQString::number(pageNum)); @@ -996,8 +996,8 @@ void KWordQuizView::addUndo( const TQString & caption ) void KWordQuizView::setFont( const TQFont & font) { TQTable::setFont(font); - horizontalHeader()->setFont(KGlobalSettings::generalFont()); - verticalHeader()->setFont(KGlobalSettings::generalFont()); + horizontalHeader()->setFont(TDEGlobalSettings::generalFont()); + verticalHeader()->setFont(TDEGlobalSettings::generalFont()); for (int i = 0; i < numRows(); ++i) adjustRow(i); //setRowHeight(i, fontMetrics().lineSpacing() ); } diff --git a/kwordquiz/src/multipleview.cpp b/kwordquiz/src/multipleview.cpp index b7376952..879bc450 100644 --- a/kwordquiz/src/multipleview.cpp +++ b/kwordquiz/src/multipleview.cpp @@ -120,7 +120,7 @@ void MultipleView::slotCheck() if (fIsCorrect) { - picYourAnswer->setPixmap(KGlobal::iconLoader()->loadIcon("check", KIcon::Panel)); + picYourAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", KIcon::Panel)); lblCorrectHeader->clear(); picCorrectAnswer->clear(); lblCorrect->clear(); @@ -132,11 +132,11 @@ void MultipleView::slotCheck() { m_error++; - picYourAnswer->setPixmap(KGlobal::iconLoader()->loadIcon("error", KIcon::Panel)); + picYourAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("error", KIcon::Panel)); lblCorrect->setText(m_quiz->answer(m_question)); //lblCorrect->setFont(m_quiz->fontAnswer(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(); @@ -146,7 +146,7 @@ void MultipleView::slotCheck() lblPreviousQuestionHeader->setText(i18n("Previous Question")); lblPreviousQuestion->setText(m_quiz->question(m_question)); //lblPreviousQuestion->setFont(m_quiz->fontQuestion(m_question)); - picPrevious->setPixmap(KGlobal::iconLoader()->loadIcon("question", KIcon::Panel)); + picPrevious->setPixmap(TDEGlobal::iconLoader()->loadIcon("question", KIcon::Panel)); lblYourAnswerHeader->setText(i18n("Your Answer")); lblYourAnswer->setText(m_quiz->yourAnswer(m_question, ans)); @@ -168,7 +168,7 @@ void MultipleView::slotCheck() opt1->hide(); opt2->hide(); opt3->hide(); - picQuestion->setPixmap(KGlobal::iconLoader()->loadIcon("kwordquiz", KIcon::Panel)); + picQuestion->setPixmap(TDEGlobal::iconLoader()->loadIcon("kwordquiz", KIcon::Panel)); picAnswer->clear(); } } @@ -224,22 +224,22 @@ void MultipleView::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)); } @@ -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, WQQuiz::qiLeftCol), KIcon::Panel)); + picQuestion->setPixmap(TDEGlobal::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, WQQuiz::qiRightCol), KIcon::Panel)); + picAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiRightCol), KIcon::Panel)); } void MultipleView::slotApplySettings( ) 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