Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

68 files changed, 753 insertions, 753 deletions

diff --git a/konversation/src/alias_preferences.cpp b/konversation/src/alias_preferences.cpp
index e715a07..7ec6f06 100644
--- a/konversation/src/alias_preferences.cpp
+++ b/konversation/src/alias_preferences.cpp
@@ -38,15 +38,15 @@ Alias_Config::Alias_Config(TQWidget* parent, const char* name)
   aliasListView->setSorting(-1,false);
   aliasListView->header()->setMovingEnabled(false);
 
-  connect(aliasListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(entrySelected(TQListViewItem*)));
-  connect(aliasListView, TQT_SIGNAL(clicked(TQListViewItem*)), this, TQT_SLOT(entrySelected(TQListViewItem*)) );
-  connect(aliasListView, TQT_SIGNAL(moved()), this, TQT_SIGNAL(modified()));
+  connect(aliasListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(entrySelected(TQListViewItem*)));
+  connect(aliasListView, TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(entrySelected(TQListViewItem*)) );
+  connect(aliasListView, TQ_SIGNAL(moved()), this, TQ_SIGNAL(modified()));
 
-  connect(aliasInput, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(nameChanged(const TQString&)));
-  connect(replacementInput, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(actionChanged(const TQString&)));
+  connect(aliasInput, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(nameChanged(const TQString&)));
+  connect(replacementInput, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(actionChanged(const TQString&)));
 
-  connect(newButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addEntry()));
-  connect(removeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeEntry()));
+  connect(newButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addEntry()));
+  connect(removeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeEntry()));
 }
 
 Alias_Config::~Alias_Config()
diff --git a/konversation/src/autoreplace_preferences.cpp b/konversation/src/autoreplace_preferences.cpp
index 02fbda3..0eae053 100644
--- a/konversation/src/autoreplace_preferences.cpp
+++ b/konversation/src/autoreplace_preferences.cpp
@@ -68,21 +68,21 @@ Autoreplace_Config::Autoreplace_Config(TQWidget* parent, const char* name)
   // populate listview
   loadSettings();
 
-  connect(patternListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(entrySelected(TQListViewItem*)));
-  connect(patternListView, TQT_SIGNAL(clicked(TQListViewItem*)), this, TQT_SLOT(entrySelected(TQListViewItem*)));
-  connect(patternListView, TQT_SIGNAL(moved()), TQT_SIGNAL(modified()));
+  connect(patternListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(entrySelected(TQListViewItem*)));
+  connect(patternListView, TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(entrySelected(TQListViewItem*)));
+  connect(patternListView, TQ_SIGNAL(moved()), TQ_SIGNAL(modified()));
 
-  connect(patternListView, TQT_SIGNAL(aboutToMove()), TQT_SLOT(disableSort()));
-  connect(patternListView->header(), TQT_SIGNAL(clicked(int)), TQT_SLOT(sort(int)));
+  connect(patternListView, TQ_SIGNAL(aboutToMove()), TQ_SLOT(disableSort()));
+  connect(patternListView->header(), TQ_SIGNAL(clicked(int)), TQ_SLOT(sort(int)));
 
-  connect(directionCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(directionChanged(int)));
+  connect(directionCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(directionChanged(int)));
 
-  connect(patternInput, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(patternChanged(const TQString&)));
-  connect(regExpEditorButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(showRegExpEditor()));
-  connect(replacementInput, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(replacementChanged(const TQString&)));
+  connect(patternInput, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(patternChanged(const TQString&)));
+  connect(regExpEditorButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(showRegExpEditor()));
+  connect(replacementInput, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(replacementChanged(const TQString&)));
 
-  connect(newButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addEntry()));
-  connect(removeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeEntry()));
+  connect(newButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addEntry()));
+  connect(removeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeEntry()));
 }
 
 Autoreplace_Config::~Autoreplace_Config()
diff --git a/konversation/src/awaymanager.cpp b/konversation/src/awaymanager.cpp
index d84368b..c1f272b 100644
--- a/konversation/src/awaymanager.cpp
+++ b/konversation/src/awaymanager.cpp
@@ -86,7 +86,7 @@ AwayManager::AwayManager(TQObject* parent) : TQObject(parent)
 #endif
 
     m_activityTimer = new TQTimer(this, "AwayTimer");
-    connect(m_activityTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(checkActivity()));
+    connect(m_activityTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(checkActivity()));
 
     m_idleTime.start();
 }
diff --git a/konversation/src/channel.cpp b/konversation/src/channel.cpp
index 101a0bb..23f11e0 100644
--- a/konversation/src/channel.cpp
+++ b/konversation/src/channel.cpp
@@ -126,13 +126,13 @@ Channel::Channel(TQWidget* parent, TQString _name) : ChatWindow(parent)
     m_topicButton = new TQToolButton(topicWidget);
     m_topicButton->setIconSet(SmallIconSet("edit", 16));
     TQToolTip::add(m_topicButton, i18n("Edit Channel Settings"));
-    connect(m_topicButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(showOptionsDialog()));
+    connect(m_topicButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(showOptionsDialog()));
 
     topicLine = new Konversation::TopicLabel(topicWidget);
     TQWhatsThis::add(topicLine, i18n("<qt>Every channel on IRC has a topic associated with it.  This is simply a message that everybody can see.<p>If you are an operator, or the channel mode <em>'T'</em> has not been set, then you can change the topic by clicking the Edit Channel Properties button to the left of the topic.  You can also view the history of topics there.</qt>"));
-    connect(topicLine, TQT_SIGNAL(setStatusBarTempText(const TQString&)), this, TQT_SIGNAL(setStatusBarTempText(const TQString&)));
-    connect(topicLine, TQT_SIGNAL(clearStatusBarTempText()), this, TQT_SIGNAL(clearStatusBarTempText()));
-    connect(topicLine,TQT_SIGNAL(popupCommand(int)),this,TQT_SLOT(popupChannelCommand(int)));
+    connect(topicLine, TQ_SIGNAL(setStatusBarTempText(const TQString&)), this, TQ_SIGNAL(setStatusBarTempText(const TQString&)));
+    connect(topicLine, TQ_SIGNAL(clearStatusBarTempText()), this, TQ_SIGNAL(clearStatusBarTempText()));
+    connect(topicLine,TQ_SIGNAL(popupCommand(int)),this,TQ_SLOT(popupChannelCommand(int)));
 
     topicLayout->addWidget(m_topicButton, 0, 0);
     topicLayout->addMultiCellWidget(topicLine, 0, 1, 1, 1);
@@ -158,20 +158,20 @@ Channel::Channel(TQWidget* parent, TQString _name) : ChatWindow(parent)
     TQWhatsThis::add(modeK, i18n("<qt>These control the <em>mode</em> of the channel.  Only an operator can change these.<p>A <b>P</b>rotected channel requires users to enter a password in order to join.</qt>"));
     TQWhatsThis::add(modeL, i18n("<qt>These control the <em>mode</em> of the channel.  Only an operator can change these.<p>A channel that has a user <b>L</b>imit means that only that many users can be in the channel at any one time.  Some channels have a bot that sits in the channel and changes this automatically depending on how busy the channel is.</qt>"));
 
-    connect(modeT,TQT_SIGNAL(clicked(int,bool)),this,TQT_SLOT(modeButtonClicked(int,bool)));
-    connect(modeN,TQT_SIGNAL(clicked(int,bool)),this,TQT_SLOT(modeButtonClicked(int,bool)));
-    connect(modeS,TQT_SIGNAL(clicked(int,bool)),this,TQT_SLOT(modeButtonClicked(int,bool)));
-    connect(modeI,TQT_SIGNAL(clicked(int,bool)),this,TQT_SLOT(modeButtonClicked(int,bool)));
-    connect(modeP,TQT_SIGNAL(clicked(int,bool)),this,TQT_SLOT(modeButtonClicked(int,bool)));
-    connect(modeM,TQT_SIGNAL(clicked(int,bool)),this,TQT_SLOT(modeButtonClicked(int,bool)));
-    connect(modeK,TQT_SIGNAL(clicked(int,bool)),this,TQT_SLOT(modeButtonClicked(int,bool)));
-    connect(modeL,TQT_SIGNAL(clicked(int,bool)),this,TQT_SLOT(modeButtonClicked(int,bool)));
+    connect(modeT,TQ_SIGNAL(clicked(int,bool)),this,TQ_SLOT(modeButtonClicked(int,bool)));
+    connect(modeN,TQ_SIGNAL(clicked(int,bool)),this,TQ_SLOT(modeButtonClicked(int,bool)));
+    connect(modeS,TQ_SIGNAL(clicked(int,bool)),this,TQ_SLOT(modeButtonClicked(int,bool)));
+    connect(modeI,TQ_SIGNAL(clicked(int,bool)),this,TQ_SLOT(modeButtonClicked(int,bool)));
+    connect(modeP,TQ_SIGNAL(clicked(int,bool)),this,TQ_SLOT(modeButtonClicked(int,bool)));
+    connect(modeM,TQ_SIGNAL(clicked(int,bool)),this,TQ_SLOT(modeButtonClicked(int,bool)));
+    connect(modeK,TQ_SIGNAL(clicked(int,bool)),this,TQ_SLOT(modeButtonClicked(int,bool)));
+    connect(modeL,TQ_SIGNAL(clicked(int,bool)),this,TQ_SLOT(modeButtonClicked(int,bool)));
 
     limit=new KLineEdit(modeBox);
     TQToolTip::add(limit, i18n("Maximum users allowed in channel"));
     TQWhatsThis::add(limit, i18n("<qt>This is the channel user limit - the maximum number of users that can be in the channel at a time.  If you are an operator, you can set this.  The channel mode <b>T</b>opic (button to left) will automatically be set if set this.</qt>"));
-    connect(limit,TQT_SIGNAL (returnPressed()),this,TQT_SLOT (channelLimitChanged()) );
-    connect(limit,TQT_SIGNAL (lostFocus()), this, TQT_SLOT(channelLimitChanged()) );
+    connect(limit,TQ_SIGNAL (returnPressed()),this,TQ_SLOT (channelLimitChanged()) );
+    connect(limit,TQ_SIGNAL (lostFocus()), this, TQ_SLOT(channelLimitChanged()) );
 
     topicLayout->addWidget(modeBox, 0, 2);
     topicLayout->setRowStretch(1, 10);
@@ -187,8 +187,8 @@ Channel::Channel(TQWidget* parent, TQString _name) : ChatWindow(parent)
     // Server will be set later in setServer()
     IRCViewBox* ircViewBox = new IRCViewBox(m_horizSplitter, NULL);
     setTextView(ircViewBox->ircView());
-    connect(textView,TQT_SIGNAL(popupCommand(int)),this,TQT_SLOT(popupChannelCommand(int)));
-    connect(topicLine, TQT_SIGNAL(currentChannelChanged(const TQString&)),textView,TQT_SLOT(setCurrentChannel(const TQString&)));
+    connect(textView,TQ_SIGNAL(popupCommand(int)),this,TQ_SLOT(popupChannelCommand(int)));
+    connect(topicLine, TQ_SIGNAL(currentChannelChanged(const TQString&)),textView,TQ_SLOT(setCurrentChannel(const TQString&)));
 
     // The box that holds the Nick List and the quick action buttons
     nickListButtons = new TQVBox(m_horizSplitter);
@@ -268,57 +268,57 @@ Channel::Channel(TQWidget* parent, TQString _name) : ChatWindow(parent)
     getTextView()->setSizePolicy(greedy);
     nicknameListView->setSizePolicy(hmodest);
 
-    connect(channelInput,TQT_SIGNAL (submit()),this,TQT_SLOT (channelTextEntered()) );
-    connect(channelInput,TQT_SIGNAL (envelopeCommand()),this,TQT_SLOT (channelPassthroughCommand()) );
-    connect(channelInput,TQT_SIGNAL (nickCompletion()),this,TQT_SLOT (completeNick()) );
-    connect(channelInput,TQT_SIGNAL (endCompletion()),this,TQT_SLOT (endCompleteNick()) );
-    connect(channelInput,TQT_SIGNAL (textPasted(const TQString&)),this,TQT_SLOT (textPasted(const TQString&)) );
+    connect(channelInput,TQ_SIGNAL (submit()),this,TQ_SLOT (channelTextEntered()) );
+    connect(channelInput,TQ_SIGNAL (envelopeCommand()),this,TQ_SLOT (channelPassthroughCommand()) );
+    connect(channelInput,TQ_SIGNAL (nickCompletion()),this,TQ_SLOT (completeNick()) );
+    connect(channelInput,TQ_SIGNAL (endCompletion()),this,TQ_SLOT (endCompleteNick()) );
+    connect(channelInput,TQ_SIGNAL (textPasted(const TQString&)),this,TQ_SLOT (textPasted(const TQString&)) );
 
-    connect(getTextView(), TQT_SIGNAL(textPasted(bool)), channelInput, TQT_SLOT(paste(bool)));
-    connect(getTextView(),TQT_SIGNAL (gotFocus()),channelInput,TQT_SLOT (setFocus()) );
-    connect(getTextView(),TQT_SIGNAL (sendFile()),this,TQT_SLOT (sendFileMenu()) );
-    connect(getTextView(),TQT_SIGNAL (autoText(const TQString&)),this,TQT_SLOT (sendChannelText(const TQString&)) );
+    connect(getTextView(), TQ_SIGNAL(textPasted(bool)), channelInput, TQ_SLOT(paste(bool)));
+    connect(getTextView(),TQ_SIGNAL (gotFocus()),channelInput,TQ_SLOT (setFocus()) );
+    connect(getTextView(),TQ_SIGNAL (sendFile()),this,TQ_SLOT (sendFileMenu()) );
+    connect(getTextView(),TQ_SIGNAL (autoText(const TQString&)),this,TQ_SLOT (sendChannelText(const TQString&)) );
 
-    connect(nicknameListView,TQT_SIGNAL (popupCommand(int)),this,TQT_SLOT (popupCommand(int)) );
-    connect(nicknameListView,TQT_SIGNAL (doubleClicked(TQListViewItem*)),this,TQT_SLOT (doubleClickCommand(TQListViewItem*)) );
-    connect(nicknameListView,TQT_SIGNAL (dropped(TQDropEvent*,TQListViewItem*)),this,TQT_SLOT (filesDropped(TQDropEvent*)) );
-    connect(nicknameCombobox,TQT_SIGNAL (activated(int)),this,TQT_SLOT(nicknameComboboxChanged()));
+    connect(nicknameListView,TQ_SIGNAL (popupCommand(int)),this,TQ_SLOT (popupCommand(int)) );
+    connect(nicknameListView,TQ_SIGNAL (doubleClicked(TQListViewItem*)),this,TQ_SLOT (doubleClickCommand(TQListViewItem*)) );
+    connect(nicknameListView,TQ_SIGNAL (dropped(TQDropEvent*,TQListViewItem*)),this,TQ_SLOT (filesDropped(TQDropEvent*)) );
+    connect(nicknameCombobox,TQ_SIGNAL (activated(int)),this,TQ_SLOT(nicknameComboboxChanged()));
 
     if(nicknameCombobox->lineEdit())
-        connect(nicknameCombobox->lineEdit(), TQT_SIGNAL (lostFocus()),this,TQT_SLOT(nicknameComboboxChanged()));
+        connect(nicknameCombobox->lineEdit(), TQ_SIGNAL (lostFocus()),this,TQ_SLOT(nicknameComboboxChanged()));
 
     nicknameList.setAutoDelete(true);
 
     setLog(Preferences::log());
 
-    connect(&userhostTimer,TQT_SIGNAL (timeout()),this,TQT_SLOT (autoUserhost()));
+    connect(&userhostTimer,TQ_SIGNAL (timeout()),this,TQ_SLOT (autoUserhost()));
 
     // every few seconds try to get more userhosts
     userhostTimer.start(10000);
 
-    connect(&m_whoTimer,TQT_SIGNAL (timeout()),this,TQT_SLOT (autoWho()));
+    connect(&m_whoTimer,TQ_SIGNAL (timeout()),this,TQ_SLOT (autoWho()));
 
     // every 5 minutes decrease everyone's activity by 1 unit
     m_fadeActivityTimer.start(5*60*1000);
     
-    connect(&m_fadeActivityTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fadeActivity()));
+    connect(&m_fadeActivityTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fadeActivity()));
 
     // re-schedule when the settings were changed
-    connect(Preferences::self(), TQT_SIGNAL (autoContinuousWhoChanged()),this,TQT_SLOT (scheduleAutoWho()));
+    connect(Preferences::self(), TQ_SIGNAL (autoContinuousWhoChanged()),this,TQ_SLOT (scheduleAutoWho()));
 
     updateAppearance();
 
     //FIXME JOHNFLUX
-    //  connect( Konversation::Addressbook::self()->getAddressBook(), TQT_SIGNAL( addressBookChanged( AddressBook * ) ), this, TQT_SLOT( slotLoadAddressees() ) );
-    //  connect( Konversation::Addressbook::self(), TQT_SIGNAL(addresseesChanged()), this, TQT_SLOT(slotLoadAddressees()));
+    //  connect( Konversation::Addressbook::self()->getAddressBook(), TQ_SIGNAL( addressBookChanged( AddressBook * ) ), this, TQ_SLOT( slotLoadAddressees() ) );
+    //  connect( Konversation::Addressbook::self(), TQ_SIGNAL(addresseesChanged()), this, TQ_SLOT(slotLoadAddressees()));
 }
 
 //FIXME there is some logic in setLogfileName that needs to be split out and called here if the server display name gets changed
 void Channel::setServer(Server* server)
 {
     if (m_server != server)
-        connect(server, TQT_SIGNAL(connectionStateChanged(Server*, Konversation::ConnectionState)),
-                TQT_SLOT(connectionStateChanged(Server*, Konversation::ConnectionState)));
+        connect(server, TQ_SIGNAL(connectionStateChanged(Server*, Konversation::ConnectionState)),
+                TQ_SLOT(connectionStateChanged(Server*, Konversation::ConnectionState)));
     ChatWindow::setServer(server);
     if (!server->getKeyForRecipient(getName()).isNull())
         blowfishLabel->show();
@@ -1268,7 +1268,7 @@ void Channel::joinNickname(ChannelNickPtr channelNick)
         appendCommandMessage(i18n("Join"),i18n("%1 is the channel and %2 is our hostmask",
                              "You have joined the channel %1 (%2).").arg(getName()).arg(channelNick->getHostmask()),false, false, true);
         m_ownChannelNick = channelNick;
-        connect(m_ownChannelNick, TQT_SIGNAL(channelNickChanged()), TQT_SLOT(refreshModeButtons()));
+        connect(m_ownChannelNick, TQ_SIGNAL(channelNickChanged()), TQ_SLOT(refreshModeButtons()));
         refreshModeButtons();
         setActive(true);
 
@@ -2101,7 +2101,7 @@ void Channel::updateQuickButtons(const TQStringList &newButtonList)
         QuickButton* quickButton = new QuickButton(TQString(), TQString(), buttonsGrid);
         buttonList.append(quickButton);
 
-        connect(quickButton, TQT_SIGNAL(clicked(const TQString &)), this, TQT_SLOT(quickButtonClicked(const TQString &)));
+        connect(quickButton, TQ_SIGNAL(clicked(const TQString &)), this, TQ_SLOT(quickButtonClicked(const TQString &)));
 
         // Get the button definition
         TQString buttonText=newButtonList[index];
@@ -2353,7 +2353,7 @@ void Channel::addPendingNickList(const TQStringList& pendingChannelNickList)
     if (!m_processingTimer)
     {
         m_processingTimer = new TQTimer(this);
-        connect(m_processingTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(processPendingNicks()));
+        connect(m_processingTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processPendingNicks()));
     }
 
     m_pendingChannelNickLists.append(pendingChannelNickList);
@@ -2702,7 +2702,7 @@ void Channel::requestNickListSort()
     if(!m_delayedSortTimer)
     {
         m_delayedSortTimer = new TQTimer(this);
-        connect(m_delayedSortTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(sortNickList()));
+        connect(m_delayedSortTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(sortNickList()));
     }
 
     if(!m_delayedSortTimer->isActive())
diff --git a/konversation/src/channellistpanel.cpp b/konversation/src/channellistpanel.cpp
index 30205d1..0af39d1 100644
--- a/konversation/src/channellistpanel.cpp
+++ b/konversation/src/channellistpanel.cpp
@@ -126,35 +126,35 @@ ChannelListPanel::ChannelListPanel(TQWidget* parent) : ChatWindow(parent)
     joinChannelButton=new TQPushButton(i18n("Join Channel"),actionBox,"join_channel_button");
     TQWhatsThis::add(joinChannelButton, i18n("Click here to join the channel. A new tab is created for the channel."));
 
-    connect(&updateTimer,TQT_SIGNAL (timeout()),this,TQT_SLOT (updateDisplay()));
+    connect(&updateTimer,TQ_SIGNAL (timeout()),this,TQ_SLOT (updateDisplay()));
 
     // double click on channel entry joins the channel
-    connect(channelListView,TQT_SIGNAL (doubleClicked(TQListViewItem*)),
-        this,TQT_SLOT (joinChannelClicked()) );
+    connect(channelListView,TQ_SIGNAL (doubleClicked(TQListViewItem*)),
+        this,TQ_SLOT (joinChannelClicked()) );
 
-    connect(channelListView,TQT_SIGNAL (contextMenu (TDEListView*, TQListViewItem*, const TQPoint&) ),
-        this, TQT_SLOT (contextMenu (TDEListView*, TQListViewItem*, const TQPoint&)) );
+    connect(channelListView,TQ_SIGNAL (contextMenu (TDEListView*, TQListViewItem*, const TQPoint&) ),
+        this, TQ_SLOT (contextMenu (TDEListView*, TQListViewItem*, const TQPoint&)) );
 
-    connect(minUsersSpin,TQT_SIGNAL (valueChanged(int)),this,TQT_SLOT(setMinUsers(int)) );
-    connect(maxUsersSpin,TQT_SIGNAL (valueChanged(int)),this,TQT_SLOT(setMaxUsers(int)) );
-    connect(this,TQT_SIGNAL (adjustMinValue(int)),minUsersSpin,TQT_SLOT (setValue(int)) );
-    connect(this,TQT_SIGNAL (adjustMaxValue(int)),maxUsersSpin,TQT_SLOT (setValue(int)) );
+    connect(minUsersSpin,TQ_SIGNAL (valueChanged(int)),this,TQ_SLOT(setMinUsers(int)) );
+    connect(maxUsersSpin,TQ_SIGNAL (valueChanged(int)),this,TQ_SLOT(setMaxUsers(int)) );
+    connect(this,TQ_SIGNAL (adjustMinValue(int)),minUsersSpin,TQ_SLOT (setValue(int)) );
+    connect(this,TQ_SIGNAL (adjustMaxValue(int)),maxUsersSpin,TQ_SLOT (setValue(int)) );
 
-    connect(filterInput,TQT_SIGNAL (textChanged(const TQString&)),this,TQT_SLOT (filterTextChanged(const TQString&)) );
-    connect(filterInput,TQT_SIGNAL (returnPressed()),this,TQT_SLOT (applyFilterClicked()) );
+    connect(filterInput,TQ_SIGNAL (textChanged(const TQString&)),this,TQ_SLOT (filterTextChanged(const TQString&)) );
+    connect(filterInput,TQ_SIGNAL (returnPressed()),this,TQ_SLOT (applyFilterClicked()) );
 
-    connect(channelFilter,TQT_SIGNAL (clicked()),this,TQT_SLOT (channelTargetClicked()) );
-    connect(topicFilter,TQT_SIGNAL (clicked()),this,TQT_SLOT (topicTargetClicked()) );
-    connect(regexpCheck,TQT_SIGNAL (clicked()),this,TQT_SLOT (regExpClicked()) );
+    connect(channelFilter,TQ_SIGNAL (clicked()),this,TQ_SLOT (channelTargetClicked()) );
+    connect(topicFilter,TQ_SIGNAL (clicked()),this,TQ_SLOT (topicTargetClicked()) );
+    connect(regexpCheck,TQ_SIGNAL (clicked()),this,TQ_SLOT (regExpClicked()) );
 
-    connect(applyFilter,TQT_SIGNAL (clicked()),this,TQT_SLOT (applyFilterClicked()) );
+    connect(applyFilter,TQ_SIGNAL (clicked()),this,TQ_SLOT (applyFilterClicked()) );
 
-    connect(refreshListButton,TQT_SIGNAL (clicked()),this,TQT_SLOT (refreshList()) );
-    connect(saveListButton,TQT_SIGNAL (clicked()),this,TQT_SLOT (saveList()) );
-    connect(joinChannelButton,TQT_SIGNAL (clicked()),this,TQT_SLOT (joinChannelClicked()) );
+    connect(refreshListButton,TQ_SIGNAL (clicked()),this,TQ_SLOT (refreshList()) );
+    connect(saveListButton,TQ_SIGNAL (clicked()),this,TQ_SLOT (saveList()) );
+    connect(joinChannelButton,TQ_SIGNAL (clicked()),this,TQ_SLOT (joinChannelClicked()) );
 
-    connect(this,TQT_SIGNAL (updateNumUsers(const TQString&)),usersLabel,TQT_SLOT (setText(const TQString&)) );
-    connect(this,TQT_SIGNAL (updateNumChannels(const TQString&)),channelsLabel,TQT_SLOT (setText(const TQString&)) );
+    connect(this,TQ_SIGNAL (updateNumUsers(const TQString&)),usersLabel,TQ_SLOT (setText(const TQString&)) );
+    connect(this,TQ_SIGNAL (updateNumChannels(const TQString&)),channelsLabel,TQ_SLOT (setText(const TQString&)) );
 
     updateUsersChannels();
 }
diff --git a/konversation/src/channeloptionsdialog.cpp b/konversation/src/channeloptionsdialog.cpp
index c4c109b..9a33b0a 100644
--- a/konversation/src/channeloptionsdialog.cpp
+++ b/konversation/src/channeloptionsdialog.cpp
@@ -58,28 +58,28 @@ namespace Konversation
         m_channel = channel;
         m_editingTopic = false;
 
-        connect(m_widget->topicHistoryList, TQT_SIGNAL(clicked(TQListViewItem*)), this, TQT_SLOT(topicHistoryItemClicked(TQListViewItem*)));
-        connect(m_widget->topicHistoryList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(topicHistoryItemClicked(TQListViewItem*)));
-        connect(m_widget->toggleAdvancedModes, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleAdvancedModes()));
-        connect(m_widget->topicEdit, TQT_SIGNAL(modificationChanged(bool)), this, TQT_SLOT(topicBeingEdited(bool)));
+        connect(m_widget->topicHistoryList, TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(topicHistoryItemClicked(TQListViewItem*)));
+        connect(m_widget->topicHistoryList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(topicHistoryItemClicked(TQListViewItem*)));
+        connect(m_widget->toggleAdvancedModes, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleAdvancedModes()));
+        connect(m_widget->topicEdit, TQ_SIGNAL(modificationChanged(bool)), this, TQ_SLOT(topicBeingEdited(bool)));
 
-        connect(m_channel, TQT_SIGNAL(topicHistoryChanged()), this, TQT_SLOT(refreshTopicHistory()));
+        connect(m_channel, TQ_SIGNAL(topicHistoryChanged()), this, TQ_SLOT(refreshTopicHistory()));
 
-        connect(m_channel, TQT_SIGNAL(modesChanged()), this, TQT_SLOT(refreshModes()));
-        connect(m_channel->getOwnChannelNick(), TQT_SIGNAL(channelNickChanged()), this, TQT_SLOT(refreshEnableModes()));
+        connect(m_channel, TQ_SIGNAL(modesChanged()), this, TQ_SLOT(refreshModes()));
+        connect(m_channel->getOwnChannelNick(), TQ_SIGNAL(channelNickChanged()), this, TQ_SLOT(refreshEnableModes()));
 
-        connect(this, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(cancelClicked()));
-        connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(changeOptions()));
-        connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked()));
+        connect(this, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(cancelClicked()));
+        connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(changeOptions()));
+        connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(okClicked()));
 
-        connect(m_channel, TQT_SIGNAL(banAdded(const TQString&)), this, TQT_SLOT(addBan(const TQString&)));
-        connect(m_channel, TQT_SIGNAL(banRemoved(const TQString&)), this, TQT_SLOT(removeBan(const TQString&)));
-        connect(m_channel, TQT_SIGNAL(banListCleared()), m_widget->banList, TQT_SLOT(clear()));
+        connect(m_channel, TQ_SIGNAL(banAdded(const TQString&)), this, TQ_SLOT(addBan(const TQString&)));
+        connect(m_channel, TQ_SIGNAL(banRemoved(const TQString&)), this, TQ_SLOT(removeBan(const TQString&)));
+        connect(m_channel, TQ_SIGNAL(banListCleared()), m_widget->banList, TQ_SLOT(clear()));
 
-        connect(m_widget->addBan, TQT_SIGNAL(clicked()), this, TQT_SLOT(addBanClicked()));
-        connect(m_widget->removeBan, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeBanClicked()));
-        connect(m_widget->banList, TQT_SIGNAL(itemRenamed (TQListViewItem*)), this, TQT_SLOT(banEdited(TQListViewItem*)));
-        connect(m_widget->banList, TQT_SIGNAL(itemRenamed (TQListViewItem*, int, const TQString&)), this, TQT_SLOT(banEdited(TQListViewItem*)));
+        connect(m_widget->addBan, TQ_SIGNAL(clicked()), this, TQ_SLOT(addBanClicked()));
+        connect(m_widget->removeBan, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeBanClicked()));
+        connect(m_widget->banList, TQ_SIGNAL(itemRenamed (TQListViewItem*)), this, TQ_SLOT(banEdited(TQListViewItem*)));
+        connect(m_widget->banList, TQ_SIGNAL(itemRenamed (TQListViewItem*, int, const TQString&)), this, TQ_SLOT(banEdited(TQListViewItem*)));
 
         refreshTopicHistory();
         refreshBanList();
diff --git a/konversation/src/chatwindow.cpp b/konversation/src/chatwindow.cpp
index 2538930..713ba9d 100644
--- a/konversation/src/chatwindow.cpp
+++ b/konversation/src/chatwindow.cpp
@@ -101,7 +101,7 @@ void ChatWindow::setServer(Server* newServer)
     else
     {
         m_server=newServer;
-        connect(m_server,TQT_SIGNAL (serverOnline(bool)),this,TQT_SLOT (serverOnline(bool)) );
+        connect(m_server,TQ_SIGNAL (serverOnline(bool)),this,TQ_SLOT (serverOnline(bool)) );
 
         // check if we need to set up the signals
         if(getType() != ChannelList)
@@ -143,9 +143,9 @@ void ChatWindow::setTextView(IRCView* newView)
     }
 
     textView->setChatWin(this);
-    connect(textView,TQT_SIGNAL(textToLog(const TQString&)), this,TQT_SLOT(logText(const TQString&)));
-    connect(textView,TQT_SIGNAL(setStatusBarTempText(const TQString&)), this, TQT_SIGNAL(setStatusBarTempText(const TQString&)));
-    connect(textView,TQT_SIGNAL(clearStatusBarTempText()), this, TQT_SIGNAL(clearStatusBarTempText()));
+    connect(textView,TQ_SIGNAL(textToLog(const TQString&)), this,TQ_SLOT(logText(const TQString&)));
+    connect(textView,TQ_SIGNAL(setStatusBarTempText(const TQString&)), this, TQ_SIGNAL(setStatusBarTempText(const TQString&)));
+    connect(textView,TQ_SIGNAL(clearStatusBarTempText()), this, TQ_SIGNAL(clearStatusBarTempText()));
 }
 
 void ChatWindow::appendRaw(const TQString& message, bool suppressTimestamps)
diff --git a/konversation/src/connectionmanager.cpp b/konversation/src/connectionmanager.cpp
index b40bf3d..cf34905 100644
--- a/konversation/src/connectionmanager.cpp
+++ b/konversation/src/connectionmanager.cpp
@@ -25,7 +25,7 @@
 
 ConnectionManager::ConnectionManager(TQObject* parent) : TQObject(parent)
 {
-    connect(this, TQT_SIGNAL(requestReconnect(Server*)), this, TQT_SLOT(handleReconnect(Server*)));
+    connect(this, TQ_SIGNAL(requestReconnect(Server*)), this, TQ_SLOT(handleReconnect(Server*)));
 }
 
 ConnectionManager::~ConnectionManager()
@@ -109,22 +109,22 @@ void ConnectionManager::connectTo(Konversation::ConnectionFlag flag, ConnectionS
 
     enlistConnection(server->connectionId(), server);
 
-    connect(server, TQT_SIGNAL(destroyed(int)), this, TQT_SLOT(delistConnection(int)));
+    connect(server, TQ_SIGNAL(destroyed(int)), this, TQ_SLOT(delistConnection(int)));
 
-    connect(server, TQT_SIGNAL(connectionStateChanged(Server*, Konversation::ConnectionState)),
-            this, TQT_SLOT(handleConnectionStateChange(Server*, Konversation::ConnectionState)));
+    connect(server, TQ_SIGNAL(connectionStateChanged(Server*, Konversation::ConnectionState)),
+            this, TQ_SLOT(handleConnectionStateChange(Server*, Konversation::ConnectionState)));
 
-    connect(server, TQT_SIGNAL(awayState(bool)), this, TQT_SIGNAL(connectionChangedAwayState(bool)));
+    connect(server, TQ_SIGNAL(awayState(bool)), this, TQ_SIGNAL(connectionChangedAwayState(bool)));
 
-    connect(server, TQT_SIGNAL(nicksNowOnline(Server*, const TQStringList&, bool)),
-        mainWindow, TQT_SLOT(setOnlineList(Server*, const TQStringList&,bool)));
-    connect(server, TQT_SIGNAL(awayInsertRememberLine(Server*)),
-        mainWindow, TQT_SIGNAL(triggerRememberLines(Server*)));
+    connect(server, TQ_SIGNAL(nicksNowOnline(Server*, const TQStringList&, bool)),
+        mainWindow, TQ_SLOT(setOnlineList(Server*, const TQStringList&,bool)));
+    connect(server, TQ_SIGNAL(awayInsertRememberLine(Server*)),
+        mainWindow, TQ_SIGNAL(triggerRememberLines(Server*)));
 
-    connect(mainWindow, TQT_SIGNAL(startNotifyTimer(int)), server, TQT_SLOT(startNotifyTimer(int)));
+    connect(mainWindow, TQ_SIGNAL(startNotifyTimer(int)), server, TQ_SLOT(startNotifyTimer(int)));
 
-    connect(server, TQT_SIGNAL(multiServerCommand(const TQString&, const TQString&)),
-        konvApp, TQT_SLOT(sendMultiServerCommand(const TQString&, const TQString&)));
+    connect(server, TQ_SIGNAL(multiServerCommand(const TQString&, const TQString&)),
+        konvApp, TQ_SLOT(sendMultiServerCommand(const TQString&, const TQString&)));
 }
 
 void ConnectionManager::enlistConnection(int connectionId, Server* server)
@@ -215,7 +215,7 @@ void ConnectionManager::handleReconnect(Server* server)
 
         server->getConnectionSettings().incrementReconnectCount();
 
-        TQTimer::singleShot(Preferences::reconnectDelay() * 1000, server, TQT_SLOT(connectToIRCServer()));
+        TQTimer::singleShot(Preferences::reconnectDelay() * 1000, server, TQ_SLOT(connectToIRCServer()));
     }
     else
         server->getStatusView()->appendServerMessage(i18n("Error"), i18n("Reconnection attempts exceeded."));
diff --git a/konversation/src/dcc_preferences.cpp b/konversation/src/dcc_preferences.cpp
index 880bd4c..27883a0 100644
--- a/konversation/src/dcc_preferences.cpp
+++ b/konversation/src/dcc_preferences.cpp
@@ -21,7 +21,7 @@ DCC_Config::DCC_Config(TQWidget *parent, const char* name) :
   DCC_ConfigUI(parent,name)
 {
     languageChange();
-    connect(kcfg_DccMethodToGetOwnIp, TQT_SIGNAL(activated(int)), this, TQT_SLOT(dccMethodChanged(int)));          dccMethodChanged(kcfg_DccMethodToGetOwnIp->currentItem()); 
+    connect(kcfg_DccMethodToGetOwnIp, TQ_SIGNAL(activated(int)), this, TQ_SLOT(dccMethodChanged(int)));          dccMethodChanged(kcfg_DccMethodToGetOwnIp->currentItem()); 
 
 
 }
diff --git a/konversation/src/dccchat.cpp b/konversation/src/dccchat.cpp
index 9708163..a42aa60 100644
--- a/konversation/src/dccchat.cpp
+++ b/konversation/src/dccchat.cpp
@@ -90,12 +90,12 @@ DccChat::DccChat(TQWidget* parent, bool listen, Server* server, const TQString&
     }
 
     // connect the signals and slots
-    connect( m_dccChatInput, TQT_SIGNAL( submit() ), this, TQT_SLOT( dccChatTextEntered() ) );
-    connect( m_dccChatInput, TQT_SIGNAL( textPasted( const TQString& ) ), this, TQT_SLOT( textPasted( const TQString& ) ) );
+    connect( m_dccChatInput, TQ_SIGNAL( submit() ), this, TQ_SLOT( dccChatTextEntered() ) );
+    connect( m_dccChatInput, TQ_SIGNAL( textPasted( const TQString& ) ), this, TQ_SLOT( textPasted( const TQString& ) ) );
 
-    connect( getTextView(), TQT_SIGNAL( textPasted(bool) ), m_dccChatInput, TQT_SLOT( paste(bool) ) );
-    connect( getTextView(), TQT_SIGNAL( gotFocus() ), m_dccChatInput, TQT_SLOT( setFocus() ) );
-    connect( getTextView(), TQT_SIGNAL( autoText(const TQString&) ), this, TQT_SLOT( sendDccChatText( const TQString& ) ) );
+    connect( getTextView(), TQ_SIGNAL( textPasted(bool) ), m_dccChatInput, TQ_SLOT( paste(bool) ) );
+    connect( getTextView(), TQ_SIGNAL( gotFocus() ), m_dccChatInput, TQ_SLOT( setFocus() ) );
+    connect( getTextView(), TQ_SIGNAL( autoText(const TQString&) ), this, TQ_SLOT( sendDccChatText( const TQString& ) ) );
 
     if (listen)
     {
@@ -138,7 +138,7 @@ void DccChat::listenForPartner()
         return;
     }
 
-    connect( m_listenSocket, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(heardPartner()) );
+    connect( m_listenSocket, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(heardPartner()) );
 
     // Get our own port number
     m_ownPort = DccCommon::getServerSocketPort( m_listenSocket );
@@ -170,11 +170,11 @@ void DccChat::connectToPartner()
     m_dccSocket->setTimeout(10000);
     m_dccSocket->blockSignals(false);
 
-    connect( m_dccSocket, TQT_SIGNAL( hostFound() ),                        this, TQT_SLOT( lookupFinished() )           );
-    connect( m_dccSocket, TQT_SIGNAL( connected( const KResolverEntry& ) ), this, TQT_SLOT( dccChatConnectionSuccess() ) );
-    connect( m_dccSocket, TQT_SIGNAL( gotError( int ) ),                    this, TQT_SLOT( dccChatBroken( int ) )       );
-    connect( m_dccSocket, TQT_SIGNAL( readyRead() ),                        this, TQT_SLOT( readData() )                 );
-    connect( m_dccSocket, TQT_SIGNAL( closed() ),                           this, TQT_SLOT( socketClosed() )             );
+    connect( m_dccSocket, TQ_SIGNAL( hostFound() ),                        this, TQ_SLOT( lookupFinished() )           );
+    connect( m_dccSocket, TQ_SIGNAL( connected( const KResolverEntry& ) ), this, TQ_SLOT( dccChatConnectionSuccess() ) );
+    connect( m_dccSocket, TQ_SIGNAL( gotError( int ) ),                    this, TQ_SLOT( dccChatBroken( int ) )       );
+    connect( m_dccSocket, TQ_SIGNAL( readyRead() ),                        this, TQ_SLOT( readData() )                 );
+    connect( m_dccSocket, TQ_SIGNAL( closed() ),                           this, TQ_SLOT( socketClosed() )             );
 
     m_dccSocket->connect();
     
@@ -324,9 +324,9 @@ void DccChat::heardPartner()
         return;
     }
 
-    connect( m_dccSocket, TQT_SIGNAL( readyRead() ),     this, TQT_SLOT( readData() )           );
-    connect( m_dccSocket, TQT_SIGNAL( closed() ),        this, TQT_SLOT( socketClosed() )       );
-    connect( m_dccSocket, TQT_SIGNAL( gotError( int ) ), this, TQT_SLOT( dccChatBroken( int ) ) );
+    connect( m_dccSocket, TQ_SIGNAL( readyRead() ),     this, TQ_SLOT( readData() )           );
+    connect( m_dccSocket, TQ_SIGNAL( closed() ),        this, TQ_SLOT( socketClosed() )       );
+    connect( m_dccSocket, TQ_SIGNAL( gotError( int ) ), this, TQ_SLOT( dccChatBroken( int ) ) );
 
     // the listen socket isn't needed anymore
     disconnect( m_listenSocket, 0, 0, 0 );
diff --git a/konversation/src/dccrecipientdialog.cpp b/konversation/src/dccrecipientdialog.cpp
index c1eb985..9fae439 100644
--- a/konversation/src/dccrecipientdialog.cpp
+++ b/konversation/src/dccrecipientdialog.cpp
@@ -44,8 +44,8 @@ DccRecipientDialog::DccRecipientDialog(TQWidget* parent, const TQStringList &lis
     dialogLayout->addWidget(nicknameList);
     dialogLayout->addWidget(nicknameInput);
 
-    connect(nicknameList,TQT_SIGNAL (highlighted(TQListBoxItem*)),this,TQT_SLOT (newNicknameSelected(TQListBoxItem*)) );
-    connect(nicknameList,TQT_SIGNAL (doubleClicked(TQListBoxItem*)),this,TQT_SLOT (newNicknameSelectedQuit(TQListBoxItem*)) );
+    connect(nicknameList,TQ_SIGNAL (highlighted(TQListBoxItem*)),this,TQ_SLOT (newNicknameSelected(TQListBoxItem*)) );
+    connect(nicknameList,TQ_SIGNAL (doubleClicked(TQListBoxItem*)),this,TQ_SLOT (newNicknameSelectedQuit(TQListBoxItem*)) );
 
     setButtonOK(KGuiItem(i18n("&OK"),"button_ok",i18n("Select nickname and close the window")));
     setButtonCancel(KGuiItem(i18n("&Cancel"),"button_cancel",i18n("Close the window without changes")));
diff --git a/konversation/src/dccresumedialog.cpp b/konversation/src/dccresumedialog.cpp
index ecd81ce..43a6984 100644
--- a/konversation/src/dccresumedialog.cpp
+++ b/konversation/src/dccresumedialog.cpp
@@ -73,7 +73,7 @@ DccResumeDialog::DccResumeDialog(DccTransferRecv* item, const TQString& caption,
     labelMessage->setText(message);
 
     m_urlreqFileURL = new KURLRequester(m_item->getFileURL().prettyURL(), page);
-    connect(m_urlreqFileURL, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateDialogButtons()));
+    connect(m_urlreqFileURL, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateDialogButtons()));
 
     pageLayout->addWidget(labelMessage);
     pageLayout->addWidget(m_urlreqFileURL);
@@ -89,8 +89,8 @@ DccResumeDialog::DccResumeDialog(DccTransferRecv* item, const TQString& caption,
         filePathToolsLayout->addItem(new TQSpacerItem(0, 0, TQSizePolicy::Expanding));
         filePathToolsLayout->addWidget(btnDefaultName);
         filePathToolsLayout->addWidget(btnSuggestNewName);
-        connect(btnSuggestNewName, TQT_SIGNAL(clicked()), this, TQT_SLOT(suggestNewName()));
-        connect(btnDefaultName, TQT_SIGNAL(clicked()), this, TQT_SLOT(setDefaultName()));
+        connect(btnSuggestNewName, TQ_SIGNAL(clicked()), this, TQ_SLOT(suggestNewName()));
+        connect(btnDefaultName, TQ_SIGNAL(clicked()), this, TQ_SLOT(setDefaultName()));
 
         pageLayout->addWidget(filePathToolsFrame);
 
diff --git a/konversation/src/dcctransfer.cpp b/konversation/src/dcctransfer.cpp
index a5fc08f..266d618 100644
--- a/konversation/src/dcctransfer.cpp
+++ b/konversation/src/dcctransfer.cpp
@@ -41,7 +41,7 @@ DccTransfer::DccTransfer( DccType dccType, TQObject* parent ) : TQObject(parent)
     m_bufferSize = Preferences::dccBufferSize();
     m_buffer = new char[ m_bufferSize ];
 
-    connect( &m_loggerTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( logTransfer() ) );
+    connect( &m_loggerTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( logTransfer() ) );
 
     m_timeOffer = TQDateTime::currentDateTime();
 }
diff --git a/konversation/src/dcctransferdetailedinfopanel.cpp b/konversation/src/dcctransferdetailedinfopanel.cpp
index f8d5558..bc320d5 100644
--- a/konversation/src/dcctransferdetailedinfopanel.cpp
+++ b/konversation/src/dcctransferdetailedinfopanel.cpp
@@ -35,10 +35,10 @@ DccTransferDetailedInfoPanel::DccTransferDetailedInfoPanel( TQWidget* parent, co
 {
     m_autoViewUpdateTimer = new TQTimer( this );
 
-    connect( m_urlreqLocation, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( slotLocationChanged( const TQString& ) ) );
-    connect( m_buttonOpenFolder, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOpenFolderButtonClicked() ) );
-    connect( KonversationApplication::instance()->getDccTransferManager(), TQT_SIGNAL( fileURLChanged( DccTransferRecv* ) ),
-             this, TQT_SLOT( updateView() ) );  // it's a little rough..
+    connect( m_urlreqLocation, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotLocationChanged( const TQString& ) ) );
+    connect( m_buttonOpenFolder, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOpenFolderButtonClicked() ) );
+    connect( KonversationApplication::instance()->getDccTransferManager(), TQ_SIGNAL( fileURLChanged( DccTransferRecv* ) ),
+             this, TQ_SLOT( updateView() ) );  // it's a little rough..
 }
 
 DccTransferDetailedInfoPanel::~DccTransferDetailedInfoPanel()
@@ -55,7 +55,7 @@ void DccTransferDetailedInfoPanel::setItem( DccTransferPanelItem* item )
     // because m_item can have been deleted already.
 
     // set up the auto view-update timer
-    connect( m_autoViewUpdateTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( updateView() ) );
+    connect( m_autoViewUpdateTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( updateView() ) );
 
     m_item = item;
 
@@ -63,7 +63,7 @@ void DccTransferDetailedInfoPanel::setItem( DccTransferPanelItem* item )
     // otherwise the information will not be updated every 0.5sec
     if (m_item->transfer()->getStatus() == DccTransfer::Transferring)
         m_autoViewUpdateTimer->start(500, false);
-    connect( m_item->transfer(), TQT_SIGNAL( statusChanged( DccTransfer*, int, int ) ), this, TQT_SLOT( slotTransferStatusChanged( DccTransfer*, int, int ) ) );
+    connect( m_item->transfer(), TQ_SIGNAL( statusChanged( DccTransfer*, int, int ) ), this, TQ_SLOT( slotTransferStatusChanged( DccTransfer*, int, int ) ) );
 
     updateView();
 }
diff --git a/konversation/src/dcctransfermanager.cpp b/konversation/src/dcctransfermanager.cpp
index cc22a35..04f9237 100644
--- a/konversation/src/dcctransfermanager.cpp
+++ b/konversation/src/dcctransfermanager.cpp
@@ -25,8 +25,8 @@ DccTransferManager::DccTransferManager( TQObject* parent )
 
     m_defaultIncomingFolder = Preferences::dccPath();
 
-    connect( KonversationApplication::instance(), TQT_SIGNAL( appearanceChanged() ),
-             this, TQT_SLOT( slotSettingsChanged() ) );
+    connect( KonversationApplication::instance(), TQ_SIGNAL( appearanceChanged() ),
+             this, TQ_SLOT( slotSettingsChanged() ) );
 }
 
 DccTransferManager::~DccTransferManager()
@@ -39,7 +39,7 @@ DccTransferRecv* DccTransferManager::newDownload()
 {
     DccTransferRecv* transfer = new DccTransferRecv(this);
     m_recvItems.push_back( transfer );
-    connect( transfer, TQT_SIGNAL( done( DccTransfer* ) ), this, TQT_SLOT( removeRecvItem( DccTransfer* ) ) );
+    connect( transfer, TQ_SIGNAL( done( DccTransfer* ) ), this, TQ_SLOT( removeRecvItem( DccTransfer* ) ) );
     initTransfer( transfer );
     return transfer;
 }
@@ -48,7 +48,7 @@ DccTransferSend* DccTransferManager::newUpload()
 {
     DccTransferSend* transfer = new DccTransferSend(this);
     m_sendItems.push_back( transfer );
-    connect( transfer, TQT_SIGNAL( done( DccTransfer* ) ), this, TQT_SLOT( removeSendItem( DccTransfer* ) ) );
+    connect( transfer, TQ_SIGNAL( done( DccTransfer* ) ), this, TQ_SLOT( removeSendItem( DccTransfer* ) ) );
     initTransfer( transfer );
     return transfer;
 }
@@ -144,7 +144,7 @@ DccTransferSend* DccTransferManager::startReverseSending( int connectionId, cons
 
 void DccTransferManager::initTransfer( DccTransfer* transfer )
 {
-    connect( transfer, TQT_SIGNAL( statusChanged( DccTransfer*, int, int ) ), this, TQT_SLOT( slotTransferStatusChanged( DccTransfer*, int, int ) ) );
+    connect( transfer, TQ_SIGNAL( statusChanged( DccTransfer*, int, int ) ), this, TQ_SLOT( slotTransferStatusChanged( DccTransfer*, int, int ) ) );
 
     emit newTransferAdded( transfer );
 }
diff --git a/konversation/src/dcctransferpanel.cpp b/konversation/src/dcctransferpanel.cpp
index b1be854..721435c 100644
--- a/konversation/src/dcctransferpanel.cpp
+++ b/konversation/src/dcctransferpanel.cpp
@@ -46,7 +46,7 @@ DccTransferPanel::DccTransferPanel(TQWidget* parent) : ChatWindow(parent)
 
     initGUI();
 
-    connect( KonversationApplication::instance()->getDccTransferManager(), TQT_SIGNAL( newTransferAdded( DccTransfer* ) ), this, TQT_SLOT( slotNewTransferAdded( DccTransfer* ) ) );
+    connect( KonversationApplication::instance()->getDccTransferManager(), TQ_SIGNAL( newTransferAdded( DccTransfer* ) ), this, TQ_SLOT( slotNewTransferAdded( DccTransfer* ) ) );
 }
 
 DccTransferPanel::~DccTransferPanel()
@@ -98,7 +98,7 @@ void DccTransferPanel::initGUI()
 
     m_listView->setSorting(Column::OfferDate, false);
 
-    connect(m_listView,TQT_SIGNAL (selectionChanged()),this,TQT_SLOT (updateButton()) );
+    connect(m_listView,TQ_SIGNAL (selectionChanged()),this,TQ_SLOT (updateButton()) );
 
     // detailed info panel
     m_detailPanel = new DccTransferDetailedInfoPanel(this);
@@ -123,12 +123,12 @@ void DccTransferPanel::initGUI()
     TQToolTip::add( m_buttonOpen,   i18n( "Run the file" ) );
     TQToolTip::add( m_buttonDetail, i18n( "View DCC transfer details" ) );
 
-    connect( m_buttonAccept, TQT_SIGNAL(clicked()), this, TQT_SLOT(acceptDcc()) );
-    connect( m_buttonAbort,  TQT_SIGNAL(clicked()), this, TQT_SLOT(abortDcc()) );
-    connect( m_buttonClear,  TQT_SIGNAL(clicked()), this, TQT_SLOT(clearDcc()) );
-    connect( m_buttonOpen,   TQT_SIGNAL(clicked()), this, TQT_SLOT(runDcc()) );
-    //connect( m_buttonDetail, TQT_SIGNAL(clicked()), this, TQT_SLOT(openDetail()) );
-    connect( m_buttonDetail, TQT_SIGNAL(toggled(bool)), m_detailPanel, TQT_SLOT(setShown(bool)) );
+    connect( m_buttonAccept, TQ_SIGNAL(clicked()), this, TQ_SLOT(acceptDcc()) );
+    connect( m_buttonAbort,  TQ_SIGNAL(clicked()), this, TQ_SLOT(abortDcc()) );
+    connect( m_buttonClear,  TQ_SIGNAL(clicked()), this, TQ_SLOT(clearDcc()) );
+    connect( m_buttonOpen,   TQ_SIGNAL(clicked()), this, TQ_SLOT(runDcc()) );
+    //connect( m_buttonDetail, TQ_SIGNAL(clicked()), this, TQ_SLOT(openDetail()) );
+    connect( m_buttonDetail, TQ_SIGNAL(toggled(bool)), m_detailPanel, TQ_SLOT(setShown(bool)) );
     m_buttonDetail->setOn(true);
 
 
@@ -150,13 +150,13 @@ void DccTransferPanel::initGUI()
 
     #undef icon
 
-    connect(m_listView, TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)), this, TQT_SLOT(popupRequested(TQListViewItem*,const TQPoint&,int)));
-    connect(m_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(popupActivated(int)));
+    connect(m_listView, TQ_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)), this, TQ_SLOT(popupRequested(TQListViewItem*,const TQPoint&,int)));
+    connect(m_popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(popupActivated(int)));
 
     // misc.
-    connect(m_listView, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), this, TQT_SLOT(doubleClicked(TQListViewItem*,const TQPoint&,int)));
+    connect(m_listView, TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), this, TQ_SLOT(doubleClicked(TQListViewItem*,const TQPoint&,int)));
 
-    connect(m_listView, TQT_SIGNAL(currentChanged(TQListViewItem*)), this, TQT_SLOT(setDetailPanelItem(TQListViewItem*)));
+    connect(m_listView, TQ_SIGNAL(currentChanged(TQListViewItem*)), this, TQ_SLOT(setDetailPanelItem(TQListViewItem*)));
 
     updateButton();
 }
@@ -164,7 +164,7 @@ void DccTransferPanel::initGUI()
 void DccTransferPanel::slotNewTransferAdded( DccTransfer* transfer )
 {
     DccTransferPanelItem* item = new DccTransferPanelItem( this, transfer );
-    connect( transfer, TQT_SIGNAL( statusChanged( DccTransfer*, int, int ) ), this, TQT_SLOT( slotTransferStatusChanged() ) );
+    connect( transfer, TQ_SIGNAL( statusChanged( DccTransfer*, int, int ) ), this, TQ_SLOT( slotTransferStatusChanged() ) );
     if ( m_listView->childCount() == 1 )
     {
         m_listView->clearSelection();
diff --git a/konversation/src/dcctransferpanelitem.cpp b/konversation/src/dcctransferpanelitem.cpp
index 22c15f3..3cd09ee 100644
--- a/konversation/src/dcctransferpanelitem.cpp
+++ b/konversation/src/dcctransferpanelitem.cpp
@@ -45,11 +45,11 @@ DccTransferPanelItem::DccTransferPanelItem( DccTransferPanel* panel, DccTransfer
     m_progressBar->setCenterIndicator( true );
     m_progressBar->setPercentageVisible( true );
 
-    connect( m_transfer, TQT_SIGNAL( transferStarted( DccTransfer* ) ), this, TQT_SLOT( startAutoViewUpdate() ) );
-    connect( m_transfer, TQT_SIGNAL( done( DccTransfer* ) ), this, TQT_SLOT( stopAutoViewUpdate() ) );
-    connect( m_transfer, TQT_SIGNAL( done( DccTransfer* ) ), this, TQT_SLOT( backupTransferInfo( DccTransfer* ) ) );
+    connect( m_transfer, TQ_SIGNAL( transferStarted( DccTransfer* ) ), this, TQ_SLOT( startAutoViewUpdate() ) );
+    connect( m_transfer, TQ_SIGNAL( done( DccTransfer* ) ), this, TQ_SLOT( stopAutoViewUpdate() ) );
+    connect( m_transfer, TQ_SIGNAL( done( DccTransfer* ) ), this, TQ_SLOT( backupTransferInfo( DccTransfer* ) ) );
 
-    connect( m_transfer, TQT_SIGNAL( statusChanged( DccTransfer*, int, int ) ), this, TQT_SLOT( slotStatusChanged( DccTransfer*, int, int ) ) );
+    connect( m_transfer, TQ_SIGNAL( statusChanged( DccTransfer*, int, int ) ), this, TQ_SLOT( slotStatusChanged( DccTransfer*, int, int ) ) );
 
     updateView();
 }
@@ -141,7 +141,7 @@ void DccTransferPanelItem::startAutoViewUpdate()
 {
     stopAutoViewUpdate();
     m_autoUpdateViewTimer = new TQTimer( this );
-    connect( m_autoUpdateViewTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( updateView()) );
+    connect( m_autoUpdateViewTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( updateView()) );
     m_autoUpdateViewTimer->start( 500 );
 }
 
diff --git a/konversation/src/dcctransferrecv.cpp b/konversation/src/dcctransferrecv.cpp
index 5bc51bc..9f9e954 100644
--- a/konversation/src/dcctransferrecv.cpp
+++ b/konversation/src/dcctransferrecv.cpp
@@ -67,7 +67,7 @@ DccTransferRecv::DccTransferRecv(TQObject* parent)
     m_writeCacheHandler = 0;
 
     m_connectionTimer = new TQTimer( this );
-    connect( m_connectionTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( connectionTimeout() ) );
+    connect( m_connectionTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( connectionTimeout() ) );
     //timer hasn't started yet.  qtimer will be deleted automatically when 'this' object is deleted
 }
 
@@ -285,9 +285,9 @@ void DccTransferRecv::prepareLocalKio( bool overwrite, bool resume, TDEIO::fileo
         return;
     }
 
-    connect( transferJob, TQT_SIGNAL( canResume( TDEIO::Job*, TDEIO::filesize_t ) ), this, TQT_SLOT( slotLocalCanResume( TDEIO::Job*, TDEIO::filesize_t ) ) );
-    connect( transferJob, TQT_SIGNAL( result( TDEIO::Job* ) ),                     this, TQT_SLOT( slotLocalGotResult( TDEIO::Job* ) ) );
-    connect( transferJob, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ),       this, TQT_SLOT( slotLocalReady( TDEIO::Job* ) ) );
+    connect( transferJob, TQ_SIGNAL( canResume( TDEIO::Job*, TDEIO::filesize_t ) ), this, TQ_SLOT( slotLocalCanResume( TDEIO::Job*, TDEIO::filesize_t ) ) );
+    connect( transferJob, TQ_SIGNAL( result( TDEIO::Job* ) ),                     this, TQ_SLOT( slotLocalGotResult( TDEIO::Job* ) ) );
+    connect( transferJob, TQ_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ),       this, TQ_SLOT( slotLocalReady( TDEIO::Job* ) ) );
 }
 
 void DccTransferRecv::askAndPrepareLocalKio( const TQString& message, int enabledActions, DccResumeDialog::ReceiveAction defaultAction, TDEIO::fileoffset_t startPosition )
@@ -419,8 +419,8 @@ void DccTransferRecv::slotLocalReady( TDEIO::Job* job )
 
     m_writeCacheHandler = new DccTransferRecvWriteCacheHandler( transferJob );
 
-    connect( m_writeCacheHandler, TQT_SIGNAL( done() ),                     this, TQT_SLOT( slotLocalWriteDone() )                     );
-    connect( m_writeCacheHandler, TQT_SIGNAL( gotError( const TQString& ) ), this, TQT_SLOT( slotLocalGotWriteError( const TQString& ) ) );
+    connect( m_writeCacheHandler, TQ_SIGNAL( done() ),                     this, TQ_SLOT( slotLocalWriteDone() )                     );
+    connect( m_writeCacheHandler, TQ_SIGNAL( gotError( const TQString& ) ), this, TQ_SLOT( slotLocalGotWriteError( const TQString& ) ) );
 
     if ( !m_resumed )
         connectWithSender();
@@ -515,8 +515,8 @@ void DccTransferRecv::connectToSendServer()
     m_recvSocket->enableRead( false );
     m_recvSocket->enableWrite( false );
 
-    connect( m_recvSocket, TQT_SIGNAL( connected( const KResolverEntry& ) ), this, TQT_SLOT( startReceiving() )     );
-    connect( m_recvSocket, TQT_SIGNAL( gotError( int ) ),                    this, TQT_SLOT( connectionFailed( int ) ) );
+    connect( m_recvSocket, TQ_SIGNAL( connected( const KResolverEntry& ) ), this, TQ_SLOT( startReceiving() )     );
+    connect( m_recvSocket, TQ_SIGNAL( gotError( int ) ),                    this, TQ_SLOT( connectionFailed( int ) ) );
 
     kdDebug() << "DccTransferRecv::connectToServer(): attempting to connect to " << m_partnerIp << ":" << m_partnerPort << endl;
 
@@ -537,8 +537,8 @@ bool DccTransferRecv::startListeningForSender()
         return false;
     }
 
-   connect( m_serverSocket, TQT_SIGNAL( readyAccept() ),   this, TQT_SLOT( slotServerSocketReadyAccept() ) );
-   connect( m_serverSocket, TQT_SIGNAL( gotError( int ) ), this, TQT_SLOT( slotServerSocketGotError( int ) ) );
+   connect( m_serverSocket, TQ_SIGNAL( readyAccept() ),   this, TQ_SLOT( slotServerSocketReadyAccept() ) );
+   connect( m_serverSocket, TQ_SIGNAL( gotError( int ) ), this, TQ_SLOT( slotServerSocketGotError( int ) ) );
 
     return true;
 }
@@ -554,7 +554,7 @@ void DccTransferRecv::slotServerSocketReadyAccept()
         return;
     }
 
-    connect( m_recvSocket, TQT_SIGNAL( gotError( int ) ), this, TQT_SLOT( connectionFailed( int ) ) );
+    connect( m_recvSocket, TQ_SIGNAL( gotError( int ) ), this, TQ_SLOT( connectionFailed( int ) ) );
 
     // we don't need ServerSocket anymore
     m_serverSocket->close();
@@ -573,9 +573,9 @@ void DccTransferRecv::startReceiving()
 
     m_recvSocket->setBlocking( false );           // asynchronous mode
 
-    connect( m_recvSocket, TQT_SIGNAL( readyRead() ),                        this, TQT_SLOT( readData() )              );
-    connect( m_recvSocket, TQT_SIGNAL( readyWrite() ),                       this, TQT_SLOT( sendAck() )               );
-    connect( m_recvSocket, TQT_SIGNAL( closed() ),                           this, TQT_SLOT( slotSocketClosed() )      );
+    connect( m_recvSocket, TQ_SIGNAL( readyRead() ),                        this, TQ_SLOT( readData() )              );
+    connect( m_recvSocket, TQ_SIGNAL( readyWrite() ),                       this, TQ_SLOT( sendAck() )               );
+    connect( m_recvSocket, TQ_SIGNAL( closed() ),                           this, TQ_SLOT( slotSocketClosed() )      );
 
     setStatus( Transferring );
 
@@ -682,9 +682,9 @@ DccTransferRecvWriteCacheHandler::DccTransferRecvWriteCacheHandler( TDEIO::Trans
     m_writeReady = true;
     m_cacheStream = 0;
 
-    connect( this,          TQT_SIGNAL( dataFinished() ),                    m_transferJob, TQT_SLOT( slotFinished() )                           );
-    connect( m_transferJob, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ), this,          TQT_SLOT( slotKIODataReq( TDEIO::Job*, TQByteArray& ) ) );
-    connect( m_transferJob, TQT_SIGNAL( result( TDEIO::Job* ) ),               this,          TQT_SLOT( slotKIOResult( TDEIO::Job* ) )               );
+    connect( this,          TQ_SIGNAL( dataFinished() ),                    m_transferJob, TQ_SLOT( slotFinished() )                           );
+    connect( m_transferJob, TQ_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ), this,          TQ_SLOT( slotKIODataReq( TDEIO::Job*, TQByteArray& ) ) );
+    connect( m_transferJob, TQ_SIGNAL( result( TDEIO::Job* ) ),               this,          TQ_SLOT( slotKIOResult( TDEIO::Job* ) )               );
 
     m_transferJob->setAsyncDataEnabled( m_writeAsyncMode = true );
 }
diff --git a/konversation/src/dcctransfersend.cpp b/konversation/src/dcctransfersend.cpp
index 69c09fc..b6599cb 100644
--- a/konversation/src/dcctransfersend.cpp
+++ b/konversation/src/dcctransfersend.cpp
@@ -56,7 +56,7 @@ DccTransferSend::DccTransferSend(TQObject* parent)
     m_sendSocket = 0;
 
     m_connectionTimer = new TQTimer( this );
-    connect( m_connectionTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotConnectionTimeout() ) );
+    connect( m_connectionTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotConnectionTimeout() ) );
 
     // set defualt values
     m_reverse = Preferences::dccPassiveSend();
@@ -256,9 +256,9 @@ void DccTransferSend::start()                     // public slot
             return;
         }
 
-        connect( m_serverSocket, TQT_SIGNAL( readyAccept() ),   this, TQT_SLOT( acceptClient() ) );
-        connect( m_serverSocket, TQT_SIGNAL( gotError( int ) ), this, TQT_SLOT( slotGotSocketError( int ) ) );
-        connect( m_serverSocket, TQT_SIGNAL( closed() ),        this, TQT_SLOT( slotServerSocketClosed() ) );
+        connect( m_serverSocket, TQ_SIGNAL( readyAccept() ),   this, TQ_SLOT( acceptClient() ) );
+        connect( m_serverSocket, TQ_SIGNAL( gotError( int ) ), this, TQ_SLOT( slotGotSocketError( int ) ) );
+        connect( m_serverSocket, TQ_SIGNAL( closed() ),        this, TQ_SLOT( slotServerSocketClosed() ) );
 
         // Get own port number
         m_ownPort = TQString::number( DccCommon::getServerSocketPort( m_serverSocket ) );
@@ -297,8 +297,8 @@ void DccTransferSend::connectToReceiver( const TQString& partnerHost, const TQSt
 
     m_sendSocket->setBlocking( false );
 
-    connect( m_sendSocket, TQT_SIGNAL( connected( const KResolverEntry& ) ), this, TQT_SLOT( startSending() ) );
-    connect( m_sendSocket, TQT_SIGNAL( gotError( int ) ), this, TQT_SLOT( slotConnectionFailed( int ) ) );
+    connect( m_sendSocket, TQ_SIGNAL( connected( const KResolverEntry& ) ), this, TQ_SLOT( startSending() ) );
+    connect( m_sendSocket, TQ_SIGNAL( gotError( int ) ), this, TQ_SLOT( slotConnectionFailed( int ) ) );
 
     setStatus( Connecting );
 
@@ -343,9 +343,9 @@ void DccTransferSend::acceptClient()                     // slot
 
 void DccTransferSend::startSending()
 {
-    connect( m_sendSocket, TQT_SIGNAL( readyWrite() ), this, TQT_SLOT( writeData() )            );
-    connect( m_sendSocket, TQT_SIGNAL( readyRead() ),  this, TQT_SLOT( getAck() )               );
-    connect( m_sendSocket, TQT_SIGNAL( closed() ),     this, TQT_SLOT( slotSendSocketClosed() ) );
+    connect( m_sendSocket, TQ_SIGNAL( readyWrite() ), this, TQ_SLOT( writeData() )            );
+    connect( m_sendSocket, TQ_SIGNAL( readyRead() ),  this, TQ_SLOT( getAck() )               );
+    connect( m_sendSocket, TQ_SIGNAL( closed() ),     this, TQ_SLOT( slotSendSocketClosed() ) );
 
     if ( m_sendSocket->peerAddress().asInet().ipAddress().isV4Mapped() )
         m_partnerIp = KNetwork::KIpAddress( m_sendSocket->peerAddress().asInet().ipAddress().IPv4Addr() ).toString();
diff --git a/konversation/src/highlight_preferences.cpp b/konversation/src/highlight_preferences.cpp
index 93b0853..6861bec 100644
--- a/konversation/src/highlight_preferences.cpp
+++ b/konversation/src/highlight_preferences.cpp
@@ -71,23 +71,23 @@ Highlight_Config::Highlight_Config(TQWidget* parent, const char* name)
   }
   // End copy
 
-  connect(highlightListView,TQT_SIGNAL (selectionChanged(TQListViewItem*)),this,TQT_SLOT (highlightSelected(TQListViewItem*)) );
-  connect(highlightListView,TQT_SIGNAL (clicked(TQListViewItem*)),this,TQT_SLOT (highlightSelected(TQListViewItem*)) );
-  connect(highlightListView,TQT_SIGNAL (spacePressed(TQListViewItem*)),this,TQT_SLOT (highlightSelected(TQListViewItem*)) );
+  connect(highlightListView,TQ_SIGNAL (selectionChanged(TQListViewItem*)),this,TQ_SLOT (highlightSelected(TQListViewItem*)) );
+  connect(highlightListView,TQ_SIGNAL (clicked(TQListViewItem*)),this,TQ_SLOT (highlightSelected(TQListViewItem*)) );
+  connect(highlightListView,TQ_SIGNAL (spacePressed(TQListViewItem*)),this,TQ_SLOT (highlightSelected(TQListViewItem*)) );
 
-  connect(highlightListView,TQT_SIGNAL (moved()),this,TQT_SIGNAL (modified()) );
+  connect(highlightListView,TQ_SIGNAL (moved()),this,TQ_SIGNAL (modified()) );
 
-  connect(patternInput,TQT_SIGNAL (textChanged(const TQString&)),this,TQT_SLOT (highlightTextChanged(const TQString&)) );
-  connect(patternButton,TQT_SIGNAL (clicked()),this,TQT_SLOT(highlightTextEditButtonClicked()));
-  connect(patternColor,TQT_SIGNAL (changed(const TQColor&)),this,TQT_SLOT (highlightColorChanged(const TQColor&)) );
+  connect(patternInput,TQ_SIGNAL (textChanged(const TQString&)),this,TQ_SLOT (highlightTextChanged(const TQString&)) );
+  connect(patternButton,TQ_SIGNAL (clicked()),this,TQ_SLOT(highlightTextEditButtonClicked()));
+  connect(patternColor,TQ_SIGNAL (changed(const TQColor&)),this,TQ_SLOT (highlightColorChanged(const TQColor&)) );
 
-  connect(soundURL, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(soundURLChanged(const TQString&)));
-  connect(soundPlayBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(playSound()));
+  connect(soundURL, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(soundURLChanged(const TQString&)));
+  connect(soundPlayBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(playSound()));
 
-  connect(autoTextInput,TQT_SIGNAL (textChanged(const TQString&)),this,TQT_SLOT (autoTextChanged(const TQString&)) );
+  connect(autoTextInput,TQ_SIGNAL (textChanged(const TQString&)),this,TQ_SLOT (autoTextChanged(const TQString&)) );
 
-  connect(newButton,TQT_SIGNAL (clicked()),this,TQT_SLOT (addHighlight()) );
-  connect(removeButton,TQT_SIGNAL (clicked()),this,TQT_SLOT (removeHighlight()) );
+  connect(newButton,TQ_SIGNAL (clicked()),this,TQ_SLOT (addHighlight()) );
+  connect(removeButton,TQ_SIGNAL (clicked()),this,TQ_SLOT (removeHighlight()) );
 
   updateButtons();
 }
diff --git a/konversation/src/identitydialog.cpp b/konversation/src/identitydialog.cpp
index 33f3a83..8807c1c 100644
--- a/konversation/src/identitydialog.cpp
+++ b/konversation/src/identitydialog.cpp
@@ -61,22 +61,22 @@ namespace Konversation
         TQToolButton* newBtn = new TQToolButton(mainWidget);
         newBtn->setIconSet(SmallIconSet("add"));
         newBtn->setTextLabel(i18n("Add"));
-        connect(newBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(newIdentity()));
+        connect(newBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(newIdentity()));
 
         TQToolButton* copyBtn = new TQToolButton(mainWidget);
         copyBtn->setIconSet(SmallIconSet("edit-copy"));
         copyBtn->setTextLabel(i18n("Duplicate"));
-        connect(copyBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(copyIdentity()));
+        connect(copyBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(copyIdentity()));
 
         m_editBtn = new TQToolButton(mainWidget);
         m_editBtn->setIconSet(SmallIconSet("edit"));
         m_editBtn->setTextLabel(i18n("Rename"));
-        connect(m_editBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(renameIdentity()));
+        connect(m_editBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(renameIdentity()));
 
         m_delBtn = new TQToolButton(mainWidget);
         m_delBtn->setIconSet(SmallIconSet("edit-delete"));
         m_delBtn->setTextLabel(i18n("Remove"));
-        connect(m_delBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteIdentity()));
+        connect(m_delBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteIdentity()));
 
         TQTabWidget* tabWidget = new TQTabWidget(mainWidget);
         TQWidget* generalWidget = new TQWidget(tabWidget);
@@ -108,12 +108,12 @@ namespace Konversation
         m_downNicknameBtn->setAutoRepeat(true);
         m_downNicknameBtn->setEnabled(false);
 
-        connect(m_addNicknameBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(addNickname()));
-        connect(m_changeNicknameBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(editNickname()));
-        connect(m_removeNicknameBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteNickname()));
-        connect(m_nicknameLBox, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(updateButtons()));
-        connect(m_upNicknameBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveNicknameUp()));
-        connect(m_downNicknameBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveNicknameDown()));
+        connect(m_addNicknameBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(addNickname()));
+        connect(m_changeNicknameBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(editNickname()));
+        connect(m_removeNicknameBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteNickname()));
+        connect(m_nicknameLBox, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(updateButtons()));
+        connect(m_upNicknameBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveNicknameUp()));
+        connect(m_downNicknameBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveNicknameDown()));
 
         nicknameLayout->setColStretch(0, 10);
         nicknameLayout->setRowStretch(4, 10);
@@ -180,10 +180,10 @@ namespace Konversation
         m_automaticUnawayChBox = new TQCheckBox(i18n("Automatically return on activity"), m_automaticAwayGBox);
         TQWhatsThis::add(m_automaticUnawayChBox, i18n("If you check this box, Konversation will automatically cancel away for all connections using this Identity when the screensaver stops or new user activity is detected."));
 
-        connect(m_automaticAwayGBox, TQT_SIGNAL(toggled(bool)), autoAwayLabel1, TQT_SLOT(setEnabled(bool)));
-        connect(m_automaticAwayGBox, TQT_SIGNAL(toggled(bool)), autoAwayLabel2, TQT_SLOT(setEnabled(bool)));
-        connect(m_automaticAwayGBox, TQT_SIGNAL(toggled(bool)), m_awayInactivitySpin, TQT_SLOT(setEnabled(bool)));
-        connect(m_automaticAwayGBox, TQT_SIGNAL(toggled(bool)), m_automaticUnawayChBox, TQT_SLOT(setEnabled(bool)));
+        connect(m_automaticAwayGBox, TQ_SIGNAL(toggled(bool)), autoAwayLabel1, TQ_SLOT(setEnabled(bool)));
+        connect(m_automaticAwayGBox, TQ_SIGNAL(toggled(bool)), autoAwayLabel2, TQ_SLOT(setEnabled(bool)));
+        connect(m_automaticAwayGBox, TQ_SIGNAL(toggled(bool)), m_awayInactivitySpin, TQ_SLOT(setEnabled(bool)));
+        connect(m_automaticAwayGBox, TQ_SIGNAL(toggled(bool)), m_automaticUnawayChBox, TQ_SLOT(setEnabled(bool)));
 
         row = 0;
         automaticAwayLayout->addWidget(autoAwayLabel1, row, 0);
@@ -210,10 +210,10 @@ namespace Konversation
         m_unAwayEdit = new KLineEdit(m_awayMessageGBox);
         unAwayLabel->setBuddy(m_unAwayEdit);
 
-        connect(m_awayMessageGBox, TQT_SIGNAL(toggled(bool)), awayLabel, TQT_SLOT(setEnabled(bool)));
-        connect(m_awayMessageGBox, TQT_SIGNAL(toggled(bool)), m_awayEdit, TQT_SLOT(setEnabled(bool)));
-        connect(m_awayMessageGBox, TQT_SIGNAL(toggled(bool)), unAwayLabel, TQT_SLOT(setEnabled(bool)));
-        connect(m_awayMessageGBox, TQT_SIGNAL(toggled(bool)), m_unAwayEdit, TQT_SLOT(setEnabled(bool)));
+        connect(m_awayMessageGBox, TQ_SIGNAL(toggled(bool)), awayLabel, TQ_SLOT(setEnabled(bool)));
+        connect(m_awayMessageGBox, TQ_SIGNAL(toggled(bool)), m_awayEdit, TQ_SLOT(setEnabled(bool)));
+        connect(m_awayMessageGBox, TQ_SIGNAL(toggled(bool)), unAwayLabel, TQ_SLOT(setEnabled(bool)));
+        connect(m_awayMessageGBox, TQ_SIGNAL(toggled(bool)), m_unAwayEdit, TQ_SLOT(setEnabled(bool)));
 
         row = 0;
         messagesLayout->addWidget(awayLabel, row, 0);
@@ -307,13 +307,13 @@ namespace Konversation
         updateIdentity(0);
 
         // Set up signals / slots for identity page
-        connect(m_identityCBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateIdentity(int)));
+        connect(m_identityCBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateIdentity(int)));
 
         setButtonOK(KGuiItem(i18n("&OK"), "button_ok", i18n("Change identity information")));
         setButtonCancel(KGuiItem(i18n("&Cancel"), "button_cancel", i18n("Discards all changes made")));
 
         AwayManager* awayManager = static_cast<KonversationApplication*>(kapp)->getAwayManager();
-        connect(this, TQT_SIGNAL(identitiesChanged()), awayManager, TQT_SLOT(identitiesChanged()));
+        connect(this, TQ_SIGNAL(identitiesChanged()), awayManager, TQ_SLOT(identitiesChanged()));
     }
 
     IdentityDialog::~IdentityDialog()
diff --git a/konversation/src/ignore_preferences.cpp b/konversation/src/ignore_preferences.cpp
index 5891bc7..721d8dd 100644
--- a/konversation/src/ignore_preferences.cpp
+++ b/konversation/src/ignore_preferences.cpp
@@ -31,21 +31,21 @@
 Ignore_Config::Ignore_Config( TQWidget* parent, const char* name, WFlags fl )
     : Ignore_ConfigUI( parent, name, fl )
 {
-    connect(newButton,TQT_SIGNAL(clicked()),
-        this,TQT_SLOT(newIgnore()));
-    connect(removeButton,TQT_SIGNAL(clicked()),
-        this,TQT_SLOT(removeIgnore()));
-    connect(removeAllButton,TQT_SIGNAL(clicked()),
-	this,TQT_SLOT(removeAllIgnore()));
-    connect(ignoreListView,TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-        this,TQT_SLOT(select(TQListViewItem*)));
-    connect(chkChannel, TQT_SIGNAL(clicked()), this, TQT_SLOT(flagCheckboxChanged()));
-    connect(chkQuery, TQT_SIGNAL(clicked()), this, TQT_SLOT(flagCheckboxChanged()));
-    connect(chkNotice, TQT_SIGNAL(clicked()), this, TQT_SLOT(flagCheckboxChanged()));
-    connect(chkCTCP, TQT_SIGNAL(clicked()), this, TQT_SLOT(flagCheckboxChanged()));
-    connect(chkDCC, TQT_SIGNAL(clicked()), this, TQT_SLOT(flagCheckboxChanged()));
-    connect(txtPattern, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(flagCheckboxChanged()));
-//    connect(chkException, TQT_SIGNAL(clicked()), this, TQT_SLOT(flagCheckboxChanged()));
+    connect(newButton,TQ_SIGNAL(clicked()),
+        this,TQ_SLOT(newIgnore()));
+    connect(removeButton,TQ_SIGNAL(clicked()),
+        this,TQ_SLOT(removeIgnore()));
+    connect(removeAllButton,TQ_SIGNAL(clicked()),
+	this,TQ_SLOT(removeAllIgnore()));
+    connect(ignoreListView,TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+        this,TQ_SLOT(select(TQListViewItem*)));
+    connect(chkChannel, TQ_SIGNAL(clicked()), this, TQ_SLOT(flagCheckboxChanged()));
+    connect(chkQuery, TQ_SIGNAL(clicked()), this, TQ_SLOT(flagCheckboxChanged()));
+    connect(chkNotice, TQ_SIGNAL(clicked()), this, TQ_SLOT(flagCheckboxChanged()));
+    connect(chkCTCP, TQ_SIGNAL(clicked()), this, TQ_SLOT(flagCheckboxChanged()));
+    connect(chkDCC, TQ_SIGNAL(clicked()), this, TQ_SLOT(flagCheckboxChanged()));
+    connect(txtPattern, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(flagCheckboxChanged()));
+//    connect(chkException, TQ_SIGNAL(clicked()), this, TQ_SLOT(flagCheckboxChanged()));
     loadSettings();
 
     ignoreListView->header()->setMovingEnabled(false);
diff --git a/konversation/src/insertchardialog.cpp b/konversation/src/insertchardialog.cpp
index dfd1463..0e69ccf 100644
--- a/konversation/src/insertchardialog.cpp
+++ b/konversation/src/insertchardialog.cpp
@@ -30,7 +30,7 @@ namespace Konversation
         m_charTable->enableFontCombo(false);
         setMainWidget(m_charTable);
 
-        connect(m_charTable, TQT_SIGNAL(doubleClicked()), this, TQT_SLOT(slotOk()));
+        connect(m_charTable, TQ_SIGNAL(doubleClicked()), this, TQ_SLOT(slotOk()));
     }
 
     InsertCharDialog::~InsertCharDialog()
diff --git a/konversation/src/irccolorchooser.cpp b/konversation/src/irccolorchooser.cpp
index 7a07263..e282b61 100644
--- a/konversation/src/irccolorchooser.cpp
+++ b/konversation/src/irccolorchooser.cpp
@@ -32,8 +32,8 @@ IRCColorChooser::IRCColorChooser(TQWidget* parent, const char* name)
     initColors(m_view->m_bgColorCBox);
     m_view->m_bgColorCBox->insertItem(i18n("None"), 0);
 
-    connect(m_view->m_fgColorCBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updatePreview()));
-    connect(m_view->m_bgColorCBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updatePreview()));
+    connect(m_view->m_fgColorCBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updatePreview()));
+    connect(m_view->m_bgColorCBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updatePreview()));
     m_view->m_fgColorCBox->setCurrentItem(1);
     m_view->m_bgColorCBox->setCurrentItem(0);
     updatePreview();
diff --git a/konversation/src/ircinput.cpp b/konversation/src/ircinput.cpp
index 1374e27..814585c 100644
--- a/konversation/src/ircinput.cpp
+++ b/konversation/src/ircinput.cpp
@@ -44,13 +44,13 @@ IRCInput::IRCInput(TQWidget* parent) : KTextEdit(parent)
     //nor in compensating for it if my guess is incorrect. so, cache it.
     m_qtBoxPadding=m_lastHeight-fontMetrics().lineSpacing();
 
-    connect(TDEApplication::kApplication(), TQT_SIGNAL(appearanceChanged()), this, TQT_SLOT(updateAppearance()));
+    connect(TDEApplication::kApplication(), TQ_SIGNAL(appearanceChanged()), this, TQ_SLOT(updateAppearance()));
     m_multiRow = Preferences::useMultiRowInputBox();
 
     m_useSelection = false;
 
     // connect history signal
-    connect(this,TQT_SIGNAL (history(bool)) ,this,TQT_SLOT (getHistory(bool)) );
+    connect(this,TQ_SIGNAL (history(bool)) ,this,TQ_SLOT (getHistory(bool)) );
     // add one empty line to the history (will be overwritten with newest entry)
     historyList.prepend(TQString());
     // reset history line counter
@@ -58,7 +58,7 @@ IRCInput::IRCInput(TQWidget* parent) : KTextEdit(parent)
     // reset completion mode
     setCompletionMode('\0');
     completionBox = new TDECompletionBox(this);
-    connect(completionBox, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(insertCompletion(const TQString&)));
+    connect(completionBox, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(insertCompletion(const TQString&)));
 
     // widget may not be resized vertically
     setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed));
@@ -78,7 +78,7 @@ IRCInput::IRCInput(TQWidget* parent) : KTextEdit(parent)
     TQWhatsThis::add(this, i18n("<qt>The input line is where you type messages to be sent the channel, query, or server.  A message sent to a channel is seen by everyone on the channel, whereas a message in a query is sent only to the person in the query with you.<p>To automatically complete the nickname you began typing, press Tab. If you have not begun typing, the last successfully completed nickname will be used.<p>You can also send special commands:<br><table><tr><th>/me <i>action</i></th><td>shows up as an action in the channel or query.  For example:  <em>/me sings a song</em> will show up in the channel as 'Nick sings a song'.</td></tr><tr><th>/whois <i>nickname</i></th><td>shows information about this person, including what channels they are in.</td></tr></table><p>For more commands, see the Konversation Handbook.<p>A message cannot contain multiple lines.</qt>"));
 
     m_disableSpellCheckTimer = new TQTimer(this);
-    connect(m_disableSpellCheckTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(disableSpellChecking()));
+    connect(m_disableSpellCheckTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(disableSpellChecking()));
 }
 
 IRCInput::~IRCInput()
diff --git a/konversation/src/ircqueue.cpp b/konversation/src/ircqueue.cpp
index a955d01..bd55625 100644
--- a/konversation/src/ircqueue.cpp
+++ b/konversation/src/ircqueue.cpp
@@ -66,11 +66,11 @@ IRCQueue::IRCQueue(Server *server, EmptyingRate& rate, int ind) :
 {
     //KX << _S(m_rate.m_rate) << _S(m_rate.m_interval) << _S(m_rate.m_type) << endl;
     m_timer=new TQTimer(this);
-    connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(sendNow()));
+    connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(sendNow()));
     if (server)
     {
-        connect(server, TQT_SIGNAL(serverOnline(bool)), TQT_SLOT(serverOnline(bool)));
-        connect(server, TQT_SIGNAL(sentStat(int, int, IRCQueue*)), TQT_SLOT(sent(int, int, IRCQueue*)));
+        connect(server, TQ_SIGNAL(serverOnline(bool)), TQ_SLOT(serverOnline(bool)));
+        connect(server, TQ_SIGNAL(sentStat(int, int, IRCQueue*)), TQ_SLOT(sent(int, int, IRCQueue*)));
         m_blocked=!(m_server->isConnected());
     }
 }
diff --git a/konversation/src/ircview.cpp b/konversation/src/ircview.cpp
index cbff402..48e9930 100644
--- a/konversation/src/ircview.cpp
+++ b/konversation/src/ircview.cpp
@@ -120,7 +120,7 @@ IRCView::IRCView(TQWidget* parent, Server* newServer) : KTextBrowser(parent)
 
     if (Preferences::useParagraphSpacing()) enableParagraphSpacing();
 
-    connect(this, TQT_SIGNAL(highlighted(const TQString&)), this, TQT_SLOT(highlightedSlot(const TQString&)));
+    connect(this, TQ_SIGNAL(highlighted(const TQString&)), this, TQ_SLOT(highlightedSlot(const TQString&)));
 }
 
 IRCView::~IRCView()
@@ -1432,9 +1432,9 @@ void IRCView::setupNickPopupMenu()
 
     m_nickPopup->insertItem(i18n("Add to Watched Nicks"), Konversation::AddNotify);
 
-    connect(m_nickPopup, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(popupCommand(int)));
-    connect(m_modes, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(popupCommand(int)));
-    connect(m_kickban, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(popupCommand(int)));
+    connect(m_nickPopup, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(popupCommand(int)));
+    connect(m_modes, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(popupCommand(int)));
+    connect(m_kickban, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(popupCommand(int)));
 }
 
 void IRCView::updateNickMenuEntries(TQPopupMenu* popup, const TQString& nickname)
@@ -1484,7 +1484,7 @@ void IRCView::setupQueryPopupMenu()
 
     m_nickPopup->insertItem(i18n("Add to Watched Nicks"), Konversation::AddNotify);
 
-    connect(m_nickPopup, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(popupCommand(int)));
+    connect(m_nickPopup, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(popupCommand(int)));
 }
 
 void IRCView::setupChannelPopupMenu()
@@ -1495,7 +1495,7 @@ void IRCView::setupChannelPopupMenu()
     m_channelPopup->insertItem(i18n("Get &user list"),Konversation::Names);
     m_channelPopup->insertItem(i18n("Get &topic"),Konversation::Topic);
 
-    connect(m_channelPopup, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(popupCommand(int)));
+    connect(m_channelPopup, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(popupCommand(int)));
 }
 
 void IRCView::setNickAndChannelContextMenusEnabled(bool enable)
@@ -1759,7 +1759,7 @@ void IRCView::resizeEvent(TQResizeEvent* e)
 
     if(doScroll)
     {
-        TQTimer::singleShot(0, this, TQT_SLOT(updateScrollBarPos()));
+        TQTimer::singleShot(0, this, TQ_SLOT(updateScrollBarPos()));
     }
 }
 
diff --git a/konversation/src/ircviewbox.cpp b/konversation/src/ircviewbox.cpp
index 6fe74c5..0b36017 100644
--- a/konversation/src/ircviewbox.cpp
+++ b/konversation/src/ircviewbox.cpp
@@ -33,15 +33,15 @@ IRCViewBox::IRCViewBox(TQWidget* parent, Server* newServer)
     m_searchBar->hide();
     m_matchedOnce = false;
 
-    connect(m_searchBar, TQT_SIGNAL(signalSearchChanged(const TQString&)),
-        this, TQT_SLOT(slotSearchChanged(const TQString&)));
-    connect(m_searchBar, TQT_SIGNAL(signalSearchNext()),
-        this, TQT_SLOT(slotSearchNext()));
-    connect(m_searchBar, TQT_SIGNAL(signalSearchPrevious()),
-            this, TQT_SLOT(slotSearchPrevious()));
-    connect(m_ircView, TQT_SIGNAL(doSearch()),
-        TQT_SLOT(slotSearch()));
-    connect(m_searchBar, TQT_SIGNAL(hidden()), m_ircView, TQT_SIGNAL(gotFocus()));
+    connect(m_searchBar, TQ_SIGNAL(signalSearchChanged(const TQString&)),
+        this, TQ_SLOT(slotSearchChanged(const TQString&)));
+    connect(m_searchBar, TQ_SIGNAL(signalSearchNext()),
+        this, TQ_SLOT(slotSearchNext()));
+    connect(m_searchBar, TQ_SIGNAL(signalSearchPrevious()),
+            this, TQ_SLOT(slotSearchPrevious()));
+    connect(m_ircView, TQ_SIGNAL(doSearch()),
+        TQ_SLOT(slotSearch()));
+    connect(m_searchBar, TQ_SIGNAL(hidden()), m_ircView, TQ_SIGNAL(gotFocus()));
 }
 
 IRCViewBox::~IRCViewBox()
diff --git a/konversation/src/konsolepanel.cpp b/konversation/src/konsolepanel.cpp
index 6b1db37..483bd35 100644
--- a/konversation/src/konsolepanel.cpp
+++ b/konversation/src/konsolepanel.cpp
@@ -32,8 +32,8 @@ KonsolePanel::KonsolePanel(TQWidget *p) : ChatWindow( p ), k_part (0)
     setFocusProxy(k_part->widget());
     k_part->widget()->setFocus();
 
-    connect(k_part, TQT_SIGNAL(destroyed()), this, TQT_SLOT(partDestroyed()));
-    connect(k_part, TQT_SIGNAL(receivedData(const TQString&)), this, TQT_SLOT(konsoleChanged(const TQString&)));
+    connect(k_part, TQ_SIGNAL(destroyed()), this, TQ_SLOT(partDestroyed()));
+    connect(k_part, TQ_SIGNAL(receivedData(const TQString&)), this, TQ_SLOT(konsoleChanged(const TQString&)));
 }
 
 KonsolePanel::~KonsolePanel()
@@ -42,7 +42,7 @@ KonsolePanel::~KonsolePanel()
     if ( k_part )
     {
         // make sure to prevent partDestroyed() signals from being sent
-        disconnect(k_part, TQT_SIGNAL(destroyed()), this, TQT_SLOT(partDestroyed()));
+        disconnect(k_part, TQ_SIGNAL(destroyed()), this, TQ_SLOT(partDestroyed()));
         delete k_part;
     }
 }
diff --git a/konversation/src/konversationapplication.cpp b/konversation/src/konversationapplication.cpp
index 6be39c7..ae8cfe0 100644
--- a/konversation/src/konversationapplication.cpp
+++ b/konversation/src/konversationapplication.cpp
@@ -79,16 +79,16 @@ int KonversationApplication::newInstance()
 
     if (!mainWindow)
     {
-        connect(this, TQT_SIGNAL(shutDown()), this, TQT_SLOT(prepareShutdown()));
+        connect(this, TQ_SIGNAL(shutDown()), this, TQ_SLOT(prepareShutdown()));
 
         m_connectionManager = new ConnectionManager(this);
 
         m_awayManager = new AwayManager(this);
 
-        connect(m_connectionManager, TQT_SIGNAL(identityOnline(int)), m_awayManager, TQT_SLOT(identityOnline(int)));
-        connect(m_connectionManager, TQT_SIGNAL(identityOffline(int)), m_awayManager, TQT_SLOT(identityOffline(int)));
-        connect(m_connectionManager, TQT_SIGNAL(identityOffline(int)), m_awayManager, TQT_SLOT(identityOffline(int)));
-        connect(m_connectionManager, TQT_SIGNAL(connectionChangedAwayState(bool)), m_awayManager, TQT_SLOT(updateGlobalAwayAction(bool)));
+        connect(m_connectionManager, TQ_SIGNAL(identityOnline(int)), m_awayManager, TQ_SLOT(identityOnline(int)));
+        connect(m_connectionManager, TQ_SIGNAL(identityOffline(int)), m_awayManager, TQ_SLOT(identityOffline(int)));
+        connect(m_connectionManager, TQ_SIGNAL(identityOffline(int)), m_awayManager, TQ_SLOT(identityOffline(int)));
+        connect(m_connectionManager, TQ_SIGNAL(connectionChangedAwayState(bool)), m_awayManager, TQ_SLOT(updateGlobalAwayAction(bool)));
 
         // an instance of DccTransferManager needs to be created before GUI class instances' creation.
         m_dccTransferManager = new DccTransferManager(this);
@@ -107,7 +107,7 @@ int KonversationApplication::newInstance()
 
         // Images object providing LEDs, NickIcons
         m_images = new Images();
-        connect(this, TQT_SIGNAL(iconChanged(int)), m_images, TQT_SLOT(updateIcons()));
+        connect(this, TQ_SIGNAL(iconChanged(int)), m_images, TQ_SLOT(updateIcons()));
 
         // Auto-alias scripts.  This adds any missing aliases
         TQStringList aliasList(Preferences::aliasList());
@@ -131,9 +131,9 @@ int KonversationApplication::newInstance()
         mainWindow = new KonversationMainWindow();
         setMainWidget(mainWindow);
 
-        connect(mainWindow, TQT_SIGNAL(showQuickConnectDialog()), this, TQT_SLOT(openQuickConnectDialog()) );
-        connect(Preferences::self(), TQT_SIGNAL(updateTrayIcon()), mainWindow, TQT_SLOT(updateTrayIcon()) );
-        connect(osd, TQT_SIGNAL(hidden()), mainWindow, TQT_SIGNAL(endNotification()));
+        connect(mainWindow, TQ_SIGNAL(showQuickConnectDialog()), this, TQ_SLOT(openQuickConnectDialog()) );
+        connect(Preferences::self(), TQ_SIGNAL(updateTrayIcon()), mainWindow, TQ_SLOT(updateTrayIcon()) );
+        connect(osd, TQ_SIGNAL(hidden()), mainWindow, TQ_SIGNAL(endNotification()));
         // take care of user style changes, setting back colors and stuff
 
         // apply GUI settings
@@ -163,7 +163,7 @@ int KonversationApplication::newInstance()
 
         if (openServerList) mainWindow->openServerList();
 
-        connect(this, TQT_SIGNAL(serverGroupsChanged(const Konversation::ServerGroupSettings*)), this, TQT_SLOT(saveOptions()));
+        connect(this, TQ_SIGNAL(serverGroupsChanged(const Konversation::ServerGroupSettings*)), this, TQ_SLOT(saveOptions()));
 
         // prepare dcop interface
         dcopObject = new KonvDCOP;
@@ -172,18 +172,18 @@ int KonversationApplication::newInstance()
 
         if (dcopObject)
         {
-            connect(dcopObject,TQT_SIGNAL (dcopMultiServerRaw(const TQString&)),
-                this,TQT_SLOT (dcopMultiServerRaw(const TQString&)) );
-            connect(dcopObject,TQT_SIGNAL (dcopRaw(const TQString&,const TQString&)),
-                this,TQT_SLOT (dcopRaw(const TQString&,const TQString&)) );
-            connect(dcopObject,TQT_SIGNAL (dcopSay(const TQString&,const TQString&,const TQString&)),
-                this,TQT_SLOT (dcopSay(const TQString&,const TQString&,const TQString&)) );
-            connect(dcopObject,TQT_SIGNAL (dcopInfo(const TQString&)),
-                this,TQT_SLOT (dcopInfo(const TQString&)) );
-            connect(dcopObject,TQT_SIGNAL (dcopInsertMarkerLine()),
-                mainWindow,TQT_SIGNAL(insertMarkerLine()));
-            connect(dcopObject, TQT_SIGNAL(connectTo(Konversation::ConnectionFlag, const TQString&, const TQString&, const TQString&, const TQString&, const TQString&, bool)),
-                m_connectionManager, TQT_SLOT(connectTo(Konversation::ConnectionFlag, const TQString&, const TQString&, const TQString&, const TQString&, const TQString&, bool)));
+            connect(dcopObject,TQ_SIGNAL (dcopMultiServerRaw(const TQString&)),
+                this,TQ_SLOT (dcopMultiServerRaw(const TQString&)) );
+            connect(dcopObject,TQ_SIGNAL (dcopRaw(const TQString&,const TQString&)),
+                this,TQ_SLOT (dcopRaw(const TQString&,const TQString&)) );
+            connect(dcopObject,TQ_SIGNAL (dcopSay(const TQString&,const TQString&,const TQString&)),
+                this,TQ_SLOT (dcopSay(const TQString&,const TQString&,const TQString&)) );
+            connect(dcopObject,TQ_SIGNAL (dcopInfo(const TQString&)),
+                this,TQ_SLOT (dcopInfo(const TQString&)) );
+            connect(dcopObject,TQ_SIGNAL (dcopInsertMarkerLine()),
+                mainWindow,TQ_SIGNAL(insertMarkerLine()));
+            connect(dcopObject, TQ_SIGNAL(connectTo(Konversation::ConnectionFlag, const TQString&, const TQString&, const TQString&, const TQString&, const TQString&, bool)),
+                m_connectionManager, TQ_SLOT(connectTo(Konversation::ConnectionFlag, const TQString&, const TQString&, const TQString&, const TQString&, const TQString&, bool)));
         }
 
         m_notificationHandler = new Konversation::NotificationHandler(this);
@@ -773,9 +773,9 @@ void KonversationApplication::clearUrlList()
 void KonversationApplication::openQuickConnectDialog()
 {
     quickConnectDialog = new QuickConnectDialog(mainWindow);
-    connect(quickConnectDialog, TQT_SIGNAL(connectClicked(Konversation::ConnectionFlag, const TQString&, const TQString&,
+    connect(quickConnectDialog, TQ_SIGNAL(connectClicked(Konversation::ConnectionFlag, const TQString&, const TQString&,
         const TQString&, const TQString&, const TQString&, bool)),
-        m_connectionManager, TQT_SLOT(connectTo(Konversation::ConnectionFlag, const TQString&, const TQString&,
+        m_connectionManager, TQ_SLOT(connectTo(Konversation::ConnectionFlag, const TQString&, const TQString&,
         const TQString&, const TQString&, const TQString&, bool)));
     quickConnectDialog->show();
 }
diff --git a/konversation/src/konversationmainwindow.cpp b/konversation/src/konversationmainwindow.cpp
index 3d513ef..84fc2e1 100644
--- a/konversation/src/konversationmainwindow.cpp
+++ b/konversation/src/konversationmainwindow.cpp
@@ -71,102 +71,102 @@ KonversationMainWindow::KonversationMainWindow() : TDEMainWindow(0,"main_window"
     setCentralWidget(m_viewContainer->getWidget());
 
     //used for event compression. See header file for resetHasDirtySettings()
-    connect(KonversationApplication::instance(), TQT_SIGNAL(appearanceChanged()), this, TQT_SLOT(resetHasDirtySettings()));
-    connect(KonversationApplication::instance(), TQT_SIGNAL(appearanceChanged()), this, TQT_SLOT(updateTrayIcon()));
+    connect(KonversationApplication::instance(), TQ_SIGNAL(appearanceChanged()), this, TQ_SLOT(resetHasDirtySettings()));
+    connect(KonversationApplication::instance(), TQ_SIGNAL(appearanceChanged()), this, TQ_SLOT(updateTrayIcon()));
 
 
     // Set up view container
-    connect(KonversationApplication::instance(), TQT_SIGNAL(appearanceChanged()), m_viewContainer, TQT_SLOT(updateAppearance()));
-    connect(KonversationApplication::instance(), TQT_SIGNAL(iconChanged(int)), m_viewContainer, TQT_SLOT(updateViewIcons()));
-    connect(KonversationApplication::instance(), TQT_SIGNAL(serverGroupsChanged(const Konversation::ServerGroupSettings*)),
-            m_viewContainer, TQT_SLOT(updateViews(const Konversation::ServerGroupSettings*)));
-    connect(m_viewContainer, TQT_SIGNAL(autoJoinToggled(const Konversation::ServerGroupSettings*)),
-            KonversationApplication::instance(), TQT_SIGNAL(serverGroupsChanged(const Konversation::ServerGroupSettings*)));
-    connect(m_viewContainer, TQT_SIGNAL(setWindowCaption(const TQString&)), this, TQT_SLOT(setCaption(const TQString&)));
+    connect(KonversationApplication::instance(), TQ_SIGNAL(appearanceChanged()), m_viewContainer, TQ_SLOT(updateAppearance()));
+    connect(KonversationApplication::instance(), TQ_SIGNAL(iconChanged(int)), m_viewContainer, TQ_SLOT(updateViewIcons()));
+    connect(KonversationApplication::instance(), TQ_SIGNAL(serverGroupsChanged(const Konversation::ServerGroupSettings*)),
+            m_viewContainer, TQ_SLOT(updateViews(const Konversation::ServerGroupSettings*)));
+    connect(m_viewContainer, TQ_SIGNAL(autoJoinToggled(const Konversation::ServerGroupSettings*)),
+            KonversationApplication::instance(), TQ_SIGNAL(serverGroupsChanged(const Konversation::ServerGroupSettings*)));
+    connect(m_viewContainer, TQ_SIGNAL(setWindowCaption(const TQString&)), this, TQ_SLOT(setCaption(const TQString&)));
     connect(KonversationApplication::instance()->getConnectionManager(),
-            TQT_SIGNAL(connectionChangedState(Server*, Konversation::ConnectionState)),
-            m_viewContainer, TQT_SLOT(connectionStateChanged(Server*, Konversation::ConnectionState)));
-    connect(this, TQT_SIGNAL(triggerRememberLine()), m_viewContainer, TQT_SLOT(insertRememberLine()));
-    connect(this, TQT_SIGNAL(triggerRememberLines(Server*)), m_viewContainer, TQT_SLOT(insertRememberLines(Server*)));
-    connect(this, TQT_SIGNAL(cancelRememberLine()), m_viewContainer, TQT_SLOT(cancelRememberLine()));
-    connect(this, TQT_SIGNAL(insertMarkerLine()), m_viewContainer, TQT_SLOT(insertMarkerLine()));
+            TQ_SIGNAL(connectionChangedState(Server*, Konversation::ConnectionState)),
+            m_viewContainer, TQ_SLOT(connectionStateChanged(Server*, Konversation::ConnectionState)));
+    connect(this, TQ_SIGNAL(triggerRememberLine()), m_viewContainer, TQ_SLOT(insertRememberLine()));
+    connect(this, TQ_SIGNAL(triggerRememberLines(Server*)), m_viewContainer, TQ_SLOT(insertRememberLines(Server*)));
+    connect(this, TQ_SIGNAL(cancelRememberLine()), m_viewContainer, TQ_SLOT(cancelRememberLine()));
+    connect(this, TQ_SIGNAL(insertMarkerLine()), m_viewContainer, TQ_SLOT(insertMarkerLine()));
 
     // Set up status bar
     m_statusBar = new KonversationStatusBar(this);
-    connect(KonversationApplication::instance(), TQT_SIGNAL(appearanceChanged()), m_statusBar, TQT_SLOT(updateAppearance()));
+    connect(KonversationApplication::instance(), TQ_SIGNAL(appearanceChanged()), m_statusBar, TQ_SLOT(updateAppearance()));
 
     createStandardStatusBarAction();
 
-    connect(actionCollection(), TQT_SIGNAL(actionStatusText(const TQString&)), m_statusBar, TQT_SLOT(setMainLabelTempText(const TQString&)));
-    connect(actionCollection(), TQT_SIGNAL(clearStatusText()), m_statusBar, TQT_SLOT(clearMainLabelTempText()));
+    connect(actionCollection(), TQ_SIGNAL(actionStatusText(const TQString&)), m_statusBar, TQ_SLOT(setMainLabelTempText(const TQString&)));
+    connect(actionCollection(), TQ_SIGNAL(clearStatusText()), m_statusBar, TQ_SLOT(clearMainLabelTempText()));
     actionCollection()->setHighlightingEnabled(true);
 
-    connect(m_viewContainer, TQT_SIGNAL(resetStatusBar()), m_statusBar, TQT_SLOT(resetStatusBar()));
-    connect(m_viewContainer, TQT_SIGNAL(setStatusBarTempText(const TQString&)), m_statusBar, TQT_SLOT(setMainLabelTempText(const TQString&)));
-    connect(m_viewContainer, TQT_SIGNAL(clearStatusBarTempText()), m_statusBar, TQT_SLOT(clearMainLabelTempText()));
-    connect(m_viewContainer, TQT_SIGNAL(setStatusBarInfoLabel(const TQString&)), m_statusBar, TQT_SLOT(updateInfoLabel(const TQString&)));
-    connect(m_viewContainer, TQT_SIGNAL(clearStatusBarInfoLabel()), m_statusBar, TQT_SLOT(clearInfoLabel()));
-    connect(m_viewContainer, TQT_SIGNAL(setStatusBarLagLabelShown(bool)), m_statusBar, TQT_SLOT(setLagLabelShown(bool)));
-    connect(m_viewContainer, TQT_SIGNAL(updateStatusBarLagLabel(Server*, int)), m_statusBar, TQT_SLOT(updateLagLabel(Server*, int)));
-    connect(m_viewContainer, TQT_SIGNAL(resetStatusBarLagLabel()), m_statusBar, TQT_SLOT(resetLagLabel()));
-    connect(m_viewContainer, TQT_SIGNAL(setStatusBarLagLabelTooLongLag(Server*, int)), m_statusBar, TQT_SLOT(setTooLongLag(Server*, int)));
-    connect(m_viewContainer, TQT_SIGNAL(updateStatusBarSSLLabel(Server*)), m_statusBar, TQT_SLOT(updateSSLLabel(Server*)));
-    connect(m_viewContainer, TQT_SIGNAL(removeStatusBarSSLLabel()), m_statusBar, TQT_SLOT(removeSSLLabel()));
+    connect(m_viewContainer, TQ_SIGNAL(resetStatusBar()), m_statusBar, TQ_SLOT(resetStatusBar()));
+    connect(m_viewContainer, TQ_SIGNAL(setStatusBarTempText(const TQString&)), m_statusBar, TQ_SLOT(setMainLabelTempText(const TQString&)));
+    connect(m_viewContainer, TQ_SIGNAL(clearStatusBarTempText()), m_statusBar, TQ_SLOT(clearMainLabelTempText()));
+    connect(m_viewContainer, TQ_SIGNAL(setStatusBarInfoLabel(const TQString&)), m_statusBar, TQ_SLOT(updateInfoLabel(const TQString&)));
+    connect(m_viewContainer, TQ_SIGNAL(clearStatusBarInfoLabel()), m_statusBar, TQ_SLOT(clearInfoLabel()));
+    connect(m_viewContainer, TQ_SIGNAL(setStatusBarLagLabelShown(bool)), m_statusBar, TQ_SLOT(setLagLabelShown(bool)));
+    connect(m_viewContainer, TQ_SIGNAL(updateStatusBarLagLabel(Server*, int)), m_statusBar, TQ_SLOT(updateLagLabel(Server*, int)));
+    connect(m_viewContainer, TQ_SIGNAL(resetStatusBarLagLabel()), m_statusBar, TQ_SLOT(resetLagLabel()));
+    connect(m_viewContainer, TQ_SIGNAL(setStatusBarLagLabelTooLongLag(Server*, int)), m_statusBar, TQ_SLOT(setTooLongLag(Server*, int)));
+    connect(m_viewContainer, TQ_SIGNAL(updateStatusBarSSLLabel(Server*)), m_statusBar, TQ_SLOT(updateSSLLabel(Server*)));
+    connect(m_viewContainer, TQ_SIGNAL(removeStatusBarSSLLabel()), m_statusBar, TQ_SLOT(removeSSLLabel()));
 
 
     // Actions
-    KStdAction::quit(this,TQT_SLOT(quitProgram()),actionCollection());
+    KStdAction::quit(this,TQ_SLOT(quitProgram()),actionCollection());
 
-    hideMenuBarAction = KStdAction::showMenubar(this, TQT_SLOT(toggleMenubar()), actionCollection());
+    hideMenuBarAction = KStdAction::showMenubar(this, TQ_SLOT(toggleMenubar()), actionCollection());
 
     setStandardToolBarMenuEnabled(true);
-    KStdAction::configureToolbars(this, TQT_SLOT(configureToolbar()), actionCollection());
+    KStdAction::configureToolbars(this, TQ_SLOT(configureToolbar()), actionCollection());
 
-    KStdAction::keyBindings(this, TQT_SLOT(openKeyBindings()), actionCollection());
-    TDEAction *preferencesAction = KStdAction::preferences(this, TQT_SLOT(openPrefsDialog()), actionCollection());
+    KStdAction::keyBindings(this, TQ_SLOT(openKeyBindings()), actionCollection());
+    TDEAction *preferencesAction = KStdAction::preferences(this, TQ_SLOT(openPrefsDialog()), actionCollection());
 
 #ifdef USE_KNOTIFY // options_configure_notifications
-    TDEAction *configureNotificationsAction = KStdAction::configureNotifications(this,TQT_SLOT(openNotifications()), actionCollection());
+    TDEAction *configureNotificationsAction = KStdAction::configureNotifications(this,TQ_SLOT(openNotifications()), actionCollection());
 #endif
 
     TDEAction* action;
 
-    (new TDEAction(i18n("&Server List..."), "server", TDEShortcut("F2"), this, TQT_SLOT(openServerList()),
+    (new TDEAction(i18n("&Server List..."), "server", TDEShortcut("F2"), this, TQ_SLOT(openServerList()),
         actionCollection(), "open_server_list"))->setToolTip(i18n("Manage networks and servers"));
-    (new TDEAction(i18n("Quick &Connect..."), "connect_creating", TDEShortcut("F7"), this, TQT_SLOT(openQuickConnectDialog()),
+    (new TDEAction(i18n("Quick &Connect..."), "connect_creating", TDEShortcut("F7"), this, TQ_SLOT(openQuickConnectDialog()),
         actionCollection(), "quick_connect_dialog"))->setToolTip(i18n("Type in the address of a new IRC server to connect to"));
 
-    action = new TDEAction(i18n("&Reconnect"), "connect_creating", 0, m_viewContainer, TQT_SLOT(reconnectFrontServer()), actionCollection(), "reconnect_server");
+    action = new TDEAction(i18n("&Reconnect"), "connect_creating", 0, m_viewContainer, TQ_SLOT(reconnectFrontServer()), actionCollection(), "reconnect_server");
     action->setEnabled(false);
     action->setToolTip(i18n("Reconnect to the current server."));
 
-    action = new TDEAction(i18n("&Disconnect"), "connect_no", 0, m_viewContainer, TQT_SLOT(disconnectFrontServer()), actionCollection(), "disconnect_server");
+    action = new TDEAction(i18n("&Disconnect"), "connect_no", 0, m_viewContainer, TQ_SLOT(disconnectFrontServer()), actionCollection(), "disconnect_server");
     action->setEnabled(false);
     action->setToolTip(i18n("Disconnect from the current server."));
 
-    (new TDEAction(i18n("&Identities..."), "identity", TDEShortcut("F8"), this, TQT_SLOT(openIdentitiesDialog()),
+    (new TDEAction(i18n("&Identities..."), "identity", TDEShortcut("F8"), this, TQ_SLOT(openIdentitiesDialog()),
         actionCollection(), "identities_dialog"))->setToolTip(i18n("Manage your nick, away and other identity settings"));
 
-    new TDEToggleAction(i18n("&Watched Nicks Online"), "kontact_contacts", TDEShortcut("F4"), m_viewContainer, TQT_SLOT(openNicksOnlinePanel()), actionCollection(), "open_nicksonline_window");
-    new TDEToggleAction(i18n("&DCC Status"), "2rightarrow", TDEShortcut("F9"), m_viewContainer, TQT_SLOT(toggleDccPanel()), actionCollection(), "open_dccstatus_window");
-    action = new TDEAction(i18n("&Open Logfile"), "history", TDEShortcut("Ctrl+O"), m_viewContainer, TQT_SLOT(openLogFile()), actionCollection(), "open_logfile");
+    new TDEToggleAction(i18n("&Watched Nicks Online"), "kontact_contacts", TDEShortcut("F4"), m_viewContainer, TQ_SLOT(openNicksOnlinePanel()), actionCollection(), "open_nicksonline_window");
+    new TDEToggleAction(i18n("&DCC Status"), "2rightarrow", TDEShortcut("F9"), m_viewContainer, TQ_SLOT(toggleDccPanel()), actionCollection(), "open_dccstatus_window");
+    action = new TDEAction(i18n("&Open Logfile"), "history", TDEShortcut("Ctrl+O"), m_viewContainer, TQ_SLOT(openLogFile()), actionCollection(), "open_logfile");
     action->setEnabled(false);
     action->setToolTip(i18n("Open the known history for this channel in a new tab"));
 
-    action = new TDEAction(i18n("&Channel Settings..."), "edit", m_viewContainer, TQT_SLOT(openChannelSettings()), actionCollection(), "channel_settings");
+    action = new TDEAction(i18n("&Channel Settings..."), "edit", m_viewContainer, TQ_SLOT(openChannelSettings()), actionCollection(), "channel_settings");
     action->setEnabled(false);
     action->setToolTip(i18n("Open the channel settings dialog for this tab"));
 
-    TDEToggleAction* channelListAction = new TDEToggleAction(i18n("Channel &List"), "view_text", TDEShortcut("F5"), m_viewContainer, TQT_SLOT(openChannelList()), actionCollection(), "open_channel_list");
+    TDEToggleAction* channelListAction = new TDEToggleAction(i18n("Channel &List"), "view_text", TDEShortcut("F5"), m_viewContainer, TQ_SLOT(openChannelList()), actionCollection(), "open_channel_list");
     channelListAction->setEnabled(false);
     channelListAction->setToolTip(i18n("Show a list of all the known channels on this server"));
 
-    action = new TDEToggleAction(i18n("&URL Catcher"), "enhanced_browsing", TDEShortcut("F6"), m_viewContainer, TQT_SLOT(addUrlCatcher()), actionCollection(), "open_url_catcher");
+    action = new TDEToggleAction(i18n("&URL Catcher"), "enhanced_browsing", TDEShortcut("F6"), m_viewContainer, TQ_SLOT(addUrlCatcher()), actionCollection(), "open_url_catcher");
     action->setToolTip(i18n("List all URLs that have been mentioned recently in a new tab"));
 
     if (kapp->authorize("shell_access"))
     {
-        action = new TDEAction(i18n("New &Konsole"), "openterm", 0, m_viewContainer, TQT_SLOT(addKonsolePanel()), actionCollection(), "open_konsole");
+        action = new TDEAction(i18n("New &Konsole"), "openterm", 0, m_viewContainer, TQ_SLOT(addKonsolePanel()), actionCollection(), "open_konsole");
         action->setToolTip(i18n("Open a terminal in a new tab"));
     }
 
@@ -177,26 +177,26 @@ KonversationMainWindow::KonversationMainWindow() : TDEMainWindow(0,"main_window"
     prevShortcut.setSeq(1, KKeySequence("Alt+Left"));
     action = new TDEAction(i18n("&Next Tab"), TQApplication::reverseLayout() ? "go-previous" : "go-next",
         TQApplication::reverseLayout() ? prevShortcut : nextShortcut,
-        m_viewContainer, TQT_SLOT(showNextView()), actionCollection(), "next_tab");
+        m_viewContainer, TQ_SLOT(showNextView()), actionCollection(), "next_tab");
     action->setEnabled(false);
     action = new TDEAction(i18n("&Previous Tab"), TQApplication::reverseLayout() ? "go-next" : "go-previous",
         TQApplication::reverseLayout() ? nextShortcut : prevShortcut,
-        m_viewContainer, TQT_SLOT(showPreviousView()),actionCollection(),"previous_tab");
+        m_viewContainer, TQ_SLOT(showPreviousView()),actionCollection(),"previous_tab");
     action->setEnabled(false);
-    action = new TDEAction(i18n("Close &Tab"),"tab_remove",TDEShortcut("Ctrl+w"), m_viewContainer, TQT_SLOT(closeCurrentView()),actionCollection(),"close_tab");
+    action = new TDEAction(i18n("Close &Tab"),"tab_remove",TDEShortcut("Ctrl+w"), m_viewContainer, TQ_SLOT(closeCurrentView()),actionCollection(),"close_tab");
     action->setEnabled(false);
-    action = new TDEAction(i18n("Next Active Tab"), 0, TDEShortcut("Ctrl+Alt+Space"), m_viewContainer, TQT_SLOT(showNextActiveView()),
+    action = new TDEAction(i18n("Next Active Tab"), 0, TDEShortcut("Ctrl+Alt+Space"), m_viewContainer, TQ_SLOT(showNextActiveView()),
                          actionCollection(), "next_active_tab");
     action->setEnabled(false);
 
     if (Preferences::tabPlacement()==PreferencesBase::Left)
     {
         action = new TDEAction(i18n("Move Tab Up"), "1uparrow", TDEShortcut("Alt+Shift+Left"),
-            m_viewContainer, TQT_SLOT(moveViewLeft()), actionCollection(), "move_tab_left");
+            m_viewContainer, TQ_SLOT(moveViewLeft()), actionCollection(), "move_tab_left");
         action->setEnabled(false);
         action->setToolTip("Move this tab");
         action = new TDEAction(i18n("Move Tab Down"), "1downarrow", TDEShortcut("Alt+Shift+Right"),
-            m_viewContainer, TQT_SLOT(moveViewRight()), actionCollection(), "move_tab_right");
+            m_viewContainer, TQ_SLOT(moveViewRight()), actionCollection(), "move_tab_right");
         action->setEnabled(false);
         action->setToolTip("Move this tab");
     }
@@ -206,16 +206,16 @@ KonversationMainWindow::KonversationMainWindow() : TDEMainWindow(0,"main_window"
         if (TQApplication::reverseLayout())
         {
             action2 = new TDEAction(i18n("Move Tab Right"), "1rightarrow", TDEShortcut("Alt+Shift+Right"),
-                          m_viewContainer, TQT_SLOT(moveViewLeft()), actionCollection(), "move_tab_left");
+                          m_viewContainer, TQ_SLOT(moveViewLeft()), actionCollection(), "move_tab_left");
             action  = new TDEAction(i18n("Move Tab Left"), "1leftarrow", TDEShortcut("Alt+Shift+Left"),
-                          m_viewContainer, TQT_SLOT(moveViewRight()), actionCollection(), "move_tab_right");
+                          m_viewContainer, TQ_SLOT(moveViewRight()), actionCollection(), "move_tab_right");
         }
         else
         {
             action  = new TDEAction(i18n("Move Tab Left"), "1leftarrow", TDEShortcut("Alt+Shift+Left"),
-                          m_viewContainer, TQT_SLOT(moveViewLeft()), actionCollection(), "move_tab_left");
+                          m_viewContainer, TQ_SLOT(moveViewLeft()), actionCollection(), "move_tab_left");
                 action2 = new TDEAction(i18n("Move Tab Right"), "1rightarrow", TDEShortcut("Alt+Shift+Right"),
-                          m_viewContainer, TQT_SLOT(moveViewRight()), actionCollection(), "move_tab_right");
+                          m_viewContainer, TQ_SLOT(moveViewRight()), actionCollection(), "move_tab_right");
         }
 
         action->setEnabled(false);
@@ -224,13 +224,13 @@ KonversationMainWindow::KonversationMainWindow() : TDEMainWindow(0,"main_window"
         action2->setToolTip("Move this tab");
     }
 
-    action = new TDEAction(i18n("Rejoin Channel"), 0, m_viewContainer, TQT_SLOT(rejoinChannel()), actionCollection(), "rejoin_channel");
+    action = new TDEAction(i18n("Rejoin Channel"), 0, m_viewContainer, TQ_SLOT(rejoinChannel()), actionCollection(), "rejoin_channel");
     action->setEnabled(false);
 
-    action = new TDEToggleAction(i18n("Enable Notifications"), 0, 0, m_viewContainer, TQT_SLOT(toggleViewNotifications()), actionCollection(), "tab_notifications");
+    action = new TDEToggleAction(i18n("Enable Notifications"), 0, 0, m_viewContainer, TQ_SLOT(toggleViewNotifications()), actionCollection(), "tab_notifications");
     action->setEnabled(false);
 
-    action = new TDEToggleAction(i18n("Join on Connect"), 0, 0, m_viewContainer, TQT_SLOT(toggleAutoJoin()), actionCollection(), "tab_autojoin");
+    action = new TDEToggleAction(i18n("Join on Connect"), 0, 0, m_viewContainer, TQ_SLOT(toggleAutoJoin()), actionCollection(), "tab_autojoin");
     action->setEnabled(false);
 
     TDESelectAction* selectAction = new TDESelectAction(i18n("Set Encoding"), "charset", 0, actionCollection(), "tab_encoding");
@@ -239,66 +239,66 @@ KonversationMainWindow::KonversationMainWindow() : TDEMainWindow(0,"main_window"
     encodingDescs.prepend(i18n("Default"));
     selectAction->setItems(encodingDescs);
     selectAction->setEnabled(false);
-    connect(selectAction, TQT_SIGNAL(activated(int)), m_viewContainer, TQT_SLOT(changeViewCharset(int)));
+    connect(selectAction, TQ_SIGNAL(activated(int)), m_viewContainer, TQ_SLOT(changeViewCharset(int)));
 
     TQSignalMapper* tabSelectionMapper = new TQSignalMapper(this);
-    connect(tabSelectionMapper, TQT_SIGNAL(mapped(int)), m_viewContainer, TQT_SLOT(goToView(int)));
+    connect(tabSelectionMapper, TQ_SIGNAL(mapped(int)), m_viewContainer, TQ_SLOT(goToView(int)));
 
     for (uint i = 1; i <= 10; ++i)
     {
         TDEAction* tabSelectionAction = new TDEAction(i18n("Go to Tab %1").arg(i), 0, TDEShortcut(TQString("Alt+%1").arg(i%10)),
-            tabSelectionMapper, TQT_SLOT(map()), actionCollection(), TQString("go_to_tab_%1").arg(i).local8Bit());
+            tabSelectionMapper, TQ_SLOT(map()), actionCollection(), TQString("go_to_tab_%1").arg(i).local8Bit());
         tabSelectionMapper->setMapping( tabSelectionAction, i-1);
     }
 
-    action = new TDEAction(i18n("Clear &Marker Lines"), 0, TDEShortcut("CTRL+SHIFT+R"), m_viewContainer, TQT_SLOT(clearViewLines()),actionCollection(),"clear_lines");
+    action = new TDEAction(i18n("Clear &Marker Lines"), 0, TDEShortcut("CTRL+SHIFT+R"), m_viewContainer, TQ_SLOT(clearViewLines()),actionCollection(),"clear_lines");
     action->setToolTip(i18n("Clear marker lines in the current tab"));
     action->setEnabled(false);
-    action = new TDEAction(i18n("&Clear Window"), 0, TDEShortcut("Ctrl+L"), m_viewContainer, TQT_SLOT(clearView()),actionCollection(),"clear_window");
+    action = new TDEAction(i18n("&Clear Window"), 0, TDEShortcut("Ctrl+L"), m_viewContainer, TQ_SLOT(clearView()),actionCollection(),"clear_window");
     action->setToolTip(i18n("Clear the contents of the current tab"));
     action->setEnabled(false);
-    action = new TDEAction(i18n("Clear &All Windows"),0,TDEShortcut("CTRL+SHIFT+L"), m_viewContainer, TQT_SLOT(clearAllViews()),actionCollection(),"clear_tabs");
+    action = new TDEAction(i18n("Clear &All Windows"),0,TDEShortcut("CTRL+SHIFT+L"), m_viewContainer, TQ_SLOT(clearAllViews()),actionCollection(),"clear_tabs");
     action->setToolTip(i18n("Clear the contents of all open tabs"));
     action->setEnabled(false);
 
     TDEToggleAction* awayAction = new TDEToggleAction(i18n("Global Away"), TDEShortcut("Ctrl+Shift+A"), actionCollection(), "toggle_away");
-    connect(awayAction, TQT_SIGNAL(toggled(bool)), static_cast<KonversationApplication*>(kapp)->getAwayManager(), TQT_SLOT(toggleGlobalAway(bool)));
+    connect(awayAction, TQ_SIGNAL(toggled(bool)), static_cast<KonversationApplication*>(kapp)->getAwayManager(), TQ_SLOT(toggleGlobalAway(bool)));
     awayAction->setEnabled(false);
 
-    action = new TDEAction(i18n("&Join Channel..."), "add", TDEShortcut("Ctrl+J"), m_viewContainer, TQT_SLOT(showJoinChannelDialog()), actionCollection(), "join_channel");
+    action = new TDEAction(i18n("&Join Channel..."), "add", TDEShortcut("Ctrl+J"), m_viewContainer, TQ_SLOT(showJoinChannelDialog()), actionCollection(), "join_channel");
     action->setEnabled(false);
     action->setToolTip("Join a new channel on this server");
 
-    action = KStdAction::find(m_viewContainer, TQT_SLOT(findText()), actionCollection());
+    action = KStdAction::find(m_viewContainer, TQ_SLOT(findText()), actionCollection());
     action->setEnabled(false);
-    action = KStdAction::findNext(m_viewContainer, TQT_SLOT(findNextText()), actionCollection());
+    action = KStdAction::findNext(m_viewContainer, TQ_SLOT(findNextText()), actionCollection());
     action->setEnabled(false);
-    action = KStdAction::findPrev(m_viewContainer, TQT_SLOT(findPrevText()), actionCollection());
+    action = KStdAction::findPrev(m_viewContainer, TQ_SLOT(findPrevText()), actionCollection());
     action->setEnabled(false);
 
-    action = new TDEAction(i18n("&IRC Color..."), "colorize", CTRL+Key_K, m_viewContainer, TQT_SLOT(insertIRCColor()), actionCollection(), "irc_colors");
+    action = new TDEAction(i18n("&IRC Color..."), "colorize", CTRL+Key_K, m_viewContainer, TQ_SLOT(insertIRCColor()), actionCollection(), "irc_colors");
     action->setToolTip(i18n("Set the color of your current IRC message"));
     action->setEnabled(false);
-    action = new TDEAction(i18n("&Marker Line"), 0,  TDEShortcut("Ctrl+R") , m_viewContainer, TQT_SLOT(insertMarkerLine()), actionCollection(), "insert_marker_line");
+    action = new TDEAction(i18n("&Marker Line"), 0,  TDEShortcut("Ctrl+R") , m_viewContainer, TQ_SLOT(insertMarkerLine()), actionCollection(), "insert_marker_line");
     action->setToolTip(i18n("Insert a horizontal line into the current tab that only you can see"));
     action->setEnabled(false);
-    action = new TDEAction(i18n("Special &Character..."), "char", TDEShortcut("Alt+Shift+C"), m_viewContainer, TQT_SLOT(insertCharacter()), actionCollection(), "insert_character");
+    action = new TDEAction(i18n("Special &Character..."), "char", TDEShortcut("Alt+Shift+C"), m_viewContainer, TQ_SLOT(insertCharacter()), actionCollection(), "insert_character");
     action->setToolTip(i18n("Insert any character into your current IRC message"));
     action->setEnabled(false);
 
-    action = new TDEAction(i18n("Close &All Open Queries"), 0, TDEShortcut("F11"), m_viewContainer, TQT_SLOT(closeQueries()), actionCollection(), "close_queries");
+    action = new TDEAction(i18n("Close &All Open Queries"), 0, TDEShortcut("F11"), m_viewContainer, TQ_SLOT(closeQueries()), actionCollection(), "close_queries");
     action->setEnabled(false);
 
     TDEToggleAction* toggleChannelNickListsAction = new TDEToggleAction(i18n("Hide Nicklist"), 0,
-        TDEShortcut("Ctrl+H"), m_viewContainer, TQT_SLOT(toggleChannelNicklists()), actionCollection(), "hide_nicknamelist");
+        TDEShortcut("Ctrl+H"), m_viewContainer, TQ_SLOT(toggleChannelNicklists()), actionCollection(), "hide_nicknamelist");
     if (!Preferences::showNickList())
         toggleChannelNickListsAction->setChecked(true);
 
     // set up system tray
     m_trayIcon = new Konversation::TrayIcon(this);
-    connect(this, TQT_SIGNAL(endNotification()), m_trayIcon, TQT_SLOT(endNotification()));
-    connect(KonversationApplication::instance(), TQT_SIGNAL(iconChanged(int)), m_trayIcon, TQT_SLOT(updateAppearance()));
-    connect(m_trayIcon, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(quitProgram()));
+    connect(this, TQ_SIGNAL(endNotification()), m_trayIcon, TQ_SLOT(endNotification()));
+    connect(KonversationApplication::instance(), TQ_SIGNAL(iconChanged(int)), m_trayIcon, TQ_SLOT(updateAppearance()));
+    connect(m_trayIcon, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(quitProgram()));
     TDEPopupMenu *trayMenu = m_trayIcon->contextMenu();
     #ifdef USE_KNOTIFY
     configureNotificationsAction->plug(trayMenu);
@@ -457,7 +457,7 @@ void KonversationMainWindow::settingsChangedSlot()
     // The appearanceChanged signal is connected to resetHasDirtySettings to reset this bool
     if (!m_hasDirtySettings) 
     {
-        TQTimer::singleShot(0, KonversationApplication::instance(), TQT_SIGNAL(appearanceChanged()));
+        TQTimer::singleShot(0, KonversationApplication::instance(), TQ_SIGNAL(appearanceChanged()));
         m_hasDirtySettings = true;
     }
 }
@@ -500,7 +500,7 @@ int KonversationMainWindow::configureToolbar()
 {
     saveMainWindowSettings(TDEGlobal::config());
     KEditToolbar dlg(actionCollection(), xmlFile(), true, this);
-    connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(saveToolbarConfig()));
+    connect(&dlg, TQ_SIGNAL(newToolbarConfig()), TQ_SLOT(saveToolbarConfig()));
     return dlg.exec();
 }
 
@@ -528,7 +528,7 @@ void KonversationMainWindow::openPrefsDialog()
         m_settingsDialog = new KonviSettingsDialog(this);
         //User edited the configuration - update your local copies of the
         //configuration data
-        connect(m_settingsDialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(settingsChangedSlot()));
+        connect(m_settingsDialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(settingsChangedSlot()));
     }
     m_settingsDialog->show();
 }
@@ -566,15 +566,15 @@ void KonversationMainWindow::openServerList()
         m_serverListDialog = new Konversation::ServerListDialog(this);
         KonversationApplication* konvApp = static_cast<KonversationApplication*>(kapp);
 
-        connect(m_serverListDialog, TQT_SIGNAL(serverGroupsChanged(const Konversation::ServerGroupSettings*)),
-                konvApp, TQT_SIGNAL(serverGroupsChanged(const Konversation::ServerGroupSettings*)));
-        connect(konvApp, TQT_SIGNAL(serverGroupsChanged(const Konversation::ServerGroupSettings*)),
-                m_serverListDialog, TQT_SLOT(updateServerList()));
-        connect(m_serverListDialog, TQT_SIGNAL(connectTo(Konversation::ConnectionFlag, int)),
-                konvApp->getConnectionManager(), TQT_SLOT(connectTo(Konversation::ConnectionFlag, int)));
-        connect(m_serverListDialog, TQT_SIGNAL(connectTo(Konversation::ConnectionFlag, ConnectionSettings&)),
-                konvApp->getConnectionManager(), TQT_SLOT(connectTo(Konversation::ConnectionFlag, ConnectionSettings&)));
-        connect(konvApp->getConnectionManager(), TQT_SIGNAL(closeServerList()), m_serverListDialog, TQT_SLOT(slotClose()));
+        connect(m_serverListDialog, TQ_SIGNAL(serverGroupsChanged(const Konversation::ServerGroupSettings*)),
+                konvApp, TQ_SIGNAL(serverGroupsChanged(const Konversation::ServerGroupSettings*)));
+        connect(konvApp, TQ_SIGNAL(serverGroupsChanged(const Konversation::ServerGroupSettings*)),
+                m_serverListDialog, TQ_SLOT(updateServerList()));
+        connect(m_serverListDialog, TQ_SIGNAL(connectTo(Konversation::ConnectionFlag, int)),
+                konvApp->getConnectionManager(), TQ_SLOT(connectTo(Konversation::ConnectionFlag, int)));
+        connect(m_serverListDialog, TQ_SIGNAL(connectTo(Konversation::ConnectionFlag, ConnectionSettings&)),
+                konvApp->getConnectionManager(), TQ_SLOT(connectTo(Konversation::ConnectionFlag, ConnectionSettings&)));
+        connect(konvApp->getConnectionManager(), TQ_SIGNAL(closeServerList()), m_serverListDialog, TQ_SLOT(slotClose()));
     }
 
     m_serverListDialog->show();
diff --git a/konversation/src/konversationmainwindow.h b/konversation/src/konversationmainwindow.h
index 86d213f..b077c88 100644
--- a/konversation/src/konversationmainwindow.h
+++ b/konversation/src/konversationmainwindow.h
@@ -95,7 +95,7 @@ class KonversationMainWindow : public TDEMainWindow
         *
         *  Do not connect to the settingsChanged signal elsewhere.  If you want to know when
         *  the settings have changed, connect to:
-        *  KonversationApplication::instance(), TQT_SIGNAL(appearanceChanged())
+        *  KonversationApplication::instance(), TQ_SIGNAL(appearanceChanged())
         */
         void settingsChangedSlot();
 
diff --git a/konversation/src/konversationstatusbar.cpp b/konversation/src/konversationstatusbar.cpp
index c2223d3..570476b 100644
--- a/konversation/src/konversationstatusbar.cpp
+++ b/konversation/src/konversationstatusbar.cpp
@@ -224,7 +224,7 @@ void KonversationStatusBar::updateSSLLabel(Server* server)
         && server->getUseSSL() && server->isConnected())
     {
         disconnect(m_sslLabel,0,0,0);
-        connect(m_sslLabel,TQT_SIGNAL(clicked()),server,TQT_SLOT(showSSLDialog()));
+        connect(m_sslLabel,TQ_SIGNAL(clicked()),server,TQ_SLOT(showSSLDialog()));
         TQToolTip::remove(m_sslLabel);
         TQToolTip::add(m_sslLabel,server->getSSLInfo());
         m_sslLabel->show();
diff --git a/konversation/src/konvibookmarkhandler.cpp b/konversation/src/konvibookmarkhandler.cpp
index 1d32ca6..e4d6283 100644
--- a/konversation/src/konvibookmarkhandler.cpp
+++ b/konversation/src/konvibookmarkhandler.cpp
@@ -50,7 +50,7 @@ m_mainWindow(mainWindow)
     manager->setUpdate( true );
     manager->setShowNSBookmarks( false );
 
-    connect( manager, TQT_SIGNAL(changed(const TQString &,const TQString &)), TQT_SLOT(slotBookmarksChanged(const TQString &,const TQString &)));
+    connect( manager, TQ_SIGNAL(changed(const TQString &,const TQString &)), TQ_SLOT(slotBookmarksChanged(const TQString &,const TQString &)));
 
     m_bookmarkMenu = new KonviBookmarkMenu( manager, this, m_menu, NULL, true );
 }
diff --git a/konversation/src/konvibookmarkmenu.cpp b/konversation/src/konvibookmarkmenu.cpp
index d4685e0..5d0bb4b 100644
--- a/konversation/src/konvibookmarkmenu.cpp
+++ b/konversation/src/konvibookmarkmenu.cpp
@@ -34,12 +34,12 @@ m_kOwner(_owner)
     /*
      * First, we disconnect KBookmarkMenu::slotAboutToShow()
      * Then,  we connect    KonviBookmarkMenu::slotAboutToShow().
-     * They are named differently because the TQT_SLOT() macro thinks we want
+     * They are named differently because the TQ_SLOT() macro thinks we want
      * KonviBookmarkMenu::KBookmarkMenu::slotAboutToShow()
      * Could this be solved if slotAboutToShow() is virtual in KBookmarMenu?
      */
-    disconnect(_parentMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotAboutToShow()));
-    connect(_parentMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow2()));
+    disconnect(_parentMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotAboutToShow()));
+    connect(_parentMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow2()));
 }
 
 /*
@@ -110,7 +110,7 @@ void KonviBookmarkMenu::fillBookmarkMenu()
                 // kdDebug(1203) << "Creating URL bookmark menu item for " << bm.text() << endl;
                 // create a normal URL item, with ID as a name
                 TDEAction * action = new TDEAction( text, bm.icon(), 0,
-                    this, TQT_SLOT( slotBookmarkSelected() ),
+                    this, TQ_SLOT( slotBookmarkSelected() ),
                     m_actionCollection, bm.url().url().utf8() );
 
                 action->setStatusText( bm.url().prettyURL() );
diff --git a/konversation/src/konviconfigdialog.cpp b/konversation/src/konviconfigdialog.cpp
index 807551e..4610842 100644
--- a/konversation/src/konviconfigdialog.cpp
+++ b/konversation/src/konviconfigdialog.cpp
@@ -85,11 +85,11 @@ KonviConfigDialog::KonviConfigDialog( TQWidget *parent, const char *name,
         setName(genericName);
     }
 
-    connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(updateSettings()));
-    connect(this, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(updateSettings()));
-    connect(this, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(updateButtons()));
-    connect(this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(updateWidgetsDefault()));
-    connect(this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(updateButtons()));
+    connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(updateSettings()));
+    connect(this, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(updateSettings()));
+    connect(this, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(updateButtons()));
+    connect(this, TQ_SIGNAL(defaultClicked()), this, TQ_SLOT(updateWidgetsDefault()));
+    connect(this, TQ_SIGNAL(defaultClicked()), this, TQ_SLOT(updateButtons()));
 
     d->manager = new TDEConfigDialogManager(this, config);
     setupManagerConnections(d->manager);
@@ -172,12 +172,12 @@ void KonviConfigDialog::addPageInternal(TQWidget *page,
 
 void KonviConfigDialog::setupManagerConnections(TDEConfigDialogManager *manager)
 {
-    connect(manager, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(settingsChangedSlot()));
-    connect(manager, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(updateButtons()));
+    connect(manager, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(settingsChangedSlot()));
+    connect(manager, TQ_SIGNAL(widgetModified()), this, TQ_SLOT(updateButtons()));
 
-    connect(this, TQT_SIGNAL(okClicked()), manager, TQT_SLOT(updateSettings()));
-    connect(this, TQT_SIGNAL(applyClicked()), manager, TQT_SLOT(updateSettings()));
-    connect(this, TQT_SIGNAL(defaultClicked()), manager, TQT_SLOT(updateWidgetsDefault()));
+    connect(this, TQ_SIGNAL(okClicked()), manager, TQ_SLOT(updateSettings()));
+    connect(this, TQ_SIGNAL(applyClicked()), manager, TQ_SLOT(updateSettings()));
+    connect(this, TQ_SIGNAL(defaultClicked()), manager, TQ_SLOT(updateWidgetsDefault()));
 }
 
 KonviConfigDialog* KonviConfigDialog::exists(const char* name)
diff --git a/konversation/src/konvisettingsdialog.cpp b/konversation/src/konvisettingsdialog.cpp
index 14d8661..2ddc3e3 100644
--- a/konversation/src/konvisettingsdialog.cpp
+++ b/konversation/src/konvisettingsdialog.cpp
@@ -83,7 +83,7 @@ KonviSettingsDialog::KonviSettingsDialog( TQWidget *parent) :
   pagePath << i18n("Interface") << i18n("Nicklist Themes");
   addPage ( m_confThemeWdg, pagePath, "iconthemes", i18n("Nicklist Themes") );
   m_indexToPageMapping.insert(lastAddedIndex(), m_confThemeWdg);
-  connect(m_confThemeWdg, TQT_SIGNAL(modified()), this, TQT_SLOT(modifiedSlot()));
+  connect(m_confThemeWdg, TQ_SIGNAL(modified()), this, TQ_SLOT(modifiedSlot()));
 
   //Interface/Colors
   m_confColorsAppearanceWdg = new ColorsAppearance_Config( this, "ColorsAppearance" );
@@ -103,7 +103,7 @@ KonviSettingsDialog::KonviSettingsDialog( TQWidget *parent) :
   pagePath << i18n("Interface") << i18n("Quick Buttons");
   addPage ( m_confQuickButtonsWdg, pagePath, "input-keyboard", i18n("Quick Buttons") );
   m_indexToPageMapping.insert(lastAddedIndex(), m_confQuickButtonsWdg);
-  connect(m_confQuickButtonsWdg, TQT_SIGNAL(modified()), this, TQT_SLOT(modifiedSlot()));
+  connect(m_confQuickButtonsWdg, TQ_SIGNAL(modified()), this, TQ_SLOT(modifiedSlot()));
 
   //Interface/Tabs
   m_confTabBarWdg = new Tabs_Config( this, "TabBar" );
@@ -134,7 +134,7 @@ KonviSettingsDialog::KonviSettingsDialog( TQWidget *parent) :
   pagePath.clear();
   pagePath << i18n("Behavior") << i18n("Nickname List");
   addPage ( m_confNicklistBehaviorWdg, pagePath, "player_playlist", i18n("Nickname List") );
-  connect(m_confNicklistBehaviorWdg, TQT_SIGNAL(modified()), this, TQT_SLOT(modifiedSlot()));
+  connect(m_confNicklistBehaviorWdg, TQ_SIGNAL(modified()), this, TQ_SLOT(modifiedSlot()));
   m_indexToPageMapping.insert(lastAddedIndex(), m_confNicklistBehaviorWdg);
 
   //Behaviour/Command Aliases
@@ -143,7 +143,7 @@ KonviSettingsDialog::KonviSettingsDialog( TQWidget *parent) :
   pagePath << i18n("Behavior") << i18n("Command Aliases");
   addPage ( m_confAliasWdg, pagePath, "edit-copy", i18n("Command Aliases") );
   m_indexToPageMapping.insert(lastAddedIndex(), m_confAliasWdg);
-  connect(m_confAliasWdg, TQT_SIGNAL(modified()), this, TQT_SLOT(modifiedSlot()));
+  connect(m_confAliasWdg, TQ_SIGNAL(modified()), this, TQ_SLOT(modifiedSlot()));
 
   //Behaviour/Auto Replace
   m_confAutoreplaceWdg = new Autoreplace_Config( this, "Autoreplace" );
@@ -151,14 +151,14 @@ KonviSettingsDialog::KonviSettingsDialog( TQWidget *parent) :
   pagePath << i18n("Behavior") << i18n("Auto Replace");
   addPage ( m_confAutoreplaceWdg, pagePath, "kview", i18n("Auto Replace") );
   m_indexToPageMapping.insert(lastAddedIndex(), m_confAutoreplaceWdg);
-  connect(m_confAutoreplaceWdg, TQT_SIGNAL(modified()), this, TQT_SLOT(modifiedSlot()));
+  connect(m_confAutoreplaceWdg, TQ_SIGNAL(modified()), this, TQ_SLOT(modifiedSlot()));
 
   //Behaviour/Ignore
   m_confIgnoreWdg = new Ignore_Config(this, "Ignore");
   pagePath.clear();
   pagePath << i18n("Behavior") << i18n("Ignore");
   addPage ( m_confIgnoreWdg, pagePath, "process-stop", i18n("Ignore") );
-  connect(m_confIgnoreWdg, TQT_SIGNAL(modified()), this, TQT_SLOT(modifiedSlot()));
+  connect(m_confIgnoreWdg, TQ_SIGNAL(modified()), this, TQ_SLOT(modifiedSlot()));
   m_indexToPageMapping.insert(lastAddedIndex(), m_confIgnoreWdg);
 
   //Behaviour/Logging
@@ -183,7 +183,7 @@ KonviSettingsDialog::KonviSettingsDialog( TQWidget *parent) :
   pagePath.clear();
   pagePath << i18n("Notifications") << i18n("Highlight");
   addPage ( m_confHighlightWdg, pagePath, "paintbrush", i18n("Highlight") );
-  connect(m_confHighlightWdg, TQT_SIGNAL(modified()), this, TQT_SLOT(modifiedSlot()));
+  connect(m_confHighlightWdg, TQ_SIGNAL(modified()), this, TQ_SLOT(modifiedSlot()));
   m_indexToPageMapping.insert(lastAddedIndex(), m_confHighlightWdg);
 
   //Notification/Watched Nicknames
@@ -193,7 +193,7 @@ KonviSettingsDialog::KonviSettingsDialog( TQWidget *parent) :
   addPage ( m_confWatchedNicknamesWdg, pagePath, "kfind", i18n("Watched Nicknames") );
   // remember index so we can open this page later from outside
   m_watchedNicknamesIndex=lastAddedIndex();
-  connect(m_confWatchedNicknamesWdg, TQT_SIGNAL(modified()), this, TQT_SLOT(modifiedSlot()));
+  connect(m_confWatchedNicknamesWdg, TQ_SIGNAL(modified()), this, TQ_SLOT(modifiedSlot()));
   m_indexToPageMapping.insert(lastAddedIndex(), m_confWatchedNicknamesWdg);
 
   //Notification/On Screen Display
@@ -210,7 +210,7 @@ KonviSettingsDialog::KonviSettingsDialog( TQWidget *parent) :
   pagePath << i18n("Notifications") << i18n("Warning Dialogs");
   addPage ( m_confWarningsWdg, pagePath, "messagebox_warning", i18n("Warning Dialogs") );
   m_indexToPageMapping.insert(lastAddedIndex(), m_confWarningsWdg);
-  connect(m_confWarningsWdg, TQT_SIGNAL(modified()), this, TQT_SLOT(modifiedSlot()));
+  connect(m_confWarningsWdg, TQ_SIGNAL(modified()), this, TQ_SLOT(modifiedSlot()));
 
   unfoldTreeList();
 }
diff --git a/konversation/src/linkaddressbook/linkaddressbookui.cpp b/konversation/src/linkaddressbook/linkaddressbookui.cpp
index 7244b9a..9e07c4e 100644
--- a/konversation/src/linkaddressbook/linkaddressbookui.cpp
+++ b/konversation/src/linkaddressbook/linkaddressbookui.cpp
@@ -60,16 +60,16 @@ LinkAddressbookUI::LinkAddressbookUI( TQWidget *parent, const char *name, const
     m_addressBook = Konversation::Addressbook::self()->getAddressBook();
 
     // Addressee validation connections
-    connect( m_mainWidget->addAddresseeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAddAddresseeClicked() ) );
-    connect( m_mainWidget->addresseeListView, TQT_SIGNAL( clicked(TQListViewItem * ) ),
-        TQT_SLOT( slotAddresseeListClicked( TQListViewItem * ) ) );
-    connect( m_mainWidget->addresseeListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ),
-        TQT_SLOT( slotAddresseeListClicked( TQListViewItem * ) ) );
-    connect( m_mainWidget->addresseeListView, TQT_SIGNAL( spacePressed( TQListViewItem * ) ),
-        TQT_SLOT( slotAddresseeListClicked( TQListViewItem * ) ) );
+    connect( m_mainWidget->addAddresseeButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAddAddresseeClicked() ) );
+    connect( m_mainWidget->addresseeListView, TQ_SIGNAL( clicked(TQListViewItem * ) ),
+        TQ_SLOT( slotAddresseeListClicked( TQListViewItem * ) ) );
+    connect( m_mainWidget->addresseeListView, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ),
+        TQ_SLOT( slotAddresseeListClicked( TQListViewItem * ) ) );
+    connect( m_mainWidget->addresseeListView, TQ_SIGNAL( spacePressed( TQListViewItem * ) ),
+        TQ_SLOT( slotAddresseeListClicked( TQListViewItem * ) ) );
 
-    connect( m_addressBook, TQT_SIGNAL( addressBookChanged( AddressBook * ) ), this, TQT_SLOT( slotLoadAddressees() ) );
-    connect( Konversation::Addressbook::self(), TQT_SIGNAL(addresseesChanged()), this, TQT_SLOT(slotLoadAddressees()));
+    connect( m_addressBook, TQ_SIGNAL( addressBookChanged( AddressBook * ) ), this, TQ_SLOT( slotLoadAddressees() ) );
+    connect( Konversation::Addressbook::self(), TQ_SIGNAL(addresseesChanged()), this, TQ_SLOT(slotLoadAddressees()));
 
     //We should add a clear TDEAction here.  But we can't really do that with a designer file :\  this sucks
 
@@ -174,14 +174,14 @@ void LinkAddressbookUI::slotOk()
             return;
         }
     }
-    disconnect( m_addressBook, TQT_SIGNAL( addressBookChanged( AddressBook * ) ), this, TQT_SLOT( slotLoadAddressees() ) );
+    disconnect( m_addressBook, TQ_SIGNAL( addressBookChanged( AddressBook * ) ), this, TQ_SLOT( slotLoadAddressees() ) );
     deleteLater();
     accept();
 }
 
 void LinkAddressbookUI::slotCancel()
 {
-    disconnect( m_addressBook, TQT_SIGNAL( addressBookChanged( AddressBook * ) ), this, TQT_SLOT( slotLoadAddressees() ) );
+    disconnect( m_addressBook, TQ_SIGNAL( addressBookChanged( AddressBook * ) ), this, TQ_SLOT( slotLoadAddressees() ) );
     deleteLater();
     reject();
 }
diff --git a/konversation/src/logfilereader.cpp b/konversation/src/logfilereader.cpp
index da3efca..2dcc8b4 100644
--- a/konversation/src/logfilereader.cpp
+++ b/konversation/src/logfilereader.cpp
@@ -45,7 +45,7 @@ LogfileReader::LogfileReader(TQWidget* parent, const TQString& log) : ChatWindow
     TQDockArea* toolBarDock = new TQDockArea(TQt::Horizontal,TQDockArea::Normal,this,"logfile_toolbar_dock");
     toolBar = new TDEToolBar(toolBarDock,"logfile_toolbar",true,true);
 
-    toolBar->insertButton("document-save-as",0,TQT_SIGNAL(clicked()),this,TQT_SLOT(saveLog()),true,i18n("Save As..."));
+    toolBar->insertButton("document-save-as",0,TQ_SIGNAL(clicked()),this,TQ_SLOT(saveLog()),true,i18n("Save As..."));
 
     new TQLabel(i18n("Show last:"),toolBar,"logfile_size_label");
     sizeSpin = new TQSpinBox(10,1000,10,toolBar,"logfile_size_spinbox");
@@ -54,8 +54,8 @@ LogfileReader::LogfileReader(TQWidget* parent, const TQString& log) : ChatWindow
     sizeSpin->setSuffix(i18n(" KB"));
     sizeSpin->installEventFilter(this);
 
-    toolBar->insertButton("reload",0,TQT_SIGNAL(clicked()),this,TQT_SLOT(updateView()),true,i18n("Reload"));
-    toolBar->insertButton("edit-delete",0,TQT_SIGNAL(clicked()),this,TQT_SLOT(clearLog()),true,i18n("Clear Logfile"));
+    toolBar->insertButton("reload",0,TQ_SIGNAL(clicked()),this,TQ_SLOT(updateView()),true,i18n("Reload"));
+    toolBar->insertButton("edit-delete",0,TQ_SIGNAL(clicked()),this,TQ_SLOT(clearLog()),true,i18n("Clear Logfile"));
 
     IRCViewBox* ircBox = new IRCViewBox(this, 0);
     setTextView(ircBox->ircView());
@@ -67,7 +67,7 @@ LogfileReader::LogfileReader(TQWidget* parent, const TQString& log) : ChatWindow
     setFocusPolicy(TQWidget::StrongFocus);
     setFocusProxy(ircBox->ircView());
 
-    connect(getTextView(), TQT_SIGNAL(gotFocus()), getTextView(), TQT_SLOT(setFocus()));
+    connect(getTextView(), TQ_SIGNAL(gotFocus()), getTextView(), TQ_SLOT(setFocus()));
 }
 
 LogfileReader::~LogfileReader()
@@ -159,7 +159,7 @@ void LogfileReader::saveLog()
             KURL(destination),
             true);
 
-        connect(job,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(copyResult(TDEIO::Job*)));
+        connect(job,TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(copyResult(TDEIO::Job*)));
     }
 }
 
diff --git a/konversation/src/modebutton.cpp b/konversation/src/modebutton.cpp
index b01661b..2d11963 100644
--- a/konversation/src/modebutton.cpp
+++ b/konversation/src/modebutton.cpp
@@ -20,7 +20,7 @@ TQPushButton::TQPushButton(label,parent)
     id=newId;
     on=false;
     setToggleButton(true);
-    connect(this,TQT_SIGNAL (clicked()),this,TQT_SLOT (wasClicked()) );
+    connect(this,TQ_SIGNAL (clicked()),this,TQ_SLOT (wasClicked()) );
 }
 
 ModeButton::~ModeButton()
diff --git a/konversation/src/multilinetextedit.cpp b/konversation/src/multilinetextedit.cpp
index be42a1f..60c1458 100644
--- a/konversation/src/multilinetextedit.cpp
+++ b/konversation/src/multilinetextedit.cpp
@@ -20,8 +20,8 @@
 MultilineTextEdit::MultilineTextEdit(TQWidget* parent,const char* name) : TQTextEdit(parent,name)
 {
   // make sure, our whitespace highlighting gets called whenever needed
-  connect(this,TQT_SIGNAL(textChanged()),this,TQT_SLOT(drawWhitespaces()));
-  connect(this,TQT_SIGNAL(cursorPositionChanged(int,int)),this,TQT_SLOT(cursorChanged(int,int)));
+  connect(this,TQ_SIGNAL(textChanged()),this,TQ_SLOT(drawWhitespaces()));
+  connect(this,TQ_SIGNAL(cursorPositionChanged(int,int)),this,TQ_SLOT(cursorChanged(int,int)));
 }
 
 MultilineTextEdit::~MultilineTextEdit()
diff --git a/konversation/src/nick.cpp b/konversation/src/nick.cpp
index dbb98f1..c37ef69 100644
--- a/konversation/src/nick.cpp
+++ b/konversation/src/nick.cpp
@@ -39,9 +39,9 @@ const ChannelNickPtr& channelnick)
 
     refresh();
 
-    connect(this, TQT_SIGNAL(refreshed()), listView, TQT_SLOT(startResortTimer()));
-    connect(getChannelNick(), TQT_SIGNAL(channelNickChanged()), TQT_SLOT(refresh()));
-    connect(getChannelNick()->getNickInfo(), TQT_SIGNAL(nickInfoChanged()), TQT_SLOT(refresh()));
+    connect(this, TQ_SIGNAL(refreshed()), listView, TQ_SLOT(startResortTimer()));
+    connect(getChannelNick(), TQ_SIGNAL(channelNickChanged()), TQ_SLOT(refresh()));
+    connect(getChannelNick()->getNickInfo(), TQ_SIGNAL(nickInfoChanged()), TQ_SLOT(refresh()));
 }
 
 Nick::~Nick()
diff --git a/konversation/src/nickinfo.cpp b/konversation/src/nickinfo.cpp
index 250eb6a..8474492 100644
--- a/konversation/src/nickinfo.cpp
+++ b/konversation/src/nickinfo.cpp
@@ -45,11 +45,11 @@ NickInfo::NickInfo(const TQString& nick, Server* server): TDEShared()
     if(!m_addressee.isEmpty())
         Konversation::Addressbook::self()->emitContactPresenceChanged(m_addressee.uid(), 4);
 
-    connect( Konversation::Addressbook::self()->getAddressBook(), TQT_SIGNAL( addressBookChanged( AddressBook * ) ), this, TQT_SLOT( refreshAddressee() ) );
-    connect( Konversation::Addressbook::self(), TQT_SIGNAL(addresseesChanged()), this, TQT_SLOT(refreshAddressee()));
+    connect( Konversation::Addressbook::self()->getAddressBook(), TQ_SIGNAL( addressBookChanged( AddressBook * ) ), this, TQ_SLOT( refreshAddressee() ) );
+    connect( Konversation::Addressbook::self(), TQ_SIGNAL(addresseesChanged()), this, TQ_SLOT(refreshAddressee()));
 
     m_changedTimer = new TQTimer( this);
-    connect(m_changedTimer, TQT_SIGNAL( timeout()), TQT_SLOT(emitNickInfoChanged()));
+    connect(m_changedTimer, TQ_SIGNAL( timeout()), TQ_SLOT(emitNickInfoChanged()));
 
     // reset nick color
     m_nickColor = 0;
diff --git a/konversation/src/nicklistbehavior_preferences.cpp b/konversation/src/nicklistbehavior_preferences.cpp
index 356f5fa..c1d20c4 100644
--- a/konversation/src/nicklistbehavior_preferences.cpp
+++ b/konversation/src/nicklistbehavior_preferences.cpp
@@ -31,7 +31,7 @@ NicklistBehavior_Config::NicklistBehavior_Config(TQWidget *parent, const char *n
   sortOrder->setSorting(-1,false);
   sortOrder->header()->setMovingEnabled(false);
 
-  connect(sortOrder,TQT_SIGNAL (moved()),this,TQT_SIGNAL (modified()) );
+  connect(sortOrder,TQ_SIGNAL (moved()),this,TQ_SIGNAL (modified()) );
 }
 
 NicklistBehavior_Config::~NicklistBehavior_Config()
diff --git a/konversation/src/nicklistview.cpp b/konversation/src/nicklistview.cpp
index edf7f4b..63638b6 100644
--- a/konversation/src/nicklistview.cpp
+++ b/konversation/src/nicklistview.cpp
@@ -104,10 +104,10 @@ TDEListView(parent)
 
         popup->insertItem(i18n("Add to Watched Nicks"), Konversation::AddNotify);
 
-        connect (popup, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(popupCommand(int)));
-        connect (modes, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(popupCommand(int)));
-        connect (kickban, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(popupCommand(int)));
-        connect (addressbook, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(popupCommand(int)));
+        connect (popup, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(popupCommand(int)));
+        connect (modes, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(popupCommand(int)));
+        connect (kickban, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(popupCommand(int)));
+        connect (addressbook, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(popupCommand(int)));
 
     }
     else
@@ -124,7 +124,7 @@ TDEListView(parent)
     m_tooltip = new Konversation::KonversationNickListViewToolTip(viewport(), this);
 
     m_resortTimer = new TQTimer(this);
-    connect(m_resortTimer, TQT_SIGNAL(timeout()), TQT_SLOT(resort()));
+    connect(m_resortTimer, TQ_SIGNAL(timeout()), TQ_SLOT(resort()));
 }
 
 NickListView::~NickListView()
diff --git a/konversation/src/nicksonline.cpp b/konversation/src/nicksonline.cpp
index a92497b..2ea90e0 100644
--- a/konversation/src/nicksonline.cpp
+++ b/konversation/src/nicksonline.cpp
@@ -90,9 +90,9 @@ NicksOnline::NicksOnline(TQWidget* parent): ChatWindow(parent)
         "Click to edit the list of nicknames that appear on this screen.");
     TQWhatsThis::add(editButton, editButtonWT);
 
-    connect(editButton, TQT_SIGNAL(clicked()), TQT_SIGNAL(editClicked()) );
-    connect(m_nickListView, TQT_SIGNAL(doubleClicked(TQListViewItem*)),
-        this,TQT_SLOT(processDoubleClick(TQListViewItem*)));
+    connect(editButton, TQ_SIGNAL(clicked()), TQ_SIGNAL(editClicked()) );
+    connect(m_nickListView, TQ_SIGNAL(doubleClicked(TQListViewItem*)),
+        this,TQ_SLOT(processDoubleClick(TQListViewItem*)));
 
     TQLabel* addressbookLabel = new TQLabel(i18n("Address book:"),
         buttonBox, "nicksonline_addressbook_label");
@@ -122,30 +122,30 @@ NicksOnline::NicksOnline(TQWidget* parent): ChatWindow(parent)
     TQWhatsThis::add(m_deleteAssociationButton, deleteAssociationButtonWT);
     m_deleteAssociationButton->setIconSet(m_tdeabcIconSet);
 
-    connect(m_editContactButton, TQT_SIGNAL(clicked()),
-        this, TQT_SLOT(slotEditContactButton_Clicked()));
-    connect(m_changeAssociationButton, TQT_SIGNAL(clicked()),
-        this, TQT_SLOT(slotChangeAssociationButton_Clicked()));
-    connect(m_deleteAssociationButton, TQT_SIGNAL(clicked()),
-        this, TQT_SLOT(slotDeleteAssociationButton_Clicked()));
-    connect(m_nickListView, TQT_SIGNAL(selectionChanged()),
-        this, TQT_SLOT(slotNickListView_SelectionChanged()));
+    connect(m_editContactButton, TQ_SIGNAL(clicked()),
+        this, TQ_SLOT(slotEditContactButton_Clicked()));
+    connect(m_changeAssociationButton, TQ_SIGNAL(clicked()),
+        this, TQ_SLOT(slotChangeAssociationButton_Clicked()));
+    connect(m_deleteAssociationButton, TQ_SIGNAL(clicked()),
+        this, TQ_SLOT(slotDeleteAssociationButton_Clicked()));
+    connect(m_nickListView, TQ_SIGNAL(selectionChanged()),
+        this, TQ_SLOT(slotNickListView_SelectionChanged()));
 
     setupAddressbookButtons(nsNotANick);
 
     // Create context menu.  Individual menu entries are created in rightButtonClicked slot.
     m_popupMenu = new TQPopupMenu(this,"nicksonline_context_menu");
-    connect(m_nickListView, TQT_SIGNAL(rightButtonClicked(TQListViewItem *, const TQPoint &, int )),
-        this, TQT_SLOT(slotNickListView_RightButtonClicked(TQListViewItem*, const TQPoint &)));
-    connect(m_popupMenu, TQT_SIGNAL(activated(int)),
-        this, TQT_SLOT(slotPopupMenu_Activated(int)));
+    connect(m_nickListView, TQ_SIGNAL(rightButtonClicked(TQListViewItem *, const TQPoint &, int )),
+        this, TQ_SLOT(slotNickListView_RightButtonClicked(TQListViewItem*, const TQPoint &)));
+    connect(m_popupMenu, TQ_SIGNAL(activated(int)),
+        this, TQ_SLOT(slotPopupMenu_Activated(int)));
 
     // Display info for all currently-connected servers.
     refreshAllServerOnlineLists();
 
     // Connect and start refresh timer.
     m_timer = new TQTimer(this, "nicksOnlineTimer");
-    connect(m_timer, TQT_SIGNAL (timeout()), this, TQT_SLOT(timerFired()));
+    connect(m_timer, TQ_SIGNAL (timeout()), this, TQ_SLOT(timerFired()));
     // TODO: User preference for refresh interval.
     m_timer->start(8000);
 }
@@ -444,8 +444,8 @@ void NicksOnline::updateServerOnlineList(Server* servr)
     {
         networkRoot->setOpen(true);
         // Connect server NickInfo updates.
-        connect (servr, TQT_SIGNAL(nickInfoChanged(Server*, const NickInfoPtr)),
-            this, TQT_SLOT(slotNickInfoChanged(Server*, const NickInfoPtr)));
+        connect (servr, TQ_SIGNAL(nickInfoChanged(Server*, const NickInfoPtr)),
+            this, TQ_SLOT(slotNickInfoChanged(Server*, const NickInfoPtr)));
     }
 }
 
diff --git a/konversation/src/osd.cpp b/konversation/src/osd.cpp
index 53d3247..73798c6 100644
--- a/konversation/src/osd.cpp
+++ b/konversation/src/osd.cpp
@@ -43,8 +43,8 @@ OSDWidget::OSDWidget( const TQString &appName, TQWidget *parent, const char *nam
     setBackgroundMode( NoBackground );
     unsetColors();
 
-    connect( &timer,     TQT_SIGNAL( timeout() ), TQT_SLOT( hide() ) );
-    connect( &timerMin,  TQT_SIGNAL( timeout() ), TQT_SLOT( minReached() ) );
+    connect( &timer,     TQ_SIGNAL( timeout() ), TQ_SLOT( hide() ) );
+    connect( &timerMin,  TQ_SIGNAL( timeout() ), TQ_SLOT( minReached() ) );
 }
 
 void OSDWidget::renderOSDText( const TQString &txt )
@@ -146,7 +146,7 @@ void OSDWidget::showOSD( const TQString &text, bool preemptive )
     }
 }
 
-void OSDWidget::minReached()                      //SLOT
+void OSDWidget::minReached()                      //TQ_SLOT
 {
     if ( !textBuffer.isEmpty() )
     {
diff --git a/konversation/src/osd_preferences.cpp b/konversation/src/osd_preferences.cpp
index 3d9dab4..4d5d0c5 100644
--- a/konversation/src/osd_preferences.cpp
+++ b/konversation/src/osd_preferences.cpp
@@ -46,9 +46,9 @@ OSD_Config::OSD_Config( TQWidget* parent, const char* name, WFlags fl )
     kcfg_OSDScreen->setEnabled(enableScreenChooser);
 
     m_pOSDPreview = new OSDPreviewWidget("Konversation");
-    connect(m_pOSDPreview, TQT_SIGNAL(positionChanged()), this, TQT_SLOT(slotPositionChanged()));
+    connect(m_pOSDPreview, TQ_SIGNAL(positionChanged()), this, TQ_SLOT(slotPositionChanged()));
 
-    connect( kcfg_OSDFont, TQT_SIGNAL(fontSelected(const TQFont&)), this, TQT_SLOT(slotUpdateFont(const TQFont&)));
+    connect( kcfg_OSDFont, TQ_SIGNAL(fontSelected(const TQFont&)), this, TQ_SLOT(slotUpdateFont(const TQFont&)));
 
     slotOSDEnabledChanged(kcfg_UseOSD->isChecked());
     slotCustomColorsChanged(kcfg_OSDUseCustomColors->isChecked());
@@ -61,12 +61,12 @@ OSD_Config::OSD_Config( TQWidget* parent, const char* name, WFlags fl )
     kcfg_OSDAlignment->hide();
 
     //Connect config page entries to control the OSDPreview
-    connect ( kcfg_UseOSD,  TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotOSDEnabledChanged(bool) ) );
-    connect ( kcfg_OSDUseCustomColors, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotCustomColorsChanged(bool)));
-    connect ( kcfg_OSDTextColor, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(slotTextColorChanged(const TQColor&)));
-    connect ( kcfg_OSDBackgroundColor, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(slotBackgroundColorChanged(const TQColor&)));
-    connect ( kcfg_OSDScreen, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotScreenChanged(int)));
-    connect ( kcfg_OSDDrawShadow, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotDrawShadowChanged(bool)));
+    connect ( kcfg_UseOSD,  TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotOSDEnabledChanged(bool) ) );
+    connect ( kcfg_OSDUseCustomColors, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotCustomColorsChanged(bool)));
+    connect ( kcfg_OSDTextColor, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(slotTextColorChanged(const TQColor&)));
+    connect ( kcfg_OSDBackgroundColor, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(slotBackgroundColorChanged(const TQColor&)));
+    connect ( kcfg_OSDScreen, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotScreenChanged(int)));
+    connect ( kcfg_OSDDrawShadow, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotDrawShadowChanged(bool)));
 }
 
 OSD_Config::~OSD_Config()
diff --git a/konversation/src/query.cpp b/konversation/src/query.cpp
index 6b7541b..c4e070e 100644
--- a/konversation/src/query.cpp
+++ b/konversation/src/query.cpp
@@ -73,8 +73,8 @@ Query::Query(TQWidget* parent, TQString _name) : ChatWindow(parent)
     IRCViewBox* ircBox = new IRCViewBox(m_headerSplitter,0);
     setTextView(ircBox->ircView());               // Server will be set later in setServer();
     textView->setAcceptDrops(true);
-    connect(textView,TQT_SIGNAL(filesDropped(const TQStrList&)),this,TQT_SLOT(filesDropped(const TQStrList&)));
-    connect(textView,TQT_SIGNAL(popupCommand(int)),this,TQT_SLOT(popup(int)));
+    connect(textView,TQ_SIGNAL(filesDropped(const TQStrList&)),this,TQ_SLOT(filesDropped(const TQStrList&)));
+    connect(textView,TQ_SIGNAL(popupCommand(int)),this,TQ_SLOT(popup(int)));
 
     // link "Whois", "Ignore" ... menu items into ircview popup
     TQPopupMenu* popup=textView->getPopup();
@@ -109,15 +109,15 @@ Query::Query(TQWidget* parent, TQString _name) : ChatWindow(parent)
     queryInput->installEventFilter(this);
 
     // connect the signals and slots
-    connect(queryInput,TQT_SIGNAL (submit()),this,TQT_SLOT (queryTextEntered()) );
-    connect(queryInput,TQT_SIGNAL (envelopeCommand()),this,TQT_SLOT (queryPassthroughCommand()) );
-    connect(queryInput,TQT_SIGNAL (textPasted(const TQString&)),this,TQT_SLOT (textPasted(const TQString&)) );
-    connect(getTextView(), TQT_SIGNAL(textPasted(bool)), queryInput, TQT_SLOT(paste(bool)));
-    connect(getTextView(),TQT_SIGNAL (gotFocus()),queryInput,TQT_SLOT (setFocus()) );
+    connect(queryInput,TQ_SIGNAL (submit()),this,TQ_SLOT (queryTextEntered()) );
+    connect(queryInput,TQ_SIGNAL (envelopeCommand()),this,TQ_SLOT (queryPassthroughCommand()) );
+    connect(queryInput,TQ_SIGNAL (textPasted(const TQString&)),this,TQ_SLOT (textPasted(const TQString&)) );
+    connect(getTextView(), TQ_SIGNAL(textPasted(bool)), queryInput, TQ_SLOT(paste(bool)));
+    connect(getTextView(),TQ_SIGNAL (gotFocus()),queryInput,TQ_SLOT (setFocus()) );
 
-    connect(textView,TQT_SIGNAL (sendFile()),this,TQT_SLOT (sendFileMenu()) );
-    connect(textView,TQT_SIGNAL (extendedPopup(int)),this,TQT_SLOT (popup(int)) );
-    connect(textView,TQT_SIGNAL (autoText(const TQString&)),this,TQT_SLOT (sendQueryText(const TQString&)) );
+    connect(textView,TQ_SIGNAL (sendFile()),this,TQ_SLOT (sendFileMenu()) );
+    connect(textView,TQ_SIGNAL (extendedPopup(int)),this,TQ_SLOT (popup(int)) );
+    connect(textView,TQ_SIGNAL (autoText(const TQString&)),this,TQ_SLOT (sendQueryText(const TQString&)) );
 
     updateAppearance();
 
@@ -131,8 +131,8 @@ Query::~Query()
 void Query::setServer(Server* newServer)
 {
     if (m_server != newServer)
-        connect(newServer, TQT_SIGNAL(connectionStateChanged(Server*, Konversation::ConnectionState)),
-                TQT_SLOT(connectionStateChanged(Server*, Konversation::ConnectionState)));
+        connect(newServer, TQ_SIGNAL(connectionStateChanged(Server*, Konversation::ConnectionState)),
+                TQ_SLOT(connectionStateChanged(Server*, Konversation::ConnectionState)));
 
     ChatWindow::setServer(newServer);
 
@@ -398,7 +398,7 @@ void Query::popup(int id)
                 "CloseQueryAfterIgnore");
 
                 if (rc == KMessageBox::Yes && m_server)
-                    TQTimer::singleShot(0, this, TQT_SLOT(closeWithoutAsking()));
+                    TQTimer::singleShot(0, this, TQ_SLOT(closeWithoutAsking()));
             }
 
             break;
@@ -468,12 +468,12 @@ void Query::childAdjustFocus()
 void Query::setNickInfo(const NickInfoPtr & nickInfo)
 {
     if(m_nickInfo)
-        disconnect(m_nickInfo, TQT_SIGNAL(nickInfoChanged()), this, TQT_SLOT(nickInfoChanged()));
+        disconnect(m_nickInfo, TQ_SIGNAL(nickInfoChanged()), this, TQ_SLOT(nickInfoChanged()));
 
     m_nickInfo = nickInfo;
     Q_ASSERT(m_nickInfo); if(!m_nickInfo) return;
     setName(m_nickInfo->getNickname());
-    connect(m_nickInfo, TQT_SIGNAL(nickInfoChanged()), this, TQT_SLOT(nickInfoChanged()));
+    connect(m_nickInfo, TQ_SIGNAL(nickInfoChanged()), this, TQ_SLOT(nickInfoChanged()));
     nickInfoChanged();
 }
 
diff --git a/konversation/src/queuetuner.cpp b/konversation/src/queuetuner.cpp
index ea1dc4f..a8becf5 100644
--- a/konversation/src/queuetuner.cpp
+++ b/konversation/src/queuetuner.cpp
@@ -36,21 +36,21 @@ QueueTuner::QueueTuner(TQWidget* parent, ViewContainer *container)
     m_vis(Preferences::self()->showQueueTunerItem()->value())
 {
     m_closeButton->setIconSet(kapp->iconLoader()->loadIconSet("window-close", TDEIcon::Toolbar, 16));
-    connect(m_closeButton, TQT_SIGNAL(clicked()), TQT_SLOT(close()));
-    connect(container, TQT_SIGNAL(frontServerChanging(Server*)), TQT_SLOT(setServer(Server*)));
-    connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(timerFired()));
+    connect(m_closeButton, TQ_SIGNAL(clicked()), TQ_SLOT(close()));
+    connect(container, TQ_SIGNAL(frontServerChanging(Server*)), TQ_SLOT(setServer(Server*)));
+    connect(&m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(timerFired()));
 
-    connect(m_slowRate, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slowRateChanged(int)));
-    connect(m_slowType, TQT_SIGNAL(activated(int)), TQT_SLOT(slowTypeChanged(int)));
-    connect(m_slowInterval, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slowIntervalChanged(int)));
+    connect(m_slowRate, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slowRateChanged(int)));
+    connect(m_slowType, TQ_SIGNAL(activated(int)), TQ_SLOT(slowTypeChanged(int)));
+    connect(m_slowInterval, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slowIntervalChanged(int)));
 
-    connect(m_normalRate, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(normalRateChanged(int)));
-    connect(m_normalType, TQT_SIGNAL(activated(int)), TQT_SLOT(normalTypeChanged(int)));
-    connect(m_normalInterval, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(normalIntervalChanged(int)));
+    connect(m_normalRate, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(normalRateChanged(int)));
+    connect(m_normalType, TQ_SIGNAL(activated(int)), TQ_SLOT(normalTypeChanged(int)));
+    connect(m_normalInterval, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(normalIntervalChanged(int)));
 
-    connect(m_fastRate, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(fastRateChanged(int)));
-    connect(m_fastType, TQT_SIGNAL(activated(int)), TQT_SLOT(fastTypeChanged(int)));
-    connect(m_fastInterval, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(fastIntervalChanged(int)));
+    connect(m_fastRate, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(fastRateChanged(int)));
+    connect(m_fastType, TQ_SIGNAL(activated(int)), TQ_SLOT(fastTypeChanged(int)));
+    connect(m_fastInterval, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(fastIntervalChanged(int)));
 }
 
 QueueTuner::~QueueTuner()
@@ -96,7 +96,7 @@ void QueueTuner::setServer(Server* newServer)
 
     if (m_server)
     {
-        connect(m_server, TQT_SIGNAL(destroyed(TQObject*)), TQT_SLOT(serverDestroyed(TQObject*)));
+        connect(m_server, TQ_SIGNAL(destroyed(TQObject*)), TQ_SLOT(serverDestroyed(TQObject*)));
 
         getRates();
     }
diff --git a/konversation/src/quickbutton.cpp b/konversation/src/quickbutton.cpp
index b69bc07..0aeaca9 100644
--- a/konversation/src/quickbutton.cpp
+++ b/konversation/src/quickbutton.cpp
@@ -18,7 +18,7 @@ QuickButton::QuickButton(const TQString &label,const TQString &newDefinition,TQW
 TQPushButton::TQPushButton(label,parent)
 {
     setDefinition(newDefinition);
-    connect(this,TQT_SIGNAL (clicked()),this,TQT_SLOT (wasClicked()) );
+    connect(this,TQ_SIGNAL (clicked()),this,TQ_SLOT (wasClicked()) );
 }
 
 QuickButton::~QuickButton()
diff --git a/konversation/src/quickbuttons_preferences.cpp b/konversation/src/quickbuttons_preferences.cpp
index 75d5ec5..8ce1eaa 100644
--- a/konversation/src/quickbuttons_preferences.cpp
+++ b/konversation/src/quickbuttons_preferences.cpp
@@ -38,15 +38,15 @@ QuickButtons_Config::QuickButtons_Config(TQWidget* parent, const char* name)
   buttonListView->setSorting(-1,false);
   buttonListView->header()->setMovingEnabled(false);
 
-  connect(buttonListView,TQT_SIGNAL (selectionChanged(TQListViewItem*)),this,TQT_SLOT (entrySelected(TQListViewItem*)) );
-  connect(buttonListView,TQT_SIGNAL (clicked(TQListViewItem*)),this,TQT_SLOT (entrySelected(TQListViewItem*)) );
-  connect(buttonListView,TQT_SIGNAL (moved()),this,TQT_SIGNAL (modified()) );
+  connect(buttonListView,TQ_SIGNAL (selectionChanged(TQListViewItem*)),this,TQ_SLOT (entrySelected(TQListViewItem*)) );
+  connect(buttonListView,TQ_SIGNAL (clicked(TQListViewItem*)),this,TQ_SLOT (entrySelected(TQListViewItem*)) );
+  connect(buttonListView,TQ_SIGNAL (moved()),this,TQ_SIGNAL (modified()) );
 
-  connect(nameInput,TQT_SIGNAL (textChanged(const TQString&)),this,TQT_SLOT (nameChanged(const TQString&)) );
-  connect(actionInput,TQT_SIGNAL (textChanged(const TQString&)),this,TQT_SLOT (actionChanged(const TQString&)) );
+  connect(nameInput,TQ_SIGNAL (textChanged(const TQString&)),this,TQ_SLOT (nameChanged(const TQString&)) );
+  connect(actionInput,TQ_SIGNAL (textChanged(const TQString&)),this,TQ_SLOT (actionChanged(const TQString&)) );
 
-  connect(newButton,TQT_SIGNAL (clicked()),this,TQT_SLOT (addEntry()));
-  connect(removeButton,TQT_SIGNAL (clicked()),this,TQT_SLOT (removeEntry()));
+  connect(newButton,TQ_SIGNAL (clicked()),this,TQ_SLOT (addEntry()));
+  connect(removeButton,TQ_SIGNAL (clicked()),this,TQ_SLOT (removeEntry()));
 }
 
 QuickButtons_Config::~QuickButtons_Config()
diff --git a/konversation/src/searchbar.cpp b/konversation/src/searchbar.cpp
index d4f060c..3305783 100644
--- a/konversation/src/searchbar.cpp
+++ b/konversation/src/searchbar.cpp
@@ -55,22 +55,22 @@ SearchBar::SearchBar(TQWidget* parent)
     m_timer = new TQTimer(this);
 
     TQAccel* accel = new TQAccel(this);
-    accel->connectItem( accel->insertItem(TQt::Key_Escape), this, TQT_SLOT(hide()));
+    accel->connectItem( accel->insertItem(TQt::Key_Escape), this, TQ_SLOT(hide()));
 
-    connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotFind()));
-    connect(m_searchEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotTextChanged()));
-    connect(m_searchEdit, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotFindNext()));
-    connect(m_findNextButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotFindNext()));
-    connect(m_findPreviousButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotFindPrevious()));
-    connect(m_closeButton, TQT_SIGNAL(clicked()), TQT_SLOT(hide()));
-    connect(m_optionsButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(showOptionsMenu()));
+    connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotFind()));
+    connect(m_searchEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotTextChanged()));
+    connect(m_searchEdit, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotFindNext()));
+    connect(m_findNextButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotFindNext()));
+    connect(m_findPreviousButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotFindPrevious()));
+    connect(m_closeButton, TQ_SIGNAL(clicked()), TQ_SLOT(hide()));
+    connect(m_optionsButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(showOptionsMenu()));
 
     m_optionsMenu = new TQPopupMenu(m_optionsButton, "options_menu");
     m_optionsMenu->setCheckable(true);
-    m_optionsMenu->insertItem(i18n("Find Forward"), this, TQT_SLOT(toggleSearchFoward()), 0, SEARCH_FORWARD_MENU);
-    m_optionsMenu->insertItem(i18n("Case Sensitive"), this, TQT_SLOT(toggleMatchCase()), 0, MATCH_CASE_MENU);
-    m_optionsMenu->insertItem(i18n("Whole Words Only"), this, TQT_SLOT(toggleWholeWords()), 0, WHOLE_WORDS_ONLY_MENU);
-    m_optionsMenu->insertItem(i18n("From Cursor"), this, TQT_SLOT(toggleFromCursor()), 0, FROM_CURSOR_MENU);
+    m_optionsMenu->insertItem(i18n("Find Forward"), this, TQ_SLOT(toggleSearchFoward()), 0, SEARCH_FORWARD_MENU);
+    m_optionsMenu->insertItem(i18n("Case Sensitive"), this, TQ_SLOT(toggleMatchCase()), 0, MATCH_CASE_MENU);
+    m_optionsMenu->insertItem(i18n("Whole Words Only"), this, TQ_SLOT(toggleWholeWords()), 0, WHOLE_WORDS_ONLY_MENU);
+    m_optionsMenu->insertItem(i18n("From Cursor"), this, TQ_SLOT(toggleFromCursor()), 0, FROM_CURSOR_MENU);
 
     m_optionsButton->setPopup(m_optionsMenu);
 }
diff --git a/konversation/src/server.cpp b/konversation/src/server.cpp
index a3c776a..e6627bd 100644
--- a/konversation/src/server.cpp
+++ b/konversation/src/server.cpp
@@ -124,9 +124,9 @@ Server::Server(TQObject* parent, ConnectionSettings& settings) : TQObject(parent
     updateAutoJoin(settings.initialChannel());
 
     if (!getIdentity()->getShellCommand().isEmpty())
-        TQTimer::singleShot(0, this, TQT_SLOT(doPreShellCommand()));
+        TQTimer::singleShot(0, this, TQ_SLOT(doPreShellCommand()));
     else
-        TQTimer::singleShot(0, this, TQT_SLOT(connectToIRCServer()));
+        TQTimer::singleShot(0, this, TQ_SLOT(connectToIRCServer()));
 
     initTimers();
 
@@ -191,7 +191,7 @@ Server::~Server()
 //... so called to match the ChatWindow derivatives.
 bool Server::closeYourself(bool)
 {
-    TQTimer::singleShot(0, m_statusView, TQT_SLOT(serverSaysClose()));
+    TQTimer::singleShot(0, m_statusView, TQ_SLOT(serverSaysClose()));
     return true;
 }
 
@@ -201,7 +201,7 @@ void Server::doPreShellCommand()
     TQString command = getIdentity()->getShellCommand();
     getStatusView()->appendServerMessage(i18n("Info"),"Running preconfigured command...");
 
-    connect(&m_preShellCommand,TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(preShellCommandExited(TDEProcess*)));
+    connect(&m_preShellCommand,TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(preShellCommandExited(TDEProcess*)));
 
     TQStringList commandList = TQStringList::split(" ",command);
 
@@ -251,90 +251,90 @@ void Server::initTimers()
 void Server::connectSignals()
 {
     // Timers
-    connect(&m_incomingTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(processIncomingData()));
-    connect(&m_notifyTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(notifyTimeout()));
-    connect(&m_pingResponseTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateLongPongLag()));
+    connect(&m_incomingTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processIncomingData()));
+    connect(&m_notifyTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(notifyTimeout()));
+    connect(&m_pingResponseTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateLongPongLag()));
 
     // OutputFilter
-    connect(getOutputFilter(), TQT_SIGNAL(requestDccSend()), this,TQT_SLOT(requestDccSend()));
-    connect(getOutputFilter(), TQT_SIGNAL(requestDccSend(const TQString&)), this, TQT_SLOT(requestDccSend(const TQString&)));
-    connect(getOutputFilter(), TQT_SIGNAL(multiServerCommand(const TQString&, const TQString&)),
-        this, TQT_SLOT(sendMultiServerCommand(const TQString&, const TQString&)));
-    connect(getOutputFilter(), TQT_SIGNAL(reconnectServer()), this, TQT_SLOT(reconnect()));
-    connect(getOutputFilter(), TQT_SIGNAL(disconnectServer()), this, TQT_SLOT(disconnect()));
-    connect(getOutputFilter(), TQT_SIGNAL(openDccSend(const TQString &, KURL)), this, TQT_SLOT(addDccSend(const TQString &, KURL)));
-    connect(getOutputFilter(), TQT_SIGNAL(openDccChat(const TQString &)), this, TQT_SLOT(openDccChat(const TQString &)));
-    connect(getOutputFilter(), TQT_SIGNAL(sendToAllChannels(const TQString&)), this, TQT_SLOT(sendToAllChannels(const TQString&)));
-    connect(getOutputFilter(), TQT_SIGNAL(banUsers(const TQStringList&,const TQString&,const TQString&)),
-        this, TQT_SLOT(requestBan(const TQStringList&,const TQString&,const TQString&)));
-    connect(getOutputFilter(), TQT_SIGNAL(unbanUsers(const TQString&,const TQString&)),
-        this, TQT_SLOT(requestUnban(const TQString&,const TQString&)));
-    connect(getOutputFilter(), TQT_SIGNAL(openRawLog(bool)), this, TQT_SLOT(addRawLog(bool)));
-    connect(getOutputFilter(), TQT_SIGNAL(closeRawLog()), this, TQT_SLOT(closeRawLog()));
-    connect(getOutputFilter(), TQT_SIGNAL(encodingChanged()), this, TQT_SLOT(updateEncoding()));
+    connect(getOutputFilter(), TQ_SIGNAL(requestDccSend()), this,TQ_SLOT(requestDccSend()));
+    connect(getOutputFilter(), TQ_SIGNAL(requestDccSend(const TQString&)), this, TQ_SLOT(requestDccSend(const TQString&)));
+    connect(getOutputFilter(), TQ_SIGNAL(multiServerCommand(const TQString&, const TQString&)),
+        this, TQ_SLOT(sendMultiServerCommand(const TQString&, const TQString&)));
+    connect(getOutputFilter(), TQ_SIGNAL(reconnectServer()), this, TQ_SLOT(reconnect()));
+    connect(getOutputFilter(), TQ_SIGNAL(disconnectServer()), this, TQ_SLOT(disconnect()));
+    connect(getOutputFilter(), TQ_SIGNAL(openDccSend(const TQString &, KURL)), this, TQ_SLOT(addDccSend(const TQString &, KURL)));
+    connect(getOutputFilter(), TQ_SIGNAL(openDccChat(const TQString &)), this, TQ_SLOT(openDccChat(const TQString &)));
+    connect(getOutputFilter(), TQ_SIGNAL(sendToAllChannels(const TQString&)), this, TQ_SLOT(sendToAllChannels(const TQString&)));
+    connect(getOutputFilter(), TQ_SIGNAL(banUsers(const TQStringList&,const TQString&,const TQString&)),
+        this, TQ_SLOT(requestBan(const TQStringList&,const TQString&,const TQString&)));
+    connect(getOutputFilter(), TQ_SIGNAL(unbanUsers(const TQString&,const TQString&)),
+        this, TQ_SLOT(requestUnban(const TQString&,const TQString&)));
+    connect(getOutputFilter(), TQ_SIGNAL(openRawLog(bool)), this, TQ_SLOT(addRawLog(bool)));
+    connect(getOutputFilter(), TQ_SIGNAL(closeRawLog()), this, TQ_SLOT(closeRawLog()));
+    connect(getOutputFilter(), TQ_SIGNAL(encodingChanged()), this, TQ_SLOT(updateEncoding()));
 
     KonversationApplication* konvApp = static_cast<KonversationApplication*>(kapp);
-    connect(getOutputFilter(), TQT_SIGNAL(connectTo(Konversation::ConnectionFlag, const TQString&,
+    connect(getOutputFilter(), TQ_SIGNAL(connectTo(Konversation::ConnectionFlag, const TQString&,
                 const TQString&, const TQString&, const TQString&, const TQString&, bool)),
-            konvApp->getConnectionManager(), TQT_SLOT(connectTo(Konversation::ConnectionFlag,
+            konvApp->getConnectionManager(), TQ_SLOT(connectTo(Konversation::ConnectionFlag,
                 const TQString&, const TQString&, const TQString&, const TQString&, const TQString&, bool)));
 
-    connect(konvApp->getDccTransferManager(), TQT_SIGNAL(newTransferQueued(DccTransfer*)),
-            this, TQT_SLOT(slotNewDccTransferItemQueued(DccTransfer*)));
+    connect(konvApp->getDccTransferManager(), TQ_SIGNAL(newTransferQueued(DccTransfer*)),
+            this, TQ_SLOT(slotNewDccTransferItemQueued(DccTransfer*)));
 
-    connect(konvApp, TQT_SIGNAL(appearanceChanged()), this, TQT_SLOT(startNotifyTimer()));
+    connect(konvApp, TQ_SIGNAL(appearanceChanged()), this, TQ_SLOT(startNotifyTimer()));
 
    // ViewContainer
-    connect(this, TQT_SIGNAL(showView(ChatWindow*)), getViewContainer(), TQT_SLOT(showView(ChatWindow*)));
-    connect(this, TQT_SIGNAL(addDccPanel()), getViewContainer(), TQT_SLOT(addDccPanel()));
-    connect(this, TQT_SIGNAL(addDccChat(const TQString&,const TQString&,const TQStringList&,bool)),
-        getViewContainer(), TQT_SLOT(addDccChat(const TQString&,const TQString&,const TQStringList&,bool)) );
-    connect(this, TQT_SIGNAL(serverLag(Server*, int)), getViewContainer(), TQT_SIGNAL(updateStatusBarLagLabel(Server*, int)));
-    connect(this, TQT_SIGNAL(tooLongLag(Server*, int)), getViewContainer(), TQT_SIGNAL(setStatusBarLagLabelTooLongLag(Server*, int)));
-    connect(this, TQT_SIGNAL(resetLag()), getViewContainer(), TQT_SIGNAL(resetStatusBarLagLabel()));
-    connect(getOutputFilter(), TQT_SIGNAL(showView(ChatWindow*)), getViewContainer(), TQT_SLOT(showView(ChatWindow*)));
-    connect(getOutputFilter(), TQT_SIGNAL(openKonsolePanel()), getViewContainer(), TQT_SLOT(addKonsolePanel()));
-    connect(getOutputFilter(), TQT_SIGNAL(openChannelList(const TQString&, bool)), getViewContainer(), TQT_SLOT(openChannelList(const TQString&, bool)));
-    connect(getOutputFilter(), TQT_SIGNAL(closeDccPanel()), getViewContainer(), TQT_SLOT(closeDccPanel()));
-    connect(getOutputFilter(), TQT_SIGNAL(addDccPanel()), getViewContainer(), TQT_SLOT(addDccPanel()));
-    connect(&m_inputFilter, TQT_SIGNAL(addDccChat(const TQString&,const TQString&,const TQStringList&,bool)),
-        getViewContainer(), TQT_SLOT(addDccChat(const TQString&,const TQString&,const TQStringList&,bool)) );
+    connect(this, TQ_SIGNAL(showView(ChatWindow*)), getViewContainer(), TQ_SLOT(showView(ChatWindow*)));
+    connect(this, TQ_SIGNAL(addDccPanel()), getViewContainer(), TQ_SLOT(addDccPanel()));
+    connect(this, TQ_SIGNAL(addDccChat(const TQString&,const TQString&,const TQStringList&,bool)),
+        getViewContainer(), TQ_SLOT(addDccChat(const TQString&,const TQString&,const TQStringList&,bool)) );
+    connect(this, TQ_SIGNAL(serverLag(Server*, int)), getViewContainer(), TQ_SIGNAL(updateStatusBarLagLabel(Server*, int)));
+    connect(this, TQ_SIGNAL(tooLongLag(Server*, int)), getViewContainer(), TQ_SIGNAL(setStatusBarLagLabelTooLongLag(Server*, int)));
+    connect(this, TQ_SIGNAL(resetLag()), getViewContainer(), TQ_SIGNAL(resetStatusBarLagLabel()));
+    connect(getOutputFilter(), TQ_SIGNAL(showView(ChatWindow*)), getViewContainer(), TQ_SLOT(showView(ChatWindow*)));
+    connect(getOutputFilter(), TQ_SIGNAL(openKonsolePanel()), getViewContainer(), TQ_SLOT(addKonsolePanel()));
+    connect(getOutputFilter(), TQ_SIGNAL(openChannelList(const TQString&, bool)), getViewContainer(), TQ_SLOT(openChannelList(const TQString&, bool)));
+    connect(getOutputFilter(), TQ_SIGNAL(closeDccPanel()), getViewContainer(), TQ_SLOT(closeDccPanel()));
+    connect(getOutputFilter(), TQ_SIGNAL(addDccPanel()), getViewContainer(), TQ_SLOT(addDccPanel()));
+    connect(&m_inputFilter, TQ_SIGNAL(addDccChat(const TQString&,const TQString&,const TQStringList&,bool)),
+        getViewContainer(), TQ_SLOT(addDccChat(const TQString&,const TQString&,const TQStringList&,bool)) );
 
     // Inputfilter
-    connect(&m_inputFilter, TQT_SIGNAL(welcome(const TQString&)), this, TQT_SLOT(connectionEstablished(const TQString&)));
-    connect(&m_inputFilter, TQT_SIGNAL(notifyResponse(const TQString&)), this, TQT_SLOT(notifyResponse(const TQString&)));
-    connect(&m_inputFilter, TQT_SIGNAL(startReverseDccSendTransfer(const TQString&,const TQStringList&)),
-        this, TQT_SLOT(startReverseDccSendTransfer(const TQString&,const TQStringList&)));
-    connect(&m_inputFilter, TQT_SIGNAL(addDccGet(const TQString&, const TQStringList&)),
-        this, TQT_SLOT(addDccGet(const TQString&, const TQStringList&)));
-    connect(&m_inputFilter, TQT_SIGNAL(resumeDccGetTransfer(const TQString&, const TQStringList&)),
-        this, TQT_SLOT(resumeDccGetTransfer(const TQString&, const TQStringList&)));
-    connect(&m_inputFilter, TQT_SIGNAL(resumeDccSendTransfer(const TQString&, const TQStringList&)),
-        this, TQT_SLOT(resumeDccSendTransfer(const TQString&, const TQStringList&)));
-    connect(&m_inputFilter, TQT_SIGNAL(userhost(const TQString&,const TQString&,bool,bool)),
-        this, TQT_SLOT(userhost(const TQString&,const TQString&,bool,bool)) );
-    connect(&m_inputFilter, TQT_SIGNAL(topicAuthor(const TQString&,const TQString&,TQDateTime)),
-        this, TQT_SLOT(setTopicAuthor(const TQString&,const TQString&,TQDateTime)) );
-    connect(&m_inputFilter, TQT_SIGNAL(endOfWho(const TQString&)),
-        this, TQT_SLOT(endOfWho(const TQString&)) );
-    connect(&m_inputFilter, TQT_SIGNAL(invitation(const TQString&,const TQString&)),
-        this,TQT_SLOT(invitation(const TQString&,const TQString&)) );
-    connect(&m_inputFilter, TQT_SIGNAL(addToChannelList(const TQString&, int, const TQString& )),
-        this, TQT_SLOT(addToChannelList(const TQString&, int, const TQString& )));
+    connect(&m_inputFilter, TQ_SIGNAL(welcome(const TQString&)), this, TQ_SLOT(connectionEstablished(const TQString&)));
+    connect(&m_inputFilter, TQ_SIGNAL(notifyResponse(const TQString&)), this, TQ_SLOT(notifyResponse(const TQString&)));
+    connect(&m_inputFilter, TQ_SIGNAL(startReverseDccSendTransfer(const TQString&,const TQStringList&)),
+        this, TQ_SLOT(startReverseDccSendTransfer(const TQString&,const TQStringList&)));
+    connect(&m_inputFilter, TQ_SIGNAL(addDccGet(const TQString&, const TQStringList&)),
+        this, TQ_SLOT(addDccGet(const TQString&, const TQStringList&)));
+    connect(&m_inputFilter, TQ_SIGNAL(resumeDccGetTransfer(const TQString&, const TQStringList&)),
+        this, TQ_SLOT(resumeDccGetTransfer(const TQString&, const TQStringList&)));
+    connect(&m_inputFilter, TQ_SIGNAL(resumeDccSendTransfer(const TQString&, const TQStringList&)),
+        this, TQ_SLOT(resumeDccSendTransfer(const TQString&, const TQStringList&)));
+    connect(&m_inputFilter, TQ_SIGNAL(userhost(const TQString&,const TQString&,bool,bool)),
+        this, TQ_SLOT(userhost(const TQString&,const TQString&,bool,bool)) );
+    connect(&m_inputFilter, TQ_SIGNAL(topicAuthor(const TQString&,const TQString&,TQDateTime)),
+        this, TQ_SLOT(setTopicAuthor(const TQString&,const TQString&,TQDateTime)) );
+    connect(&m_inputFilter, TQ_SIGNAL(endOfWho(const TQString&)),
+        this, TQ_SLOT(endOfWho(const TQString&)) );
+    connect(&m_inputFilter, TQ_SIGNAL(invitation(const TQString&,const TQString&)),
+        this,TQ_SLOT(invitation(const TQString&,const TQString&)) );
+    connect(&m_inputFilter, TQ_SIGNAL(addToChannelList(const TQString&, int, const TQString& )),
+        this, TQ_SLOT(addToChannelList(const TQString&, int, const TQString& )));
 
     // Status View
-    connect(this, TQT_SIGNAL(serverOnline(bool)), getStatusView(), TQT_SLOT(serverOnline(bool)));
+    connect(this, TQ_SIGNAL(serverOnline(bool)), getStatusView(), TQ_SLOT(serverOnline(bool)));
 
     // Scripts
-    connect(getOutputFilter(), TQT_SIGNAL(launchScript(const TQString&, const TQString&)),
-        m_scriptLauncher, TQT_SLOT(launchScript(const TQString&, const TQString&)));
-    connect(m_scriptLauncher, TQT_SIGNAL(scriptNotFound(const TQString&)),
-        this, TQT_SLOT(scriptNotFound(const TQString&)));
-    connect(m_scriptLauncher, TQT_SIGNAL(scriptExecutionError(const TQString&)),
-        this, TQT_SLOT(scriptExecutionError(const TQString&)));
+    connect(getOutputFilter(), TQ_SIGNAL(launchScript(const TQString&, const TQString&)),
+        m_scriptLauncher, TQ_SLOT(launchScript(const TQString&, const TQString&)));
+    connect(m_scriptLauncher, TQ_SIGNAL(scriptNotFound(const TQString&)),
+        this, TQ_SLOT(scriptNotFound(const TQString&)));
+    connect(m_scriptLauncher, TQ_SIGNAL(scriptExecutionError(const TQString&)),
+        this, TQ_SLOT(scriptExecutionError(const TQString&)));
 
     // Stats
-    connect(this, TQT_SIGNAL(sentStat(int, int)), TQT_SLOT(collectStats(int, int)));
+    connect(this, TQ_SIGNAL(sentStat(int, int)), TQ_SLOT(collectStats(int, int)));
 }
 
 int Server::getPort()
@@ -389,22 +389,22 @@ void Server::connectToIRCServer()
         if(!getConnectionSettings().server().SSLEnabled())
         {
             m_socket = new KNetwork::TDEBufferedSocket(TQString(), TQString(), 0L, "serverSocket");
-            connect(m_socket, TQT_SIGNAL(connected(const KResolverEntry&)), TQT_SLOT (ircServerConnectionSuccess()));
+            connect(m_socket, TQ_SIGNAL(connected(const KResolverEntry&)), TQ_SLOT (ircServerConnectionSuccess()));
         }
         else
         {
             m_socket = new SSLSocket(getViewContainer()->getWindow(), 0L, "serverSSLSocket");
-            connect(m_socket, TQT_SIGNAL(sslInitDone()), TQT_SLOT(ircServerConnectionSuccess()));
-            connect(m_socket, TQT_SIGNAL(sslFailure(const TQString&)), TQT_SIGNAL(sslInitFailure()));
-            connect(m_socket, TQT_SIGNAL(sslFailure(const TQString&)), TQT_SLOT(sslError(const TQString&)));
+            connect(m_socket, TQ_SIGNAL(sslInitDone()), TQ_SLOT(ircServerConnectionSuccess()));
+            connect(m_socket, TQ_SIGNAL(sslFailure(const TQString&)), TQ_SIGNAL(sslInitFailure()));
+            connect(m_socket, TQ_SIGNAL(sslFailure(const TQString&)), TQ_SLOT(sslError(const TQString&)));
         }
 
         m_socket->enableWrite(false);
 
-        connect(m_socket, TQT_SIGNAL(hostFound()), TQT_SLOT(lookupFinished()));
-        connect(m_socket, TQT_SIGNAL(gotError(int)), TQT_SLOT(broken(int)) );
-        connect(m_socket, TQT_SIGNAL(readyRead()), TQT_SLOT(incoming()));
-        connect(m_socket, TQT_SIGNAL(closed()), TQT_SLOT(closed()));
+        connect(m_socket, TQ_SIGNAL(hostFound()), TQ_SLOT(lookupFinished()));
+        connect(m_socket, TQ_SIGNAL(gotError(int)), TQ_SLOT(broken(int)) );
+        connect(m_socket, TQ_SIGNAL(readyRead()), TQ_SLOT(incoming()));
+        connect(m_socket, TQ_SIGNAL(closed()), TQ_SLOT(closed()));
 
         m_socket->connect(getConnectionSettings().server().host(), TQString::number(getConnectionSettings().server().port()));
 
@@ -550,7 +550,7 @@ void Server::ircServerConnectionSuccess()
 
     Konversation::ServerSettings serverSettings = getConnectionSettings().server();
 
-    connect(this, TQT_SIGNAL(nicknameChanged(const TQString&)), getStatusView(), TQT_SLOT(setNickname(const TQString&)));
+    connect(this, TQ_SIGNAL(nicknameChanged(const TQString&)), getStatusView(), TQ_SLOT(setNickname(const TQString&)));
     getStatusView()->appendServerMessage(i18n("Info"),i18n("Connected; logging in..."));
 
     TQString connectString = "USER " +
@@ -631,7 +631,7 @@ void Server::connectionEstablished(const TQString& ownHost)
     // Some servers don't include the userhost in RPL_WELCOME, so we
     // need to use RPL_USERHOST to get ahold of our IP later on
     if (!ownHost.isEmpty())
-        KNetwork::KResolver::resolveAsync(this,TQT_SLOT(gotOwnResolvedHostByWelcome(KResolverResults)),ownHost,"0");
+        KNetwork::KResolver::resolveAsync(this,TQ_SLOT(gotOwnResolvedHostByWelcome(KResolverResults)),ownHost,"0");
 
     updateConnectionState(Konversation::SSConnected);
 
@@ -646,7 +646,7 @@ void Server::connectionEstablished(const TQString& ownHost)
     requestUserhost(getNickname());
 
     // Start the PINGPONG match
-    TQTimer::singleShot(1000 /*1 sec*/, this, TQT_SLOT(sendPing()));
+    TQTimer::singleShot(1000 /*1 sec*/, this, TQ_SLOT(sendPing()));
 
     // Recreate away state if we were set away prior to a reconnect.
     if (m_away)
@@ -1447,8 +1447,8 @@ class Query* Server::addQuery(const NickInfoPtr & nickInfo, bool weinitiated)
         TQString lcNickname = nickname.lower();
         query = getViewContainer()->addQuery(this, nickInfo, weinitiated);
 
-        connect(query, TQT_SIGNAL(sendFile(const TQString&)),this, TQT_SLOT(requestDccSend(const TQString&)));
-        connect(this, TQT_SIGNAL(serverOnline(bool)), query, TQT_SLOT(serverOnline(bool)));
+        connect(query, TQ_SIGNAL(sendFile(const TQString&)),this, TQ_SLOT(requestDccSend(const TQString&)));
+        connect(this, TQ_SIGNAL(serverOnline(bool)), query, TQ_SLOT(serverOnline(bool)));
 
         // Append query to internal list
         m_queryList.append(query);
@@ -1648,13 +1648,13 @@ void Server::slotNewDccTransferItemQueued(DccTransfer* transfer)
         kdDebug() << "Server::slotNewDccTranfserItemQueued(): connecting slots for " << transfer->getFileName() << " [" << transfer->getType() << "]" << endl;
         if ( transfer->getType() == DccTransfer::Receive )
         {
-            connect( transfer, TQT_SIGNAL( done( DccTransfer* ) ), this, TQT_SLOT( dccGetDone( DccTransfer* ) ) );
-            connect( transfer, TQT_SIGNAL( statusChanged( DccTransfer*, int, int ) ), this, TQT_SLOT( dccStatusChanged( DccTransfer*, int, int ) ) );
+            connect( transfer, TQ_SIGNAL( done( DccTransfer* ) ), this, TQ_SLOT( dccGetDone( DccTransfer* ) ) );
+            connect( transfer, TQ_SIGNAL( statusChanged( DccTransfer*, int, int ) ), this, TQ_SLOT( dccStatusChanged( DccTransfer*, int, int ) ) );
         }
         else
         {
-            connect( transfer, TQT_SIGNAL( done( DccTransfer* ) ), this, TQT_SLOT( dccSendDone( DccTransfer* ) ) );
-            connect( transfer, TQT_SIGNAL( statusChanged( DccTransfer*, int, int ) ), this, TQT_SLOT( dccStatusChanged( DccTransfer*, int, int ) ) );
+            connect( transfer, TQ_SIGNAL( done( DccTransfer* ) ), this, TQ_SLOT( dccSendDone( DccTransfer* ) ) );
+            connect( transfer, TQ_SIGNAL( statusChanged( DccTransfer*, int, int ) ), this, TQ_SLOT( dccStatusChanged( DccTransfer*, int, int ) ) );
         }
     }
 }
@@ -1989,8 +1989,8 @@ void Server::joinChannel(const TQString& name, const TQString& hostmask)
 
         m_channelList.append(channel);
 
-        connect(channel,TQT_SIGNAL (sendFile()),this,TQT_SLOT (requestDccSend()) );
-        connect(this, TQT_SIGNAL(nicknameChanged(const TQString&)), channel, TQT_SLOT(setNickname(const TQString&)));
+        connect(channel,TQ_SIGNAL (sendFile()),this,TQ_SLOT (requestDccSend()) );
+        connect(this, TQ_SIGNAL(nicknameChanged(const TQString&)), channel, TQ_SLOT(setNickname(const TQString&)));
     }
     // Move channel from unjoined (if present) to joined list and add our own nickname to the joined list.
     ChannelNickPtr channelNick = addNickToJoinedChannelsList(name, getNickname());
@@ -2689,7 +2689,7 @@ void Server::userhost(const TQString& nick,const TQString& hostmask,bool away,bo
     {
         TQString myhost = hostmask.section('@', 1);
         // Use async lookup else you will be blocking GUI badly
-        KNetwork::KResolver::resolveAsync(this,TQT_SLOT(gotOwnResolvedHostByUserhost(KResolverResults)),myhost,"0");
+        KNetwork::KResolver::resolveAsync(this,TQ_SLOT(gotOwnResolvedHostByUserhost(KResolverResults)),myhost,"0");
     }
     NickInfoPtr nickInfo = getNickInfo(nick);
     if (nickInfo)
@@ -2921,7 +2921,7 @@ void Server::addRawLog(bool show)
 {
     if (!m_rawLog) m_rawLog = getViewContainer()->addRawLog(this);
 
-    connect(this, TQT_SIGNAL(serverOnline(bool)), m_rawLog, TQT_SLOT(serverOnline(bool)));
+    connect(this, TQ_SIGNAL(serverOnline(bool)), m_rawLog, TQ_SLOT(serverOnline(bool)));
 
     // bring raw log to front since the main window does not do this for us
     if (show) emit showView(m_rawLog);
@@ -2938,9 +2938,9 @@ ChannelListPanel* Server::addChannelListPanel()
     {
         m_channelListPanel = getViewContainer()->addChannelListPanel(this);
 
-        connect(m_channelListPanel, TQT_SIGNAL(refreshChannelList()), this, TQT_SLOT(requestChannelList()));
-        connect(m_channelListPanel, TQT_SIGNAL(joinChannel(const TQString&)), this, TQT_SLOT(sendJoinCommand(const TQString&)));
-        connect(this, TQT_SIGNAL(serverOnline(bool)), m_channelListPanel, TQT_SLOT(serverOnline(bool)));
+        connect(m_channelListPanel, TQ_SIGNAL(refreshChannelList()), this, TQ_SLOT(requestChannelList()));
+        connect(m_channelListPanel, TQ_SIGNAL(joinChannel(const TQString&)), this, TQ_SLOT(sendJoinCommand(const TQString&)));
+        connect(this, TQ_SIGNAL(serverOnline(bool)), m_channelListPanel, TQ_SLOT(serverOnline(bool)));
     }
 
     return m_channelListPanel;
@@ -3133,7 +3133,7 @@ void Server::reconnect()
     // quitServer might cause is delivered before connectToIRCServer
     // sets SSConnecting and broken() announces a deliberate disconnect
     // due to the failure allegedly occuring during SSConnecting.
-    TQTimer::singleShot(0, this, TQT_SLOT(connectToIRCServer()));
+    TQTimer::singleShot(0, this, TQ_SLOT(connectToIRCServer()));
 }
 
 void Server::disconnect()
@@ -3317,7 +3317,7 @@ void Server::pongReceived()
     emit serverLag(this, m_currentLag);
 
     // Send another PING in 60 seconds
-    TQTimer::singleShot(60000 /*60 sec*/, this, TQT_SLOT(sendPing()));
+    TQTimer::singleShot(60000 /*60 sec*/, this, TQ_SLOT(sendPing()));
 }
 
 void Server::updateLongPongLag()
diff --git a/konversation/src/servergroupdialog.cpp b/konversation/src/servergroupdialog.cpp
index 0cc78ad..3268131 100644
--- a/konversation/src/servergroupdialog.cpp
+++ b/konversation/src/servergroupdialog.cpp
@@ -58,7 +58,7 @@ namespace Konversation
 
         TQWhatsThis::add(m_mainWidget->m_identityCBox,i18n("Choose an existing Identity or click the Edit button to add a new Identity or edit an existing one. The Identity will identify you and determine your nickname when you connect to the network."));
         m_mainWidget->m_identityLabel->setBuddy(m_mainWidget->m_identityCBox);
-        connect(m_mainWidget->m_editIdentityButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editIdentity()));
+        connect(m_mainWidget->m_editIdentityButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(editIdentity()));
 
         IdentityList identities = Preferences::identityList();
 
@@ -76,12 +76,12 @@ namespace Konversation
         m_mainWidget->m_upServerBtn->setIconSet(SmallIconSet("go-up"));
         m_mainWidget->m_downServerBtn->setIconSet(SmallIconSet("go-down"));
 
-        connect(m_mainWidget->m_addServerButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addServer()));
-        connect(m_mainWidget->m_changeServerButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editServer()));
-        connect(m_mainWidget->m_removeServerButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteServer()));
-        connect(m_mainWidget->m_serverLBox, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(updateServerArrows()));
-        connect(m_mainWidget->m_upServerBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveServerUp()));
-        connect(m_mainWidget->m_downServerBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveServerDown()));
+        connect(m_mainWidget->m_addServerButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addServer()));
+        connect(m_mainWidget->m_changeServerButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(editServer()));
+        connect(m_mainWidget->m_removeServerButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteServer()));
+        connect(m_mainWidget->m_serverLBox, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(updateServerArrows()));
+        connect(m_mainWidget->m_upServerBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveServerUp()));
+        connect(m_mainWidget->m_downServerBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveServerDown()));
 
         TQWhatsThis::add(m_mainWidget->m_channelLBox, i18n("Optional. This is a list of the channels that will be automatically joined once Konversation has connected to a server. You may leave this blank if you wish to not automatically join any channels."));
         m_mainWidget->m_removeChannelButton->setIconSet(SmallIconSet("edit-delete"));
@@ -89,12 +89,12 @@ namespace Konversation
         m_mainWidget->m_upChannelBtn->setIconSet(SmallIconSet("go-up"));
         m_mainWidget->m_downChannelBtn->setIconSet(SmallIconSet("go-down"));
 
-        connect(m_mainWidget->m_addChannelButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addChannel()));
-        connect(m_mainWidget->m_changeChannelButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editChannel()));
-        connect(m_mainWidget->m_removeChannelButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteChannel()));
-        connect(m_mainWidget->m_channelLBox, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(updateChannelArrows()));
-        connect(m_mainWidget->m_upChannelBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveChannelUp()));
-        connect(m_mainWidget->m_downChannelBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveChannelDown()));
+        connect(m_mainWidget->m_addChannelButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addChannel()));
+        connect(m_mainWidget->m_changeChannelButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(editChannel()));
+        connect(m_mainWidget->m_removeChannelButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteChannel()));
+        connect(m_mainWidget->m_channelLBox, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(updateChannelArrows()));
+        connect(m_mainWidget->m_upChannelBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveChannelUp()));
+        connect(m_mainWidget->m_downChannelBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveChannelDown()));
 
         setButtonOK(KGuiItem(i18n("&OK"), "button_ok", i18n("Change network information")));
         setButtonCancel(KGuiItem(i18n("&Cancel"), "button_cancel", i18n("Discards all changes made")));
diff --git a/konversation/src/serverison.cpp b/konversation/src/serverison.cpp
index 15a486f..f7dc162 100644
--- a/konversation/src/serverison.cpp
+++ b/konversation/src/serverison.cpp
@@ -34,22 +34,22 @@ ServerISON::ServerISON(Server* server) : m_server(server)
     m_ISONList_invalid = true;
     //We need to know when the addressbook changes because if the info for an offline nick changes,
     //we won't get a nickInfoChanged signal.
-    connect( Konversation::Addressbook::self()->getAddressBook(), TQT_SIGNAL( addressBookChanged( AddressBook * ) ),
-        this, TQT_SLOT( addressbookChanged() ) );
-    connect( Konversation::Addressbook::self(), TQT_SIGNAL(addresseesChanged()),
-        this, TQT_SLOT(addressbookChanged()));
-    connect( m_server, TQT_SIGNAL(nickInfoChanged(Server*, const NickInfoPtr)),
-        this, TQT_SLOT(nickInfoChanged(Server*, const NickInfoPtr)));
+    connect( Konversation::Addressbook::self()->getAddressBook(), TQ_SIGNAL( addressBookChanged( AddressBook * ) ),
+        this, TQ_SLOT( addressbookChanged() ) );
+    connect( Konversation::Addressbook::self(), TQ_SIGNAL(addresseesChanged()),
+        this, TQ_SLOT(addressbookChanged()));
+    connect( m_server, TQ_SIGNAL(nickInfoChanged(Server*, const NickInfoPtr)),
+        this, TQ_SLOT(nickInfoChanged(Server*, const NickInfoPtr)));
     connect( m_server,
-        TQT_SIGNAL(channelMembersChanged(Server*, const TQString&, bool, bool, const TQString& )),
+        TQ_SIGNAL(channelMembersChanged(Server*, const TQString&, bool, bool, const TQString& )),
         this,
-        TQT_SLOT(slotChannelMembersChanged(Server*, const TQString&, bool, bool, const TQString& )));
+        TQ_SLOT(slotChannelMembersChanged(Server*, const TQString&, bool, bool, const TQString& )));
     connect( m_server,
-        TQT_SIGNAL(channelJoinedOrUnjoined(Server*, const TQString&, bool )),
+        TQ_SIGNAL(channelJoinedOrUnjoined(Server*, const TQString&, bool )),
         this,
-        TQT_SLOT(slotChannelJoinedOrUnjoined(Server*, const TQString&, bool )));
-    connect(KonversationApplication::instance(), TQT_SIGNAL(serverGroupsChanged(const Konversation::ServerGroupSettings*)),
-        this, TQT_SLOT(slotServerGroupsChanged()));
+        TQ_SLOT(slotChannelJoinedOrUnjoined(Server*, const TQString&, bool )));
+    connect(KonversationApplication::instance(), TQ_SIGNAL(serverGroupsChanged(const Konversation::ServerGroupSettings*)),
+        this, TQ_SLOT(slotServerGroupsChanged()));
 }
 
 TQStringList ServerISON::getWatchList()
diff --git a/konversation/src/serverlistdialog.cpp b/konversation/src/serverlistdialog.cpp
index 9f1e8b5..a46b56e 100644
--- a/konversation/src/serverlistdialog.cpp
+++ b/konversation/src/serverlistdialog.cpp
@@ -130,7 +130,7 @@ namespace Konversation
 
         TQCheckBox* showAtStartup = new TQCheckBox(i18n("Show at application startup"), mainWidget);
         showAtStartup->setChecked(Preferences::showServerList());
-        connect(showAtStartup, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShowAtStartup(bool)));
+        connect(showAtStartup, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setShowAtStartup(bool)));
 
         TQGridLayout* layout = new TQGridLayout(mainWidget, 5, 2, 0, spacingHint());
 
@@ -149,15 +149,15 @@ namespace Konversation
         // Load server list
         updateServerList();
 
-        connect(m_serverList, TQT_SIGNAL(aboutToMove()), this, TQT_SLOT(slotAboutToMove()));
-        connect(m_serverList, TQT_SIGNAL(moved()), this, TQT_SLOT(slotMoved()));
-        connect(m_serverList, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint&, int)), this, TQT_SLOT(slotOk()));
-        connect(m_serverList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(updateButtons()));
-        connect(m_serverList, TQT_SIGNAL(expanded(TQListViewItem*)), this, TQT_SLOT(slotSetGroupExpanded(TQListViewItem*)));
-        connect(m_serverList, TQT_SIGNAL(collapsed(TQListViewItem*)), this, TQT_SLOT(slotSetGroupCollapsed(TQListViewItem*)));
-        connect(m_addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAdd()));
-        connect(m_editButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEdit()));
-        connect(m_delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelete()));
+        connect(m_serverList, TQ_SIGNAL(aboutToMove()), this, TQ_SLOT(slotAboutToMove()));
+        connect(m_serverList, TQ_SIGNAL(moved()), this, TQ_SLOT(slotMoved()));
+        connect(m_serverList, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint&, int)), this, TQ_SLOT(slotOk()));
+        connect(m_serverList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(updateButtons()));
+        connect(m_serverList, TQ_SIGNAL(expanded(TQListViewItem*)), this, TQ_SLOT(slotSetGroupExpanded(TQListViewItem*)));
+        connect(m_serverList, TQ_SIGNAL(collapsed(TQListViewItem*)), this, TQ_SLOT(slotSetGroupCollapsed(TQListViewItem*)));
+        connect(m_addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAdd()));
+        connect(m_editButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEdit()));
+        connect(m_delButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDelete()));
 
         updateButtons();
 
diff --git a/konversation/src/statuspanel.cpp b/konversation/src/statuspanel.cpp
index c1b1fd9..e6d2762 100644
--- a/konversation/src/statuspanel.cpp
+++ b/konversation/src/statuspanel.cpp
@@ -61,20 +61,20 @@ StatusPanel::StatusPanel(TQWidget* parent) : ChatWindow(parent)
 
     setLog(Preferences::log());
 
-    connect(getTextView(),TQT_SIGNAL (gotFocus()),statusInput,TQT_SLOT (setFocus()) );
+    connect(getTextView(),TQ_SIGNAL (gotFocus()),statusInput,TQ_SLOT (setFocus()) );
 
-    connect(getTextView(),TQT_SIGNAL (sendFile()),this,TQT_SLOT (sendFileMenu()) );
-    connect(getTextView(),TQT_SIGNAL (autoText(const TQString&)),this,TQT_SLOT (sendStatusText(const TQString&)) );
+    connect(getTextView(),TQ_SIGNAL (sendFile()),this,TQ_SLOT (sendFileMenu()) );
+    connect(getTextView(),TQ_SIGNAL (autoText(const TQString&)),this,TQ_SLOT (sendStatusText(const TQString&)) );
 
-    connect(statusInput,TQT_SIGNAL (submit()),this,TQT_SLOT(statusTextEntered()) );
-    connect(statusInput,TQT_SIGNAL (textPasted(const TQString&)),this,TQT_SLOT(textPasted(const TQString&)) );
-    connect(getTextView(), TQT_SIGNAL(textPasted(bool)), statusInput, TQT_SLOT(paste(bool)));
-    connect(getTextView(), TQT_SIGNAL(popupCommand(int)), this, TQT_SLOT(popupCommand(int)));
+    connect(statusInput,TQ_SIGNAL (submit()),this,TQ_SLOT(statusTextEntered()) );
+    connect(statusInput,TQ_SIGNAL (textPasted(const TQString&)),this,TQ_SLOT(textPasted(const TQString&)) );
+    connect(getTextView(), TQ_SIGNAL(textPasted(bool)), statusInput, TQ_SLOT(paste(bool)));
+    connect(getTextView(), TQ_SIGNAL(popupCommand(int)), this, TQ_SLOT(popupCommand(int)));
 
-    connect(nicknameCombobox,TQT_SIGNAL (activated(int)),this,TQT_SLOT(nicknameComboboxChanged()));
+    connect(nicknameCombobox,TQ_SIGNAL (activated(int)),this,TQ_SLOT(nicknameComboboxChanged()));
     Q_ASSERT(nicknameCombobox->lineEdit());       //it should be editedable.  if we design it so it isn't, remove these lines.
     if(nicknameCombobox->lineEdit())
-        connect(nicknameCombobox->lineEdit(), TQT_SIGNAL (lostFocus()),this,TQT_SLOT(nicknameComboboxChanged()));
+        connect(nicknameCombobox->lineEdit(), TQ_SIGNAL (lostFocus()),this,TQ_SLOT(nicknameComboboxChanged()));
 
     updateAppearance();
 }
diff --git a/konversation/src/tabs_preferences.cpp b/konversation/src/tabs_preferences.cpp
index c3f8836..5a65ac9 100644
--- a/konversation/src/tabs_preferences.cpp
+++ b/konversation/src/tabs_preferences.cpp
@@ -19,7 +19,7 @@
 Tabs_Config::Tabs_Config(TQWidget *parent, const char *name)
  : Tabs_PreferencesUI(parent, name)
 {
-    connect(kcfg_TabPlacement, TQT_SIGNAL(activated(int)), this, TQT_SLOT(toggleCheckBoxes(int)));
+    connect(kcfg_TabPlacement, TQ_SIGNAL(activated(int)), this, TQ_SLOT(toggleCheckBoxes(int)));
 }
 
 Tabs_Config::~Tabs_Config()
diff --git a/konversation/src/theme_preferences.cpp b/konversation/src/theme_preferences.cpp
index b033155..34d56dc 100644
--- a/konversation/src/theme_preferences.cpp
+++ b/konversation/src/theme_preferences.cpp
@@ -55,11 +55,11 @@ Theme_Config::Theme_Config(TQWidget* parent, const char* name)
     // load the current settings
     loadSettings();
 
-    connect(iconThemeIndex,TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(updatePreview(int)));
-    connect(iconThemeIndex,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(updateButtons()));
-    connect(iconThemeIndex,TQT_SIGNAL(selectionChanged()),this,TQT_SIGNAL(modified()));
-    connect(installButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(installTheme()));
-    connect(removeButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeTheme()));
+    connect(iconThemeIndex,TQ_SIGNAL(highlighted(int)),this,TQ_SLOT(updatePreview(int)));
+    connect(iconThemeIndex,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(updateButtons()));
+    connect(iconThemeIndex,TQ_SIGNAL(selectionChanged()),this,TQ_SIGNAL(modified()));
+    connect(installButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(installTheme()));
+    connect(removeButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(removeTheme()));
 }
 
 Theme_Config::~Theme_Config()
@@ -255,7 +255,7 @@ void Theme_Config::removeTheme()
     {
         unlink(TQFile::encodeName(dir));
         TDEIO::DeleteJob* job = TDEIO::del(KURL(dir.remove("index.desktop")));
-        connect(job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(postRemoveTheme(TDEIO::Job*)));
+        connect(job, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(postRemoveTheme(TDEIO::Job*)));
     }
 }
 
diff --git a/konversation/src/topiccombobox.cpp b/konversation/src/topiccombobox.cpp
index 1340f02..eb23185 100644
--- a/konversation/src/topiccombobox.cpp
+++ b/konversation/src/topiccombobox.cpp
@@ -17,8 +17,8 @@
 TopicComboBox::TopicComboBox(TQWidget* parent) :
 KComboBox(parent,"topic_combo_box")
 {
-    connect(this,TQT_SIGNAL(activated(int)),this,TQT_SLOT(topicActivated(int)));
-    connect(this,TQT_SIGNAL(returnPressed(const TQString&)),this,TQT_SLOT(topicActivated(const TQString&)));
+    connect(this,TQ_SIGNAL(activated(int)),this,TQ_SLOT(topicActivated(int)));
+    connect(this,TQ_SIGNAL(returnPressed(const TQString&)),this,TQ_SLOT(topicActivated(const TQString&)));
 }
 
 TopicComboBox::~TopicComboBox()
diff --git a/konversation/src/topiclabel.cpp b/konversation/src/topiclabel.cpp
index 94c4613..be9e87c 100644
--- a/konversation/src/topiclabel.cpp
+++ b/konversation/src/topiclabel.cpp
@@ -53,7 +53,7 @@ namespace Konversation
 
         setupChannelPopupMenu();
 
-        connect(this, TQT_SIGNAL(highlighted(const TQString&)), this, TQT_SLOT(highlightedSlot(const TQString&)));
+        connect(this, TQ_SIGNAL(highlighted(const TQString&)), this, TQ_SLOT(highlightedSlot(const TQString&)));
     }
 
     TopicLabel::~TopicLabel()
@@ -230,7 +230,7 @@ namespace Konversation
         m_channelPopup->insertItem(i18n("Get &user list"),Konversation::Names);
         m_channelPopup->insertItem(i18n("Get &topic"),Konversation::Topic);
 
-        connect(m_channelPopup, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(popupCommand(int)));
+        connect(m_channelPopup, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(popupCommand(int)));
     }
 
     void TopicLabel::setText(const TQString& text)
diff --git a/konversation/src/trayicon.cpp b/konversation/src/trayicon.cpp
index 5ec86e4..e99cec6 100644
--- a/konversation/src/trayicon.cpp
+++ b/konversation/src/trayicon.cpp
@@ -33,7 +33,7 @@ namespace Konversation
     {
         m_notificationEnabled = false;
         m_blinkTimer = new TQTimer(this);
-        connect(m_blinkTimer, TQT_SIGNAL(timeout()), TQT_SLOT(blinkTimeout()));
+        connect(m_blinkTimer, TQ_SIGNAL(timeout()), TQ_SLOT(blinkTimeout()));
 
         updateAppearance();
 
diff --git a/konversation/src/urlcatcher.cpp b/konversation/src/urlcatcher.cpp
index 0c90533..e91e899 100644
--- a/konversation/src/urlcatcher.cpp
+++ b/konversation/src/urlcatcher.cpp
@@ -84,14 +84,14 @@ UrlCatcher::UrlCatcher(TQWidget* parent) : ChatWindow(parent)
         "Click to erase the entire list.");
     TQWhatsThis::add(clearListButton, clearListButtonWT);
 
-    connect(urlListView,TQT_SIGNAL (executed(TQListViewItem*)),this,TQT_SLOT (openUrl(TQListViewItem*)) );
-    connect(urlListView,TQT_SIGNAL (selectionChanged()),this,TQT_SLOT (urlSelected()) );
-
-    connect(openUrlButton,TQT_SIGNAL (clicked()),this,TQT_SLOT (openUrlClicked()) );
-    connect(copyUrlButton,TQT_SIGNAL (clicked()),this,TQT_SLOT (copyUrlClicked()) );
-    connect(deleteUrlButton,TQT_SIGNAL (clicked()),this,TQT_SLOT (deleteUrlClicked()) );
-    connect(saveListButton,TQT_SIGNAL (clicked()),this,TQT_SLOT (saveListClicked()) );
-    connect(clearListButton,TQT_SIGNAL (clicked()),this,TQT_SLOT (clearListClicked()) );
+    connect(urlListView,TQ_SIGNAL (executed(TQListViewItem*)),this,TQ_SLOT (openUrl(TQListViewItem*)) );
+    connect(urlListView,TQ_SIGNAL (selectionChanged()),this,TQ_SLOT (urlSelected()) );
+
+    connect(openUrlButton,TQ_SIGNAL (clicked()),this,TQ_SLOT (openUrlClicked()) );
+    connect(copyUrlButton,TQ_SIGNAL (clicked()),this,TQ_SLOT (copyUrlClicked()) );
+    connect(deleteUrlButton,TQ_SIGNAL (clicked()),this,TQ_SLOT (deleteUrlClicked()) );
+    connect(saveListButton,TQ_SIGNAL (clicked()),this,TQ_SLOT (saveListClicked()) );
+    connect(clearListButton,TQ_SIGNAL (clicked()),this,TQ_SLOT (clearListClicked()) );
 
     saveListButton->setEnabled(false);
     clearListButton->setEnabled(false);
diff --git a/konversation/src/viewcontainer.cpp b/konversation/src/viewcontainer.cpp
index 5d4bdf1..a92ef13 100644
--- a/konversation/src/viewcontainer.cpp
+++ b/konversation/src/viewcontainer.cpp
@@ -78,7 +78,7 @@ ViewContainer::ViewContainer(KonversationMainWindow* window):
     m_dccPanel = new DccTransferPanel(m_tabWidget);
     m_dccPanel->hide();
     m_dccPanelOpen = false;
-    connect(m_dccPanel, TQT_SIGNAL(updateTabNotification(ChatWindow*,const Konversation::TabNotifyType&)), this, TQT_SLOT(setViewNotification(ChatWindow*,const Konversation::TabNotifyType&)));
+    connect(m_dccPanel, TQ_SIGNAL(updateTabNotification(ChatWindow*,const Konversation::TabNotifyType&)), this, TQ_SLOT(setViewNotification(ChatWindow*,const Konversation::TabNotifyType&)));
 }
 
 ViewContainer::~ViewContainer()
@@ -159,12 +159,12 @@ void ViewContainer::setupTabWidget()
     closeBtn->resize(22, 22);
     closeBtn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
     m_tabWidget->setCornerWidget(closeBtn);
-    connect(closeBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeCurrentView()));
+    connect(closeBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(closeCurrentView()));
 
-    connect(m_tabWidget, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT (switchView(TQWidget*)));
-    connect(m_tabWidget, TQT_SIGNAL(closeRequest(TQWidget*)), this, TQT_SLOT(closeView(TQWidget*)));
-    connect(m_tabWidget, TQT_SIGNAL(contextMenu(TQWidget*, const TQPoint&)), this, TQT_SLOT(showViewContextMenu(TQWidget*, const TQPoint&)));
-    connect(m_tabWidget, TQT_SIGNAL(mouseMiddleClick(TQWidget*)), this, TQT_SLOT(closeViewMiddleClick(TQWidget*)));
+    connect(m_tabWidget, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT (switchView(TQWidget*)));
+    connect(m_tabWidget, TQ_SIGNAL(closeRequest(TQWidget*)), this, TQ_SLOT(closeView(TQWidget*)));
+    connect(m_tabWidget, TQ_SIGNAL(contextMenu(TQWidget*, const TQPoint&)), this, TQ_SLOT(showViewContextMenu(TQWidget*, const TQPoint&)));
+    connect(m_tabWidget, TQ_SIGNAL(mouseMiddleClick(TQWidget*)), this, TQ_SLOT(closeViewMiddleClick(TQWidget*)));
 
     updateTabWidgetAppearance();
 }
@@ -175,16 +175,16 @@ void ViewContainer::setupViewTree()
     m_viewTreeSplitter->setResizeMode(m_viewTree, TQSplitter::KeepSize);
     m_viewTree->hide();
 
-    connect(KonversationApplication::instance(), TQT_SIGNAL(appearanceChanged()), m_viewTree, TQT_SLOT(updateAppearance()));
-    connect(this, TQT_SIGNAL(viewChanged(ChatWindow*)), m_viewTree, TQT_SLOT(selectView(ChatWindow*)));
-    connect(this, TQT_SIGNAL(removeView(ChatWindow*)), m_viewTree, TQT_SLOT(removeView(ChatWindow*)));
-    connect(this, TQT_SIGNAL(contextMenuClosed()), m_viewTree, TQT_SLOT(unHighlight()));
-    connect(m_viewTree, TQT_SIGNAL(setViewTreeShown(bool)), this, TQT_SLOT(setViewTreeShown(bool)));
-    connect(m_viewTree, TQT_SIGNAL(showView(ChatWindow*)), this, TQT_SLOT(showView(ChatWindow*)));
-    connect(m_viewTree, TQT_SIGNAL(closeView(ChatWindow*)), this, TQT_SLOT(closeView(ChatWindow*)));
-    connect(m_viewTree, TQT_SIGNAL(showViewContextMenu(TQWidget*, const TQPoint&)), this, TQT_SLOT(showViewContextMenu(TQWidget*, const TQPoint&)));
-    connect(m_viewTree, TQT_SIGNAL(sizeChanged()), this, TQT_SLOT(saveSplitterSizes()));
-    connect(m_viewTree, TQT_SIGNAL(syncTabBarToTree()), this, TQT_SLOT(syncTabBarToTree()));
+    connect(KonversationApplication::instance(), TQ_SIGNAL(appearanceChanged()), m_viewTree, TQ_SLOT(updateAppearance()));
+    connect(this, TQ_SIGNAL(viewChanged(ChatWindow*)), m_viewTree, TQ_SLOT(selectView(ChatWindow*)));
+    connect(this, TQ_SIGNAL(removeView(ChatWindow*)), m_viewTree, TQ_SLOT(removeView(ChatWindow*)));
+    connect(this, TQ_SIGNAL(contextMenuClosed()), m_viewTree, TQ_SLOT(unHighlight()));
+    connect(m_viewTree, TQ_SIGNAL(setViewTreeShown(bool)), this, TQ_SLOT(setViewTreeShown(bool)));
+    connect(m_viewTree, TQ_SIGNAL(showView(ChatWindow*)), this, TQ_SLOT(showView(ChatWindow*)));
+    connect(m_viewTree, TQ_SIGNAL(closeView(ChatWindow*)), this, TQ_SLOT(closeView(ChatWindow*)));
+    connect(m_viewTree, TQ_SIGNAL(showViewContextMenu(TQWidget*, const TQPoint&)), this, TQ_SLOT(showViewContextMenu(TQWidget*, const TQPoint&)));
+    connect(m_viewTree, TQ_SIGNAL(sizeChanged()), this, TQ_SLOT(saveSplitterSizes()));
+    connect(m_viewTree, TQ_SIGNAL(syncTabBarToTree()), this, TQ_SLOT(syncTabBarToTree()));
 
     TDEAction* action;
 
@@ -276,16 +276,16 @@ void ViewContainer::setViewTreeShown(bool show)
 
 void ViewContainer::removeViewTree()
 {
-    disconnect(KonversationApplication::instance(), TQT_SIGNAL(appearanceChanged()), m_viewTree, TQT_SLOT(updateAppearance()));
-    disconnect(this, TQT_SIGNAL(viewChanged(ChatWindow*)), m_viewTree, TQT_SLOT(selectView(ChatWindow*)));
-    disconnect(this, TQT_SIGNAL(removeView(ChatWindow*)), m_viewTree, TQT_SLOT(removeView(ChatWindow*)));
-    disconnect(this, TQT_SIGNAL(contextMenuClosed()), m_viewTree, TQT_SLOT(unHighlight()));
-    disconnect(m_viewTree, TQT_SIGNAL(setViewTreeShown(bool)), this, TQT_SLOT(setViewTreeShown(bool)));
-    disconnect(m_viewTree, TQT_SIGNAL(showView(ChatWindow*)), this, TQT_SLOT(showView(ChatWindow*)));
-    disconnect(m_viewTree, TQT_SIGNAL(closeView(ChatWindow*)), this, TQT_SLOT(closeView(ChatWindow*)));
-    disconnect(m_viewTree, TQT_SIGNAL(showViewContextMenu(TQWidget*, const TQPoint&)), this, TQT_SLOT(showViewContextMenu(TQWidget*, const TQPoint&)));
-    disconnect(m_viewTree, TQT_SIGNAL(sizeChanged()), this, TQT_SLOT(saveSplitterSizes()));
-    disconnect(m_viewTree, TQT_SIGNAL(syncTabBarToTree()), this, TQT_SLOT(syncTabBarToTree()));
+    disconnect(KonversationApplication::instance(), TQ_SIGNAL(appearanceChanged()), m_viewTree, TQ_SLOT(updateAppearance()));
+    disconnect(this, TQ_SIGNAL(viewChanged(ChatWindow*)), m_viewTree, TQ_SLOT(selectView(ChatWindow*)));
+    disconnect(this, TQ_SIGNAL(removeView(ChatWindow*)), m_viewTree, TQ_SLOT(removeView(ChatWindow*)));
+    disconnect(this, TQ_SIGNAL(contextMenuClosed()), m_viewTree, TQ_SLOT(unHighlight()));
+    disconnect(m_viewTree, TQ_SIGNAL(setViewTreeShown(bool)), this, TQ_SLOT(setViewTreeShown(bool)));
+    disconnect(m_viewTree, TQ_SIGNAL(showView(ChatWindow*)), this, TQ_SLOT(showView(ChatWindow*)));
+    disconnect(m_viewTree, TQ_SIGNAL(closeView(ChatWindow*)), this, TQ_SLOT(closeView(ChatWindow*)));
+    disconnect(m_viewTree, TQ_SIGNAL(showViewContextMenu(TQWidget*, const TQPoint&)), this, TQ_SLOT(showViewContextMenu(TQWidget*, const TQPoint&)));
+    disconnect(m_viewTree, TQ_SIGNAL(sizeChanged()), this, TQ_SLOT(saveSplitterSizes()));
+    disconnect(m_viewTree, TQ_SIGNAL(syncTabBarToTree()), this, TQ_SLOT(syncTabBarToTree()));
 
     TDEAction* action;
 
@@ -678,14 +678,14 @@ void ViewContainer::updateFrontView()
     // Make sure that only views with info output get to be the m_frontView
     if (m_frontView)
     {
-        disconnect(m_frontView, TQT_SIGNAL(updateInfo(const TQString &)), this, TQT_SIGNAL(setStatusBarInfoLabel(const TQString &)));
+        disconnect(m_frontView, TQ_SIGNAL(updateInfo(const TQString &)), this, TQ_SIGNAL(setStatusBarInfoLabel(const TQString &)));
     }
 
     if (view->canBeFrontView())
     {
         m_frontView = view;
 
-        connect(view, TQT_SIGNAL(updateInfo(const TQString &)), this, TQT_SIGNAL(setStatusBarInfoLabel(const TQString &)));
+        connect(view, TQ_SIGNAL(updateInfo(const TQString &)), this, TQ_SIGNAL(setStatusBarInfoLabel(const TQString &)));
         view->emitUpdateInfo();
     }
     else
@@ -1173,11 +1173,11 @@ void ViewContainer::addView(ChatWindow* view, const TQString& label, bool weinit
     ChatWindow::WindowType wtype;
     TQIconSet iconSet;
 
-    connect(KonversationApplication::instance(), TQT_SIGNAL(appearanceChanged()), view, TQT_SLOT(updateAppearance()));
-    connect(view, TQT_SIGNAL(setStatusBarTempText(const TQString&)), this, TQT_SIGNAL(setStatusBarTempText(const TQString&)));
-    connect(view, TQT_SIGNAL(clearStatusBarTempText()), this, TQT_SIGNAL(clearStatusBarTempText()));
-    connect(view, TQT_SIGNAL(closing(ChatWindow*)), this, TQT_SIGNAL(removeView(ChatWindow*)));
-    connect(view, TQT_SIGNAL(closing(ChatWindow*)), this, TQT_SLOT(cleanupAfterClose(ChatWindow*)));
+    connect(KonversationApplication::instance(), TQ_SIGNAL(appearanceChanged()), view, TQ_SLOT(updateAppearance()));
+    connect(view, TQ_SIGNAL(setStatusBarTempText(const TQString&)), this, TQ_SIGNAL(setStatusBarTempText(const TQString&)));
+    connect(view, TQ_SIGNAL(clearStatusBarTempText()), this, TQ_SIGNAL(clearStatusBarTempText()));
+    connect(view, TQ_SIGNAL(closing(ChatWindow*)), this, TQ_SIGNAL(removeView(ChatWindow*)));
+    connect(view, TQ_SIGNAL(closing(ChatWindow*)), this, TQ_SLOT(cleanupAfterClose(ChatWindow*)));
 
     // Please be careful about changing any of the grouping behavior in here,
     // because it needs to match up with the sorting behavior of the tree list,
@@ -1380,7 +1380,7 @@ void ViewContainer::switchView(TQWidget* newView)
     {
         m_frontView->resetTabNotification();
 
-        disconnect(m_frontView, TQT_SIGNAL(updateInfo(const TQString &)), this, TQT_SIGNAL(setStatusBarInfoLabel(const TQString &)));
+        disconnect(m_frontView, TQ_SIGNAL(updateInfo(const TQString &)), this, TQ_SIGNAL(setStatusBarInfoLabel(const TQString &)));
 
         if (Preferences::automaticRememberLine() && m_frontView->isInsertSupported())
             m_frontView->getTextView()->insertRememberLine();
@@ -1860,7 +1860,7 @@ void ViewContainer::insertCharacter()
     if (!m_insertCharDialog)
     {
         m_insertCharDialog = new Konversation::InsertCharDialog(font.family(), m_window);
-        connect(m_insertCharDialog, TQT_SIGNAL(insertChar(const TQChar&)), this, TQT_SLOT(insertChar(const TQChar&)));
+        connect(m_insertCharDialog, TQ_SIGNAL(insertChar(const TQChar&)), this, TQ_SLOT(insertChar(const TQChar&)));
     }
 
     m_insertCharDialog->setFont(font);
@@ -1979,8 +1979,8 @@ void ViewContainer::addKonsolePanel()
     KonsolePanel* panel=new KonsolePanel(m_tabWidget);
     panel->setName(i18n("Konsole"));
     addView(panel, i18n("Konsole"));
-    connect(panel, TQT_SIGNAL(updateTabNotification(ChatWindow*,const Konversation::TabNotifyType&)), this, TQT_SLOT(setViewNotification(ChatWindow*,const Konversation::TabNotifyType&)));
-    connect(panel, TQT_SIGNAL(closeView(ChatWindow*)), this, TQT_SLOT(closeView(ChatWindow*)));
+    connect(panel, TQ_SIGNAL(updateTabNotification(ChatWindow*,const Konversation::TabNotifyType&)), this, TQ_SLOT(setViewNotification(ChatWindow*,const Konversation::TabNotifyType&)));
+    connect(panel, TQ_SIGNAL(closeView(ChatWindow*)), this, TQ_SLOT(closeView(ChatWindow*)));
 }
 
 void ViewContainer::addUrlCatcher()
@@ -1991,12 +1991,12 @@ void ViewContainer::addUrlCatcher()
         m_urlCatcherPanel=new UrlCatcher(m_tabWidget);
         addView(m_urlCatcherPanel, i18n("URL Catcher"));
         KonversationApplication *konvApp=static_cast<KonversationApplication *>(TDEApplication::kApplication());
-        connect(konvApp,TQT_SIGNAL(catchUrl(const TQString&,const TQString&)),
-            m_urlCatcherPanel, TQT_SLOT(addUrl(const TQString&,const TQString&)) );
-        connect(m_urlCatcherPanel, TQT_SIGNAL(deleteUrl(const TQString&,const TQString&)),
-            konvApp, TQT_SLOT(deleteUrl(const TQString&,const TQString&)) );
-        connect(m_urlCatcherPanel, TQT_SIGNAL(clearUrlList()),
-            konvApp, TQT_SLOT(clearUrlList()));
+        connect(konvApp,TQ_SIGNAL(catchUrl(const TQString&,const TQString&)),
+            m_urlCatcherPanel, TQ_SLOT(addUrl(const TQString&,const TQString&)) );
+        connect(m_urlCatcherPanel, TQ_SIGNAL(deleteUrl(const TQString&,const TQString&)),
+            konvApp, TQ_SLOT(deleteUrl(const TQString&,const TQString&)) );
+        connect(m_urlCatcherPanel, TQ_SIGNAL(clearUrlList()),
+            konvApp, TQ_SLOT(clearUrlList()));
 
         TQStringList urlList=konvApp->getUrlList();
         for(unsigned int index=0;index<urlList.count();index++)
@@ -2081,7 +2081,7 @@ void ViewContainer::addDccChat(const TQString& myNick,const TQString& nick,const
             ? new DccChat(m_tabWidget, listen, m_frontServer, myNick, nick )
             : new DccChat(m_tabWidget, listen, m_frontServer, myNick, nick, arguments[1], arguments[2].toInt() );
 
-        connect(dccChatPanel, TQT_SIGNAL(updateTabNotification(ChatWindow*,const Konversation::TabNotifyType&)), this, TQT_SLOT(setViewNotification(ChatWindow*,const Konversation::TabNotifyType&)));
+        connect(dccChatPanel, TQ_SIGNAL(updateTabNotification(ChatWindow*,const Konversation::TabNotifyType&)), this, TQ_SLOT(setViewNotification(ChatWindow*,const Konversation::TabNotifyType&)));
 
         // This needs to be here as addView will change m_frontServer if focus new tabs is enabled.
         addView(dccChatPanel, dccChatPanel->getName());
@@ -2101,16 +2101,16 @@ StatusPanel* ViewContainer::addStatusView(Server* server)
     TQString label = server->getDisplayName();
     statusView->setName(label);
 
-    TQObject::connect(server, TQT_SIGNAL(sslInitFailure()), this, TQT_SIGNAL(removeStatusBarSSLLabel()));
-    TQObject::connect(server, TQT_SIGNAL(sslConnected(Server*)), this, TQT_SIGNAL(updateStatusBarSSLLabel(Server*)));
+    TQObject::connect(server, TQ_SIGNAL(sslInitFailure()), this, TQ_SIGNAL(removeStatusBarSSLLabel()));
+    TQObject::connect(server, TQ_SIGNAL(sslConnected(Server*)), this, TQ_SIGNAL(updateStatusBarSSLLabel(Server*)));
 
     // ... then put it into the tab widget, otherwise we'd have a race with server member
     addView(statusView, label);
 
-    connect(statusView, TQT_SIGNAL(updateTabNotification(ChatWindow*,const Konversation::TabNotifyType&)),
-        this, TQT_SLOT(setViewNotification(ChatWindow*,const Konversation::TabNotifyType&)));
-    connect(statusView, TQT_SIGNAL(sendFile()), server, TQT_SLOT(requestDccSend()));
-    connect(server, TQT_SIGNAL(awayState(bool)), statusView, TQT_SLOT(indicateAway(bool)) );
+    connect(statusView, TQ_SIGNAL(updateTabNotification(ChatWindow*,const Konversation::TabNotifyType&)),
+        this, TQ_SLOT(setViewNotification(ChatWindow*,const Konversation::TabNotifyType&)));
+    connect(statusView, TQ_SIGNAL(sendFile()), server, TQ_SLOT(requestDccSend()));
+    connect(server, TQ_SIGNAL(awayState(bool)), statusView, TQ_SLOT(indicateAway(bool)) );
 
     // make sure that m_frontServer gets set on adding the first status panel, too,
     // since there won't be a switchView happening
@@ -2129,8 +2129,8 @@ RawLog* ViewContainer::addRawLog(Server* server)
 
     addView(rawLog, i18n("Raw Log"));
 
-    connect(rawLog, TQT_SIGNAL(updateTabNotification(ChatWindow*,const Konversation::TabNotifyType&)),
-        this, TQT_SLOT(setViewNotification(ChatWindow*,const Konversation::TabNotifyType&)));
+    connect(rawLog, TQ_SIGNAL(updateTabNotification(ChatWindow*,const Konversation::TabNotifyType&)),
+        this, TQ_SLOT(setViewNotification(ChatWindow*,const Konversation::TabNotifyType&)));
 
     return rawLog;
 }
@@ -2227,10 +2227,10 @@ Channel* ViewContainer::addChannel(Server* server, const TQString& name)
     channel->setName(name); //still have to do this for now
     addView(channel, name);
 
-    connect(this, TQT_SIGNAL(updateChannelAppearance()), channel, TQT_SLOT(updateAppearance()));
-    connect(channel, TQT_SIGNAL(updateTabNotification(ChatWindow*,const Konversation::TabNotifyType&)), this, TQT_SLOT(setViewNotification(ChatWindow*,const Konversation::TabNotifyType&)));
-    connect(server, TQT_SIGNAL(awayState(bool)), channel, TQT_SLOT(indicateAway(bool)) );
-    connect(channel, TQT_SIGNAL(joined(Channel*)), this, TQT_SLOT(channelJoined(Channel*)));
+    connect(this, TQ_SIGNAL(updateChannelAppearance()), channel, TQ_SLOT(updateAppearance()));
+    connect(channel, TQ_SIGNAL(updateTabNotification(ChatWindow*,const Konversation::TabNotifyType&)), this, TQ_SLOT(setViewNotification(ChatWindow*,const Konversation::TabNotifyType&)));
+    connect(server, TQ_SIGNAL(awayState(bool)), channel, TQ_SLOT(indicateAway(bool)) );
+    connect(channel, TQ_SIGNAL(joined(Channel*)), this, TQ_SLOT(channelJoined(Channel*)));
 
     return channel;
 }
@@ -2284,9 +2284,9 @@ Query* ViewContainer::addQuery(Server* server, const NickInfoPtr& nickInfo, bool
 
     ++m_queryViewCount;
 
-    connect(query, TQT_SIGNAL(updateTabNotification(ChatWindow*,const Konversation::TabNotifyType&)), this, TQT_SLOT(setViewNotification(ChatWindow*,const Konversation::TabNotifyType&)));
-    connect(query, TQT_SIGNAL(updateQueryChrome(ChatWindow*, const TQString &)), this, TQT_SLOT(updateQueryChrome(ChatWindow*, const TQString &)));
-    connect(server, TQT_SIGNAL(awayState(bool)), query, TQT_SLOT(indicateAway(bool)));
+    connect(query, TQ_SIGNAL(updateTabNotification(ChatWindow*,const Konversation::TabNotifyType&)), this, TQ_SLOT(setViewNotification(ChatWindow*,const Konversation::TabNotifyType&)));
+    connect(query, TQ_SIGNAL(updateQueryChrome(ChatWindow*, const TQString &)), this, TQ_SLOT(updateQueryChrome(ChatWindow*, const TQString &)));
+    connect(server, TQ_SIGNAL(awayState(bool)), query, TQ_SLOT(indicateAway(bool)));
 
     return query;
 }
@@ -2400,10 +2400,10 @@ void ViewContainer::openNicksOnlinePanel()
     {
         m_nicksOnlinePanel=new NicksOnline(m_window);
         addView(m_nicksOnlinePanel, i18n("Watched Nicks Online"));
-        connect(m_nicksOnlinePanel, TQT_SIGNAL(editClicked()), m_window, TQT_SLOT(openNotify()));
-        connect(m_nicksOnlinePanel, TQT_SIGNAL(doubleClicked(const TQString&,const TQString&)), m_window, TQT_SLOT(notifyAction(const TQString&,const TQString&)));
-        connect(m_nicksOnlinePanel, TQT_SIGNAL(showView(ChatWindow*)), this, TQT_SLOT(showView(ChatWindow*)));
-        connect(m_window, TQT_SIGNAL(nicksNowOnline(Server*)), m_nicksOnlinePanel, TQT_SLOT(updateServerOnlineList(Server*)));
+        connect(m_nicksOnlinePanel, TQ_SIGNAL(editClicked()), m_window, TQ_SLOT(openNotify()));
+        connect(m_nicksOnlinePanel, TQ_SIGNAL(doubleClicked(const TQString&,const TQString&)), m_window, TQ_SLOT(notifyAction(const TQString&,const TQString&)));
+        connect(m_nicksOnlinePanel, TQ_SIGNAL(showView(ChatWindow*)), this, TQ_SLOT(showView(ChatWindow*)));
+        connect(m_window, TQ_SIGNAL(nicksNowOnline(Server*)), m_nicksOnlinePanel, TQ_SLOT(updateServerOnlineList(Server*)));
         (dynamic_cast<TDEToggleAction*>(actionCollection()->action("open_nicksonline_window")))->setChecked(true);
     }
     else
diff --git a/konversation/src/viewtree.cpp b/konversation/src/viewtree.cpp
index bb036a4..ac42347 100644
--- a/konversation/src/viewtree.cpp
+++ b/konversation/src/viewtree.cpp
@@ -94,10 +94,10 @@ ViewTree::ViewTree(TQWidget *parent)
 
     m_middleClickItem = 0;
 
-    connect(m_enableCloseButtonTimer, TQT_SIGNAL(timeout()), TQT_SLOT(enableCloseButton()));
-    connect(this, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(announceSelection(TQListViewItem*)));
-    connect(this, TQT_SIGNAL(aboutToMove()), TQT_SLOT(slotAboutToMoveView()));
-    connect(this, TQT_SIGNAL(moved()), TQT_SLOT(slotMovedView()));
+    connect(m_enableCloseButtonTimer, TQ_SIGNAL(timeout()), TQ_SLOT(enableCloseButton()));
+    connect(this, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(announceSelection(TQListViewItem*)));
+    connect(this, TQ_SIGNAL(aboutToMove()), TQ_SLOT(slotAboutToMoveView()));
+    connect(this, TQ_SIGNAL(moved()), TQ_SLOT(slotMovedView()));
 }
 
 ViewTree::~ViewTree()
diff --git a/konversation/src/warnings_preferences.cpp b/konversation/src/warnings_preferences.cpp
index e475842..80cd51f 100644
--- a/konversation/src/warnings_preferences.cpp
+++ b/konversation/src/warnings_preferences.cpp
@@ -29,7 +29,7 @@ Warnings_Config::Warnings_Config( TQWidget* parent, const char* name, WFlags fl
 {
   dialogListView->setSorting(1);
   loadSettings();
-  connect(dialogListView, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SIGNAL(modified()));
+  connect(dialogListView, TQ_SIGNAL(clicked(TQListViewItem *)), this, TQ_SIGNAL(modified()));
 }
 
 Warnings_Config::~Warnings_Config()
diff --git a/konversation/src/watchednicknames_preferences.cpp b/konversation/src/watchednicknames_preferences.cpp
index 2b78db2..2e4206a 100644
--- a/konversation/src/watchednicknames_preferences.cpp
+++ b/konversation/src/watchednicknames_preferences.cpp
@@ -37,17 +37,17 @@ WatchedNicknames_Config::WatchedNicknames_Config(TQWidget *parent, const char *n
 
   loadSettings();
 
-  connect(kcfg_UseNotify,TQT_SIGNAL (toggled(bool)),this,TQT_SLOT (checkIfEmptyListview(bool)) );
-  connect(newButton,TQT_SIGNAL (clicked()),this,TQT_SLOT (newNotify()) );
-  connect(removeButton,TQT_SIGNAL (clicked()),this,TQT_SLOT (removeNotify()) );
-  connect(notifyListView,TQT_SIGNAL (selectionChanged(TQListViewItem*)),this,TQT_SLOT (entrySelected(TQListViewItem*)) );
-  connect(notifyListView,TQT_SIGNAL (clicked(TQListViewItem*)),this,TQT_SLOT (entrySelected(TQListViewItem*)) );
+  connect(kcfg_UseNotify,TQ_SIGNAL (toggled(bool)),this,TQ_SLOT (checkIfEmptyListview(bool)) );
+  connect(newButton,TQ_SIGNAL (clicked()),this,TQ_SLOT (newNotify()) );
+  connect(removeButton,TQ_SIGNAL (clicked()),this,TQ_SLOT (removeNotify()) );
+  connect(notifyListView,TQ_SIGNAL (selectionChanged(TQListViewItem*)),this,TQ_SLOT (entrySelected(TQListViewItem*)) );
+  connect(notifyListView,TQ_SIGNAL (clicked(TQListViewItem*)),this,TQ_SLOT (entrySelected(TQListViewItem*)) );
 
-  connect(networkDropdown,TQT_SIGNAL (activated(const TQString&)),this,TQT_SLOT (networkChanged(const TQString&)) );
-  connect(nicknameInput,TQT_SIGNAL (textChanged(const TQString&)),this,TQT_SLOT (nicknameChanged(const TQString&)) );
+  connect(networkDropdown,TQ_SIGNAL (activated(const TQString&)),this,TQ_SLOT (networkChanged(const TQString&)) );
+  connect(nicknameInput,TQ_SIGNAL (textChanged(const TQString&)),this,TQ_SLOT (nicknameChanged(const TQString&)) );
 
-  connect(KonversationApplication::instance(), TQT_SIGNAL(serverGroupsChanged(const Konversation::ServerGroupSettings*)),
-      this, TQT_SLOT(updateNetworkNames()));
+  connect(KonversationApplication::instance(), TQ_SIGNAL(serverGroupsChanged(const Konversation::ServerGroupSettings*)),
+      this, TQ_SLOT(updateNetworkNames()));
 }
 
 WatchedNicknames_Config::~WatchedNicknames_Config()