From 8cb8ba0f957e8a164cdcfbc2685b14d8d0a5c9a5 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 4 Feb 2013 14:15:51 -0600
Subject: Rename KIcon to enhance compatibility with KDE4

---
 kwordquiz/src/dlglanguage.cpp  |  4 ++--
 kwordquiz/src/flashview.cpp    |  8 ++++----
 kwordquiz/src/kwordquiz.cpp    | 10 +++++-----
 kwordquiz/src/multipleview.cpp | 22 +++++++++++-----------
 kwordquiz/src/qaview.cpp       | 22 +++++++++++-----------
 5 files changed, 33 insertions(+), 33 deletions(-)

(limited to 'kwordquiz')

diff --git a/kwordquiz/src/dlglanguage.cpp b/kwordquiz/src/dlglanguage.cpp
index 2b32ab6c..3433c6f1 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(TDEGlobal::iconLoader()->loadIcon("question", KIcon::Panel));
-  dlgBase -> picLanguage2 -> setPixmap(TDEGlobal::iconLoader()->loadIcon("answer", KIcon::Panel));
+  dlgBase -> picLanguage1 -> setPixmap(TDEGlobal::iconLoader()->loadIcon("question", TDEIcon::Panel));
+  dlgBase -> picLanguage2 -> setPixmap(TDEGlobal::iconLoader()->loadIcon("answer", TDEIcon::Panel));
   
   completion1 = new KCompletion();
   completion1->setItems(Prefs::columnTitles1());
diff --git a/kwordquiz/src/flashview.cpp b/kwordquiz/src/flashview.cpp
index 1daea15e..36640b89 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(TDEGlobal::iconLoader()->loadIcon("kwordquiz", KIcon::Panel));
+  picCount->setPixmap(TDEGlobal::iconLoader()->loadIcon("kwordquiz", TDEIcon::Panel));
 
   s = m_score->answerText();
   lblScoreAnswered->setText(s);
   if (!s.isEmpty())
-    picAnswered->setPixmap(TDEGlobal::iconLoader()->loadIcon("question", KIcon::Panel));
+    picAnswered->setPixmap(TDEGlobal::iconLoader()->loadIcon("question", TDEIcon::Panel));
 
   s = m_score->correctText();
   lblScoreCorrect->setText(s);
   if (!s.isEmpty())
-    picCorrect->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", KIcon::Panel));
+    picCorrect->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", TDEIcon::Panel));
 
   s = m_score->errorText();
   lblScoreError->setText(s);
   if (!s.isEmpty())
-    picError->setPixmap(TDEGlobal::iconLoader()->loadIcon("error", KIcon::Panel));
+    picError->setPixmap(TDEGlobal::iconLoader()->loadIcon("error", TDEIcon::Panel));
 }
 
 void FlashView::slotTimer( )
diff --git a/kwordquiz/src/kwordquiz.cpp b/kwordquiz/src/kwordquiz.cpp
index 4206a476..6abf0e02 100644
--- a/kwordquiz/src/kwordquiz.cpp
+++ b/kwordquiz/src/kwordquiz.cpp
@@ -205,11 +205,11 @@ void KWordQuizApp::initActions()
 
   TDEPopupMenu *popup = mode->popupMenu();
   popup->clear();
-  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);
+  popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode1", TDEIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode1()), 0, 0);
+  popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode2", TDEIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode2()), 0, 1);
+  popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode3", TDEIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode3()), 0, 2);
+  popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode4", TDEIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode4()), 0, 3);
+  popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode5", TDEIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode5()), 0, 4);
 
   mode1 = new TDEToggleAction("", "mode1", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode1()), actionCollection(),"mode_1");
   mode2 = new TDEToggleAction("", "mode2", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode2()), actionCollection(),"mode_2");
diff --git a/kwordquiz/src/multipleview.cpp b/kwordquiz/src/multipleview.cpp
index 879bc450..4a8e11b8 100644
--- a/kwordquiz/src/multipleview.cpp
+++ b/kwordquiz/src/multipleview.cpp
@@ -120,7 +120,7 @@ void MultipleView::slotCheck()
     if (fIsCorrect)
     {
 
-      picYourAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", KIcon::Panel));
+      picYourAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", TDEIcon::Panel));
       lblCorrectHeader->clear();
       picCorrectAnswer->clear();
       lblCorrect->clear();
@@ -132,11 +132,11 @@ void MultipleView::slotCheck()
     {
       m_error++;
 
-      picYourAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("error", KIcon::Panel));
+      picYourAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("error", TDEIcon::Panel));
 
       lblCorrect->setText(m_quiz->answer(m_question));
       //lblCorrect->setFont(m_quiz->fontAnswer(m_question));
-      picCorrectAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", KIcon::Panel));
+      picCorrectAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", TDEIcon::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(TDEGlobal::iconLoader()->loadIcon("question", KIcon::Panel));
+    picPrevious->setPixmap(TDEGlobal::iconLoader()->loadIcon("question", TDEIcon::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(TDEGlobal::iconLoader()->loadIcon("kwordquiz", KIcon::Panel));
+      picQuestion->setPixmap(TDEGlobal::iconLoader()->loadIcon("kwordquiz", TDEIcon::Panel));
       picAnswer->clear();
     }
   }
@@ -224,22 +224,22 @@ void MultipleView::updateScore()
   TQString s;
   s = s.setNum(m_quiz->questionCount(), 10);
   lblScoreCount->setText(s);
-  picCount->setPixmap(TDEGlobal::iconLoader()->loadIcon("kwordquiz", KIcon::Panel));
+  picCount->setPixmap(TDEGlobal::iconLoader()->loadIcon("kwordquiz", TDEIcon::Panel));
 
   s = m_score->answerText();
   lblScoreAnswered->setText(s);
   if (!s.isEmpty())
-    picAnswered->setPixmap(TDEGlobal::iconLoader()->loadIcon("question", KIcon::Panel));
+    picAnswered->setPixmap(TDEGlobal::iconLoader()->loadIcon("question", TDEIcon::Panel));
 
   s = m_score->correctText();
   lblScoreCorrect->setText(s);
   if (!s.isEmpty())
-    picCorrect->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", KIcon::Panel));
+    picCorrect->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", TDEIcon::Panel));
 
   s = m_score->errorText();
   lblScoreError->setText(s);
   if (!s.isEmpty())
-    picError->setPixmap(TDEGlobal::iconLoader()->loadIcon("error", KIcon::Panel));
+    picError->setPixmap(TDEGlobal::iconLoader()->loadIcon("error", TDEIcon::Panel));
 }
 
 
@@ -253,7 +253,7 @@ void MultipleView::showQuestion(int i)
   lblQuestion -> setText(m_quiz ->question(i));
   //lblQuestion -> setFont(m_quiz->fontQuestion(i));
 
-  picQuestion->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiLeftCol), KIcon::Panel));
+  picQuestion->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiLeftCol), TDEIcon::Panel));
 
   lblAnswerLanguage -> setText(m_quiz ->langAnswer(i));
 
@@ -278,7 +278,7 @@ void MultipleView::showQuestion(int i)
   opt2->setChecked(false);
   opt3->setChecked(false);
 
-  picAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiRightCol), KIcon::Panel));
+  picAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiRightCol), TDEIcon::Panel));
 }
 
 void MultipleView::slotApplySettings( )
diff --git a/kwordquiz/src/qaview.cpp b/kwordquiz/src/qaview.cpp
index 049b4e19..6a5af0aa 100644
--- a/kwordquiz/src/qaview.cpp
+++ b/kwordquiz/src/qaview.cpp
@@ -150,7 +150,7 @@ void QAView::slotCheck()
     if (fIsCorrect)
     {
 
-      picYourAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", KIcon::Panel));
+      picYourAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", TDEIcon::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(TDEGlobal::iconLoader()->loadIcon("error", KIcon::Panel));
+      picYourAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("error", TDEIcon::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(TDEGlobal::iconLoader()->loadIcon("check", KIcon::Panel));
+      picCorrectAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", TDEIcon::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(TDEGlobal::iconLoader()->loadIcon("question", KIcon::Panel));
+    picPrevious->setPixmap(TDEGlobal::iconLoader()->loadIcon("question", TDEIcon::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(TDEGlobal::iconLoader()->loadIcon("kwordquiz", KIcon::Panel));
+      picQuestion->setPixmap(TDEGlobal::iconLoader()->loadIcon("kwordquiz", TDEIcon::Panel));
       picAnswer->clear();
     }
   }
@@ -245,22 +245,22 @@ void QAView::updateScore()
   TQString s;
   s = s.setNum(m_quiz->questionCount(), 10);
   lblScoreCount->setText(s);
-  picCount->setPixmap(TDEGlobal::iconLoader()->loadIcon("kwordquiz", KIcon::Panel));
+  picCount->setPixmap(TDEGlobal::iconLoader()->loadIcon("kwordquiz", TDEIcon::Panel));
 
   s = m_score->answerText();
   lblScoreAnswered->setText(s);
   if (!s.isEmpty())
-    picAnswered->setPixmap(TDEGlobal::iconLoader()->loadIcon("question", KIcon::Panel));
+    picAnswered->setPixmap(TDEGlobal::iconLoader()->loadIcon("question", TDEIcon::Panel));
 
   s = m_score->correctText();
   lblScoreCorrect->setText(s);
   if (!s.isEmpty())
-    picCorrect->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", KIcon::Panel));
+    picCorrect->setPixmap(TDEGlobal::iconLoader()->loadIcon("check", TDEIcon::Panel));
 
   s = m_score->errorText();
   lblScoreError->setText(s);
   if (!s.isEmpty())
-    picError->setPixmap(TDEGlobal::iconLoader()->loadIcon("error", KIcon::Panel));
+    picError->setPixmap(TDEGlobal::iconLoader()->loadIcon("error", TDEIcon::Panel));
 }
 
 
@@ -274,7 +274,7 @@ void QAView::showQuestion(int i)
   lblQuestion -> setText(m_quiz ->question(i));
   //lblQuestion -> setFont(m_quiz->fontQuestion(i));
   
-  picQuestion->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiLeftCol), KIcon::Panel));
+  picQuestion->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiLeftCol), TDEIcon::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(TDEGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiRightCol), KIcon::Panel));  
+  picAnswer->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiRightCol), TDEIcon::Panel));  
 
   //@todo handle keyboard layouts
 }
-- 
cgit v1.2.1