From 2d7b541a4e0095d40e37aaefbf9c4a9b9d149302 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:58:43 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 6c3f7a55fb7888efc80a7350ef0c2f46ee02baa3.
---
 klettres/klettres/klettres.cpp   | 18 +++++++++---------
 klettres/klettres/klettresview.h |  2 +-
 klettres/klettres/timerdlg.ui    | 14 +++++++-------
 3 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'klettres')

diff --git a/klettres/klettres/klettres.cpp b/klettres/klettres/klettres.cpp
index c777f2b0..d1d5e550 100644
--- a/klettres/klettres/klettres.cpp
+++ b/klettres/klettres/klettres.cpp
@@ -127,7 +127,7 @@ void KLettres::findLanguages()
     {
         TQString tmp = m_languages[i];
         if (!config->readEntry(tmp))
-            config->writeEntry(tmp, TQString(TQDate::currentDate().toString()));
+            config->writeEntry(tmp, TQString(TQDate::tqcurrentDate().toString()));
     }
     //we look in $TDEDIR/share/locale/all_languages from /tdelibs/tdecore/all_languages
     //to find the name of the country
@@ -285,11 +285,11 @@ void KLettres::loadSettings()
     m_languageAction->setCurrentItem(Prefs::languageNumber());
     TQString langString = m_languageNames[Prefs::languageNumber()];
     langString.replace("&", TQString());
-    m_langLabel->setText(i18n("Current language is %1").arg(langString));
+    m_langLabel->setText(i18n("Current language is %1").tqarg(langString));
     loadLangToolBar();
     // load default level
     m_levelAction->setCurrentItem(Prefs::level()-1);
-    m_levLabel->setText(i18n("Current level is %1").arg(Prefs::level()));
+    m_levLabel->setText(i18n("Current level is %1").tqarg(Prefs::level()));
 
     if (Prefs::theme() == Prefs::EnumTheme::classroom) {
         m_themeAction->setCurrentItem(0);
@@ -358,7 +358,7 @@ void KLettres::updateLevMenu(int id)
 {
     //m_levelCombo->setCurrentItem(id);
     m_levelAction->setCurrentItem(id);
-    m_levLabel->setText(i18n("Current level is %1").arg(Prefs::level()));
+    m_levLabel->setText(i18n("Current level is %1").tqarg(Prefs::level()));
 }
 
 void KLettres::slotChangeLanguage(int newLanguage)
@@ -369,7 +369,7 @@ void KLettres::slotChangeLanguage(int newLanguage)
     // Update the StatusBar
     TQString langString = m_languageNames[newLanguage];
     langString.replace("&", TQString());
-    m_langLabel->setText(i18n("Current language is %1").arg(langString));
+    m_langLabel->setText(i18n("Current language is %1").tqarg(langString));
     loadLangToolBar();
     // Change language effectively
     bool ok = loadLayout(soundFactory->m_layoutsDocument);
@@ -452,14 +452,14 @@ void KLettres::loadLangToolBar()
     if (m_languages[Prefs::languageNumber()]== "cs" || m_languages[Prefs::languageNumber()]== "da" || m_languages[Prefs::languageNumber()]== "sk" || m_languages[Prefs::languageNumber()]== "es" || m_languages[Prefs::languageNumber()]== "de" || m_languages[Prefs::languageNumber()]== "nds")//Dutch, English, French and Italian have no special characters
     {
         allData.clear();
-        TQString myString=TQString("klettres/%1.txt").arg(m_languages[Prefs::languageNumber()]);
+        TQString myString=TQString("klettres/%1.txt").tqarg(m_languages[Prefs::languageNumber()]);
         TQFile myFile;
         myFile.setName(locate("data",myString));
         if (!myFile.exists())
         {
         
             TQString mString=i18n("File $TDEDIR/share/apps/klettres/%1.txt not found;\n"
-                                    "please check your installation.").arg(m_languages[Prefs::languageNumber()]);
+                                    "please check your installation.").tqarg(m_languages[Prefs::languageNumber()]);
             KMessageBox::sorry( this, mString,
                                     i18n("Error") );
             kapp->quit();
@@ -475,7 +475,7 @@ void KLettres::loadLangToolBar()
         openFileStream.close();
         for (int i=0; i<(int) allData.count(); i++) {
             if (!allData[i].isEmpty())
-                m_secondToolbar->insertButton (charIcon(allData[i].at(0)), i, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotPasteChar()), true,  i18n("Inserts the character %1").arg(allData[i]), i+1 );
+                m_secondToolbar->insertButton (charIcon(allData[i].at(0)), i, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotPasteChar()), true,  i18n("Inserts the character %1").tqarg(allData[i]), i+1 );
         }
     }
 }
@@ -489,7 +489,7 @@ void KLettres::slotPasteChar()
 TQString KLettres::charIcon(const TQChar & c)
 {
     ///Create a name and path for the icon
-    TQString s = locateLocal("icon", "char" + TQString::number(c.unicode()) + ".png");
+    TQString s = locateLocal("icon", "char" + TQString::number(c.tqunicode()) + ".png");
 
     TQRect r(4, 4, 120, 120);
 
diff --git a/klettres/klettres/klettresview.h b/klettres/klettres/klettresview.h
index 43db289e..a5c1d9e6 100644
--- a/klettres/klettres/klettresview.h
+++ b/klettres/klettres/klettresview.h
@@ -22,7 +22,7 @@
 #define KLETTRESVIEW_H
 
 #include <tqwidget.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <klineedit.h>
 
 class TQLabel;
diff --git a/klettres/klettres/timerdlg.ui b/klettres/klettres/timerdlg.ui
index 82637661..089399a8 100644
--- a/klettres/klettres/timerdlg.ui
+++ b/klettres/klettres/timerdlg.ui
@@ -12,7 +12,7 @@
             <height>260</height>
         </rect>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>350</width>
             <height>0</height>
@@ -80,7 +80,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>264</width>
                     <height>20</height>
@@ -97,7 +97,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>25</width>
                     <height>16</height>
@@ -114,7 +114,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>270</width>
                     <height>20</height>
@@ -163,7 +163,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>228</width>
                     <height>20</height>
@@ -199,7 +199,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>226</width>
                     <height>20</height>
@@ -216,7 +216,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>25</width>
                     <height>16</height>
-- 
cgit v1.2.3