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

This reverts commit 808e453c56036211f57482ed847d54aca01bba68.

1 files changed, 17 insertions, 17 deletions

diff --git a/kdict/matchview.cpp b/kdict/matchview.cpp
index 9243615e..e4dd030b 100644
--- a/kdict/matchview.cpp
+++ b/kdict/matchview.cpp
@@ -13,11 +13,11 @@
 
  ------------------------------------------------------------- */
 
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqcombobox.h>
 #include <tqpushbutton.h>
 #include <tqheader.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqregexp.h>
 
@@ -96,14 +96,14 @@ void MatchViewItem::setOpen(bool o)
 }
 
 
-void MatchViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
+void MatchViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
 {
   if(command.isEmpty()) {
     TQFont font=p->font();
     font.setBold(true);
     p->setFont(font);
   }
-  TQListViewItem::paintCell(p,cg,column,width,alignment);
+  TQListViewItem::paintCell(p,cg,column,width,tqalignment);
 }
 
 
@@ -119,7 +119,7 @@ MatchView::MatchView(TQWidget *parent, const char *name)
 
   boxLayout->addSpacing(1);
   w_strat = new TQComboBox(false,this);
-  w_strat->setFixedHeight(w_strat->sizeHint().height());
+  w_strat->setFixedHeight(w_strat->tqsizeHint().height());
   connect(w_strat,TQT_SIGNAL(activated(int)),this,TQT_SLOT(strategySelected(int)));
   boxLayout->addWidget(w_strat,0);
   boxLayout->addSpacing(1);
@@ -133,7 +133,7 @@ MatchView::MatchView(TQWidget *parent, const char *name)
   w_list->setSelectionMode(TQListView::Extended);
   w_list->setTreeStepSize(18);
   w_list->setSorting(-1);                                 // disable sorting
-  w_list->setMinimumHeight(w_strat->sizeHint().height());
+  w_list->setMinimumHeight(w_strat->tqsizeHint().height());
   connect(w_list,TQT_SIGNAL(selectionChanged()),TQT_SLOT(enableGetButton()));
   connect(w_list,TQT_SIGNAL(returnPressed(TQListViewItem *)),TQT_SLOT(returnPressed(TQListViewItem *)));
   connect(w_list,TQT_SIGNAL(doubleClicked(TQListViewItem *)),TQT_SLOT(getOneItem(TQListViewItem *)));
@@ -144,15 +144,15 @@ MatchView::MatchView(TQWidget *parent, const char *name)
 
   boxLayout->addSpacing(1);
   w_get = new TQPushButton(i18n("&Get Selected"),this);
-  w_get->setFixedHeight(w_get->sizeHint().height()-3);
-  w_get->setMinimumWidth(w_get->sizeHint().width()-20);
+  w_get->setFixedHeight(w_get->tqsizeHint().height()-3);
+  w_get->setMinimumWidth(w_get->tqsizeHint().width()-20);
   w_get->setEnabled(false);
   connect(w_get, TQT_SIGNAL(clicked()), this, TQT_SLOT(getSelected()));
   boxLayout->addWidget(w_get,0);
 
   w_getAll = new TQPushButton(i18n("Get &All"),this);
-  w_getAll->setFixedHeight(w_getAll->sizeHint().height()-3);
-  w_getAll->setMinimumWidth(w_getAll->sizeHint().width()-20);
+  w_getAll->setFixedHeight(w_getAll->tqsizeHint().height()-3);
+  w_getAll->setMinimumWidth(w_getAll->tqsizeHint().width()-20);
   w_getAll->setEnabled(false);
   connect(w_getAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(getAll()));
   boxLayout->addWidget(w_getAll,0);
@@ -310,7 +310,7 @@ void MatchView::doGet(TQStringList &defines)
   if (defines.count() > 0) {
     if (defines.count() > global->maxDefinitions) {
       KMessageBox::sorry(global->topLevel,i18n("You have selected %1 definitions,\nbut Kdict will fetch only the first %2 definitions.\nYou can modify this limit in the Preferences Dialog.")
-                                             .arg(defines.count()).arg(global->maxDefinitions));
+                                             .tqarg(defines.count()).tqarg(global->maxDefinitions));
       while (defines.count()>global->maxDefinitions)
         defines.pop_back();
     }
@@ -368,7 +368,7 @@ void MatchView::newList(const TQStringList &matches)
   }
 
   w_list->setUpdatesEnabled(true);
-  w_list->repaint();
+  w_list->tqrepaint();
   w_list->setFocus();
 }
 
@@ -388,14 +388,14 @@ void MatchView::buildPopupMenu(TQListViewItem *i, const TQPoint &_point, int)
     rightBtnMenu->insertSeparator();
   }
 
-  kapp->clipboard()->setSelectionMode(false);
-  TQString text = kapp->clipboard()->text();
+  kapp->tqclipboard()->setSelectionMode(false);
+  TQString text = kapp->tqclipboard()->text();
   if (text.isEmpty()) {
-    kapp->clipboard()->setSelectionMode(true);
-    text = kapp->clipboard()->text();
+    kapp->tqclipboard()->setSelectionMode(true);
+    text = kapp->tqclipboard()->text();
   }
   if (!text.isEmpty()) {
-    popupClip = kapp->clipboard()->text();
+    popupClip = kapp->tqclipboard()->text();
     rightBtnMenu->insertItem(i18n("Match &Clipboard Content"),this,TQT_SLOT(popupMatchClip()));
     rightBtnMenu->insertItem(SmallIcon("define_clip"),i18n("D&efine Clipboard Content"),this,TQT_SLOT(popupDefineClip()));
     rightBtnMenu->insertSeparator();