Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 1329ec6abbcb7b79cd960e0ca138f16598d5f11f)

8 files changed, 165 insertions, 165 deletions

diff --git a/kdict/actions.cpp b/kdict/actions.cpp
index 2448a2e9..f35dfbb4 100644
--- a/kdict/actions.cpp
+++ b/kdict/actions.cpp
@@ -50,15 +50,15 @@ int DictComboAction::plug( TQWidget *widget, int index )
     bar->setItemAutoSized(id_,m_autoSized);
 
     if ( m_combo ) {
-      connect(bar->getCombo(id_), TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&)));
-      connect(bar->getCombo(id_), TQT_SIGNAL(activated(int)), TQT_SLOT(slotComboActivated(int)));
+      connect(bar->getCombo(id_), TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotComboActivated(const TQString&)));
+      connect(bar->getCombo(id_), TQ_SIGNAL(activated(int)), TQ_SLOT(slotComboActivated(int)));
 
       if (m_editable)
         m_combo->setInsertionPolicy( TQComboBox::NoInsertion );
     }
 
     addContainer( bar, id_ );
-    connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
     return containerCount() - 1;
   }
 
@@ -222,7 +222,7 @@ int DictLabelAction::plug( TQWidget *widget, int index )
 
     addContainer( tb, id );
 
-    connect( tb, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( tb, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     m_label = label;
 
@@ -284,12 +284,12 @@ int DictButtonAction::plug( TQWidget *widget, int index )
 
     TQPushButton *button = new TQPushButton( text(), widget );
     button->adjustSize();
-    connect(button,TQT_SIGNAL(clicked()),this,TQT_SLOT(activate()));
+    connect(button,TQ_SIGNAL(clicked()),this,TQ_SLOT(activate()));
     tb->insertWidget( id, button->width(), button, index );
 
     addContainer( tb, id );
 
-    connect( tb, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( tb, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     m_button = button;
 
diff --git a/kdict/applet/kdictapplet.cpp b/kdict/applet/kdictapplet.cpp
index 04268177..1fa07914 100644
--- a/kdict/applet/kdictapplet.cpp
+++ b/kdict/applet/kdictapplet.cpp
@@ -60,7 +60,7 @@ void PopupBox::hideEvent(TQHideEvent *)
 {
   emit(hidden());
   popupEnabled = false;
-  TQTimer::singleShot(100, this, TQT_SLOT(enablePopup()));
+  TQTimer::singleShot(100, this, TQ_SLOT(enablePopup()));
 }
 
 
@@ -111,7 +111,7 @@ DictApplet::DictApplet(const TQString& configFile, Type type, int actions, TQWid
   clipboardBtn->setBackgroundOrigin(AncestorOrigin);
   clipboardBtn->setFont(f);
   clipboardBtn->setFixedSize(16,16);
-  connect(clipboardBtn, TQT_SIGNAL(clicked()), TQT_SLOT(queryClipboard()));
+  connect(clipboardBtn, TQ_SIGNAL(clicked()), TQ_SLOT(queryClipboard()));
   baseLay->addWidget(clipboardBtn,0,3);
   TQToolTip::add(clipboardBtn,i18n("Define selected text"));
 
@@ -120,7 +120,7 @@ DictApplet::DictApplet(const TQString& configFile, Type type, int actions, TQWid
   defineBtn->setFont(f);
   defineBtn->setFixedSize(16,16);
   defineBtn->setEnabled(false);
-  connect(defineBtn, TQT_SIGNAL(clicked()), TQT_SLOT(startDefine()));
+  connect(defineBtn, TQ_SIGNAL(clicked()), TQ_SLOT(startDefine()));
   baseLay->addWidget(defineBtn,0,4);
   TQToolTip::add(defineBtn,i18n("Define word/phrase"));
 
@@ -129,7 +129,7 @@ DictApplet::DictApplet(const TQString& configFile, Type type, int actions, TQWid
   matchBtn->setFont(f);
   matchBtn->setFixedSize(16,16);
   matchBtn->setEnabled(false);
-  connect(matchBtn, TQT_SIGNAL(clicked()), TQT_SLOT(startMatch()));
+  connect(matchBtn, TQ_SIGNAL(clicked()), TQ_SLOT(startMatch()));
   baseLay->addWidget(matchBtn,0,5);
   TQToolTip::add(matchBtn,i18n("Find matching definitions"));
 
@@ -141,8 +141,8 @@ DictApplet::DictApplet(const TQString& configFile, Type type, int actions, TQWid
   internalCombo->setFocus();
   internalCombo->clearEdit();
   internalCombo->lineEdit()->installEventFilter( this );
-  connect(internalCombo, TQT_SIGNAL(returnPressed(const TQString&)), TQT_SLOT(startQuery(const TQString&)));
-  connect(internalCombo, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(comboTextChanged(const TQString&)));
+  connect(internalCombo, TQ_SIGNAL(returnPressed(const TQString&)), TQ_SLOT(startQuery(const TQString&)));
+  connect(internalCombo, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(comboTextChanged(const TQString&)));
   TQToolTip::add(internalCombo,i18n("Look up a word or phrase with Kdict"));
 
   baseLay->addMultiCellWidget(internalCombo,1,1,1,5);
@@ -151,21 +151,21 @@ DictApplet::DictApplet(const TQString& configFile, Type type, int actions, TQWid
 	
   // widgets for a vertical panel
   verticalBtn = new TQPushButton(this);
-  connect(verticalBtn, TQT_SIGNAL(pressed()), TQT_SLOT(showExternalCombo()));	
+  connect(verticalBtn, TQ_SIGNAL(pressed()), TQ_SLOT(showExternalCombo()));	
   TQToolTip::add(verticalBtn,i18n("Look up a word or phrase with Kdict"));
 
   popupBox = new PopupBox();
   popupBox->setFixedSize(160, 22);
-  connect(popupBox, TQT_SIGNAL(hidden()), TQT_SLOT(externalComboHidden()));
+  connect(popupBox, TQ_SIGNAL(hidden()), TQ_SLOT(externalComboHidden()));
   externalCombo = new KHistoryCombo(popupBox);
   externalCombo->setCompletionObject(completionObject);  
-  connect(externalCombo, TQT_SIGNAL(returnPressed(const TQString&)), TQT_SLOT(startQuery(const TQString&)));
+  connect(externalCombo, TQ_SIGNAL(returnPressed(const TQString&)), TQ_SLOT(startQuery(const TQString&)));
   externalCombo->setFixedSize(160, externalCombo->sizeHint().height());
   
-  connect(internalCombo, TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
-          this, TQT_SLOT(updateCompletionMode(TDEGlobalSettings::Completion)));
-  connect(externalCombo, TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
-          this, TQT_SLOT(updateCompletionMode(TDEGlobalSettings::Completion)));
+  connect(internalCombo, TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
+          this, TQ_SLOT(updateCompletionMode(TDEGlobalSettings::Completion)));
+  connect(externalCombo, TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
+          this, TQ_SLOT(updateCompletionMode(TDEGlobalSettings::Completion)));
 
   // restore history and completion list
   TDEConfig *c = config();
@@ -282,7 +282,7 @@ void DictApplet::sendCommand(const TQCString &fun, const TQString &data)
     waiting = 1;
     delayedFunc = fun.copy();
     delayedData = data;
-    TQTimer::singleShot(100, this, TQT_SLOT(sendDelayedCommand()));
+    TQTimer::singleShot(100, this, TQ_SLOT(sendDelayedCommand()));
     return;
   } else {
     QCStringList list = client->remoteObjects("kdict");
@@ -290,7 +290,7 @@ void DictApplet::sendCommand(const TQCString &fun, const TQString &data)
       waiting = 1;
       delayedFunc = fun.copy();
       delayedData = data;
-      TQTimer::singleShot(100, this, TQT_SLOT(sendDelayedCommand()));
+      TQTimer::singleShot(100, this, TQ_SLOT(sendDelayedCommand()));
       return;
     }
   }
@@ -309,13 +309,13 @@ void DictApplet::sendDelayedCommand()
   DCOPClient *client = kapp->dcopClient();
   if (!client->isApplicationRegistered("kdict")) {
     waiting++;
-    TQTimer::singleShot(100, this, TQT_SLOT(sendDelayedCommand()));
+    TQTimer::singleShot(100, this, TQ_SLOT(sendDelayedCommand()));
     return;
   } else {
     QCStringList list = client->remoteObjects("kdict");
     if (list.findIndex("KDictIface")==-1) {
       waiting++;
-      TQTimer::singleShot(100, this, TQT_SLOT(sendDelayedCommand()));
+      TQTimer::singleShot(100, this, TQ_SLOT(sendDelayedCommand()));
       return;
     }
   }
diff --git a/kdict/dict.cpp b/kdict/dict.cpp
index 6864cfe8..f7d183cd 100644
--- a/kdict/dict.cpp
+++ b/kdict/dict.cpp
@@ -1199,7 +1199,7 @@ DictInterface::DictInterface()
   }
 
   notifier = new TQSocketNotifier(fdPipeIn[0],TQSocketNotifier::Read,this);
-  connect(notifier,TQT_SIGNAL(activated(int)),this,TQT_SLOT(clientDone()));
+  connect(notifier,TQ_SIGNAL(activated(int)),this,TQ_SLOT(clientDone()));
 
   // initialize the KSocks stuff in the main thread, otherwise we get
   // strange effects on FreeBSD
@@ -1218,7 +1218,7 @@ DictInterface::DictInterface()
 
 DictInterface::~DictInterface()
 {
-  disconnect(notifier,TQT_SIGNAL(activated(int)),this,TQT_SLOT(clientDone()));
+  disconnect(notifier,TQ_SIGNAL(activated(int)),this,TQ_SLOT(clientDone()));
   if (client)
   {
     client->request_termination();
diff --git a/kdict/matchview.cpp b/kdict/matchview.cpp
index 556685f5..424ae13e 100644
--- a/kdict/matchview.cpp
+++ b/kdict/matchview.cpp
@@ -120,7 +120,7 @@ MatchView::MatchView(TQWidget *parent, const char *name)
   boxLayout->addSpacing(1);
   w_strat = new TQComboBox(false,this);
   w_strat->setFixedHeight(w_strat->sizeHint().height());
-  connect(w_strat,TQT_SIGNAL(activated(int)),this,TQT_SLOT(strategySelected(int)));
+  connect(w_strat,TQ_SIGNAL(activated(int)),this,TQ_SLOT(strategySelected(int)));
   boxLayout->addWidget(w_strat,0);
   boxLayout->addSpacing(1);
 
@@ -134,12 +134,12 @@ MatchView::MatchView(TQWidget *parent, const char *name)
   w_list->setTreeStepSize(18);
   w_list->setSorting(-1);                                 // disable sorting
   w_list->setMinimumHeight(w_strat->sizeHint().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 *)));
-  connect(w_list,TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem *, const TQPoint &, int)),
-                 TQT_SLOT(mouseButtonPressed(int, TQListViewItem *, const TQPoint &, int)));
-  connect(w_list,TQT_SIGNAL(rightButtonPressed(TQListViewItem *,const TQPoint &,int)),TQT_SLOT(buildPopupMenu(TQListViewItem *,const TQPoint &,int)));
+  connect(w_list,TQ_SIGNAL(selectionChanged()),TQ_SLOT(enableGetButton()));
+  connect(w_list,TQ_SIGNAL(returnPressed(TQListViewItem *)),TQ_SLOT(returnPressed(TQListViewItem *)));
+  connect(w_list,TQ_SIGNAL(doubleClicked(TQListViewItem *)),TQ_SLOT(getOneItem(TQListViewItem *)));
+  connect(w_list,TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem *, const TQPoint &, int)),
+                 TQ_SLOT(mouseButtonPressed(int, TQListViewItem *, const TQPoint &, int)));
+  connect(w_list,TQ_SIGNAL(rightButtonPressed(TQListViewItem *,const TQPoint &,int)),TQ_SLOT(buildPopupMenu(TQListViewItem *,const TQPoint &,int)));
   boxLayout->addWidget(w_list,1);
 
   boxLayout->addSpacing(1);
@@ -147,16 +147,16 @@ MatchView::MatchView(TQWidget *parent, const char *name)
   w_get->setFixedHeight(w_get->sizeHint().height()-3);
   w_get->setMinimumWidth(w_get->sizeHint().width()-20);
   w_get->setEnabled(false);
-  connect(w_get, TQT_SIGNAL(clicked()), this, TQT_SLOT(getSelected()));
+  connect(w_get, TQ_SIGNAL(clicked()), this, TQ_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->setEnabled(false);
-  connect(w_getAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(getAll()));
+  connect(w_getAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(getAll()));
   boxLayout->addWidget(w_getAll,0);
-  connect(interface,TQT_SIGNAL(matchReady(const TQStringList &)),this,TQT_SLOT(newList(const TQStringList &)));
+  connect(interface,TQ_SIGNAL(matchReady(const TQStringList &)),this,TQ_SLOT(newList(const TQStringList &)));
   rightBtnMenu = new TDEPopupMenu();
 }
 
@@ -380,10 +380,10 @@ void MatchView::buildPopupMenu(TQListViewItem *i, const TQPoint &_point, int)
 
   if ((i!=0L)&&(i->isExpandable()||i->parent())) {
     popupCurrent = (MatchViewItem *)(i);
-    rightBtnMenu->insertItem(i18n("&Get"),this,TQT_SLOT(popupGetCurrent()));
+    rightBtnMenu->insertItem(i18n("&Get"),this,TQ_SLOT(popupGetCurrent()));
     if (!i->isExpandable()) {       // toplevel item -> only "get"
-      rightBtnMenu->insertItem(i18n("&Match"),this,TQT_SLOT(popupMatchCurrent()));
-      rightBtnMenu->insertItem(i18n("&Define"),this,TQT_SLOT(popupDefineCurrent()));
+      rightBtnMenu->insertItem(i18n("&Match"),this,TQ_SLOT(popupMatchCurrent()));
+      rightBtnMenu->insertItem(i18n("&Define"),this,TQ_SLOT(popupDefineCurrent()));
     }
     rightBtnMenu->insertSeparator();
   }
@@ -396,20 +396,20 @@ void MatchView::buildPopupMenu(TQListViewItem *i, const TQPoint &_point, int)
   }
   if (!text.isEmpty()) {
     popupClip = kapp->clipboard()->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->insertItem(i18n("Match &Clipboard Content"),this,TQ_SLOT(popupMatchClip()));
+    rightBtnMenu->insertItem(SmallIcon("define_clip"),i18n("D&efine Clipboard Content"),this,TQ_SLOT(popupDefineClip()));
     rightBtnMenu->insertSeparator();
   }
 
-  int ID = rightBtnMenu->insertItem(i18n("Get &Selected"),this,TQT_SLOT(getSelected()));
+  int ID = rightBtnMenu->insertItem(i18n("Get &Selected"),this,TQ_SLOT(getSelected()));
   rightBtnMenu->setItemEnabled(ID,getOn);
-  ID = rightBtnMenu->insertItem(i18n("Get &All"),this,TQT_SLOT(getAll()));
+  ID = rightBtnMenu->insertItem(i18n("Get &All"),this,TQ_SLOT(getAll()));
   rightBtnMenu->setItemEnabled(ID,getAllOn);
 
   if (w_list->childCount()) {
     rightBtnMenu->insertSeparator();
-    rightBtnMenu->insertItem(i18n("E&xpand List"),this,TQT_SLOT(expandList()));
-    rightBtnMenu->insertItem(i18n("C&ollapse List"),this,TQT_SLOT(collapseList()));
+    rightBtnMenu->insertItem(i18n("E&xpand List"),this,TQ_SLOT(expandList()));
+    rightBtnMenu->insertItem(i18n("C&ollapse List"),this,TQ_SLOT(collapseList()));
   }
 
   rightBtnMenu->popup(_point);
diff --git a/kdict/options.cpp b/kdict/options.cpp
index 0d6b65cd..9afbcb16 100644
--- a/kdict/options.cpp
+++ b/kdict/options.cpp
@@ -501,7 +501,7 @@ OptionsDialog::OptionsDialog(TQWidget *parent, const char *name)
   TQLabel *l = new TQLabel(w_server, i18n("Host&name:"), serverTab);
   grid->addWidget(l,0,0);
   grid->addMultiCellWidget(w_server,0,0,1,2);
-  connect( w_server, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) );
+  connect( w_server, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) );
 
   w_port = new KLineEdit(serverTab);
   w_port->setValidator(new KIntValidator(0,65536,this));
@@ -509,7 +509,7 @@ OptionsDialog::OptionsDialog(TQWidget *parent, const char *name)
   l = new TQLabel(w_port, i18n("&Port:"), serverTab);
   grid->addWidget(l,1,0);
   grid->addWidget(w_port,1,1);
-  connect( w_port, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) );
+  connect( w_port, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) );
 
   w_idleHold = new KIntSpinBox(0,300,5,0,10,serverTab);
   w_idleHold->setSuffix(i18n(" sec"));
@@ -517,7 +517,7 @@ OptionsDialog::OptionsDialog(TQWidget *parent, const char *name)
   l = new TQLabel(w_idleHold, i18n("Hold conn&ection for:"), serverTab);
   grid->addWidget(l,2,0);
   grid->addWidget(w_idleHold,2,1);
-  connect( w_idleHold, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotChanged() ) );
+  connect( w_idleHold, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotChanged() ) );
 
   w_timeout = new KIntSpinBox(5,600,5,5,10,serverTab);
   w_timeout->setSuffix(i18n(" sec"));
@@ -525,7 +525,7 @@ OptionsDialog::OptionsDialog(TQWidget *parent, const char *name)
   l = new TQLabel(w_timeout, i18n("T&imeout:"), serverTab);
   grid->addWidget(l,3,0);
   grid->addWidget(w_timeout,3,1);
-  connect( w_timeout, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotChanged() ) );
+  connect( w_timeout, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotChanged() ) );
 
   w_pipesize = new KIntSpinBox(100,5000,2,2,10,serverTab);
   w_pipesize->setSuffix(i18n(" bytes"));
@@ -533,7 +533,7 @@ OptionsDialog::OptionsDialog(TQWidget *parent, const char *name)
   l = new TQLabel(w_pipesize, i18n("Command &buffer:"), serverTab);
   grid->addWidget(l,4,0);
   grid->addWidget(w_pipesize,4,1);
-  connect( w_pipesize, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotChanged() ) );
+  connect( w_pipesize, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotChanged() ) );
 
   TQStringList encodingNames = TDEGlobal::charsets()->descriptiveEncodingNames();
   int i=0,x=0;
@@ -550,20 +550,20 @@ OptionsDialog::OptionsDialog(TQWidget *parent, const char *name)
   l = new TQLabel(w_encoding, i18n("Encod&ing:"), serverTab);
   grid->addWidget(l,5,0);
   grid->addMultiCellWidget(w_encoding,5,5,1,2);
-  connect( w_encoding, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotChanged() ) );
+  connect( w_encoding, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotChanged() ) );
 
   w_auth = new TQCheckBox(i18n("Server requires a&uthentication"),serverTab);
   w_auth->setChecked(global->authEnabled);
   grid->addMultiCellWidget(w_auth,6,6,0,2);
-  connect( w_auth, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) );
-  connect(w_auth,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotAuthRequiredToggled(bool)));
+  connect( w_auth, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) );
+  connect(w_auth,TQ_SIGNAL(toggled(bool)),TQ_SLOT(slotAuthRequiredToggled(bool)));
 
   w_user = new KLineEdit(serverTab);
   w_user->setText(global->user);
   l_user = new TQLabel(w_user, i18n("U&ser:"),serverTab);
   grid->addWidget(l_user,7,0);
   grid->addMultiCellWidget(w_user,7,7,1,2);
-  connect( w_user, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) );
+  connect( w_user, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) );
 
   w_secret = new KLineEdit(serverTab);
   w_secret->setEchoMode(TQLineEdit::Password);
@@ -571,7 +571,7 @@ OptionsDialog::OptionsDialog(TQWidget *parent, const char *name)
   l_secret = new TQLabel(w_secret, i18n("Pass&word:"), serverTab);
   grid->addWidget(l_secret,8,0);
   grid->addMultiCellWidget(w_secret,8,8,1,2);
-  connect( w_secret, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) );
+  connect( w_secret, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) );
 
   slotAuthRequiredToggled( w_auth->isChecked() );
 
@@ -586,42 +586,42 @@ OptionsDialog::OptionsDialog(TQWidget *parent, const char *name)
   //color-list
   c_List = new DialogListBox(false, appTab);
   topL->addMultiCellWidget(c_List,1,3,0,1);
-  connect(c_List, TQT_SIGNAL(selected(TQListBoxItem*)),TQT_SLOT(slotColItemSelected(TQListBoxItem*)));
-  connect(c_List, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotColSelectionChanged()));
+  connect(c_List, TQ_SIGNAL(selected(TQListBoxItem*)),TQ_SLOT(slotColItemSelected(TQListBoxItem*)));
+  connect(c_List, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotColSelectionChanged()));
 
   c_olorCB = new TQCheckBox(i18n("&Use custom colors"),appTab);
   topL->addWidget(c_olorCB,0,0);
-  connect(c_olorCB, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotColCheckBoxToggled(bool)));
-  connect(c_olorCB, TQT_SIGNAL(toggled(bool) ), this, TQT_SLOT( slotChanged()));
+  connect(c_olorCB, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotColCheckBoxToggled(bool)));
+  connect(c_olorCB, TQ_SIGNAL(toggled(bool) ), this, TQ_SLOT( slotChanged()));
 
   c_olChngBtn=new TQPushButton(i18n("Cha&nge..."), appTab);
-  connect(c_olChngBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotColChangeBtnClicked()));
+  connect(c_olChngBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotColChangeBtnClicked()));
   topL->addWidget(c_olChngBtn,1,2);
 
   c_olDefBtn=new TQPushButton(i18n("Default&s"), appTab);
-  connect(c_olDefBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotColDefaultBtnClicked()));
+  connect(c_olDefBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotColDefaultBtnClicked()));
   topL->addWidget(c_olDefBtn,2,2);
-  connect(c_olDefBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+  connect(c_olDefBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
 
   //font-list
   f_List = new DialogListBox(false, appTab);
   topL->addMultiCellWidget(f_List,5,7,0,1);
-  connect(f_List, TQT_SIGNAL(selected(TQListBoxItem*)),TQT_SLOT(slotFontItemSelected(TQListBoxItem*)));
-  connect(f_List, TQT_SIGNAL(selectionChanged()),TQT_SLOT(slotFontSelectionChanged()));
+  connect(f_List, TQ_SIGNAL(selected(TQListBoxItem*)),TQ_SLOT(slotFontItemSelected(TQListBoxItem*)));
+  connect(f_List, TQ_SIGNAL(selectionChanged()),TQ_SLOT(slotFontSelectionChanged()));
 
   f_ontCB = new TQCheckBox(i18n("Use custom &fonts"),appTab);
   topL->addWidget(f_ontCB,4,0);
-  connect(f_ontCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotFontCheckBoxToggled(bool)));
-  connect(f_ontCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
+  connect(f_ontCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotFontCheckBoxToggled(bool)));
+  connect(f_ontCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
 
   f_ntChngBtn=new TQPushButton(i18n("Chang&e..."), appTab);
-  connect(f_ntChngBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotFontChangeBtnClicked()));
+  connect(f_ntChngBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotFontChangeBtnClicked()));
   topL->addWidget(f_ntChngBtn,5,2);
 
   f_ntDefBtn=new TQPushButton(i18n("Defaul&ts"), appTab);
-  connect(f_ntDefBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotFontDefaultBtnClicked()));
+  connect(f_ntDefBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotFontDefaultBtnClicked()));
   topL->addWidget(f_ntDefBtn,6,2);
-  connect(f_ntDefBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
+  connect(f_ntDefBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
 
   topL->setColStretch(1,2);
   topL->setColStretch(2,0);
@@ -658,9 +658,9 @@ OptionsDialog::OptionsDialog(TQWidget *parent, const char *name)
   w_layout[2] = new TQRadioButton(i18n("A separate heading for &each definition"),bGroup);
   w_layout[2]->setChecked(global->headLayout == 2);
   bvbox->addWidget(w_layout[2],1);
-  connect(w_layout[0], TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
-  connect(w_layout[1], TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
-  connect(w_layout[2], TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
+  connect(w_layout[0], TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+  connect(w_layout[1], TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+  connect(w_layout[2], TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
 
   vbox->addWidget(bGroup,0);
   vbox->addStretch(1);
@@ -680,21 +680,21 @@ OptionsDialog::OptionsDialog(TQWidget *parent, const char *name)
   l = new TQLabel(w_MaxDefinitions, i18n("De&finitions:"), group);
   grid->addWidget(l,1,0);
   grid->addWidget(w_MaxDefinitions,1,1);
-  connect(w_MaxDefinitions, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged()));
+  connect(w_MaxDefinitions, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChanged()));
 
   w_Maxbrowse = new KIntSpinBox(1,100,1,1,10,group);
   w_Maxbrowse->setValue(global->maxBrowseListEntrys);
   l = new TQLabel(w_Maxbrowse, i18n("Cached &results:"), group);
   grid->addWidget(l,2,0);
   grid->addWidget(w_Maxbrowse,2,1);
-  connect(w_Maxbrowse, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged()));
+  connect(w_Maxbrowse, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChanged()));
 
   w_Maxhist = new KIntSpinBox(10,5000,10,10,10,group);
   w_Maxhist->setValue(global->maxHistEntrys);
   l = new TQLabel(w_Maxhist, i18n("Hi&story entries:"), group);
   grid->addWidget(l,3,0);
   grid->addWidget(w_Maxhist,3,1);
-  connect(w_Maxhist, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged()));
+  connect(w_Maxhist, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChanged()));
 
   grid->setColStretch(1,1);
 
@@ -709,12 +709,12 @@ OptionsDialog::OptionsDialog(TQWidget *parent, const char *name)
   w_Savehist = new TQCheckBox(i18n("Sa&ve history on exit"),group);
   w_Savehist->setChecked(global->saveHistory);
   vbox2->addWidget(w_Savehist,0);
-  connect(w_Savehist, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
+  connect(w_Savehist, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
 
   w_Clipboard = new TQCheckBox(i18n("D&efine selected text on start"),group);
   w_Clipboard->setChecked(global->defineClipboard);
   vbox2->addWidget(w_Clipboard,1);
-  connect(w_Clipboard, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
+  connect(w_Clipboard, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
 
   vbox->addWidget(group,0);
   vbox->addStretch(2);
diff --git a/kdict/queryview.cpp b/kdict/queryview.cpp
index c96dc540..d1d93c1d 100644
--- a/kdict/queryview.cpp
+++ b/kdict/queryview.cpp
@@ -141,15 +141,15 @@ QueryView::QueryView(TQWidget *_parent)
   part->setJavaEnabled(false);
   part->setURLCursor(KCursor::handCursor());
   setFocusPolicy(TQWidget::NoFocus);
-  connect(part, TQT_SIGNAL(completed()), TQT_SLOT(partCompleted()));
-  connect(part, TQT_SIGNAL(middleButtonClicked()), TQT_SLOT(middleButtonClicked()));
+  connect(part, TQ_SIGNAL(completed()), TQ_SLOT(partCompleted()));
+  connect(part, TQ_SIGNAL(middleButtonClicked()), TQ_SLOT(middleButtonClicked()));
   rightBtnMenu = new TDEPopupMenu(this);
-  connect(part,TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)),this,TQT_SLOT(buildPopupMenu(const TQString &, const TQPoint &)));
-  connect(part->browserExtension(),TQT_SIGNAL(openURLRequest(const KURL &,const KParts::URLArgs &)),
-          this,TQT_SLOT(slotURLRequest(const KURL &,const KParts::URLArgs &)));
-  connect(part->browserExtension(),TQT_SIGNAL(enableAction(const char *,bool)),this,TQT_SLOT(enableAction(const char *,bool)));
-  TQTimer::singleShot( 0, this, TQT_SLOT(optionsChanged()) );
-  connect(interface,TQT_SIGNAL(resultReady(const TQString &, const TQString &)), TQT_SLOT(resultReady(const TQString &, const TQString &)));
+  connect(part,TQ_SIGNAL(popupMenu(const TQString &, const TQPoint &)),this,TQ_SLOT(buildPopupMenu(const TQString &, const TQPoint &)));
+  connect(part->browserExtension(),TQ_SIGNAL(openURLRequest(const KURL &,const KParts::URLArgs &)),
+          this,TQ_SLOT(slotURLRequest(const KURL &,const KParts::URLArgs &)));
+  connect(part->browserExtension(),TQ_SIGNAL(enableAction(const char *,bool)),this,TQ_SLOT(enableAction(const char *,bool)));
+  TQTimer::singleShot( 0, this, TQ_SLOT(optionsChanged()) );
+  connect(interface,TQ_SIGNAL(resultReady(const TQString &, const TQString &)), TQ_SLOT(resultReady(const TQString &, const TQString &)));
 }
 
 
@@ -160,9 +160,9 @@ QueryView::~QueryView()
 void QueryView::setActions(TDEToolBarPopupAction* NactBack, TDEToolBarPopupAction* NactForward, DictComboAction* NactQueryCombo)
 {
   actBack = NactBack;
-  connect(actBack->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(browseBack(int)));
+  connect(actBack->popupMenu(),TQ_SIGNAL(activated(int)),TQ_SLOT(browseBack(int)));
   actForward = NactForward;
-  connect(actForward->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(browseForward(int)));
+  connect(actForward->popupMenu(),TQ_SIGNAL(activated(int)),TQ_SLOT(browseForward(int)));
   actQueryCombo = NactQueryCombo;
 }
 
@@ -407,27 +407,27 @@ void QueryView::buildPopupMenu(const TQString &url, const TQPoint &point)
     if (type.length()) {             // valid url
       if(type=="define") {
         rightBtnMenu->insertItem(i18n("Define &Synonym"),
-                                 this,TQT_SLOT(popupDefineLink()));
+                                 this,TQ_SLOT(popupDefineLink()));
         rightBtnMenu->insertItem(i18n("M&atch Synonym"),
-                                 this,TQT_SLOT(popupMatchLink()));
+                                 this,TQ_SLOT(popupMatchLink()));
         rightBtnMenu->insertSeparator();
       }
       if(type=="dbinfo") {
-        rightBtnMenu->insertItem(i18n("D&atabase Information"),this,TQT_SLOT(popupDbInfo()));
+        rightBtnMenu->insertItem(i18n("D&atabase Information"),this,TQ_SLOT(popupDbInfo()));
         rightBtnMenu->insertSeparator();
       }
       if(type=="realhttp") {
         popupLink.prepend("http://");
         rightBtnMenu->insertItem(SmallIcon("document-open"),
                                  i18n("&Open Link"),
-                                 this,TQT_SLOT(popupOpenLink()));
+                                 this,TQ_SLOT(popupOpenLink()));
         rightBtnMenu->insertSeparator();
       }
       if(type=="realftp") {
         popupLink.prepend("ftp://");
         rightBtnMenu->insertItem(SmallIcon("document-open"),
                                  i18n("&Open Link"),
-                                 this,TQT_SLOT(popupOpenLink()));
+                                 this,TQ_SLOT(popupOpenLink()));
         rightBtnMenu->insertSeparator();
       }
     }
@@ -436,9 +436,9 @@ void QueryView::buildPopupMenu(const TQString &url, const TQPoint &point)
   if (part->hasSelection()) {
     popupSelect = part->selectedText();
     rightBtnMenu->insertItem(i18n("&Define Selection"),
-                             this,TQT_SLOT(popupDefineSelect()));
+                             this,TQ_SLOT(popupDefineSelect()));
     rightBtnMenu->insertItem(i18n("&Match Selection"),
-                             this,TQT_SLOT(popupMatchSelect()));
+                             this,TQ_SLOT(popupMatchSelect()));
     rightBtnMenu->insertSeparator();
   } else {
     kapp->clipboard()->setSelectionMode(false);
@@ -451,9 +451,9 @@ void QueryView::buildPopupMenu(const TQString &url, const TQPoint &point)
       popupSelect = TQApplication::clipboard()->text();
       rightBtnMenu->insertItem(SmallIcon("define_clip"),
                                i18n("&Define Clipboard Content"),
-                               this,TQT_SLOT(popupDefineSelect()));
+                               this,TQ_SLOT(popupDefineSelect()));
       rightBtnMenu->insertItem(i18n("&Match Clipboard Content"),
-                               this,TQT_SLOT(popupMatchSelect()));
+                               this,TQ_SLOT(popupMatchSelect()));
       rightBtnMenu->insertSeparator();
     }
   }
@@ -464,13 +464,13 @@ void QueryView::buildPopupMenu(const TQString &url, const TQPoint &point)
     if (browseList.at(browsePos-1)->queryText.isEmpty())
       rightBtnMenu->insertItem(SmallIcon("back"),
                                i18n("&Back: Information"),
-                               this,TQT_SLOT(browseBack()));
+                               this,TQ_SLOT(browseBack()));
     else
       rightBtnMenu->insertItem(SmallIcon("back"),
                                i18n("&Back: '%1'").arg(getShortString(browseList.at(browsePos-1)->queryText,25)),
-                               this,TQT_SLOT(browseBack()));
+                               this,TQ_SLOT(browseBack()));
   } else {
-    ID = rightBtnMenu->insertItem(SmallIcon("back"), i18n("&Back"), this, TQT_SLOT(browseBack()));
+    ID = rightBtnMenu->insertItem(SmallIcon("back"), i18n("&Back"), this, TQ_SLOT(browseBack()));
     rightBtnMenu->setItemEnabled(ID,false);
   }
 
@@ -478,13 +478,13 @@ void QueryView::buildPopupMenu(const TQString &url, const TQPoint &point)
     if (browseList.at(browsePos+1)->queryText.isEmpty())
       rightBtnMenu->insertItem(SmallIcon("forward"),
                                i18n("&Forward: Information"),
-                               this,TQT_SLOT(browseForward()));
+                               this,TQ_SLOT(browseForward()));
     else
       rightBtnMenu->insertItem(SmallIcon("forward"),
                                i18n("&Forward: '%1'").arg(getShortString(browseList.at(browsePos+1)->queryText,25)),
-                               this,TQT_SLOT(browseForward()));
+                               this,TQ_SLOT(browseForward()));
   } else {
-    ID = rightBtnMenu->insertItem(SmallIcon("forward"),i18n("&Forward"),this,TQT_SLOT(browseForward()));
+    ID = rightBtnMenu->insertItem(SmallIcon("forward"),i18n("&Forward"),this,TQ_SLOT(browseForward()));
     rightBtnMenu->setItemEnabled(ID,false);
   }
 
@@ -544,7 +544,7 @@ void QueryView::browseBack(int index)
     browsePos = x;
     actQueryCombo->setEditText(browseList.at(browsePos)->queryText);
     showResult();
-    TQTimer::singleShot(0, this, TQT_SLOT(updateBrowseActions()));  // don't clear the menu in this slot
+    TQTimer::singleShot(0, this, TQ_SLOT(updateBrowseActions()));  // don't clear the menu in this slot
   }
 }
 
@@ -557,7 +557,7 @@ void QueryView::browseForward(int index)
     browsePos = x;
     actQueryCombo->setEditText(browseList.at(browsePos)->queryText);
     showResult();
-    TQTimer::singleShot(0, this, TQT_SLOT(updateBrowseActions()));  // don't clear the menu in this slot
+    TQTimer::singleShot(0, this, TQ_SLOT(updateBrowseActions()));  // don't clear the menu in this slot
   }
 }
 
diff --git a/kdict/sets.cpp b/kdict/sets.cpp
index d49828b6..4a98e7d6 100644
--- a/kdict/sets.cpp
+++ b/kdict/sets.cpp
@@ -47,7 +47,7 @@ DbSetsDialog::DbSetsDialog(TQWidget *parent, const char *name)
   w_set->setFixedHeight(w_set->sizeHint().height());
   w_set->setInsertionPolicy (TQComboBox::NoInsertion);
   w_set->insertStringList(sets);
-  connect(w_set, TQT_SIGNAL(activated(int)),this, TQT_SLOT(activateSet(int)));
+  connect(w_set, TQ_SIGNAL(activated(int)),this, TQ_SLOT(activateSet(int)));
   TQLabel *l = new TQLabel(w_set, i18n("&Set:"),page);
   l->setMinimumSize(l->sizeHint());
   subLayout1->addWidget(l,0);
@@ -56,17 +56,17 @@ DbSetsDialog::DbSetsDialog(TQWidget *parent, const char *name)
   subLayout1->addSpacing(8);
 
   w_save = new TQPushButton(i18n("S&ave"),page);
-  connect(w_save,TQT_SIGNAL(clicked()),this, TQT_SLOT(transferSet()));
+  connect(w_save,TQ_SIGNAL(clicked()),this, TQ_SLOT(transferSet()));
   subLayout1->addWidget(w_save,0);
 
   TQPushButton *btn = new TQPushButton(i18n("&New"),page);
   btn->setMinimumSize(btn->sizeHint());
-  connect(btn, TQT_SIGNAL(clicked()),this, TQT_SLOT(newPressed()));
+  connect(btn, TQ_SIGNAL(clicked()),this, TQ_SLOT(newPressed()));
   subLayout1->addWidget(btn,0);
 
   w_delete = new TQPushButton(i18n("&Delete"),page);
   w_delete->setMinimumSize(w_delete->sizeHint());
-  connect(w_delete, TQT_SIGNAL(clicked()),this, TQT_SLOT(deletePressed()));
+  connect(w_delete, TQ_SIGNAL(clicked()),this, TQ_SLOT(deletePressed()));
   subLayout1->addWidget(w_delete,0);
 
   topLayout->addSpacing(8);
@@ -80,8 +80,8 @@ DbSetsDialog::DbSetsDialog(TQWidget *parent, const char *name)
   topLayout->addLayout(subLayout2,1);
 
   w_leftBox = new TQListBox(page);
-  connect(w_leftBox, TQT_SIGNAL(selected(int)),this, TQT_SLOT(leftSelected(int)));
-  connect(w_leftBox, TQT_SIGNAL(highlighted(int)),this, TQT_SLOT(leftHighlighted(int)));
+  connect(w_leftBox, TQ_SIGNAL(selected(int)),this, TQ_SLOT(leftSelected(int)));
+  connect(w_leftBox, TQ_SIGNAL(highlighted(int)),this, TQ_SLOT(leftHighlighted(int)));
   TQLabel *leftLabel = new TQLabel(w_leftBox, i18n("S&elected databases:"),page);
   leftLabel->setMinimumSize(leftLabel->sizeHint());
   subLayout2->addWidget(leftLabel,0,0);
@@ -89,27 +89,27 @@ DbSetsDialog::DbSetsDialog(TQWidget *parent, const char *name)
 
   w_allLeft = new TQPushButton(page);
   w_allLeft->setIconSet(BarIconSet("2leftarrow"));
-  connect(w_allLeft, TQT_SIGNAL(clicked()),this, TQT_SLOT(allLeftPressed()));
+  connect(w_allLeft, TQ_SIGNAL(clicked()),this, TQ_SLOT(allLeftPressed()));
   subLayout2->addWidget(w_allLeft,2,1);
 
   w_left = new TQPushButton(page);
   w_left->setIconSet(BarIconSet("1leftarrow"));
-  connect(w_left, TQT_SIGNAL(clicked()),this, TQT_SLOT(leftPressed()));
+  connect(w_left, TQ_SIGNAL(clicked()),this, TQ_SLOT(leftPressed()));
   subLayout2->addWidget(w_left,3,1);
 
   w_right = new TQPushButton(page);
   w_right->setIconSet(BarIconSet("1rightarrow"));
-  connect(w_right, TQT_SIGNAL(clicked()),this, TQT_SLOT(rightPressed()));
+  connect(w_right, TQ_SIGNAL(clicked()),this, TQ_SLOT(rightPressed()));
   subLayout2->addWidget(w_right,4,1);
 
   w_allRight = new TQPushButton(page);
   w_allRight->setIconSet(BarIconSet("2rightarrow"));
-  connect(w_allRight, TQT_SIGNAL(clicked()),this, TQT_SLOT(allRightPressed()));
+  connect(w_allRight, TQ_SIGNAL(clicked()),this, TQ_SLOT(allRightPressed()));
   subLayout2->addWidget(w_allRight,5,1);
 
   w_rightBox = new TQListBox(page);
-  connect(w_rightBox, TQT_SIGNAL(selected(int)),this, TQT_SLOT(rightSelected(int)));
-  connect(w_rightBox, TQT_SIGNAL(highlighted(int)),this, TQT_SLOT(rightHighlighted(int)));
+  connect(w_rightBox, TQ_SIGNAL(selected(int)),this, TQ_SLOT(rightSelected(int)));
+  connect(w_rightBox, TQ_SIGNAL(highlighted(int)),this, TQ_SLOT(rightHighlighted(int)));
   TQLabel *rightLabel = new TQLabel(w_rightBox, i18n("A&vailable databases:"),page);
   rightLabel->setMinimumSize(rightLabel->sizeHint());
   subLayout2->addWidget(rightLabel,0,2);
diff --git a/kdict/toplevel.cpp b/kdict/toplevel.cpp
index d6ac7302..eb1af9c9 100644
--- a/kdict/toplevel.cpp
+++ b/kdict/toplevel.cpp
@@ -61,26 +61,26 @@ TopLevel::TopLevel(TQWidget* parent, const char* name)
   global->topLevel = this;
   global->read();
   interface = new DictInterface();
-  connect(interface,TQT_SIGNAL(infoReady()),TQT_SLOT(stratDbChanged()));
-  connect(interface,TQT_SIGNAL(started(const TQString&)),TQT_SLOT(clientStarted(const TQString&)));
-  connect(interface,TQT_SIGNAL(stopped(const TQString&)),TQT_SLOT(clientStopped(const TQString&)));
+  connect(interface,TQ_SIGNAL(infoReady()),TQ_SLOT(stratDbChanged()));
+  connect(interface,TQ_SIGNAL(started(const TQString&)),TQ_SLOT(clientStarted(const TQString&)));
+  connect(interface,TQ_SIGNAL(stopped(const TQString&)),TQ_SLOT(clientStopped(const TQString&)));
 
   queryView = new QueryView(this);
-  connect(queryView,TQT_SIGNAL(defineRequested(const TQString&)),TQT_SLOT(define(const TQString&)));
-  connect(queryView,TQT_SIGNAL(matchRequested(const TQString&)),TQT_SLOT(match(const TQString&)));
-  connect(queryView,TQT_SIGNAL(clipboardRequested()),TQT_SLOT(defineClipboard()));
-  connect(queryView,TQT_SIGNAL(enableCopy(bool)),TQT_SLOT(enableCopy(bool)));
-  connect(queryView,TQT_SIGNAL(enablePrintSave()),TQT_SLOT(enablePrintSave()));
-  connect(queryView,TQT_SIGNAL(renderingStarted()),TQT_SLOT(renderingStarted()));
-  connect(queryView,TQT_SIGNAL(renderingStopped()),TQT_SLOT(renderingStopped()));
-  connect(queryView,TQT_SIGNAL(newCaption(const TQString&)),TQT_SLOT(newCaption(const TQString&)));
+  connect(queryView,TQ_SIGNAL(defineRequested(const TQString&)),TQ_SLOT(define(const TQString&)));
+  connect(queryView,TQ_SIGNAL(matchRequested(const TQString&)),TQ_SLOT(match(const TQString&)));
+  connect(queryView,TQ_SIGNAL(clipboardRequested()),TQ_SLOT(defineClipboard()));
+  connect(queryView,TQ_SIGNAL(enableCopy(bool)),TQ_SLOT(enableCopy(bool)));
+  connect(queryView,TQ_SIGNAL(enablePrintSave()),TQ_SLOT(enablePrintSave()));
+  connect(queryView,TQ_SIGNAL(renderingStarted()),TQ_SLOT(renderingStarted()));
+  connect(queryView,TQ_SIGNAL(renderingStopped()),TQ_SLOT(renderingStopped()));
+  connect(queryView,TQ_SIGNAL(newCaption(const TQString&)),TQ_SLOT(newCaption(const TQString&)));
 
   matchView = new MatchView();
-  connect(matchView,TQT_SIGNAL(defineRequested(const TQString&)),TQT_SLOT(define(const TQString&)));
-  connect(matchView,TQT_SIGNAL(matchRequested(const TQString&)),TQT_SLOT(match(const TQString&)));
-  connect(matchView,TQT_SIGNAL(clipboardRequested()),TQT_SLOT(matchClipboard()));
-  connect(matchView,TQT_SIGNAL(windowClosed()),TQT_SLOT(toggleMatchListShow()));
-  connect(&resetStatusbarTimer,TQT_SIGNAL(timeout()),TQT_SLOT(resetStatusbar()));
+  connect(matchView,TQ_SIGNAL(defineRequested(const TQString&)),TQ_SLOT(define(const TQString&)));
+  connect(matchView,TQ_SIGNAL(matchRequested(const TQString&)),TQ_SLOT(match(const TQString&)));
+  connect(matchView,TQ_SIGNAL(clipboardRequested()),TQ_SLOT(matchClipboard()));
+  connect(matchView,TQ_SIGNAL(windowClosed()),TQ_SLOT(toggleMatchListShow()));
+  connect(&resetStatusbarTimer,TQ_SIGNAL(timeout()),TQ_SLOT(resetStatusbar()));
 
   setupStatusBar();
   setupActions();
@@ -314,80 +314,80 @@ bool TopLevel::queryClose()
 void TopLevel::setupActions()
 {
   // file menu...
-  actSave = KStdAction::save(queryView, TQT_SLOT(saveQuery()), actionCollection());
+  actSave = KStdAction::save(queryView, TQ_SLOT(saveQuery()), actionCollection());
   actSave->setText(i18n("&Save As..."));
   actSave->setEnabled(false);
-  actPrint = KStdAction::print(queryView, TQT_SLOT(printQuery()), actionCollection());
+  actPrint = KStdAction::print(queryView, TQ_SLOT(printQuery()), actionCollection());
   actPrint->setEnabled(false);
   actStartQuery = new TDEAction(i18n("St&art Query"),"reload", 0 , this,
-                  TQT_SLOT(doDefine()), actionCollection(), "start_query");
+                  TQ_SLOT(doDefine()), actionCollection(), "start_query");
   actStopQuery = new TDEAction(i18n("St&op Query"),"process-stop", 0 , this,
-                 TQT_SLOT(stopClients()), actionCollection(), "stop_query");
+                 TQ_SLOT(stopClients()), actionCollection(), "stop_query");
   actStopQuery->setEnabled(false);
-  KStdAction::quit(kapp, TQT_SLOT(closeAllWindows()), actionCollection());
+  KStdAction::quit(kapp, TQ_SLOT(closeAllWindows()), actionCollection());
 
   // edit menu...
-  actCopy = KStdAction::copy(queryView, TQT_SLOT(copySelection()), actionCollection());
+  actCopy = KStdAction::copy(queryView, TQ_SLOT(copySelection()), actionCollection());
   actCopy->setEnabled(false);
-  KStdAction::selectAll(queryView, TQT_SLOT(selectAll()), actionCollection());
+  KStdAction::selectAll(queryView, TQ_SLOT(selectAll()), actionCollection());
   new TDEAction(i18n("&Define Clipboard Content"), "define_clip", 0 , this,
-              TQT_SLOT(defineClipboard()), actionCollection(), "define_clipboard");
+              TQ_SLOT(defineClipboard()), actionCollection(), "define_clipboard");
   new TDEAction(i18n("&Match Clipboard Content"), 0 , this,
-              TQT_SLOT(matchClipboard()), actionCollection(), "match_clipboard");
-  KStdAction::find(queryView, TQT_SLOT(showFindDialog()), actionCollection());
+              TQ_SLOT(matchClipboard()), actionCollection(), "match_clipboard");
+  KStdAction::find(queryView, TQ_SLOT(showFindDialog()), actionCollection());
 
   // history menu...
   actBack = new TDEToolBarPopupAction(i18n("&Back"), "back", TDEStdAccel::shortcut(TDEStdAccel::Back),
-                                    queryView, TQT_SLOT(browseBack()), actionCollection(),"browse_back");
+                                    queryView, TQ_SLOT(browseBack()), actionCollection(),"browse_back");
   actBack->setDelayed(true);
   actBack->setStickyMenu(false);
   actBack->setEnabled(false);
   actForward = new TDEToolBarPopupAction(i18n("&Forward"), "forward", TDEStdAccel::shortcut(TDEStdAccel::Forward),
-                                       queryView, TQT_SLOT(browseForward()), actionCollection(),"browse_forward");
+                                       queryView, TQ_SLOT(browseForward()), actionCollection(),"browse_forward");
   actForward->setDelayed(true);
   actForward->setStickyMenu(false);
   actForward->setEnabled(false);
   new TDEAction(i18n("&Clear History"), 0 , this,
-              TQT_SLOT(clearQueryHistory()), actionCollection(), "clear_history");
+              TQ_SLOT(clearQueryHistory()), actionCollection(), "clear_history");
 
   // server menu...
   new TDEAction(i18n("&Get Capabilities"), 0 , interface,
-              TQT_SLOT(updateServer()), actionCollection(), "get_capabilities");
+              TQ_SLOT(updateServer()), actionCollection(), "get_capabilities");
   new TDEAction(i18n("Edit &Database Sets..."), "edit", 0 , this,
-              TQT_SLOT(showSetsDialog()), actionCollection(), "edit_sets");
+              TQ_SLOT(showSetsDialog()), actionCollection(), "edit_sets");
   new TDEAction(i18n("&Summary"), 0 , interface,
-              TQT_SLOT(showDatabases()), actionCollection(), "db_summary");
+              TQ_SLOT(showDatabases()), actionCollection(), "db_summary");
   new TDEAction(i18n("S&trategy Information"), 0 , interface,
-              TQT_SLOT(showStrategies()), actionCollection(), "strategy_info");
+              TQ_SLOT(showStrategies()), actionCollection(), "strategy_info");
   new TDEAction(i18n("&Server Information"), 0 , interface,
-              TQT_SLOT(showInfo()), actionCollection(), "server_info");
+              TQ_SLOT(showInfo()), actionCollection(), "server_info");
 
   // settings menu...
   createStandardStatusBarAction();
   setStandardToolBarMenuEnabled(true);
 
   actShowMatchList = new TDEToggleAction(i18n("Show &Match List"), 0 , this,
-                                 TQT_SLOT(toggleMatchListShow()), actionCollection(), "show_match");
+                                 TQ_SLOT(toggleMatchListShow()), actionCollection(), "show_match");
   actShowMatchList->setCheckedState(i18n("Hide &Match List"));
   actShowMatchList->setChecked(global->showMatchList);
-  KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
+  KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()),
 actionCollection());
-  KStdAction::configureToolbars(this, TQT_SLOT(slotConfToolbar()), actionCollection());
-  KStdAction::preferences(this, TQT_SLOT(showOptionsDialog()), actionCollection());
+  KStdAction::configureToolbars(this, TQ_SLOT(slotConfToolbar()), actionCollection());
+  KStdAction::preferences(this, TQ_SLOT(showOptionsDialog()), actionCollection());
 
   // toolbar...
   new TDEAction(i18n("Clear Input Field"), "query_erase", 0 , this,
-              TQT_SLOT(clearInput()), actionCollection(), "clear_query");
+              TQ_SLOT(clearInput()), actionCollection(), "clear_query");
 
   actQueryLabel = new DictLabelAction(i18n("&Look for:"), actionCollection(), "look_label");
   actQueryCombo = new DictComboAction(i18n("Query"), actionCollection(), "query_combo",true,true);
-  connect(actQueryCombo,TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(define(const TQString&)));
+  connect(actQueryCombo,TQ_SIGNAL(activated(const TQString &)), TQ_SLOT(define(const TQString&)));
   actQueryCombo->setCompletionMode(global->queryComboCompletionMode);
   actDbLabel = new DictLabelAction(i18n("&in"), actionCollection(), "in_label");
   actDbCombo = new DictComboAction(i18n("Databases"), actionCollection(), "db_combo",false,false);
-  connect(actDbCombo,TQT_SIGNAL(activated(int)),TQT_SLOT(databaseSelected(int)));
-  actDefineBtn = new DictButtonAction(i18n("&Define"), this, TQT_SLOT(doDefine()), actionCollection(), "define_btn");
-  actMatchBtn = new DictButtonAction(i18n("&Match"), this, TQT_SLOT(doMatch()), actionCollection(), "match_btn");
+  connect(actDbCombo,TQ_SIGNAL(activated(int)),TQ_SLOT(databaseSelected(int)));
+  actDefineBtn = new DictButtonAction(i18n("&Define"), this, TQ_SLOT(doDefine()), actionCollection(), "define_btn");
+  actMatchBtn = new DictButtonAction(i18n("&Match"), this, TQ_SLOT(doMatch()), actionCollection(), "match_btn");
 
   queryView->setActions(actBack,actForward,actQueryCombo);
 }
@@ -509,7 +509,7 @@ void TopLevel::buildHistMenu()
 
   unsigned int i = 0;
   while ((i<10)&&(i<global->queryHistory.count())) {
-    historyActionList.append( new TDEAction(getShortString(global->queryHistory[i],70), 0, this, TQT_SLOT(queryHistMenu()),
+    historyActionList.append( new TDEAction(getShortString(global->queryHistory[i],70), 0, this, TQ_SLOT(queryHistMenu()),
                                           (TQObject*)0, global->queryHistory[i].utf8().data()) );
     i++;
   }
@@ -548,7 +548,7 @@ void TopLevel::stratDbChanged()
   dbActionList.clear();
 
   for (unsigned int i=0;i<global->serverDatabases.count();i++)
-    dbActionList.append( new TDEAction(global->serverDatabases[i], 0, this, TQT_SLOT(dbInfoMenuClicked()),
+    dbActionList.append( new TDEAction(global->serverDatabases[i], 0, this, TQ_SLOT(dbInfoMenuClicked()),
                                      (TQObject*)0, global->serverDatabases[i].utf8().data()) );
 
   plugActionList("db_detail", dbActionList);
@@ -684,7 +684,7 @@ void TopLevel::slotConfToolbar()
 {
   saveMainWindowSettings(TDEGlobal::config(),"toplevel_options");
   KEditToolbar dlg(actionCollection(), "kdictui.rc");
-  connect(&dlg,TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() ));
+  connect(&dlg,TQ_SIGNAL( newToolbarConfig() ), this, TQ_SLOT( slotNewToolbarConfig() ));
   dlg.exec();
 }
 
@@ -702,8 +702,8 @@ void TopLevel::showSetsDialog()
 {
   if (!setsDlg) {
     setsDlg = new DbSetsDialog(this);
-    connect(setsDlg,TQT_SIGNAL(setsChanged()),this,TQT_SLOT(setsChanged()));
-    connect(setsDlg,TQT_SIGNAL(dialogClosed()),this,TQT_SLOT(hideSetsDialog()));
+    connect(setsDlg,TQ_SIGNAL(setsChanged()),this,TQ_SLOT(setsChanged()));
+    connect(setsDlg,TQ_SIGNAL(dialogClosed()),this,TQ_SLOT(hideSetsDialog()));
     setsDlg->show();
   } else {
     KWin::activateWindow(setsDlg->winId());
@@ -731,8 +731,8 @@ void TopLevel::showOptionsDialog()
 {
   if (!optDlg) {
     optDlg = new OptionsDialog(this);
-    connect(optDlg,TQT_SIGNAL(optionsChanged()),this,TQT_SLOT(optionsChanged()));
-    connect(optDlg,TQT_SIGNAL(finished()),this,TQT_SLOT(hideOptionsDialog()));
+    connect(optDlg,TQ_SIGNAL(optionsChanged()),this,TQ_SLOT(optionsChanged()));
+    connect(optDlg,TQ_SIGNAL(finished()),this,TQ_SLOT(hideOptionsDialog()));
     optDlg->show();
   } else {
     KWin::activateWindow(optDlg->winId());