Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 6c3f7a55fb7888efc80a7350ef0c2f46ee02baa3.

1 files changed, 10 insertions, 10 deletions

diff --git a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
index e212c87c..9669719c 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
@@ -26,7 +26,7 @@
 
 #include "PhoneticEntryPage.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqframe.h>
 #include <tqgroupbox.h>
 #include <tqtooltip.h>
@@ -43,11 +43,11 @@
 
 struct KV_Unicode_Ref {
   wchar_t     code;
-  const char *unicodename;
+  const char *tqunicodename;
   const char *audible;
 };
 
-KV_Unicode_Ref kv_unicode_ref[] = {
+KV_Unicode_Ref kv_tqunicode_ref[] = {
 
    {0x00E6, "LATIN SMALL LETTER AE", I18N_NOOP_maybe("")},
    {0x00E7, "LATIN SMALL LETTER C WITH CEDILLA", I18N_NOOP_maybe("")},
@@ -171,18 +171,18 @@ KV_Unicode_Ref kv_unicode_ref[] = {
 void PhoneticButton::slotClicked()
 {
   if (text().length() != 0)
-    emit page->charSelected(text()[0].unicode());
+    emit page->charSelected(text()[0].tqunicode());
 }
 
 
 PhoneticEntryPage::PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent, const char *name, bool modal)
   : KDialogBase(Plain, i18n("Select Characters From Phonetic Alphabet"), Close, Close, parent, name, modal)
 {
-  int num = sizeof(kv_unicode_ref) / sizeof(kv_unicode_ref[0]);
+  int num = sizeof(kv_tqunicode_ref) / sizeof(kv_tqunicode_ref[0]);
   TQFrame * phoneticbox = plainPage();
   TQGridLayout *gbox = new TQGridLayout(phoneticbox, KV_MAX_HORIZ, (num+KV_MAX_HORIZ-1)/KV_MAX_HORIZ, 1);
 
-  KV_Unicode_Ref *uni_ref = kv_unicode_ref;
+  KV_Unicode_Ref *uni_ref = kv_tqunicode_ref;
   int vert = 0;
   int horiz = 0;
   while (uni_ref->code != 0) {
@@ -191,12 +191,12 @@ PhoneticEntryPage::PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent, co
     PhoneticButton *butt = new PhoneticButton(text, phoneticbox, this);
     connect (butt, TQT_SIGNAL(clicked()), butt, TQT_SLOT(slotClicked()) );
     TQString tip = i18n("Unicode name: ");
-    tip += TQString::fromLatin1(uni_ref->unicodename);
+    tip += TQString::tqfromLatin1(uni_ref->tqunicodename);
     tip += "\n";
     tip += i18n("Describing the sound of the character", "Sound: ");
     tip += i18n(uni_ref->audible);
     butt->setFont(ipafont);
-    butt->setSizePolicy(TQSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+    butt->tqsetSizePolicy(TQSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed));
     int sz = TQMAX(14, int(1.7*ipafont.pointSize()));
     butt->setMaximumSize(TQSize (sz, sz));
     gbox->addWidget( butt, vert, horiz, AlignCenter );
@@ -208,7 +208,7 @@ PhoneticEntryPage::PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent, co
     }
     ++uni_ref;
   }
-  resize(sizeHint());
+  resize(tqsizeHint());
 }
 
 
@@ -217,7 +217,7 @@ void PhoneticEntryPage::keyPressEvent( TQKeyEvent *e )
   if ((e->state() & (ControlButton | AltButton)) == 0) {
     TQString s = e->text();
     for (unsigned i = 0; i < s.length(); ++i) {
-      emit charSelected(s[i].unicode());
+      emit charSelected(s[i].tqunicode());
     }
     e->accept();
   }