rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/konversation@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

konversation/src/alias_preferences.cpp

@@ -25,8 +25,8 @@
 #include <klistview.h>
 
 
-Alias_Config::Alias_Config(TQWidget* tqparent, const char* name)
+Alias_Config::Alias_Config(TQWidget* parent, const char* name)
- : Alias_ConfigUI(tqparent, name)
+ : Alias_ConfigUI(parent, name)
 {
   // reset flag to defined state (used to block signals when just selecting a new item)
   m_newItemSelected = false;

konversation/src/alias_preferences.h

@@ -22,7 +22,7 @@ class Alias_Config : public Alias_ConfigUI, public KonviSettingsPage
   TQ_OBJECT
 
     public:
-        explicit Alias_Config(TQWidget* tqparent, const char* name = 0);
+        explicit Alias_Config(TQWidget* parent, const char* name = 0);
         ~Alias_Config();
 
         virtual void saveSettings();

konversation/src/autoreplace_preferences.cpp

@@ -34,8 +34,8 @@
 #define DIRECTION_BOTH   2
 
 
-Autoreplace_Config::Autoreplace_Config(TQWidget* tqparent, const char* name)
+Autoreplace_Config::Autoreplace_Config(TQWidget* parent, const char* name)
- : Autoreplace_ConfigUI(tqparent, name)
+ : Autoreplace_ConfigUI(parent, name)
 {
   // reset flag to defined state (used to block signals when just selecting a new item)
   m_newItemSelected=false;

konversation/src/autoreplace_preferences.h

@@ -23,7 +23,7 @@ class Autoreplace_Config : public Autoreplace_ConfigUI, public KonviSettingsPage
   TQ_OBJECT
 
   public:
-    explicit Autoreplace_Config(TQWidget* tqparent, const char* name=NULL);
+    explicit Autoreplace_Config(TQWidget* parent, const char* name=NULL);
     ~Autoreplace_Config();
 
     virtual void saveSettings();

konversation/src/awaymanager.cpp

@@ -55,7 +55,7 @@ struct AwayManagerPrivate
     bool useMit;
 };
 
-AwayManager::AwayManager(TQObject* tqparent) : TQObject(tqparent)
+AwayManager::AwayManager(TQObject* parent) : TQObject(parent)
 {
     int dummy = 0;
     dummy = dummy;
@@ -176,12 +176,12 @@ bool AwayManager::Xactivity()
     Display* display = qt_xdisplay();
     Window dummyW;
     int dummyC;
-    unsigned int tqmask;
+    unsigned int mask;
     int rootX;
     int rootY;
 
     if (!XQueryPointer (display, d->root, &(d->root), &dummyW, &rootX, &rootY,
-            &dummyC, &dummyC, &tqmask))
+            &dummyC, &dummyC, &mask))
     {
         // Figure out which screen the pointer has moved to.
         for (int i = 0; i < ScreenCount(display); i++)
@@ -214,7 +214,7 @@ bool AwayManager::Xactivity()
     #endif
     }
 
-    if (rootX != d->mouseX || rootY != d->mouseY || tqmask != d->mouseMask
+    if (rootX != d->mouseX || rootY != d->mouseY || mask != d->mouseMask
         || ((d->useXidle || d->useMit) && xIdleTime < d->xIdleTime + 2000))
     {
         // Set by setManagedIdentitiesAway() to skip X-based activity checking for one
@@ -224,7 +224,7 @@ bool AwayManager::Xactivity()
 
         d->mouseX = rootX;
         d->mouseY = rootY;
-        d->mouseMask = tqmask;
+        d->mouseMask = mask;
         d->xIdleTime = xIdleTime;
     }
 #endif

konversation/src/awaymanager.h

@@ -31,7 +31,7 @@ class AwayManager : public TQObject
   TQ_OBJECT
 
     public:
-        explicit AwayManager(TQObject* tqparent = 0);
+        explicit AwayManager(TQObject* parent = 0);
         ~AwayManager();
 
 

konversation/src/channel.cpp

@@ -65,7 +65,7 @@
 #include <kwin.h>
 
 
-Channel::Channel(TQWidget* tqparent, TQString _name) : ChatWindow(tqparent)
+Channel::Channel(TQWidget* parent, TQString _name) : ChatWindow(parent)
 {
     // init variables
 
@@ -1265,8 +1265,8 @@ void Channel::joinNickname(ChannelNickPtr channelNick)
     {
         m_joined = true;
         emit joined(this);
-        appendCommandMessage(i18n("Join"),i18n("%1 is the channel and %2 is our hosttqmask",
+        appendCommandMessage(i18n("Join"),i18n("%1 is the channel and %2 is our hostmask",
-                             "You have joined the channel %1 (%2).").tqarg(getName()).tqarg(channelNick->getHosttqmask()),false, false, true);
+                             "You have joined the channel %1 (%2).").tqarg(getName()).tqarg(channelNick->getHostmask()),false, false, true);
         m_ownChannelNick = channelNick;
         connect(m_ownChannelNick, TQT_SIGNAL(channelNickChanged()), TQT_SLOT(refreshModeButtons()));
         refreshModeButtons();
@@ -1281,8 +1281,8 @@ void Channel::joinNickname(ChannelNickPtr channelNick)
     else
     {
         TQString nick = channelNick->getNickname();
-        TQString hostname = channelNick->getHosttqmask();
+        TQString hostname = channelNick->getHostmask();
-        appendCommandMessage(i18n("Join"), i18n("%1 is the nick joining and %2 the hosttqmask of that nick",
+        appendCommandMessage(i18n("Join"), i18n("%1 is the nick joining and %2 the hostmask of that nick",
                              "%1 has joined this channel (%2).").tqarg(nick).tqarg(hostname),false, false);
         addNickname(channelNick);
     }
@@ -1959,13 +1959,13 @@ void Channel::updateMode(const TQString& sourceNick, char mode, bool plus, const
         case 'I':
             if(plus)
             {
-                if(fromMe) message=i18n("You set invitation tqmask %1.").tqarg(parameter);
+                if(fromMe) message=i18n("You set invitation mask %1.").tqarg(parameter);
-                else message=i18n("%1 sets invitation tqmask %2.").tqarg(sourceNick).tqarg(parameter);
+                else message=i18n("%1 sets invitation mask %2.").tqarg(sourceNick).tqarg(parameter);
             }
             else
             {
-                if(fromMe) message=i18n("You remove the invitation tqmask %1.").tqarg(parameter);
+                if(fromMe) message=i18n("You remove the invitation mask %1.").tqarg(parameter);
-                else message=i18n("%1 removes the invitation tqmask %2.").tqarg(sourceNick).tqarg(parameter);
+                else message=i18n("%1 removes the invitation mask %2.").tqarg(sourceNick).tqarg(parameter);
             }
             break;
         default:
@@ -2423,7 +2423,7 @@ void Channel::autoUserhost()
 
         while((nick = it.current()) != 0)
         {
-            if(nick->getChannelNick()->getHosttqmask().isEmpty())
+            if(nick->getChannelNick()->getHostmask().isEmpty())
             {
                 if(limit--) nickString = nickString + nick->getChannelNick()->getNickname() + ' ';
                 else break;
@@ -2448,7 +2448,7 @@ void Channel::setAutoUserhost(bool state)
         // if the column was actually gone (just to be sure) ...
         if(nicknameListView->columns()==2)
         {
-            // re-add the hosttqmask column
+            // re-add the hostmask column
             nicknameListView->addColumn(TQString());
             nicknameListView->setColumnWidthMode(2,KListView::Maximum);
             nicknameListView->setResizeMode(TQListView::NoColumn);
@@ -2458,7 +2458,7 @@ void Channel::setAutoUserhost(bool state)
             while(item)
             {
                 Nick* lookNick=getNickByName(item->text(1));
-                if(lookNick) item->setText(2,lookNick->getChannelNick()->getHosttqmask());
+                if(lookNick) item->setText(2,lookNick->getChannelNick()->getHostmask());
                 item=item->itemBelow();
             }
         }

konversation/src/channel.h

@@ -77,7 +77,7 @@ class Channel : public ChatWindow
   TQ_OBJECT
 
     public:
-        explicit Channel(TQWidget* tqparent, TQString name);
+        explicit Channel(TQWidget* parent, TQString name);
         ~Channel();
 //META
         virtual bool canBeFrontView();

konversation/src/channeldialog.cpp

@@ -23,8 +23,8 @@
 namespace Konversation
 {
 
-    ChannelDialog::ChannelDialog(const TQString& title, TQWidget *tqparent, const char *name)
+    ChannelDialog::ChannelDialog(const TQString& title, TQWidget *parent, const char *name)
-        : KDialogBase(Plain, title, Ok|Cancel, Ok, tqparent, name)
+        : KDialogBase(Plain, title, Ok|Cancel, Ok, parent, name)
     {
         TQFrame* mainWidget = plainPage();
         TQGridLayout* mainLayout = new TQGridLayout(mainWidget, 1, 2, 0, spacingHint());

konversation/src/channeldialog.h

@@ -28,7 +28,7 @@ namespace Konversation
   TQ_OBJECT
 
         public:
-            explicit ChannelDialog(const TQString& title, TQWidget *tqparent = 0, const char *name = 0);
+            explicit ChannelDialog(const TQString& title, TQWidget *parent = 0, const char *name = 0);
             ~ChannelDialog();
 
             void setChannelSettings(const ChannelSettings& channel);

konversation/src/channellistpanel.cpp

@@ -41,7 +41,7 @@
 #include <kdeversion.h>
 
 
-ChannelListPanel::ChannelListPanel(TQWidget* tqparent) : ChatWindow(tqparent)
+ChannelListPanel::ChannelListPanel(TQWidget* parent) : ChatWindow(parent)
 {
     setType(ChatWindow::ChannelList);
     setName(i18n("Channel List"));

konversation/src/channellistpanel.h

@@ -37,7 +37,7 @@ class ChannelListPanel : public ChatWindow
   TQ_OBJECT
 
     public:
-        explicit ChannelListPanel(TQWidget* tqparent);
+        explicit ChannelListPanel(TQWidget* parent);
         ~ChannelListPanel();
 
         virtual bool closeYourself();

konversation/src/channellistviewitem.cpp

@@ -15,8 +15,8 @@
 #include "channellistviewitem.h"
 
 
-ChannelListViewItem::ChannelListViewItem(KListView* tqparent, const TQString& channel, const TQString& users, const TQString& topic)
+ChannelListViewItem::ChannelListViewItem(KListView* parent, const TQString& channel, const TQString& users, const TQString& topic)
-: KListViewItem(tqparent,channel,users,topic)
+: KListViewItem(parent,channel,users,topic)
 {
 }
 

konversation/src/channellistviewitem.h

@@ -23,7 +23,7 @@
 class ChannelListViewItem : public KListViewItem
 {
     public:
-        ChannelListViewItem(KListView* tqparent, const TQString& channel, const TQString& users, const TQString& topic);
+        ChannelListViewItem(KListView* parent, const TQString& channel, const TQString& users, const TQString& topic);
         ~ChannelListViewItem();
 
         int compare(TQListViewItem* item, int col, bool ascending) const;

konversation/src/channelnick.cpp

@@ -187,10 +187,10 @@ TQString ChannelNick::getNickname() const
         return TQString();
 }
 
-TQString ChannelNick::getHosttqmask() const
+TQString ChannelNick::getHostmask() const
 {
     if ( this )
-        return nickInfo->getHosttqmask();
+        return nickInfo->getHostmask();
     else
         return TQString();
 }

konversation/src/channelnick.h

@@ -58,7 +58,7 @@ class ChannelNick :  public TQObject, public KShared
         //Just calls nickInfo->getNickname() etc
         TQString getNickname() const;
         TQString loweredNickname() const;
-        TQString getHosttqmask() const;
+        TQString getHostmask() const;
         TQString tooltip();
     private:
         NickInfoPtr nickInfo;

konversation/src/channeloptionsdialog.cpp

@@ -423,7 +423,7 @@ namespace Konversation
 
             // We delete the existing item because it's possible the server may
             // Modify the ban causing us not to catch it. If that happens we'll be
-            // stuck with a stale item and a new item with the modified hosttqmask.
+            // stuck with a stale item and a new item with the modified hostmask.
             delete new_edited;
         }
     }
@@ -467,27 +467,27 @@ namespace Konversation
 
     // This is our implementation of BanListViewItem
 
-    BanListViewItem::BanListViewItem(TQListView *tqparent)
+    BanListViewItem::BanListViewItem(TQListView *parent)
-      : KListViewItem(tqparent)
+      : KListViewItem(parent)
     {
         m_isNewBan = 0;
     }
 
-    BanListViewItem::BanListViewItem(TQListView *tqparent, bool isNew)
+    BanListViewItem::BanListViewItem(TQListView *parent, bool isNew)
-      : KListViewItem(tqparent)
+      : KListViewItem(parent)
     {
         m_isNewBan = isNew;
     }
 
-    BanListViewItem::BanListViewItem (TQListView *tqparent, const TQString& label1, const TQString& label2,
+    BanListViewItem::BanListViewItem (TQListView *parent, const TQString& label1, const TQString& label2,
-        uint timestamp) : KListViewItem(tqparent, label1, label2)
+        uint timestamp) : KListViewItem(parent, label1, label2)
     {
         m_isNewBan = 0;
         m_timestamp.setTime_t(timestamp);
     }
 
-    BanListViewItem::BanListViewItem (TQListView *tqparent, bool isNew, const TQString& label1, const TQString& label2,
+    BanListViewItem::BanListViewItem (TQListView *parent, bool isNew, const TQString& label1, const TQString& label2,
-        uint timestamp) : KListViewItem(tqparent, label1, label2)
+        uint timestamp) : KListViewItem(parent, label1, label2)
     {
         m_isNewBan = isNew;
         m_timestamp.setTime_t(timestamp);

konversation/src/channeloptionsdialog.h

@@ -78,10 +78,10 @@ namespace Konversation
     class BanListViewItem : public KListViewItem
     {
         public:
-            explicit BanListViewItem( TQListView *tqparent );
+            explicit BanListViewItem( TQListView *parent );
-            BanListViewItem(TQListView *tqparent, bool isNew);
+            BanListViewItem(TQListView *parent, bool isNew);
-            BanListViewItem(TQListView *tqparent, const TQString& label1, const TQString& label2 = TQString(), uint timestamp = 0);
+            BanListViewItem(TQListView *parent, const TQString& label1, const TQString& label2 = TQString(), uint timestamp = 0);
-            BanListViewItem (TQListView *tqparent, bool isNew, const TQString& label1, const TQString& label2 = TQString(), uint timestamp = 0);
+            BanListViewItem (TQListView *parent, bool isNew, const TQString& label1, const TQString& label2 = TQString(), uint timestamp = 0);
 
             TQString getOldValue() { return m_oldValue; }
             TQDateTime timestamp() { return m_timestamp; }

konversation/src/channeloptionsui.ui

@@ -438,7 +438,7 @@ the Free Software Foundation; either version 2 of the License, or
                     <widget class="KListView" row="1" column="0" rowspan="1" colspan="4">
                         <column>
                             <property name="text">
-                                <string>Hosttqmask</string>
+                                <string>Hostmask</string>
                             </property>
                             <property name="clickable">
                                 <bool>true</bool>

konversation/src/chatwindow.cpp

@@ -31,11 +31,11 @@
 #include <kaction.h>
 
 
-ChatWindow::ChatWindow(TQWidget* tqparent) : TQVBox(tqparent)
+ChatWindow::ChatWindow(TQWidget* parent) : TQVBox(parent)
 {
     setName("ChatWindowObject");
     setTextView(0);
-    parentWidget=tqparent;
+    parentWidget=parent;
     firstLog=true;
     m_server=0;
     m_notificationsEnabled = true;

konversation/src/chatwindow.h

@@ -30,7 +30,7 @@ class ChatWindow : public TQVBox
   TQ_OBJECT
 
     public:
-        explicit ChatWindow(TQWidget* tqparent);
+        explicit ChatWindow(TQWidget* parent);
         ~ChatWindow();
 
         enum WindowType

konversation/src/connectionmanager.cpp

@@ -24,7 +24,7 @@
 #include <kmessagebox.h>
 
 
-ConnectionManager::ConnectionManager(TQObject* tqparent) : TQObject(tqparent)
+ConnectionManager::ConnectionManager(TQObject* parent) : TQObject(parent)
 {
     connect(this, TQT_SIGNAL(requestReconnect(Server*)), this, TQT_SLOT(handleReconnect(Server*)));
 }

konversation/src/connectionmanager.h

@@ -26,7 +26,7 @@ class ConnectionManager : public TQObject
   TQ_OBJECT
 
     public:
-        explicit ConnectionManager(TQObject* tqparent = 0);
+        explicit ConnectionManager(TQObject* parent = 0);
         ~ConnectionManager();
 
         uint connectionCount() const { return m_connectionList.count(); }

konversation/src/dcc_preferences.cpp

@@ -17,8 +17,8 @@
 #include <klocale.h>
 
 
-DCC_Config::DCC_Config(TQWidget *tqparent, const char* name) :
+DCC_Config::DCC_Config(TQWidget *parent, const char* name) :
-  DCC_ConfigUI(tqparent,name)
+  DCC_ConfigUI(parent,name)
 {
     languageChange();
     connect(kcfg_DccMethodToGetOwnIp, TQT_SIGNAL(activated(int)), this, TQT_SLOT(dccMethodChanged(int)));          dccMethodChanged(kcfg_DccMethodToGetOwnIp->currentItem()); 

konversation/src/dcc_preferences.h

@@ -24,7 +24,7 @@ class DCC_Config : public DCC_ConfigUI
   TQ_OBJECT
 
     public:
-        DCC_Config(TQWidget* tqparent, const char* name);
+        DCC_Config(TQWidget* parent, const char* name);
         ~DCC_Config();
 
     public slots:

konversation/src/dccchat.cpp

@@ -45,8 +45,8 @@
 #define DCCCHAT_BUFFER_SIZE 1024
 
 
-DccChat::DccChat(TQWidget* tqparent, bool listen, Server* server, const TQString& ownNick, const TQString& partnerNick, const TQString& partnerHost, int partnerPort)
+DccChat::DccChat(TQWidget* parent, bool listen, Server* server, const TQString& ownNick, const TQString& partnerNick, const TQString& partnerHost, int partnerPort)
-    : ChatWindow(tqparent)
+    : ChatWindow(parent)
 {
     kdDebug() << "DccChat::DccChat() [BEGIN]" << endl;
 

konversation/src/dccchat.h

@@ -39,7 +39,7 @@ class DccChat : public ChatWindow
   TQ_OBJECT
 
         public:
-        DccChat(TQWidget* tqparent, bool listen, Server* server, const TQString& ownNick, const TQString& partnerNick, const TQString& partnerHost = TQString(), int partnerPort = 0);
+        DccChat(TQWidget* parent, bool listen, Server* server, const TQString& ownNick, const TQString& partnerNick, const TQString& partnerHost = TQString(), int partnerPort = 0);
         ~DccChat();
 
         virtual TQString getTextInLine();

konversation/src/dcccommon.cpp

@@ -69,9 +69,9 @@ TQString DccCommon::getOwnIp( Server* server )
     return ownIp;
 }
 
-KNetwork::KServerSocket* DccCommon::createServerSocketAndListen( TQObject* tqparent, TQString* failedReason, int minPort, int maxPort )
+KNetwork::KServerSocket* DccCommon::createServerSocketAndListen( TQObject* parent, TQString* failedReason, int minPort, int maxPort )
 {
-    KNetwork::KServerSocket* socket = new KNetwork::KServerSocket( tqparent );
+    KNetwork::KServerSocket* socket = new KNetwork::KServerSocket( parent );
     socket->setFamily( KNetwork::KResolver::InetFamily );
 
     if ( minPort > 0 && maxPort >= minPort )  // ports are configured manually

konversation/src/dcccommon.h

@@ -36,7 +36,7 @@ class DccCommon
         static TQString getOwnIp( Server* server = 0 );
 
         // creates an instance of KNetwork::ServerSocket following the DCC settings
-        static KNetwork::KServerSocket* createServerSocketAndListen( TQObject* tqparent = 0, TQString* failedReason = 0, int minPort = 0, int maxPort = 0 );
+        static KNetwork::KServerSocket* createServerSocketAndListen( TQObject* parent = 0, TQString* failedReason = 0, int minPort = 0, int maxPort = 0 );
 
         // returns the port number from a server socket
         static int getServerSocketPort( KNetwork::KServerSocket* serverSocket );

konversation/src/dccrecipientdialog.cpp

@@ -23,8 +23,8 @@
 
 TQString DccRecipientDialog::selectedNickname;     // static
 
-DccRecipientDialog::DccRecipientDialog(TQWidget* tqparent, const TQStringList &list,const TQSize &size) :
+DccRecipientDialog::DccRecipientDialog(TQWidget* parent, const TQStringList &list,const TQSize &size) :
-  KDialogBase(tqparent,"dcc_recipient_dialog",true,i18n("Select Recipient"),
+  KDialogBase(parent,"dcc_recipient_dialog",true,i18n("Select Recipient"),
 	      KDialogBase::Ok | KDialogBase::Cancel,KDialogBase::Ok,true)
 {
     // Create the top level widget
@@ -88,10 +88,10 @@ void DccRecipientDialog::slotOk()
     KDialogBase::slotOk();
 }
 
-TQString DccRecipientDialog::getNickname(TQWidget* tqparent, const TQStringList& list)
+TQString DccRecipientDialog::getNickname(TQWidget* parent, const TQStringList& list)
 {
     TQSize size;                                   // TODO: get it from Preferences
-    DccRecipientDialog dlg(tqparent,list,size);
+    DccRecipientDialog dlg(parent,list,size);
     dlg.exec();
 
     return dlg.getSelectedNickname();

konversation/src/dccrecipientdialog.h

@@ -26,10 +26,10 @@ class DccRecipientDialog : public KDialogBase
   TQ_OBJECT
 
         public:
-        DccRecipientDialog(TQWidget* tqparent, const TQStringList &list, const TQSize &size);
+        DccRecipientDialog(TQWidget* parent, const TQStringList &list, const TQSize &size);
         ~DccRecipientDialog();
 
-        static TQString getNickname(TQWidget* tqparent, const TQStringList& list);
+        static TQString getNickname(TQWidget* parent, const TQStringList& list);
 
     protected slots:
         void newNicknameSelected(TQListBoxItem* item);

konversation/src/dcctransfer.cpp

@@ -20,7 +20,7 @@
 #include <kdebug.h>
 
 
-DccTransfer::DccTransfer( DccType dccType, TQObject* tqparent ) : TQObject(tqparent)
+DccTransfer::DccTransfer( DccType dccType, TQObject* parent ) : TQObject(parent)
 {
     kdDebug() << "DccTransfer::DccTransfer()" << endl;
 

konversation/src/dcctransfer.h

@@ -59,7 +59,7 @@ class DccTransfer : public TQObject
             InfiniteValue = -3
         };
 
-        DccTransfer( DccType dccType, TQObject* tqparent );
+        DccTransfer( DccType dccType, TQObject* parent );
         virtual ~DccTransfer();
 
         // info of DccTransfer can be copied with this constructor.

konversation/src/dcctransferdetailedinfopanel.cpp

@@ -30,8 +30,8 @@
 #include <ksqueezedtextlabel.h>
 
 
-DccTransferDetailedInfoPanel::DccTransferDetailedInfoPanel( TQWidget* tqparent, const char* name )
+DccTransferDetailedInfoPanel::DccTransferDetailedInfoPanel( TQWidget* parent, const char* name )
-    : DccTransferDetailedInfoPanelUI( tqparent, name )
+    : DccTransferDetailedInfoPanelUI( parent, name )
 {
     m_autoViewUpdateTimer = new TQTimer( this );
 

konversation/src/dcctransferdetailedinfopanel.h

@@ -26,7 +26,7 @@ class DccTransferDetailedInfoPanel : public DccTransferDetailedInfoPanelUI
   TQ_OBJECT
 
     public:
-        explicit DccTransferDetailedInfoPanel( TQWidget* tqparent = 0, const char* name = 0 );
+        explicit DccTransferDetailedInfoPanel( TQWidget* parent = 0, const char* name = 0 );
         virtual ~DccTransferDetailedInfoPanel();
 
         void setItem( DccTransferPanelItem* item );

konversation/src/dcctransfermanager.cpp

@@ -18,8 +18,8 @@
 #include <kdebug.h>
 
 
-DccTransferManager::DccTransferManager( TQObject* tqparent )
+DccTransferManager::DccTransferManager( TQObject* parent )
-    : TQObject( tqparent )
+    : TQObject( parent )
 {
     // initial number
     m_nextReverseTokenNumber = 1001;

konversation/src/dcctransfermanager.h

@@ -35,7 +35,7 @@ class DccTransferManager : public TQObject
   TQ_OBJECT
 
     public:
-        DccTransferManager( TQObject* tqparent = 0 );
+        DccTransferManager( TQObject* parent = 0 );
         ~DccTransferManager();
 
     signals:

konversation/src/dcctransferpanel.cpp

@@ -40,7 +40,7 @@
 #include <kapplication.h>
 
 
-DccTransferPanel::DccTransferPanel(TQWidget* tqparent) : ChatWindow(tqparent)
+DccTransferPanel::DccTransferPanel(TQWidget* parent) : ChatWindow(parent)
 {
     setType(ChatWindow::DccTransferPanel);
     setName(i18n("DCC tqStatus"));

konversation/src/dcctransferpanel.h

@@ -67,7 +67,7 @@ class DccTransferPanel : public ChatWindow
                 };
         };
 
-        DccTransferPanel(TQWidget* tqparent);
+        DccTransferPanel(TQWidget* parent);
         ~DccTransferPanel();
 
         KListView* getListView();

konversation/src/dcctransferrecv.cpp

@@ -57,8 +57,8 @@ connectionSuccess()  : called by recvSocket
 
 */
 
-DccTransferRecv::DccTransferRecv(TQObject* tqparent)
+DccTransferRecv::DccTransferRecv(TQObject* parent)
-    : DccTransfer( DccTransfer::Receive, tqparent )
+    : DccTransfer( DccTransfer::Receive, parent )
 {
     kdDebug() << "DccTransferRecv::DccTransferRecv()" << endl;
 
@@ -100,7 +100,7 @@ void DccTransferRecv::cleanUp()
     if ( m_recvSocket )
     {
         m_recvSocket->close();
-        m_recvSocket = 0;                         // the instance will be deleted automatically by its tqparent
+        m_recvSocket = 0;                         // the instance will be deleted automatically by its parent
     }
     if ( m_writeCacheHandler )
     {

konversation/src/dcctransferrecv.h

@@ -47,7 +47,7 @@ class DccTransferRecv : public DccTransfer
   TQ_OBJECT
 
     public:
-        DccTransferRecv(TQObject* tqparent);
+        DccTransferRecv(TQObject* parent);
         virtual ~DccTransferRecv();
 
         // RETQUIRED

konversation/src/dcctransfersend.cpp

@@ -47,8 +47,8 @@
 
 using namespace KNetwork;
 
-DccTransferSend::DccTransferSend(TQObject* tqparent)
+DccTransferSend::DccTransferSend(TQObject* parent)
-    : DccTransfer( DccTransfer::Send, tqparent )
+    : DccTransfer( DccTransfer::Send, parent )
 {
     kdDebug() << "DccTransferSend::DccTransferSend()" << endl;
 
@@ -79,12 +79,12 @@ void DccTransferSend::cleanUp()
     if ( m_sendSocket )
     {
         m_sendSocket->close();
-        m_sendSocket = 0;                         // the instance will be deleted automatically by its tqparent
+        m_sendSocket = 0;                         // the instance will be deleted automatically by its parent
     }
     if ( m_serverSocket )
     {
         m_serverSocket->close();
-        m_serverSocket = 0;                       // the instance will be deleted automatically by its tqparent
+        m_serverSocket = 0;                       // the instance will be deleted automatically by its parent
     }
 }
 

konversation/src/dcctransfersend.h

@@ -36,7 +36,7 @@ class DccTransferSend : public DccTransfer
   TQ_OBJECT
 
         public:
-        DccTransferSend(TQObject* tqparent);
+        DccTransferSend(TQObject* parent);
         virtual ~DccTransferSend();
 
         // RETQUIRED

konversation/src/editnotifydialog.cpp

@@ -25,11 +25,11 @@
 #include <klocale.h>
 
 
-EditNotifyDialog::EditNotifyDialog(TQWidget* tqparent,
+EditNotifyDialog::EditNotifyDialog(TQWidget* parent,
 const TQString& network,
 const TQString& nickname):
 
-KDialogBase(tqparent,"editnotify",true,i18n("Edit Watched Nickname"),
+KDialogBase(parent,"editnotify",true,i18n("Edit Watched Nickname"),
 KDialogBase::Ok | KDialogBase::Cancel,
 KDialogBase::Ok,true)
 

konversation/src/editnotifydialog.h

@@ -34,7 +34,7 @@ class EditNotifyDialog : public KDialogBase
   TQ_OBJECT
 
     public:
-        explicit EditNotifyDialog(TQWidget* tqparent=0,const TQString& network=TQString(),
+        explicit EditNotifyDialog(TQWidget* parent=0,const TQString& network=TQString(),
             const TQString& nickname=TQString());
         ~EditNotifyDialog();
 

konversation/src/highlight_preferences.cpp

@@ -35,8 +35,8 @@
 #include <kiconloader.h>
 
 
-Highlight_Config::Highlight_Config(TQWidget* tqparent, const char* name)
+Highlight_Config::Highlight_Config(TQWidget* parent, const char* name)
- : Highlight_ConfigUI(tqparent,name)
+ : Highlight_ConfigUI(parent,name)
 {
   // reset flag to defined state (used to block signals when just selecting a new item)
   newItemSelected=false;

konversation/src/highlight_preferences.h

@@ -28,7 +28,7 @@ class Highlight_Config : public Highlight_ConfigUI, public KonviSettingsPage
   TQ_OBJECT
 
     public:
-        explicit Highlight_Config(TQWidget *tqparent = 0, const char *name = 0);
+        explicit Highlight_Config(TQWidget *parent = 0, const char *name = 0);
         ~Highlight_Config();
 
     public:

konversation/src/highlightviewitem.cpp

@@ -19,8 +19,8 @@
 #include <klistview.h>
 
 
-HighlightViewItem::HighlightViewItem(KListView* tqparent, Highlight* passed_Highlight)
+HighlightViewItem::HighlightViewItem(KListView* parent, Highlight* passed_Highlight)
-: TQCheckListItem(tqparent, TQString(), TQCheckListItem::CheckBox)
+: TQCheckListItem(parent, TQString(), TQCheckListItem::CheckBox)
 {
     setText(1,passed_Highlight->getPattern());
     itemColor = passed_Highlight->getColor();

konversation/src/highlightviewitem.h

@@ -27,7 +27,7 @@ class KListView;
 class HighlightViewItem : public TQCheckListItem
 {
     public:
-        HighlightViewItem(KListView* tqparent, Highlight* passed_Highlight);
+        HighlightViewItem(KListView* parent, Highlight* passed_Highlight);
         ~HighlightViewItem();
 
         TQString getPattern();

konversation/src/identitydialog.cpp

@@ -39,8 +39,8 @@
 namespace Konversation
 {
 
-    IdentityDialog::IdentityDialog(TQWidget *tqparent, const char *name)
+    IdentityDialog::IdentityDialog(TQWidget *parent, const char *name)
-        : KDialogBase(Plain, i18n("Identities"), Ok|Cancel, Ok, tqparent, name)
+        : KDialogBase(Plain, i18n("Identities"), Ok|Cancel, Ok, parent, name)
     {
         TQFrame* mainWidget = plainPage();
         TQGridLayout* mainLayout = new TQGridLayout(mainWidget, 1, 2, 0, spacingHint());
@@ -85,7 +85,7 @@ namespace Konversation
 
         TQLabel* realNameLabel = new TQLabel(i18n("&Real name:"), generalWidget);
         m_realNameEdit = new KLineEdit(generalWidget);
-        TQWhatsThis::add(m_realNameEdit, i18n("Enter your real name here. IRC is not intended to keep you hidden from your friends or enemies. Keep this in mind if you are tempted to behave maliciously. A fake \"real name\" can be a good way to tqmask your gender from all the nerds out there, but the PC you use can always be traced so you will never be truly anonymous."));
+        TQWhatsThis::add(m_realNameEdit, i18n("Enter your real name here. IRC is not intended to keep you hidden from your friends or enemies. Keep this in mind if you are tempted to behave maliciously. A fake \"real name\" can be a good way to mask your gender from all the nerds out there, but the PC you use can always be traced so you will never be truly anonymous."));
         realNameLabel->setBuddy(m_realNameEdit);
 
         TQGroupBox* nicknameGBox = new TQGroupBox(0, Qt::Horizontal, i18n("Nickname"), generalWidget);

konversation/src/identitydialog.h

@@ -33,7 +33,7 @@ namespace Konversation
         Q_OBJECT
   TQ_OBJECT
         public:
-            explicit IdentityDialog(TQWidget *tqparent = 0, const char *name = 0);
+            explicit IdentityDialog(TQWidget *parent = 0, const char *name = 0);
             ~IdentityDialog();
             void setCurrentIdentity(int index);
             IdentityPtr setCurrentIdentity(IdentityPtr identity);

konversation/src/ignore_preferences.cpp

@@ -28,8 +28,8 @@
 #include <tqcheckbox.h>
 
 
-Ignore_Config::Ignore_Config( TQWidget* tqparent, const char* name, WFlags fl )
+Ignore_Config::Ignore_Config( TQWidget* parent, const char* name, WFlags fl )
-    : Ignore_ConfigUI( tqparent, name, fl )
+    : Ignore_ConfigUI( parent, name, fl )
 {
     connect(newButton,TQT_SIGNAL(clicked()),
         this,TQT_SLOT(newIgnore()));

konversation/src/ignore_preferences.h

@@ -26,7 +26,7 @@ class Ignore_Config : public Ignore_ConfigUI, public KonviSettingsPage
   TQ_OBJECT
 
     public:
-        explicit Ignore_Config( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+        explicit Ignore_Config( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
         ~Ignore_Config();
         TQString flagNames;
 

konversation/src/ignorelistviewitem.cpp

@@ -18,8 +18,8 @@
 #include <kdebug.h>
 
 
-IgnoreListViewItem::IgnoreListViewItem(TQListView* tqparent,const TQString& name,int newFlags):
+IgnoreListViewItem::IgnoreListViewItem(TQListView* parent,const TQString& name,int newFlags):
-KListViewItem(tqparent,name)
+KListViewItem(parent,name)
 {
     setFlags(newFlags);
 }

konversation/src/ignorelistviewitem.h

@@ -22,7 +22,7 @@
 class IgnoreListViewItem : public KListViewItem
 {
     public:
-        IgnoreListViewItem(TQListView* tqparent,const TQString& name,int flags);
+        IgnoreListViewItem(TQListView* parent,const TQString& name,int flags);
         ~IgnoreListViewItem();
 
         void setFlag(int flag,bool active);

konversation/src/inputfilter.cpp

@@ -119,9 +119,9 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com
     // Extract nickname from prefix
     int pos = prefix.find("!");
     TQString sourceNick = prefix.left(pos);
-    TQString sourceHosttqmask = prefix.mid(pos + 1);
+    TQString sourceHostmask = prefix.mid(pos + 1);
-    // remember hosttqmask for this nick, it could have changed
+    // remember hostmask for this nick, it could have changed
-    server->addHostmaskToNick(sourceNick,sourceHosttqmask);
+    server->addHostmaskToNick(sourceNick,sourceHostmask);
     TQString trailing = _trailing;
 
     if(command=="privmsg")
@@ -177,7 +177,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com
                 if(!isIgnore(prefix,Ignore::Query))
                 {
                     NickInfoPtr nickinfo = server->obtainNickInfo(sourceNick);
-                    nickinfo->setHosttqmask(sourceHosttqmask);
+                    nickinfo->setHostmask(sourceHostmask);
 
                     // create new query (server will check for dupes)
                     query = server->addQuery(nickinfo, false /* we didn't initiate this*/ );
@@ -502,7 +502,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com
             */
 
             // Join the channel
-            server->joinChannel(channelName, sourceHosttqmask);
+            server->joinChannel(channelName, sourceHostmask);
 
             server->resetNickList(channelName);
 
@@ -522,7 +522,7 @@ void InputFilter::parseClientCommand(const TQString &prefix, const TQString &com
         }
         else
         {
-            Channel* channel = server->nickJoinsChannel(channelName,sourceNick,sourceHosttqmask);
+            Channel* channel = server->nickJoinsChannel(channelName,sourceNick,sourceHostmask);
             konv_app->notificationHandler()->join(channel, sourceNick);
         }
     }
@@ -1173,7 +1173,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
                 NickInfo* nickInfo = server->getNickInfo(parameterList[1]);
                 if(nickInfo)
                 {
-                    nickInfo->setHosttqmask(i18n("%1@%2").tqarg(parameterList[2]).tqarg(parameterList[3]));
+                    nickInfo->setHostmask(i18n("%1@%2").tqarg(parameterList[2]).tqarg(parameterList[3]));
                     nickInfo->setRealName(trailing);
                 }
                 // Display message only if this was not an automatic request.
@@ -1250,7 +1250,7 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
                 bool bAway = parameterList[6].upper().startsWith("G");
                 if(nickInfo)
                 {
-                    nickInfo->setHosttqmask(i18n("%1@%2").tqarg(parameterList[2]).tqarg(parameterList[3]));
+                    nickInfo->setHostmask(i18n("%1@%2").tqarg(parameterList[2]).tqarg(parameterList[3]));
                                                   //Strip off the "0 "
                     nickInfo->setRealName(trailing.section(" ", 1));
                     nickInfo->setAway(bAway);
@@ -1563,32 +1563,32 @@ void InputFilter::parseServerCommand(const TQString &prefix, const TQString &com
 
                 for(unsigned int index=0;index<uhosts.count();index++)
                 {
-                    // extract nickname and hosttqmask from reply
+                    // extract nickname and hostmask from reply
                     TQString nick(uhosts[index].section('=',0,0));
-                    TQString tqmask(uhosts[index].section('=',1));
+                    TQString mask(uhosts[index].section('=',1));
 
                     // get away and IRC operator flags
-                    bool away=(tqmask[0]=='-');
+                    bool away=(mask[0]=='-');
                     bool ircOp=(nick[nick.length()-1]=='*');
 
-                    // cut flags from nick/hosttqmask
+                    // cut flags from nick/hostmask
-                    tqmask=tqmask.mid(1);
+                    mask=mask.mid(1);
                     if(ircOp)
                     {
                         nick=nick.left(nick.length()-1);
                     }
 
                     // inform server of this user's data
-                    emit userhost(nick,tqmask,away,ircOp);
+                    emit userhost(nick,mask,away,ircOp);
 
                     // display message only if this was no automatic request
                     if(getAutomaticRequest("USERHOST",nick)==0)
                     {
                         server->appendMessageToFrontmost(i18n("Userhost"),
-                            i18n("%1 = nick, %2 = shows if nick is op, %3 = hosttqmask, %4 = shows away", "%1%2 is %3%4.")
+                            i18n("%1 = nick, %2 = shows if nick is op, %3 = hostmask, %4 = shows away", "%1%2 is %3%4.")
                             .tqarg(nick)
                             .tqarg((ircOp) ? i18n(" (IRC Operator)") : TQString())
-                            .tqarg(tqmask)
+                            .tqarg(mask)
                             .tqarg((away) ? i18n(" (away)") : TQString()));
                     }
 
@@ -1900,13 +1900,13 @@ void InputFilter::parsePrivMsg(const TQString& prefix,
 {
     int pos = prefix.find("!");
     TQString source;
-    TQString sourceHosttqmask;
+    TQString sourceHostmask;
     TQString message(trailing);
 
     if(pos > 0)
     {
         source = prefix.left(pos);
-        sourceHosttqmask = prefix.mid(pos + 1);
+        sourceHostmask = prefix.mid(pos + 1);
     }
     else
     {
@@ -1950,7 +1950,7 @@ void InputFilter::parsePrivMsg(const TQString& prefix,
         if(!isIgnore(prefix,Ignore::Query))
         {
             NickInfoPtr nickinfo = server->obtainNickInfo(source);
-            nickinfo->setHosttqmask(sourceHosttqmask);
+            nickinfo->setHostmask(sourceHostmask);
 
             // Create a new query (server will check for dupes)
             query = server->addQuery(nickinfo, false /*we didn't initiate this*/ );

konversation/src/inputfilter.h

@@ -60,7 +60,7 @@ class InputFilter : public TQObject
                                                   // will be connected to Server::resumeDccSendTransfer()
         void resumeDccSendTransfer(const TQString &sourceNick, const TQStringList &dccArgument);
                                                   // will be connected to Server::userhost()
-        void userhost(const TQString& nick,const TQString& hosttqmask,bool away,bool ircOp);
+        void userhost(const TQString& nick,const TQString& hostmask,bool away,bool ircOp);
                                                   // will be connected to Server::setTopicAuthor()
         void topicAuthor(const TQString& channel, const TQString& author, TQDateTime t);
         void endOfWho(const TQString& target);     // for scheduling auto /WHO

konversation/src/insertchardialog.cpp

@@ -19,8 +19,8 @@
 namespace Konversation
 {
 
-    InsertCharDialog::InsertCharDialog(const TQString& font, TQWidget *tqparent, const char *name)
+    InsertCharDialog::InsertCharDialog(const TQString& font, TQWidget *parent, const char *name)
-        : KDialogBase(tqparent, name, false, i18n("Insert Character"),
+        : KDialogBase(parent, name, false, i18n("Insert Character"),
         KDialogBase::Ok | KDialogBase::Close,
         KDialogBase::Ok, false)
     {

konversation/src/insertchardialog.h

@@ -27,7 +27,7 @@ namespace Konversation
   TQ_OBJECT
 
         public:
-            explicit InsertCharDialog(const TQString& font = TQString(), TQWidget *tqparent = 0, const char *name = 0);
+            explicit InsertCharDialog(const TQString& font = TQString(), TQWidget *parent = 0, const char *name = 0);
             ~InsertCharDialog();
 
             void setFont(const TQFont &font);

konversation/src/irccolorchooser.cpp

@@ -23,8 +23,8 @@
 #include <kcombobox.h>
 
 
-IRCColorChooser::IRCColorChooser(TQWidget* tqparent, const char* name)
+IRCColorChooser::IRCColorChooser(TQWidget* parent, const char* name)
-: KDialogBase(tqparent, name, true, i18n("IRC Color Chooser"), Ok|Cancel, Ok)
+: KDialogBase(parent, name, true, i18n("IRC Color Chooser"), Ok|Cancel, Ok)
 {
     m_view = new IRCColorChooserUI(this);
     setMainWidget(m_view);

konversation/src/irccolorchooser.h

@@ -27,7 +27,7 @@ class IRCColorChooser : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
         public:
-        explicit IRCColorChooser(TQWidget* tqparent, const char* name = 0);
+        explicit IRCColorChooser(TQWidget* parent, const char* name = 0);
         TQString color();
 
     protected slots:

konversation/src/ircinput.cpp

@@ -36,7 +36,7 @@
 #define RICHTEXT 0
 
 
-IRCInput::IRCInput(TQWidget* tqparent) : KTextEdit(tqparent)
+IRCInput::IRCInput(TQWidget* parent) : KTextEdit(parent)
 {
     m_lastHeight=document()->height();
 

konversation/src/ircinput.h

@@ -29,7 +29,7 @@ class IRCInput : public KTextEdit
   TQ_OBJECT
 
     public:
-        explicit IRCInput(TQWidget* tqparent);
+        explicit IRCInput(TQWidget* parent);
         ~IRCInput();
 
         void setCompletionMode(char mode);

konversation/src/ircview.cpp

@@ -68,7 +68,7 @@
 #include <kglobal.h>
 
 
-IRCView::IRCView(TQWidget* tqparent, Server* newServer) : KTextBrowser(tqparent)
+IRCView::IRCView(TQWidget* parent, Server* newServer) : KTextBrowser(parent)
 {
     m_copyUrlMenu = false;
     m_resetScrollbar = true;

konversation/src/ircview.h

@@ -40,7 +40,7 @@ class IRCView : public KTextBrowser
   TQ_OBJECT
 
     public:
-        IRCView(TQWidget* tqparent,Server* newServer);
+        IRCView(TQWidget* parent,Server* newServer);
         ~IRCView();
 
         void clear();
@@ -231,7 +231,7 @@ class IRCView : public KTextBrowser
 
         TQFontDatabase m_fontDataBase;
 	
-	// Provide ability to disable tqparent ensureCursorVisible() call
+	// Provide ability to disable parent ensureCursorVisible() call
 	bool m_disableEnsureCursorVisible;
 	// If this widget was painted at least once. Needed for scrollbar
 	// reset HACK as a precaution.

konversation/src/ircviewbox.cpp

@@ -25,8 +25,8 @@ static TQPixmap getIcon(const TQString& name)
     return iconLoader->loadIcon(name, KIcon::Toolbar, 16);
 }
 
-IRCViewBox::IRCViewBox(TQWidget* tqparent, Server* newServer)
+IRCViewBox::IRCViewBox(TQWidget* parent, Server* newServer)
-: TQVBox(tqparent)
+: TQVBox(parent)
 {
     m_ircView = new IRCView(this, newServer);
     m_searchBar = new SearchBar(this);

konversation/src/ircviewbox.h

@@ -26,7 +26,7 @@ class IRCViewBox : public TQVBox
 
         public:
 
-        IRCViewBox(TQWidget* tqparent, Server* newServer);
+        IRCViewBox(TQWidget* parent, Server* newServer);
         ~IRCViewBox();
 
         IRCView*   ircView() const;

konversation/src/joinchanneldialog.cpp

@@ -25,8 +25,8 @@
 namespace Konversation
 {
 
-    JoinChannelDialog::JoinChannelDialog(Server* server, TQWidget *tqparent, const char *name)
+    JoinChannelDialog::JoinChannelDialog(Server* server, TQWidget *parent, const char *name)
-        : KDialogBase(tqparent, name, true, i18n("Join Channel on %1").tqarg(server->getDisplayName()), Ok|Cancel, Ok)
+        : KDialogBase(parent, name, true, i18n("Join Channel on %1").tqarg(server->getDisplayName()), Ok|Cancel, Ok)
     {
         m_server = server;
         m_widget = new JoinChannelUI(this);

konversation/src/joinchanneldialog.h

@@ -27,7 +27,7 @@ namespace Konversation
         Q_OBJECT
   TQ_OBJECT
             public:
-            explicit JoinChannelDialog(Server* server, TQWidget *tqparent = 0, const char *name = 0);
+            explicit JoinChannelDialog(Server* server, TQWidget *parent = 0, const char *name = 0);
             ~JoinChannelDialog();
 
             TQString channel() const;

konversation/src/konversationsound.cpp

@@ -23,8 +23,8 @@
 
 namespace Konversation
 {
-    Sound::Sound(TQObject* tqparent, const char* name)
+    Sound::Sound(TQObject* parent, const char* name)
-        : TQObject(tqparent, name)
+        : TQObject(parent, name)
         {}
 
     Sound::~Sound()

konversation/src/konversationsound.h

@@ -31,7 +31,7 @@ namespace Konversation
   TQ_OBJECT
 
         public:
-            explicit Sound(TQObject *tqparent = 0, const char *name = 0);
+            explicit Sound(TQObject *parent = 0, const char *name = 0);
             ~Sound();
 
         public slots:

konversation/src/konversationstatusbar.h

@@ -28,7 +28,7 @@ class KonversationStatusBar : public TQObject
   TQ_OBJECT
 
     public:
-        explicit KonversationStatusBar(KonversationMainWindow* tqparent);
+        explicit KonversationStatusBar(KonversationMainWindow* parent);
         ~KonversationStatusBar();
 
     public slots:

konversation/src/konviconfigdialog.cpp

@@ -63,14 +63,14 @@ class KonviConfigDialog::KConfigDialogPrivate
         TQMap<TQWidget *, KConfigDialogManager *> managerForPage;
 };
 
-KonviConfigDialog::KonviConfigDialog( TQWidget *tqparent, const char *name,
+KonviConfigDialog::KonviConfigDialog( TQWidget *parent, const char *name,
                                       KConfigSkeleton *config,
                                       DialogType dialogType,
                                       int dialogButtons,
                                       ButtonCode defaultButton,
                                       bool modal ) :
                    KDialogBase( dialogType, TQt::WStyle_DialogBorder,
-                                tqparent, name, modal, i18n("Configure"), dialogButtons, defaultButton ),
+                                parent, name, modal, i18n("Configure"), dialogButtons, defaultButton ),
                                 d(new KConfigDialogPrivate(dialogType))
 {
     if ( name )

konversation/src/konviconfigdialog.h

@@ -63,7 +63,7 @@ class KonviConfigDialog : public KDialogBase
     void sigUpdateWidgets();
 
     public:
-        KonviConfigDialog( TQWidget *tqparent, const char *name,
+        KonviConfigDialog( TQWidget *parent, const char *name,
                            KConfigSkeleton *config,
                            DialogType dialogType = IconList,
                            int dialogButtons = Default|Ok|Apply|Cancel|Help,

konversation/src/konvisettingsdialog.cpp

@@ -43,8 +43,8 @@
 #include <klistview.h>
 
 
-KonviSettingsDialog::KonviSettingsDialog( TQWidget *tqparent) :
+KonviSettingsDialog::KonviSettingsDialog( TQWidget *parent) :
-	           KonviConfigDialog( tqparent, "settings", Preferences::self(), KDialogBase::TreeList)
+	           KonviConfigDialog( parent, "settings", Preferences::self(), KDialogBase::TreeList)
 {
   m_modified = false;
   setShowIconsInTreeList(true);

konversation/src/konvisettingsdialog.h

@@ -72,7 +72,7 @@ class KDEUI_EXPORT KonviSettingsDialog : public KonviConfigDialog
 	bool m_modified;
 
     public:
-        explicit KonviSettingsDialog(TQWidget *tqparent);
+        explicit KonviSettingsDialog(TQWidget *parent);
         ~KonviSettingsDialog();
 
         void openWatchedNicknamesPage();

konversation/src/linkaddressbook/addresseeitem.cpp

@@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include <kdebug.h>
 
 
-AddresseeItem::AddresseeItem( TQListView *tqparent, const KABC::Addressee &addressee) :
+AddresseeItem::AddresseeItem( TQListView *parent, const KABC::Addressee &addressee) :
-KListViewItem( tqparent ),
+KListViewItem( parent ),
 mAddressee( addressee )
 {
     //We can't save showphoto because we don't have a d pointer

konversation/src/linkaddressbook/addresseeitem.h

@@ -45,10 +45,10 @@ class AddresseeItem : public KListViewItem
         /**
           Constructor.
 
-          @param tqparent    The tqparent listview.
+          @param parent    The parent listview.
           @param addressee The associated addressee.
         */
-        AddresseeItem( TQListView *tqparent, const KABC::Addressee &addressee );
+        AddresseeItem( TQListView *parent, const KABC::Addressee &addressee );
 
         /**
           Returns the addressee.

konversation/src/linkaddressbook/linkaddressbookui.cpp

@@ -47,8 +47,8 @@ Kopete    (c) 2002-2004 by the Kopete developers  <kopete-devel@kde.org>
 #include <kabc/stdaddressbook.h>
 
 
-LinkAddressbookUI::LinkAddressbookUI( TQWidget *tqparent, const char *name, const TQString &ircnick, const TQString &servername, const TQString &servergroup, const TQString &suggested_realname )
+LinkAddressbookUI::LinkAddressbookUI( TQWidget *parent, const char *name, const TQString &ircnick, const TQString &servername, const TQString &servergroup, const TQString &suggested_realname )
-: KDialogBase(Plain, i18n("Link IRC Nick to Addressbook Contact"), Ok|Cancel|Help, Ok, tqparent, name)
+: KDialogBase(Plain, i18n("Link IRC Nick to Addressbook Contact"), Ok|Cancel|Help, Ok, parent, name)
 {
     TQFrame* page = plainPage();
     TQGridLayout* pageLayout = new TQGridLayout(page, 1, 1, 0, 0);

konversation/src/linkaddressbook/linkaddressbookui.h

@@ -41,7 +41,7 @@ class LinkAddressbookUI : public KDialogBase
   TQ_OBJECT
 
         public:
-        LinkAddressbookUI( TQWidget *tqparent, const char *name, const TQString &ircnick, const TQString &servername, const TQString &servergroup, const TQString &suggested_realname);
+        LinkAddressbookUI( TQWidget *parent, const char *name, const TQString &ircnick, const TQString &servername, const TQString &servergroup, const TQString &suggested_realname);
         ~LinkAddressbookUI();
 
     private:

konversation/src/linkaddressbook/nicklisttooltip.cpp

@@ -27,7 +27,7 @@ class NickListView;
 
 namespace Konversation
 {
-    KonversationNickListViewToolTip::KonversationNickListViewToolTip(TQWidget *tqparent, NickListView *lv) : TQToolTip(tqparent)
+    KonversationNickListViewToolTip::KonversationNickListViewToolTip(TQWidget *parent, NickListView *lv) : TQToolTip(parent)
     {
         m_listView = lv;
     }

konversation/src/linkaddressbook/nicklisttooltip.h

@@ -33,7 +33,7 @@ namespace Konversation
     class KonversationNickListViewToolTip : public TQToolTip
     {
         public:
-            KonversationNickListViewToolTip(TQWidget *tqparent, NickListView *lv);
+            KonversationNickListViewToolTip(TQWidget *parent, NickListView *lv);
             virtual ~KonversationNickListViewToolTip();
 
             void maybeTip( const TQPoint &pos );

konversation/src/linkaddressbook/nicksonlinetooltip.cpp

@@ -29,7 +29,7 @@ class NickListView;
 
 namespace Konversation
 {
-    KonversationNicksOnlineToolTip::KonversationNicksOnlineToolTip(TQWidget *tqparent, NicksOnline *nicksOnline) : TQToolTip(tqparent)
+    KonversationNicksOnlineToolTip::KonversationNicksOnlineToolTip(TQWidget *parent, NicksOnline *nicksOnline) : TQToolTip(parent)
     {
         m_nicksOnline = nicksOnline;
     }

konversation/src/linkaddressbook/nicksonlinetooltip.h

@@ -33,7 +33,7 @@ namespace Konversation
     class KonversationNicksOnlineToolTip : public TQToolTip
     {
         public:
-            KonversationNicksOnlineToolTip(TQWidget *tqparent, NicksOnline *nicksOnline);
+            KonversationNicksOnlineToolTip(TQWidget *parent, NicksOnline *nicksOnline);
             virtual ~KonversationNicksOnlineToolTip();
 
             void maybeTip( const TQPoint &pos );

konversation/src/logfilereader.cpp

@@ -37,7 +37,7 @@
 #include <kio/jobclasses.h>
 
 
-LogfileReader::LogfileReader(TQWidget* tqparent, const TQString& log) : ChatWindow(tqparent)
+LogfileReader::LogfileReader(TQWidget* parent, const TQString& log) : ChatWindow(parent)
 {
     setType(ChatWindow::LogFileReader);
 

konversation/src/logfilereader.h

@@ -29,7 +29,7 @@ class LogfileReader : public ChatWindow
   TQ_OBJECT
 
         public:
-        LogfileReader(TQWidget* tqparent, const TQString& log);
+        LogfileReader(TQWidget* parent, const TQString& log);
         ~LogfileReader();
 
         virtual bool closeYourself() { closeLog(); return true; }

konversation/src/modebutton.cpp

@@ -14,8 +14,8 @@
 #include "modebutton.h"
 
 
-ModeButton::ModeButton(const TQString& label,TQWidget* tqparent,int newId) :
+ModeButton::ModeButton(const TQString& label,TQWidget* parent,int newId) :
-TQPushButton::TQPushButton(label,tqparent)
+TQPushButton::TQPushButton(label,parent)
 {
     id=newId;
     on=false;

konversation/src/modebutton.h

@@ -23,7 +23,7 @@ class ModeButton : public TQPushButton
   TQ_OBJECT
 
         public:
-        ModeButton(const TQString& label,TQWidget* tqparent,int id);
+        ModeButton(const TQString& label,TQWidget* parent,int id);
         ~ModeButton();
 
         void setOn(bool state);

konversation/src/multilineedit.cpp

@@ -20,8 +20,8 @@
 
 TQString MultilineEdit::returnText;                // static
 
-MultilineEdit::MultilineEdit(TQWidget* tqparent, const TQString& text) :
+MultilineEdit::MultilineEdit(TQWidget* parent, const TQString& text) :
-KDialogBase(tqparent,"multiline_edit_dialog",true,i18n("Edit Multiline Paste"),
+KDialogBase(parent,"multiline_edit_dialog",true,i18n("Edit Multiline Paste"),
 KDialogBase::User1 | KDialogBase::Ok | KDialogBase::Cancel,KDialogBase::Ok,true,
 KGuiItem(i18n("Add &Quotation Indicators")))
 {
@@ -68,9 +68,9 @@ void MultilineEdit::slotUser1()
     textEditor->setText(lines.join("\n"));
 }
 
-TQString MultilineEdit::edit(TQWidget* tqparent, const TQString& text)
+TQString MultilineEdit::edit(TQWidget* parent, const TQString& text)
 {
-    MultilineEdit dlg(tqparent,text);
+    MultilineEdit dlg(parent,text);
     dlg.exec();
 
     return returnText;

konversation/src/multilineedit.h

@@ -24,10 +24,10 @@ class MultilineEdit : public KDialogBase
   TQ_OBJECT
 
         public:
-        MultilineEdit(TQWidget* tqparent, const TQString& text);
+        MultilineEdit(TQWidget* parent, const TQString& text);
         ~MultilineEdit();
 
-        static TQString edit(TQWidget* tqparent, const TQString& text);
+        static TQString edit(TQWidget* parent, const TQString& text);
 
     protected slots:
         void slotOk();

konversation/src/multilinetextedit.cpp

@@ -17,7 +17,7 @@
 #include <kdebug.h>
 
 
-MultilineTextEdit::MultilineTextEdit(TQWidget* tqparent,const char* name) : TQTextEdit(tqparent,name)
+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()));

konversation/src/multilinetextedit.h

@@ -24,7 +24,7 @@ class MultilineTextEdit : public TQTextEdit
   TQ_OBJECT
 
     public:
-        explicit MultilineTextEdit(TQWidget* tqparent=0,const char* name=0);
+        explicit MultilineTextEdit(TQWidget* parent=0,const char* name=0);
         ~MultilineTextEdit();
 
     protected slots:

konversation/src/nick.cpp

@@ -28,7 +28,7 @@ Nick::Nick(KListView *listView,
 const ChannelNickPtr& channelnick)
     : TQObject (),
     KListViewItem (listView, listView->lastItem(), TQString(),
-                   channelnick->getNickname(), channelnick->getHosttqmask())
+                   channelnick->getNickname(), channelnick->getHostmask())
 {
     m_channelnickptr = channelnick;
 
@@ -152,7 +152,7 @@ TQString Nick::calculateLabel1()
 
 TQString Nick::calculateLabel2()
 {
-    return getChannelNick()->getNickInfo()->getHosttqmask();
+    return getChannelNick()->getNickInfo()->getHostmask();
 }
 
 int Nick::compare(TQListViewItem* item,int col,bool ascending) const

konversation/src/nickinfo.cpp

@@ -64,7 +64,7 @@ NickInfo::~NickInfo()
 // Get properties of NickInfo object.
 TQString NickInfo::getNickname() const { return m_nickname; }
 TQString NickInfo::loweredNickname() const { return m_loweredNickname; }
-TQString NickInfo::getHosttqmask() const { return m_hosttqmask; }
+TQString NickInfo::getHostmask() const { return m_hostmask; }
 
 bool NickInfo::isAway() const { return m_away; }
 TQString NickInfo::getAwayMessage() const { return m_awayMessage; }
@@ -153,10 +153,10 @@ void NickInfo::startNickInfoChangedTimer()
     m_changedTimer->start(3000, true /*single shot*/);
 }
 
-void NickInfo::setHosttqmask(const TQString& newMask)
+void NickInfo::setHostmask(const TQString& newMask)
 {
-    if (newMask.isEmpty() || newMask == m_hosttqmask) return;
+    if (newMask.isEmpty() || newMask == m_hostmask) return;
-    m_hosttqmask = newMask;
+    m_hostmask = newMask;
 
     startNickInfoChangedTimer();
 }
@@ -386,9 +386,9 @@ void NickInfo::tooltipTableData(TQTextStream &tooltip) const
         tooltip << "<tr><td><b>" << m_addressee.birthdayLabel() << ": </b></td><td>" << m_addressee.birthday().toString("ddd d MMMM yyyy") << "</td></tr>";
         dirty=true;
     }
-    if(!getHosttqmask().isEmpty())
+    if(!getHostmask().isEmpty())
     {
-        tooltip << "<tr><td><b>" << i18n("Hosttqmask:") << " </b></td><td>" << getHosttqmask() << "</td></tr>";
+        tooltip << "<tr><td><b>" << i18n("Hostmask:") << " </b></td><td>" << getHostmask() << "</td></tr>";
         dirty=true;
     }
     if(isAway())

konversation/src/nickinfo.h

@@ -45,7 +45,7 @@ class NickInfo : public TQObject, public KShared
         // Get properties of NickInfo object.
         TQString getNickname() const;
         TQString loweredNickname() const;
-        TQString getHosttqmask() const;
+        TQString getHostmask() const;
         /** Currently return whether the user has set themselves to away with /away.
          *  May be changed in the future to parse the nick string and see if it contains
          *  "|away" or "|afk"  or something.
@@ -77,8 +77,8 @@ class NickInfo : public TQObject, public KShared
 
         /** Set properties of NickInfo object. */
         void setNickname(const TQString& newNickname);
-        /** Set properties of NickInfo object. Ignores the request is newtqmask is empty.*/
+        /** Set properties of NickInfo object. Ignores the request is newmask is empty.*/
-        void setHosttqmask(const TQString& newMask);
+        void setHostmask(const TQString& newMask);
         /** Set properties of NickInfo object. */
         void setAway(bool state);
         /** Set properties of NickInfo object. */
@@ -141,7 +141,7 @@ class NickInfo : public TQObject, public KShared
         TQString m_nickname;
         TQString m_loweredNickname;
         Server* m_owningServer;
-        TQString m_hosttqmask;
+        TQString m_hostmask;
         bool m_away;
         TQString m_awayMessage;
         TQString m_identdInfo;

konversation/src/nicklistbehavior_preferences.cpp

@@ -21,8 +21,8 @@
 #include <klocale.h>
 
 
-NicklistBehavior_Config::NicklistBehavior_Config(TQWidget *tqparent, const char *name)
+NicklistBehavior_Config::NicklistBehavior_Config(TQWidget *parent, const char *name)
- : NicklistBehavior_ConfigUI(tqparent, name)
+ : NicklistBehavior_ConfigUI(parent, name)
 {
   // get page widget and populate listview
   loadSettings();

konversation/src/nicklistbehavior_preferences.h

@@ -25,7 +25,7 @@ class NicklistBehavior_Config : public NicklistBehavior_ConfigUI, public KonviSe
   TQ_OBJECT
 
     public:
-        explicit NicklistBehavior_Config(TQWidget *tqparent = 0, const char *name = 0);
+        explicit NicklistBehavior_Config(TQWidget *parent = 0, const char *name = 0);
         ~NicklistBehavior_Config();
 
         virtual void saveSettings();

konversation/src/nicklistview.cpp

@@ -27,8 +27,8 @@
 #include <tqdragobject.h>
 
 
-NickListView::NickListView(TQWidget* tqparent, Channel *chan) :
+NickListView::NickListView(TQWidget* parent, Channel *chan) :
-KListView(tqparent)
+KListView(parent)
 {
     KListView::setSorting(-1);
     setWhatsThis();

konversation/src/nicklistview.h

@@ -33,7 +33,7 @@ class NickListView : public KListView
   TQ_OBJECT
 
         public:
-        NickListView(TQWidget* tqparent, Channel *chan);
+        NickListView(TQWidget* parent, Channel *chan);
         ~NickListView();
 
         /** Call when the icons have been changed.

konversation/src/nicksonline.cpp

@@ -47,7 +47,7 @@
 #include <kmessagebox.h>
 
 
-NicksOnline::NicksOnline(TQWidget* tqparent): ChatWindow(tqparent)
+NicksOnline::NicksOnline(TQWidget* parent): ChatWindow(parent)
 {
     setName(i18n("Watched Nicks Online"));
     setType(ChatWindow::NicksOnline);
@@ -165,17 +165,17 @@ KListView* NicksOnline::getNickListView()
 }
 
 /**
- * Returns the named child of tqparent item in a NicksOnlineItem
+ * Returns the named child of parent item in a NicksOnlineItem
- * @param tqparent            Pointer to a NicksOnlineItem.
+ * @param parent            Pointer to a NicksOnlineItem.
  * @param name              The name in the desired child TQListViewItem, must be in column 0.
  * @param type              The type of entry to be found
  * @return                  Pointer to the child TQListViewItem or 0 if not found.
  */
-TQListViewItem* NicksOnline::findItemChild(const TQListViewItem* tqparent, const TQString& name, NicksOnlineItem::NickListViewColumn type)
+TQListViewItem* NicksOnline::findItemChild(const TQListViewItem* parent, const TQString& name, NicksOnlineItem::NickListViewColumn type)
 {
-    if (!tqparent) return 0;
+    if (!parent) return 0;
     TQListViewItem* child;
-    for (child = tqparent->firstChild(); (child) ; child = child->nextSibling())
+    for (child = parent->firstChild(); (child) ; child = child->nextSibling())
     {
         if(static_cast<NicksOnlineItem*>(child)->type() == type && child->text(0) == name) return child;
     }
@@ -184,15 +184,15 @@ TQListViewItem* NicksOnline::findItemChild(const TQListViewItem* tqparent, const
 
 /**
  * Returns the first occurrence of a child item of a given type in a NicksOnlineItem
- * @param tqparent            Pointer to a NicksOnlineItem.
+ * @param parent            Pointer to a NicksOnlineItem.
  * @param type              The type of entry to be found
  * @return                  Pointer to the child TQListViewItem or 0 if not found.
  */
-TQListViewItem* NicksOnline::findItemType(const TQListViewItem* tqparent, NicksOnlineItem::NickListViewColumn type)
+TQListViewItem* NicksOnline::findItemType(const TQListViewItem* parent, NicksOnlineItem::NickListViewColumn type)
 {
-    if (!tqparent) return 0;
+    if (!parent) return 0;
     TQListViewItem* child;
-    for (child = tqparent->firstChild(); (child) ; child = child->nextSibling())
+    for (child = parent->firstChild(); (child) ; child = child->nextSibling())
     {
         if(static_cast<NicksOnlineItem*>(child)->type() == type) return child;
     }
@@ -243,8 +243,8 @@ bool& needWhois)
             if (!nickInfo->getAwayMessage().isEmpty())
                 niInfo += '(' + nickInfo->getAwayMessage() + ')';
         }
-        if (!nickInfo->getHosttqmask().isEmpty())
+        if (!nickInfo->getHostmask().isEmpty())
-            niInfo += ' ' + nickInfo->getHosttqmask();
+            niInfo += ' ' + nickInfo->getHostmask();
         if (!nickInfo->getRealName().isEmpty())
             niInfo += " (" + nickInfo->getRealName() + ')';
         if (!nickInfo->getNetServer().isEmpty())
@@ -582,7 +582,7 @@ bool NicksOnline::getItemServerAndNick(const TQListViewItem* item, TQString& ser
     // If on a channel, move up to the nickname.
     if (nlItem->type() == NicksOnlineItem::ChannelItem)
     {
-        item = item->tqparent();
+        item = item->parent();
         serverName = item->text(nlvcServerName);
     }
     nickname = item->text(nlvcNick);

konversation/src/nicksonline.h

@@ -61,7 +61,7 @@ class NicksOnline : public ChatWindow
             nsHasAddress = 2                      // Nick has an associated addressbook entry.
         };
 
-        explicit NicksOnline(TQWidget* tqparent);
+        explicit NicksOnline(TQWidget* parent);
         ~NicksOnline();
 
         // These are here for the benefit of NicksOnlineTooltip.
@@ -135,20 +135,20 @@ class NicksOnline : public ChatWindow
 
     private:
         /**
-        * Returns the named child of tqparent item in a NicksOnlineItem
+        * Returns the named child of parent item in a NicksOnlineItem
-        * @param tqparent            Pointer to a NicksOnlineItem.
+        * @param parent            Pointer to a NicksOnlineItem.
         * @param name              The name in the desired child TQListViewItem, must be in column 0.
         * @param type              The type of entry to be found
         * @return                  Pointer to the child TQListViewItem or 0 if not found.
         */
-        TQListViewItem* findItemChild(const TQListViewItem* tqparent, const TQString& name, NicksOnlineItem::NickListViewColumn type);
+        TQListViewItem* findItemChild(const TQListViewItem* parent, const TQString& name, NicksOnlineItem::NickListViewColumn type);
         /**
         * Returns the first occurrence of a child item of a given type in a NicksOnlineItem
-        * @param tqparent            Pointer to a NicksOnlineItem.
+        * @param parent            Pointer to a NicksOnlineItem.
         * @param type              The type of entry to be found
         * @return                  Pointer to the child TQListViewItem or 0 if not found.
         */
-        TQListViewItem* findItemType(const TQListViewItem* tqparent, NicksOnlineItem::NickListViewColumn type);
+        TQListViewItem* findItemType(const TQListViewItem* parent, NicksOnlineItem::NickListViewColumn type);
         /**
          * Returns a pointer to the network TQListViewItem with the given name.
          * @param name              The name of the network, assumed to be in column 0 of the item.

konversation/src/nicksonlineitem.cpp

@@ -12,14 +12,14 @@
 #include "nicksonlineitem.h"
 
 
-NicksOnlineItem::NicksOnlineItem(int type, TQListView* tqparent, const TQString& name, const TQString& col2) :
+NicksOnlineItem::NicksOnlineItem(int type, TQListView* parent, const TQString& name, const TQString& col2) :
-                 KListViewItem(tqparent, name, col2)
+                 KListViewItem(parent, name, col2)
 {
   m_type=type;
 }
 
-NicksOnlineItem::NicksOnlineItem(int type, TQListViewItem* tqparent, const TQString& name, const TQString& col2) :
+NicksOnlineItem::NicksOnlineItem(int type, TQListViewItem* parent, const TQString& name, const TQString& col2) :
-                 KListViewItem(tqparent, name, col2)
+                 KListViewItem(parent, name, col2)
 {
   m_type=type;
 }

konversation/src/nicksonlineitem.h

@@ -27,12 +27,12 @@ class NicksOnlineItem : public KListViewItem
         };
 
         NicksOnlineItem(int type,
-                        TQListView* tqparent,
+                        TQListView* parent,
                         const TQString& name,
                         const TQString& col2 = TQString());
 
         NicksOnlineItem(int type,
-                        TQListViewItem* tqparent,
+                        TQListViewItem* parent,
                         const TQString& name,
                         const TQString& col2 = TQString());
 

konversation/src/notificationhandler.cpp

@@ -29,10 +29,10 @@
 namespace Konversation
 {
 
-    NotificationHandler::NotificationHandler(KonversationApplication* tqparent, const char* name)
+    NotificationHandler::NotificationHandler(KonversationApplication* parent, const char* name)
-        : TQObject(tqparent, name)
+        : TQObject(parent, name)
     {
-        m_mainWindow = tqparent->getMainWindow();
+        m_mainWindow = parent->getMainWindow();
     }
 
     NotificationHandler::~NotificationHandler()

konversation/src/notificationhandler.h

@@ -28,7 +28,7 @@ namespace Konversation
   TQ_OBJECT
 
         public:
-            explicit NotificationHandler(KonversationApplication* tqparent = 0, const char* name = 0);
+            explicit NotificationHandler(KonversationApplication* parent = 0, const char* name = 0);
             ~NotificationHandler();
 
         public slots:

konversation/src/osd.cpp

@@ -29,8 +29,8 @@ the Free Software Foundation; either version 2 of the License, or
 #include <X11/Xlib.h>                             //reposition()
 
 
-OSDWidget::OSDWidget( const TQString &appName, TQWidget *tqparent, const char *name )
+OSDWidget::OSDWidget( const TQString &appName, TQWidget *parent, const char *name )
-: TQWidget( tqparent, name, WNoAutoErase | WStyle_Customize | WX11BypassWM | WStyle_StaysOnTop | WStyle_Tool )
+: TQWidget( parent, name, WNoAutoErase | WStyle_Customize | WX11BypassWM | WStyle_StaysOnTop | WStyle_Tool )
 , m_appName( appName )
 , m_duration( 5000 )
 , m_shadow( true )
@@ -52,7 +52,7 @@ void OSDWidget::renderOSDText( const TQString &txt )
                                                   // Escaped text
     TQString text = Konversation::removeIrcMarkup(txt);
 
-    static TQBitmap tqmask;
+    static TQBitmap mask;
 
     //This is various spacings and margins, based on the font to look "just right"
     const uint METRIC = fontMetrics().width( 'x' );
@@ -75,11 +75,11 @@ void OSDWidget::renderOSDText( const TQString &txt )
     textRect.addCoords( 0, 0, METRIC*2, titleRect.height() + METRIC );
 
     osdBuffer.resize( textRect.size() );
-    tqmask.resize( textRect.size() );
+    mask.resize( textRect.size() );
 
     // Start painting!
     TQPainter bufferPainter( &osdBuffer );
-    TQPainter maskPainter( &tqmask );
+    TQPainter maskPainter( &mask );
 
     // Draw backing rectangle
     const uint xround = (METRIC * 200) / textRect.width();
@@ -109,10 +109,10 @@ void OSDWidget::renderOSDText( const TQString &txt )
     bufferPainter.drawText( METRIC * 2, (METRIC/2), w, h, AlignLeft, m_appName );
 
     // Masking for transparency
-    tqmask.fill( TQt::black );
+    mask.fill( TQt::black );
     maskPainter.setBrush( TQt::white );
     maskPainter.drawRoundRect( textRect, xround, yround );
-    setMask( tqmask );
+    setMask( mask );
 
     //do last to reduce noticeable change when showing multiple OSDs in succession
     reposition( textRect.size() );
@@ -314,8 +314,8 @@ void OSDWidget::reposition( TQSize newSize )
 #include <kcursor.h>                              //previewWidget
 #include <klocale.h>
 
-OSDPreviewWidget::OSDPreviewWidget( const TQString &appName, TQWidget *tqparent, const char *name )
+OSDPreviewWidget::OSDPreviewWidget( const TQString &appName, TQWidget *parent, const char *name )
-: OSDWidget( appName, tqparent, name )
+: OSDWidget( appName, parent, name )
 , m_dragging( false )
 {
     m_currentText = i18n( "OSD Preview - drag to reposition" );

konversation/src/osd.h

@@ -34,7 +34,7 @@ class OSDWidget : public TQWidget
     public:
         enum Alignment { Left, Middle, Center, Right };
 
-        explicit OSDWidget(const TQString &appName, TQWidget *tqparent = 0, const char *name = "osd");
+        explicit OSDWidget(const TQString &appName, TQWidget *parent = 0, const char *name = "osd");
         void setDuration(int ms);
         void setFont(TQFont newfont);
         void setShadow(bool shadow);
@@ -107,7 +107,7 @@ class OSDPreviewWidget : public OSDWidget
   TQ_OBJECT
 
     public:
-        explicit OSDPreviewWidget( const TQString &appName, TQWidget *tqparent = 0, const char *name = "osdpreview" );
+        explicit OSDPreviewWidget( const TQString &appName, TQWidget *parent = 0, const char *name = "osdpreview" );
 
         static TQPoint m_previewOffset;
 

konversation/src/osd_preferences.cpp

@@ -28,8 +28,8 @@
 #include <kconfigdialog.h>
 
 
-OSD_Config::OSD_Config( TQWidget* tqparent, const char* name, WFlags fl )
+OSD_Config::OSD_Config( TQWidget* parent, const char* name, WFlags fl )
-    : OSD_ConfigUI( tqparent, name, fl )
+    : OSD_ConfigUI( parent, name, fl )
 {
     bool enableScreenChooser = false;
     TQRect screenRect;

konversation/src/osd_preferences.h

@@ -28,7 +28,7 @@ class OSD_Config : public OSD_ConfigUI, public KonviSettingsPage
   TQ_OBJECT
 
     public:
-        explicit OSD_Config( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+        explicit OSD_Config( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
         ~OSD_Config();
 
         virtual void restorePageToDefaults();

konversation/src/outputfilter.cpp

@@ -1175,7 +1175,7 @@ namespace Konversation
                 parameterList.pop_front();
             }
 
-            // look for channel / ban tqmask
+            // look for channel / ban mask
             if (parameterList.count())
             {
                 // user specified channel
@@ -1226,19 +1226,19 @@ namespace Konversation
         if (showUsage)
         {
             if (!kick)
-                result = usage(i18n("Usage: %1BAN [-HOST | -DOMAIN | -USERHOST | -USERDOMAIN] [channel] <user|tqmask>").tqarg(commandChar));
+                result = usage(i18n("Usage: %1BAN [-HOST | -DOMAIN | -USERHOST | -USERDOMAIN] [channel] <user|mask>").tqarg(commandChar));
             else
-                result = usage(i18n("Usage: %1KICKBAN [-HOST | -DOMAIN | -USERHOST | -USERDOMAIN] [channel] <user|tqmask> [reason]").tqarg(commandChar));
+                result = usage(i18n("Usage: %1KICKBAN [-HOST | -DOMAIN | -USERHOST | -USERDOMAIN] [channel] <user|mask> [reason]").tqarg(commandChar));
         }
 
         return result;
     }
 
     // finally set the ban
-    OutputFilterResult OutputFilter::execBan(const TQString& tqmask,const TQString& channel)
+    OutputFilterResult OutputFilter::execBan(const TQString& mask,const TQString& channel)
     {
         OutputFilterResult result;
-        result.toServer = "MODE " + channel + " +b " + tqmask;
+        result.toServer = "MODE " + channel + " +b " + mask;
         return result;
     }
 
@@ -1252,7 +1252,7 @@ namespace Konversation
         {
             TQStringList parameterList = TQStringList::split(' ', parameter);
             TQString channel;
-            TQString tqmask;
+            TQString mask;
 
             // if the user specified a channel
             if(isAChannel(parameterList[0]))
@@ -1272,7 +1272,7 @@ namespace Konversation
                 // no usage information after error
                 showUsage = false;
             }
-            // if all went good, signal server to unban this tqmask
+            // if all went good, signal server to unban this mask
             if(!channel.isEmpty())
             {
                 emit unbanUsers(parameterList[0], channel);
@@ -1289,10 +1289,10 @@ namespace Konversation
         return result;
     }
 
-    OutputFilterResult OutputFilter::execUnban(const TQString& tqmask,const TQString& channel)
+    OutputFilterResult OutputFilter::execUnban(const TQString& mask,const TQString& channel)
     {
         OutputFilterResult result;
-        result.toServer = "MODE " + channel + " -b " + tqmask;
+        result.toServer = "MODE " + channel + " -b " + mask;
         return result;
     }
 

konversation/src/outputfilter.h

@@ -87,7 +87,7 @@ namespace Konversation
             void sendToAllChannels(const TQString& text);
             void launchScript(const TQString& target, const TQString& parameter);
             void banUsers(const TQStringList& userList,const TQString& channel,const TQString& option);
-            void unbanUsers(const TQString& tqmask,const TQString& channel);
+            void unbanUsers(const TQString& mask,const TQString& channel);
             void multiServerCommand(const TQString& command, const TQString& parameter);
             void reconnectServer();
             void disconnectServer();
@@ -107,8 +107,8 @@ namespace Konversation
 
         public slots:
             void setCommandChar();
-            OutputFilterResult execBan(const TQString& tqmask,const TQString& channels);
+            OutputFilterResult execBan(const TQString& mask,const TQString& channels);
-            OutputFilterResult execUnban(const TQString& tqmask,const TQString& channels);
+            OutputFilterResult execUnban(const TQString& mask,const TQString& channels);
 
         protected:
             OutputFilterResult parseMsg(const TQString& myNick,const TQString& parameter, bool focusQueryWindow);

konversation/src/query.cpp

@@ -41,7 +41,7 @@
 #include <kpopupmenu.h>
 
 
-Query::Query(TQWidget* tqparent, TQString _name) : ChatWindow(tqparent)
+Query::Query(TQWidget* parent, TQString _name) : ChatWindow(parent)
 {
     name=_name; // need the name a little bit earlier for setServer
     // don't setName here! It will break logfiles!
@@ -63,12 +63,12 @@ Query::Query(TQWidget* tqparent, TQString _name) : ChatWindow(tqparent)
     addresseelogoimage->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
     addresseelogoimage->hide();
 
-    queryHosttqmask=new Konversation::TopicLabel(box, "query_hosttqmask");
+    queryHostmask=new Konversation::TopicLabel(box, "query_hostmask");
 
-    TQString whatsthis = i18n("<qt>Some details of the person you are talking to in this query is shown in this bar.  The full name and hosttqmask is shown, along with any image or logo this person has associated with them in the KDE Addressbook.<p>See the <i>Konversation Handbook</i> for information on associating a nick with a contact in the Addressbook, and for an explanation of what the hosttqmask is.</qt>");
+    TQString whatsthis = i18n("<qt>Some details of the person you are talking to in this query is shown in this bar.  The full name and hostmask is shown, along with any image or logo this person has associated with them in the KDE Addressbook.<p>See the <i>Konversation Handbook</i> for information on associating a nick with a contact in the Addressbook, and for an explanation of what the hostmask is.</qt>");
     TQWhatsThis::add(addresseeimage, whatsthis);
     TQWhatsThis::add(addresseelogoimage, whatsthis);
-    TQWhatsThis::add(queryHosttqmask, whatsthis);
+    TQWhatsThis::add(queryHostmask, whatsthis);
 
     IRCViewBox* ircBox = new IRCViewBox(m_headerSplitter,0);
     setTextView(ircBox->ircView());               // Server will be set later in setServer();
@@ -174,7 +174,7 @@ void Query::setName(const TQString& newName)
         if(Preferences::addHostnameToLog())
         {
             if(m_nickInfo)
-                logName += m_nickInfo->getHosttqmask();
+                logName += m_nickInfo->getHostmask();
         }
 
         setLogfileName(logName);
@@ -365,7 +365,7 @@ void Query::showEvent(TQShowEvent*)
     if(m_initialShow) {
         m_initialShow = false;
         TQValueList<int> sizes;
-        sizes << queryHosttqmask->tqsizeHint().height() << (height() - queryHosttqmask->tqsizeHint().height());
+        sizes << queryHostmask->tqsizeHint().height() << (height() - queryHostmask->tqsizeHint().height());
         m_headerSplitter->setSizes(sizes);
     }
 }
@@ -483,17 +483,17 @@ void Query::nickInfoChanged()
     {
         setName(m_nickInfo->getNickname());
         TQString text = m_nickInfo->getBestAddresseeName();
-        if(!m_nickInfo->getHosttqmask().isEmpty() && !text.isEmpty())
+        if(!m_nickInfo->getHostmask().isEmpty() && !text.isEmpty())
             text += " - ";
-        text += m_nickInfo->getHosttqmask();
+        text += m_nickInfo->getHostmask();
         if(m_nickInfo->isAway() && !m_nickInfo->getAwayMessage().isEmpty())
             text += " (" + KStringHandler::rsqueeze(m_nickInfo->getAwayMessage(),100) + ") ";
-        queryHosttqmask->setText(Konversation::removeIrcMarkup(text));
+        queryHostmask->setText(Konversation::removeIrcMarkup(text));
 
         KABC::Picture pic = m_nickInfo->getAddressee().photo();
         if(pic.isIntern())
         {
-            TQPixmap qpixmap(pic.data().scaleHeight(queryHosttqmask->height()));
+            TQPixmap qpixmap(pic.data().scaleHeight(queryHostmask->height()));
             if(!qpixmap.isNull())
             {
                 addresseeimage->setPixmap(qpixmap);
@@ -511,7 +511,7 @@ void Query::nickInfoChanged()
         KABC::Picture logo = m_nickInfo->getAddressee().logo();
         if(logo.isIntern())
         {
-            TQPixmap qpixmap(logo.data().scaleHeight(queryHosttqmask->height()));
+            TQPixmap qpixmap(logo.data().scaleHeight(queryHostmask->height()));
             if(!qpixmap.isNull())
             {
                 addresseelogoimage->setPixmap(qpixmap);
@@ -537,7 +537,7 @@ void Query::nickInfoChanged()
         m_nickInfo->tooltipTableData(tooltip);
 
         tooltip << "</table></qt>";
-        TQToolTip::add(queryHosttqmask, strTooltip);
+        TQToolTip::add(queryHostmask, strTooltip);
         TQToolTip::add(addresseeimage, strTooltip);
         TQToolTip::add(addresseelogoimage, strTooltip);
 

konversation/src/query.h

@@ -38,7 +38,7 @@ class Query : public ChatWindow
   TQ_OBJECT
 
     public:
-        explicit Query(TQWidget* tqparent, TQString name);
+        explicit Query(TQWidget* parent, TQString name);
         virtual void setServer(Server* newServer);
 
         ~Query();
@@ -106,7 +106,7 @@ class Query : public ChatWindow
         TQString buffer;
 
         TQSplitter* m_headerSplitter;
-        Konversation::TopicLabel* queryHosttqmask;
+        Konversation::TopicLabel* queryHostmask;
         TQLabel* addresseeimage;
         TQLabel* addresseelogoimage;
         TQLabel* awayLabel;

konversation/src/queuetuner.cpp

@@ -31,8 +31,8 @@
 #include <klocale.h>
 
 
-QueueTuner::QueueTuner(TQWidget* tqparent, ViewContainer *container)
+QueueTuner::QueueTuner(TQWidget* parent, ViewContainer *container)
-: QueueTunerBase(tqparent), m_server(0), m_timer(this, "qTuner"),
+: QueueTunerBase(parent), m_server(0), m_timer(this, "qTuner"),
     m_vis(Preferences::self()->showQueueTunerItem()->value())
 {
     m_closeButton->setIconSet(kapp->iconLoader()->loadIconSet("fileclose", KIcon::Toolbar, 16));

konversation/src/queuetuner.h

@@ -27,7 +27,7 @@ class QueueTuner: public QueueTunerBase
   TQ_OBJECT
 
     public:
-        QueueTuner(TQWidget* tqparent, ViewContainer *container);
+        QueueTuner(TQWidget* parent, ViewContainer *container);
         ~QueueTuner();
         virtual void contextMenuEvent (TQContextMenuEvent*);
 

konversation/src/quickbutton.cpp

@@ -14,8 +14,8 @@
 #include "quickbutton.h"
 
 
-QuickButton::QuickButton(const TQString &label,const TQString &newDefinition,TQWidget* tqparent) :
+QuickButton::QuickButton(const TQString &label,const TQString &newDefinition,TQWidget* parent) :
-TQPushButton::TQPushButton(label,tqparent)
+TQPushButton::TQPushButton(label,parent)
 {
     setDefinition(newDefinition);
     connect(this,TQT_SIGNAL (clicked()),this,TQT_SLOT (wasClicked()) );

konversation/src/quickbutton.h

@@ -23,7 +23,7 @@ class QuickButton : public TQPushButton
   TQ_OBJECT
 
         public:
-        QuickButton(const TQString &label,const TQString &newDefinition,TQWidget* tqparent);
+        QuickButton(const TQString &label,const TQString &newDefinition,TQWidget* parent);
         ~QuickButton();
 
         void setDefinition(const TQString &newDefinition);

konversation/src/quickbuttons_preferences.cpp

@@ -25,8 +25,8 @@
 #include <klistview.h>
 
 
-QuickButtons_Config::QuickButtons_Config(TQWidget* tqparent, const char* name)
+QuickButtons_Config::QuickButtons_Config(TQWidget* parent, const char* name)
- : QuickButtons_ConfigUI(tqparent, name)
+ : QuickButtons_ConfigUI(parent, name)
 {
   // reset flag to defined state (used to block signals when just selecting a new item)
   m_newItemSelected=false;

konversation/src/quickbuttons_preferences.h

@@ -23,7 +23,7 @@ class QuickButtons_Config : public QuickButtons_ConfigUI, public KonviSettingsPa
   TQ_OBJECT
 
   public:
-    explicit QuickButtons_Config(TQWidget* tqparent, const char* name=NULL);
+    explicit QuickButtons_Config(TQWidget* parent, const char* name=NULL);
     ~QuickButtons_Config();
 
     virtual void saveSettings();

konversation/src/quickconnectdialog.cpp

@@ -24,8 +24,8 @@
 #include <klocale.h>
 
 
-QuickConnectDialog::QuickConnectDialog(TQWidget *tqparent)
+QuickConnectDialog::QuickConnectDialog(TQWidget *parent)
-:KDialogBase(tqparent, "quickconnect", true, i18n("Quick Connect"),
+:KDialogBase(parent, "quickconnect", true, i18n("Quick Connect"),
 KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true)
 {
     TQWidget* page = new TQWidget(this);

konversation/src/quickconnectdialog.h

@@ -29,7 +29,7 @@ class QuickConnectDialog : public KDialogBase
   TQ_OBJECT
 
     public:
-        explicit QuickConnectDialog(TQWidget* tqparent=0);
+        explicit QuickConnectDialog(TQWidget* parent=0);
         ~QuickConnectDialog();
 
     signals:

konversation/src/rawlog.cpp

@@ -23,7 +23,7 @@
 #include <kdebug.h>
 
 
-RawLog::RawLog(TQWidget* tqparent) : ChatWindow(tqparent)
+RawLog::RawLog(TQWidget* parent) : ChatWindow(parent)
 {
     setName(i18n("Raw Log"));
     setType(ChatWindow::RawLog);

konversation/src/rawlog.h

@@ -24,7 +24,7 @@ class RawLog : public ChatWindow
   TQ_OBJECT
 
         public:
-        explicit RawLog(TQWidget* tqparent);
+        explicit RawLog(TQWidget* parent);
         ~RawLog();
 
         virtual bool closeYourself();

konversation/src/searchbar.cpp

@@ -36,8 +36,8 @@
 #define FROM_CURSOR_MENU 4
 
 
-SearchBar::SearchBar(TQWidget* tqparent)
+SearchBar::SearchBar(TQWidget* parent)
-: SearchBarBase(tqparent)
+: SearchBarBase(parent)
 {
     m_searchFoward = false;
     m_matchCase = false;

konversation/src/searchbar.h

@@ -30,7 +30,7 @@ class SearchBar : public SearchBarBase
   TQ_OBJECT
 
     public:
-        explicit SearchBar(TQWidget* tqparent);
+        explicit SearchBar(TQWidget* parent);
         ~SearchBar();
 
         void setHasMatch(bool value);

konversation/src/server.cpp

@@ -64,7 +64,7 @@
 
 int Server::m_availableConnectionId = 0;
 
-Server::Server(TQObject* tqparent, ConnectionSettings& settings) : TQObject(tqparent)
+Server::Server(TQObject* parent, ConnectionSettings& settings) : TQObject(parent)
 {
     m_connectionId = m_availableConnectionId;
     m_availableConnectionId++;
@@ -1039,11 +1039,11 @@ int Server::getPreLength(const TQString& command, const TQString& dest)
     int hostMaskLength = 0;
 
     if(info)
-        hostMaskLength = info->getHosttqmask().length();
+        hostMaskLength = info->getHostmask().length();
 
     //:Sho_!i=ehs1@konversation/developer/hein PRIVMSG #konversation :and then back to it
 
-    //<colon>$nickname<!>$hosttqmask<space>$command<space>$destination<space><colon>$message<cr><lf>
+    //<colon>$nickname<!>$hostmask<space>$command<space>$destination<space><colon>$message<cr><lf>
     int x= 512 - 8 - (m_nickname.length() + hostMaskLength + command.length() + dest.length());
 
     return x;
@@ -1461,8 +1461,8 @@ class Query* Server::addQuery(const NickInfoPtr & nickInfo, bool weinitiated)
             static_cast<KonversationApplication*>(kapp)->notificationHandler()->query(query, nickname);
     }
 
-    // try to get hosttqmask if there's none yet
+    // try to get hostmask if there's none yet
-    if (query->getNickInfo()->getHosttqmask().isEmpty()) requestUserhost(nickname);
+    if (query->getNickInfo()->getHostmask().isEmpty()) requestUserhost(nickname);
 
     Q_ASSERT(query);
 
@@ -1536,50 +1536,50 @@ void Server::resolveUserhost(const TQString& nickname)
 
 void Server::requestBan(const TQStringList& users,const TQString& channel,const TQString& a_option)
 {
-    TQString hosttqmask;
+    TQString hostmask;
     TQString option=a_option.lower();
 
     Channel* targetChannel=getChannelByName(channel);
 
     for(unsigned int index=0;index<users.count();index++)
     {
-        // first, set the ban tqmask to the specified nick
+        // first, set the ban mask to the specified nick
-        TQString tqmask=users[index];
+        TQString mask=users[index];
         // did we specify an option?
         if(!option.isEmpty())
         {
             // try to find specified nick on the channel
-            Nick* targetNick=targetChannel->getNickByName(tqmask);
+            Nick* targetNick=targetChannel->getNickByName(mask);
-            // if we found the nick try to find their hosttqmask
+            // if we found the nick try to find their hostmask
             if(targetNick)
             {
-                TQString hosttqmask=targetNick->getChannelNick()->getHosttqmask();
+                TQString hostmask=targetNick->getChannelNick()->getHostmask();
-                // if we found the hosttqmask, add it to the ban tqmask
+                // if we found the hostmask, add it to the ban mask
-                if(!hosttqmask.isEmpty())
+                if(!hostmask.isEmpty())
                 {
-                    tqmask=targetNick->getChannelNick()->getNickname()+'!'+hosttqmask;
+                    mask=targetNick->getChannelNick()->getNickname()+'!'+hostmask;
 
-                    // adapt ban tqmask to the option given
+                    // adapt ban mask to the option given
                     if(option=="host")
-                        tqmask="*!*@*."+hosttqmask.section('.',1);
+                        mask="*!*@*."+hostmask.section('.',1);
                     else if(option=="domain")
-                        tqmask="*!*@"+hosttqmask.section('@',1);
+                        mask="*!*@"+hostmask.section('@',1);
                     else if(option=="userhost")
-                        tqmask="*!"+hosttqmask.section('@',0,0)+"@*."+hosttqmask.section('.',1);
+                        mask="*!"+hostmask.section('@',0,0)+"@*."+hostmask.section('.',1);
                     else if(option=="userdomain")
-                        tqmask="*!"+hosttqmask.section('@',0,0)+'@'+hosttqmask.section('@',1);
+                        mask="*!"+hostmask.section('@',0,0)+'@'+hostmask.section('@',1);
                 }
             }
         }
 
-        Konversation::OutputFilterResult result = getOutputFilter()->execBan(tqmask,channel);
+        Konversation::OutputFilterResult result = getOutputFilter()->execBan(mask,channel);
         queue(result.toServer);
     }
 }
 
-void Server::requestUnban(const TQString& tqmask,const TQString& channel)
+void Server::requestUnban(const TQString& mask,const TQString& channel)
 {
-    Konversation::OutputFilterResult result = getOutputFilter()->execUnban(tqmask,channel);
+    Konversation::OutputFilterResult result = getOutputFilter()->execUnban(mask,channel);
     queue(result.toServer);
 }
 
@@ -1969,7 +1969,7 @@ void Server::sendJoinCommand(const TQString& name, const TQString& password)
     queue(result.toServer);
 }
 
-void Server::joinChannel(const TQString& name, const TQString& hosttqmask)
+void Server::joinChannel(const TQString& name, const TQString& hostmask)
 {
     // (re-)join channel, open a new panel if needed
     Channel* channel = getChannelByName(name);
@@ -1997,10 +1997,10 @@ void Server::joinChannel(const TQString& name, const TQString& hosttqmask)
     // Move channel from unjoined (if present) to joined list and add our own nickname to the joined list.
     ChannelNickPtr channelNick = addNickToJoinedChannelsList(name, getNickname());
 
-    if ((channelNick->getHosttqmask() != hosttqmask ) && !hosttqmask.isEmpty())
+    if ((channelNick->getHostmask() != hostmask ) && !hostmask.isEmpty())
     {
         NickInfoPtr nickInfo = channelNick->getNickInfo();
-        nickInfo->setHosttqmask(hosttqmask);
+        nickInfo->setHostmask(hostmask);
     }
 
     channel->joinNickname(channelNick);
@@ -2548,7 +2548,7 @@ void Server::renameNickInfo(NickInfoPtr nickInfo, const TQString& newname)
     }
 }
 
-Channel* Server::nickJoinsChannel(const TQString &channelName, const TQString &nickname, const TQString &hosttqmask)
+Channel* Server::nickJoinsChannel(const TQString &channelName, const TQString &nickname, const TQString &hostmask)
 {
     Channel* outChannel=getChannelByName(channelName);
     if(outChannel)
@@ -2556,9 +2556,9 @@ Channel* Server::nickJoinsChannel(const TQString &channelName, const TQString &n
         // Update NickInfo.
         ChannelNickPtr channelNick = addNickToJoinedChannelsList(channelName, nickname);
         NickInfoPtr nickInfo = channelNick->getNickInfo();
-        if ((nickInfo->getHosttqmask() != hosttqmask) && !hosttqmask.isEmpty())
+        if ((nickInfo->getHostmask() != hostmask) && !hostmask.isEmpty())
         {
-            nickInfo->setHosttqmask(hosttqmask);
+            nickInfo->setHostmask(hostmask);
         }
         outChannel->joinNickname(channelNick);
     }
@@ -2566,15 +2566,15 @@ Channel* Server::nickJoinsChannel(const TQString &channelName, const TQString &n
     return outChannel;
 }
 
-void Server::addHostmaskToNick(const TQString& sourceNick, const TQString& sourceHosttqmask)
+void Server::addHostmaskToNick(const TQString& sourceNick, const TQString& sourceHostmask)
 {
     // Update NickInfo.
     NickInfoPtr nickInfo=getNickInfo(sourceNick);
     if (nickInfo)
     {
-        if ((nickInfo->getHosttqmask() != sourceHosttqmask) && !sourceHosttqmask.isEmpty())
+        if ((nickInfo->getHostmask() != sourceHostmask) && !sourceHostmask.isEmpty())
         {
-            nickInfo->setHosttqmask(sourceHosttqmask);
+            nickInfo->setHostmask(sourceHostmask);
         }
     }
 }
@@ -2683,14 +2683,14 @@ void Server::renameNick(const TQString &nickname, const TQString &newNick)
 
 }
 
-void Server::userhost(const TQString& nick,const TQString& hosttqmask,bool away,bool /* ircOp */)
+void Server::userhost(const TQString& nick,const TQString& hostmask,bool away,bool /* ircOp */)
 {
-    addHostmaskToNick(nick, hosttqmask);
+    addHostmaskToNick(nick, hostmask);
     // remember my IP for DCC things
                                                   // myself
     if (m_ownIpByUserhost.isEmpty() && nick == getNickname())
     {
-        TQString myhost = hosttqmask.section('@', 1);
+        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");
     }
@@ -3296,7 +3296,7 @@ void Server::removeBan(const TQString &channel, const TQString &ban)
 void Server::sendPing()
 {
     //WHO ourselves once a minute in case the irc server has changed our
-    //hosttqmask, such as what happens when a Freenode cloak is activated.
+    //hostmask, such as what happens when a Freenode cloak is activated.
     //It might be more intelligent to only do this when there is text
     //in the inputbox. Kinda changes this into a "do minutely"
     //queue :-)

konversation/src/server.h

@@ -77,7 +77,7 @@ void resetNickSelection();
             RegularPriority=StandardPriority
         };
 
-        Server(TQObject* tqparent, ConnectionSettings& settings);
+        Server(TQObject* parent, ConnectionSettings& settings);
         ~Server();
 
         int connectionId() { return m_connectionId; }
@@ -105,8 +105,8 @@ void resetNickSelection();
 
         void resetNickList(const TQString& channelName);
         void addPendingNickList(const TQString& channelName,const TQStringList& nickList);
-        void addHostmaskToNick(const TQString &sourceNick, const TQString &sourceHosttqmask);
+        void addHostmaskToNick(const TQString &sourceNick, const TQString &sourceHostmask);
-        Channel* nickJoinsChannel(const TQString &channelName, const TQString &nickname, const TQString &hosttqmask);
+        Channel* nickJoinsChannel(const TQString &channelName, const TQString &nickname, const TQString &hostmask);
         void renameNick(const TQString &nickname,const TQString &newNick);
         Channel* removeNickFromChannel(const TQString &channelName, const TQString &nickname, const TQString &reason, bool quit=false);
         void nickWasKickedFromChannel(const TQString &channelName, const TQString &nickname, const TQString &kicker, const TQString &reason);
@@ -131,7 +131,7 @@ void resetNickSelection();
         InputFilter* getInputFilter() { return &m_inputFilter; }
         Konversation::OutputFilter* getOutputFilter() { return m_outputFilter; };
 
-        void joinChannel(const TQString& name, const TQString& hosttqmask);
+        void joinChannel(const TQString& name, const TQString& hostmask);
         void removeChannel(Channel* channel);
         void appendServerMessageToChannel(const TQString& channel, const TQString& type, const TQString& message);
         void appendCommandMessageToChannel(const TQString& channel, const TQString& command, const TQString& message, bool highlight = true);
@@ -272,7 +272,7 @@ void resetNickSelection();
          *  Returns the NickInfo object if nick is on any lists, otherwise 0.
          *  @param channelName The channel name.  Case sensitive.
          *  @param nickname    The nickname.  Case sensitive.
-         *  @param mode        Bit tqmask containing the modes the nick has in the channel,
+         *  @param mode        Bit mask containing the modes the nick has in the channel,
          *                     or 99 if not known.  See channelnick.cpp for bit definitions.
          */
         ChannelNickPtr setChannelNick(const TQString& channelName, const TQString& nickname, unsigned int mode = 99);
@@ -439,7 +439,7 @@ void resetNickSelection();
         void openDccChat(const TQString& nickname);
         void requestDccChat(const TQString& partnerNick, const TQString& numericalOwnIp, const TQString& ownPort);
         void requestBan(const TQStringList& users,const TQString& channel,const TQString& option);
-        void requestUnban(const TQString& tqmask,const TQString& channel);
+        void requestUnban(const TQString& mask,const TQString& channel);
 
         void addDccSend(const TQString &recipient,KURL fileURL, const TQString &altFileName = TQString(), uint fileSize = 0);
         void removeQuery(Query *query);
@@ -505,7 +505,7 @@ void resetNickSelection();
         void dccStatusChanged(DccTransfer* item, int newtqStatus, int oldtqStatus);
         void scriptNotFound(const TQString& name);
         void scriptExecutionError(const TQString& name);
-        void userhost(const TQString& nick,const TQString& hosttqmask,bool away,bool ircOp);
+        void userhost(const TQString& nick,const TQString& hostmask,bool away,bool ircOp);
         void setTopicAuthor(const TQString& channel,const TQString& author, TQDateTime t);
         void endOfWho(const TQString& target);
         void invitation(const TQString& nick,const TQString& channel);

konversation/src/serverdialog.cpp

@@ -27,8 +27,8 @@
 namespace Konversation
 {
 
-    ServerDialog::ServerDialog(const TQString& title, TQWidget *tqparent, const char *name)
+    ServerDialog::ServerDialog(const TQString& title, TQWidget *parent, const char *name)
-        : KDialogBase(Plain, title, Ok|Cancel, Ok, tqparent, name)
+        : KDialogBase(Plain, title, Ok|Cancel, Ok, parent, name)
     {
         TQFrame* mainWidget = plainPage();
         TQGridLayout* mainLayout = new TQGridLayout(mainWidget, 1, 4, 0, spacingHint());

konversation/src/serverdialog.h

@@ -29,7 +29,7 @@ namespace Konversation
   TQ_OBJECT
 
         public:
-            explicit ServerDialog(const TQString& title, TQWidget *tqparent = 0, const char *name = 0);
+            explicit ServerDialog(const TQString& title, TQWidget *parent = 0, const char *name = 0);
             ~ServerDialog();
 
             void setServerSettings(const ServerSettings& server);

konversation/src/servergroupdialog.cpp

@@ -44,8 +44,8 @@
 namespace Konversation
 {
 
-    ServerGroupDialog::ServerGroupDialog(const TQString& title, TQWidget *tqparent, const char *name)
+    ServerGroupDialog::ServerGroupDialog(const TQString& title, TQWidget *parent, const char *name)
-        : KDialogBase(Swallow, title, Ok|Cancel, Ok, tqparent, name)
+        : KDialogBase(Swallow, title, Ok|Cancel, Ok, parent, name)
     {
         m_id = -1;
         m_identitiesNeedsUpdate = false;

konversation/src/servergroupdialog.h

@@ -33,7 +33,7 @@ namespace Konversation
         Q_OBJECT
   TQ_OBJECT
         public:
-            explicit ServerGroupDialog(const TQString& title, TQWidget* tqparent = 0, const char* name = 0);
+            explicit ServerGroupDialog(const TQString& title, TQWidget* parent = 0, const char* name = 0);
             ~ServerGroupDialog();
 
             void setServerGroupSettings(ServerGroupSettingsPtr settings);

konversation/src/serverlistdialog.cpp

@@ -36,9 +36,9 @@ namespace Konversation
     // ServerListItem
     //
 
-    ServerListItem::ServerListItem(KListView* tqparent, int serverGroupId, int sortIndex,
+    ServerListItem::ServerListItem(KListView* parent, int serverGroupId, int sortIndex,
         const TQString& serverGroup, const TQString& identity, const TQString& channels)
-        : KListViewItem(tqparent, serverGroup, identity, channels)
+        : KListViewItem(parent, serverGroup, identity, channels)
     {
         m_serverGroupId = serverGroupId;
         m_sortIndex = sortIndex;
@@ -46,9 +46,9 @@ namespace Konversation
         m_isServer = false;
     }
 
-    ServerListItem::ServerListItem(TQListViewItem* tqparent, int serverGroupId, int sortIndex,
+    ServerListItem::ServerListItem(TQListViewItem* parent, int serverGroupId, int sortIndex,
         const TQString& name, const ServerSettings& server)
-        : KListViewItem(tqparent, name)
+        : KListViewItem(parent, name)
     {
         m_serverGroupId = serverGroupId;
         m_sortIndex = sortIndex;
@@ -101,8 +101,8 @@ namespace Konversation
         return key( col, ascending ).localeAwareCompare( i->key( col, ascending ) );
     }
 
-    ServerListDialog::ServerListDialog(TQWidget *tqparent, const char *name)
+    ServerListDialog::ServerListDialog(TQWidget *parent, const char *name)
-        : KDialogBase(Plain, i18n("Server List"), Ok|Close, Ok, tqparent, name, false)
+        : KDialogBase(Plain, i18n("Server List"), Ok|Close, Ok, parent, name, false)
     {
         setButtonOK(KGuiItem(i18n("C&onnect"), "connect_creating", i18n("Connect to the server"), i18n("Click here to connect to the selected IRC network and channel.")));
 
@@ -276,23 +276,23 @@ namespace Konversation
             return;
 
         ServerListItem* item = static_cast<ServerListItem*>(selectedItems.first());
-        ServerListItem* tqparent = 0;
+        ServerListItem* parent = 0;
 
         // Make sure we're not deleting a network's only servers
         while (item)
         {
             if (item->isServer())
             {
-                tqparent = static_cast<ServerListItem*>(item->tqparent());
+                parent = static_cast<ServerListItem*>(item->parent());
 
-                if (tqparent && tqparent->childCount() == 1)
+                if (parent && parent->childCount() == 1)
                 {
-                    KMessageBox::error(this, i18n("You cannot delete %1.\n\nThe network %2 needs to have at least one server.").tqarg(item->name()).tqarg(tqparent->name()));
+                    KMessageBox::error(this, i18n("You cannot delete %1.\n\nThe network %2 needs to have at least one server.").tqarg(item->name()).tqarg(parent->name()));
                     return;
                 }
-                else if (tqparent && tqparent->childCount() == tqparent->selectedChildrenCount())
+                else if (parent && parent->childCount() == parent->selectedChildrenCount())
                 {
-                    KMessageBox::error(this, i18n("You cannot delete the selected servers.\n\nThe network %1 needs to have at least one server.").tqarg(tqparent->name()));
+                    KMessageBox::error(this, i18n("You cannot delete the selected servers.\n\nThe network %1 needs to have at least one server.").tqarg(parent->name()));
                     return;
                 }
             }

konversation/src/serverlistdialog.h

@@ -29,9 +29,9 @@ namespace Konversation
     class ServerListItem : public KListViewItem
     {
         public:
-            ServerListItem(KListView* tqparent, int serverGroupId, int sortIndex,
+            ServerListItem(KListView* parent, int serverGroupId, int sortIndex,
                 const TQString& serverGroup, const TQString& identity, const TQString& channels);
-            ServerListItem(TQListViewItem* tqparent, int serverGroupId, int sortIndex, 
+            ServerListItem(TQListViewItem* parent, int serverGroupId, int sortIndex, 
                 const TQString& name, const ServerSettings& server);
 
             int serverGroupId() const { return m_serverGroupId; }
@@ -61,7 +61,7 @@ namespace Konversation
   TQ_OBJECT
 
         public:
-            explicit ServerListDialog(TQWidget *tqparent = 0, const char *name = 0);
+            explicit ServerListDialog(TQWidget *parent = 0, const char *name = 0);
             ~ServerListDialog();
 
         public slots:

konversation/src/serverlistview.cpp

@@ -18,8 +18,8 @@
 #include <kdebug.h>
 
 
-ServerListView::ServerListView(TQWidget *tqparent)
+ServerListView::ServerListView(TQWidget *parent)
-    : KListView(tqparent)
+    : KListView(parent)
 {
 }
 
@@ -37,9 +37,9 @@ TQPtrList<TQListViewItem> ServerListView::selectedServerListItems()
 
     while (item)
     {
-        if (item->tqparent())
+        if (item->parent())
         {
-            if (!item->tqparent()->isSelected())
+            if (!item->parent()->isSelected())
                 selectedServerListItems.append(item);
         }
         else
@@ -53,7 +53,7 @@ TQPtrList<TQListViewItem> ServerListView::selectedServerListItems()
     return selectedServerListItems;
 }
 
-void ServerListView::findDrop(const TQPoint &pos, TQListViewItem *&tqparent, TQListViewItem *&after)
+void ServerListView::findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListViewItem *&after)
 {
     TQPoint p (contentsToViewport(pos));
 
@@ -77,19 +77,19 @@ void ServerListView::findDrop(const TQPoint &pos, TQListViewItem *&tqparent, TQL
         if (above->firstChild())
         {
             after = above;
-            tqparent = after->tqparent();
+            parent = after->parent();
             return;
         }
         else
         {
-            after = above->tqparent();
+            after = above->parent();
-            tqparent = after ? after->tqparent() : 0L;
+            parent = after ? after->parent() : 0L;
             return;
         }
     }
     // set as sibling
     after = above;
-    tqparent = after ? after->tqparent() : 0L;
+    parent = after ? after->parent() : 0L;
 }
 
 TQDragObject* ServerListView::dragObject()

konversation/src/serverlistview.h

@@ -26,13 +26,13 @@ class ServerListView : public KListView
   TQ_OBJECT
 
     public:
-        explicit ServerListView(TQWidget *tqparent);
+        explicit ServerListView(TQWidget *parent);
         ~ServerListView();
 
         TQPtrList<TQListViewItem> selectedServerListItems();
 
     protected:
-        void findDrop(const TQPoint &pos, TQListViewItem *&tqparent, TQListViewItem *&after);
+        void findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListViewItem *&after);
         TQDragObject* dragObject();
 };
 

konversation/src/ssllabel.cpp

@@ -15,8 +15,8 @@
 #include "ssllabel.h"
 
 
-SSLLabel::SSLLabel(TQWidget* tqparent,const char* name)
+SSLLabel::SSLLabel(TQWidget* parent,const char* name)
-: TQLabel(tqparent,name)
+: TQLabel(parent,name)
 {
 }
 

konversation/src/ssllabel.h

@@ -23,7 +23,7 @@ class SSLLabel : public TQLabel
   TQ_OBJECT
 
         public:
-        SSLLabel(TQWidget* tqparent, const char* name);
+        SSLLabel(TQWidget* parent, const char* name);
 
     protected:
         void mouseReleaseEvent(TQMouseEvent *e);

konversation/src/sslsocket.cpp

@@ -39,8 +39,8 @@ struct SSLSocketPrivate
     KSSLCertificateCache* cc;
 };
 
-SSLSocket::SSLSocket(TQWidget* serverParent, TQObject* tqparent, const char* name)
+SSLSocket::SSLSocket(TQWidget* serverParent, TQObject* parent, const char* name)
-: KStreamSocket(0L,0L,tqparent,name), m_serverParent(serverParent)
+: KStreamSocket(0L,0L,parent,name), m_serverParent(serverParent)
 {
     d = new SSLSocketPrivate;
     d->kssl = 0L;

konversation/src/sslsocket.h

@@ -30,7 +30,7 @@ class SSLSocket : public KStreamSocket
   TQ_OBJECT
 
     public:
-        explicit SSLSocket(TQWidget* serverParent, TQObject* tqparent = 0L, const char* name = 0L);
+        explicit SSLSocket(TQWidget* serverParent, TQObject* parent = 0L, const char* name = 0L);
         ~SSLSocket();
 
         void showInfoDialog();

konversation/src/statuspanel.cpp

@@ -30,7 +30,7 @@
 #include <kmessagebox.h>
 
 
-StatusPanel::StatusPanel(TQWidget* tqparent) : ChatWindow(tqparent)
+StatusPanel::StatusPanel(TQWidget* parent) : ChatWindow(parent)
 {
     setType(ChatWindow::tqStatus);
 

konversation/src/statuspanel.h

@@ -32,7 +32,7 @@ class StatusPanel : public ChatWindow
   TQ_OBJECT
 
     public:
-        explicit StatusPanel(TQWidget* tqparent);
+        explicit StatusPanel(TQWidget* parent);
         ~StatusPanel();
 
         virtual void setName(const TQString& newName);

konversation/src/tabs_preferences.cpp

@@ -16,8 +16,8 @@
 #include <tqcheckbox.h>
 
 
-Tabs_Config::Tabs_Config(TQWidget *tqparent, const char *name)
+Tabs_Config::Tabs_Config(TQWidget *parent, const char *name)
- : Tabs_PreferencesUI(tqparent, name)
+ : Tabs_PreferencesUI(parent, name)
 {
     connect(kcfg_TabPlacement, TQT_SIGNAL(activated(int)), this, TQT_SLOT(toggleCheckBoxes(int)));
 }

konversation/src/tabs_preferences.h

@@ -21,7 +21,7 @@ class Tabs_Config : public Tabs_PreferencesUI
   TQ_OBJECT
 
     public:
-        explicit Tabs_Config(TQWidget *tqparent = 0, const char *name = 0);
+        explicit Tabs_Config(TQWidget *parent = 0, const char *name = 0);
         ~Tabs_Config();
 
     public slots:

konversation/src/theme_preferences.cpp

@@ -47,8 +47,8 @@
 
 using namespace Konversation;
 
-Theme_Config::Theme_Config(TQWidget* tqparent, const char* name)
+Theme_Config::Theme_Config(TQWidget* parent, const char* name)
-  : Theme_ConfigUI( tqparent, name)
+  : Theme_ConfigUI( parent, name)
 {
     m_defaultThemeIndex = -1;
 

konversation/src/theme_preferences.h

@@ -29,7 +29,7 @@ class Theme_Config : public Theme_ConfigUI, public KonviSettingsPage
   TQ_OBJECT
 
     public:
-        explicit Theme_Config(TQWidget* tqparent, const char* name=NULL);
+        explicit Theme_Config(TQWidget* parent, const char* name=NULL);
         ~Theme_Config();
 
         virtual void restorePageToDefaults();

konversation/src/topiccombobox.cpp

@@ -14,8 +14,8 @@
 #include "topiccombobox.h"
 
 
-TopicComboBox::TopicComboBox(TQWidget* tqparent) :
+TopicComboBox::TopicComboBox(TQWidget* parent) :
-KComboBox(tqparent,"topic_combo_box")
+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&)));

konversation/src/topiccombobox.h

@@ -23,7 +23,7 @@ class TopicComboBox : public KComboBox
   TQ_OBJECT
 
     public:
-        explicit TopicComboBox(TQWidget* tqparent);
+        explicit TopicComboBox(TQWidget* parent);
         ~TopicComboBox();
         void insertStringList(const TQStringList& list);
 

konversation/src/topiclabel.cpp

@@ -37,8 +37,8 @@
 namespace Konversation
 {
 
-    TopicLabel::TopicLabel(TQWidget *tqparent, const char *name)
+    TopicLabel::TopicLabel(TQWidget *parent, const char *name)
-        : KActiveLabel(tqparent, name)
+        : KActiveLabel(parent, name)
     {
         setWrapPolicy(TQTextEdit::AtWordOrDocumentBoundary);
         setFocusPolicy(TQ_ClickFocus);

konversation/src/topiclabel.h

@@ -30,7 +30,7 @@ namespace Konversation
   TQ_OBJECT
 
         public:
-            explicit TopicLabel(TQWidget *tqparent = 0, const char *name = 0);
+            explicit TopicLabel(TQWidget *parent = 0, const char *name = 0);
             ~TopicLabel();
 
             TQSize tqminimumSizeHint() const;

konversation/src/trayicon.cpp

@@ -30,7 +30,7 @@
 namespace Konversation
 {
 
-    TrayIcon::TrayIcon(TQWidget* tqparent) : KSystemTray(tqparent)
+    TrayIcon::TrayIcon(TQWidget* parent) : KSystemTray(parent)
     {
         m_notificationEnabled = false;
         m_blinkTimer = new TQTimer(this);

konversation/src/trayicon.h

@@ -33,7 +33,7 @@ namespace Konversation
   TQ_OBJECT
 
         public:
-            explicit TrayIcon(TQWidget* tqparent = 0);
+            explicit TrayIcon(TQWidget* parent = 0);
             ~TrayIcon();
 
             bool notificationEnabled() { return m_notificationEnabled; }

konversation/src/urlcatcher.cpp

@@ -38,7 +38,7 @@
 #include <klistviewsearchline.h>
 
 
-UrlCatcher::UrlCatcher(TQWidget* tqparent) : ChatWindow(tqparent)
+UrlCatcher::UrlCatcher(TQWidget* parent) : ChatWindow(parent)
 {
     tqlayout()->setAutoAdd(false);
     setName(i18n("URL Catcher"));

konversation/src/urlcatcher.h

@@ -30,7 +30,7 @@ class UrlCatcher : public ChatWindow
   TQ_OBJECT
 
         public:
-        explicit UrlCatcher(TQWidget* tqparent);
+        explicit UrlCatcher(TQWidget* parent);
         ~UrlCatcher();
 
         virtual bool canBeFrontView()   { return true; }

konversation/src/valuelistviewitem.cpp

@@ -16,15 +16,15 @@
 #include "valuelistviewitem.h"
 
 
-ValueListViewItem::ValueListViewItem(int newValue, KListView* tqparent, const TQString& label)
+ValueListViewItem::ValueListViewItem(int newValue, KListView* parent, const TQString& label)
-: KListViewItem(tqparent,label)
+: KListViewItem(parent,label)
 {
     m_value=newValue;
     enforceSortOrder();
 }
 
-ValueListViewItem::ValueListViewItem(int newValue, KListView* tqparent, TQListViewItem* after, const TQString& label)
+ValueListViewItem::ValueListViewItem(int newValue, KListView* parent, TQListViewItem* after, const TQString& label)
-: KListViewItem(tqparent,after,label)
+: KListViewItem(parent,after,label)
 {
     m_value=newValue;
     enforceSortOrder();

konversation/src/valuelistviewitem.h

@@ -21,8 +21,8 @@
 class ValueListViewItem : public KListViewItem
 {
     public:
-        ValueListViewItem(int newValue, KListView* tqparent, const TQString& label);
+        ValueListViewItem(int newValue, KListView* parent, const TQString& label);
-        ValueListViewItem(int newValue, KListView* tqparent, TQListViewItem* after, const TQString& label);
+        ValueListViewItem(int newValue, KListView* parent, TQListViewItem* after, const TQString& label);
         ~ValueListViewItem();
 
         int getValue() const;

konversation/src/viewtree.cpp

@@ -35,7 +35,7 @@
 class ViewTree::ToolTip : public TQToolTip
 {
     public:
-        ToolTip(TQWidget *tqparent, KListView *viewTree);
+        ToolTip(TQWidget *parent, KListView *viewTree);
         virtual ~ToolTip() {}
 
     protected:
@@ -45,8 +45,8 @@ class ViewTree::ToolTip : public TQToolTip
         KListView* viewTree;
 };
 
-ViewTree::ToolTip::ToolTip(TQWidget *tqparent, KListView *viewTree)
+ViewTree::ToolTip::ToolTip(TQWidget *parent, KListView *viewTree)
-    : TQToolTip(tqparent), viewTree(viewTree)
+    : TQToolTip(parent), viewTree(viewTree)
 {
 }
 
@@ -60,8 +60,8 @@ void ViewTree::ToolTip::maybeTip (const TQPoint &pos)
 }
 
 
-ViewTree::ViewTree(TQWidget *tqparent)
+ViewTree::ViewTree(TQWidget *parent)
-    : KListView(tqparent)
+    : KListView(parent)
 {
     header()->hide();
     setHScrollBarMode(TQScrollView::AlwaysOff);
@@ -135,22 +135,22 @@ void ViewTree::updateAppearance()
 void ViewTree::addView(const TQString& name, ChatWindow* view, const TQIconSet &iconset, bool select, ChatWindow* afterView)
 {
     ViewTreeItem* item = 0;
-    ViewTreeItem* tqparent = 0;
+    ViewTreeItem* parent = 0;
 
     if (view->getType() != ChatWindow::DccChat)
-        tqparent = getParentItemForView(view);
+        parent = getParentItemForView(view);
 
-    if (tqparent)
+    if (parent)
     {
         if (afterView)
         {
             ViewTreeItem* afterItem = getItemForView(afterView);
             slotAboutToMoveView();
-            item = new ViewTreeItem(tqparent, afterItem, name, view);
+            item = new ViewTreeItem(parent, afterItem, name, view);
             slotMovedView();
         }
         else
-            item = new ViewTreeItem(tqparent, name, view);
+            item = new ViewTreeItem(parent, name, view);
     }
     else
         item = new ViewTreeItem(this, name, view);
@@ -385,15 +385,15 @@ void ViewTree::moveViewUp(ChatWindow* view)
         }
         else if (item->depth() < itemAbove->depth())
         {
-            ViewTreeItem* tqparent = static_cast<ViewTreeItem*>(itemAbove->tqparent());
+            ViewTreeItem* parent = static_cast<ViewTreeItem*>(itemAbove->parent());
 
-            if (tqparent)
+            if (parent)
             {
-                int newSortIndex = tqparent->getSortIndex();
+                int newSortIndex = parent->getSortIndex();
                 int oldSortIndex = item->getSortIndex();
 
                 item->setSortIndex(newSortIndex);
-                tqparent->setSortIndex(oldSortIndex);
+                parent->setSortIndex(oldSortIndex);
 
                 sort();
             }
@@ -735,7 +735,7 @@ void ViewTree::resizeEvent(TQResizeEvent* e)
     emit sizeChanged();
 }
 
-void ViewTree::findDrop(const TQPoint &pos, TQListViewItem *&tqparent, TQListViewItem *&after)
+void ViewTree::findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListViewItem *&after)
 {
     TQPoint p (contentsToViewport(pos));
 
@@ -764,14 +764,14 @@ void ViewTree::findDrop(const TQPoint &pos, TQListViewItem *&tqparent, TQListVie
             if (itemAbove->sortLast())
             {
                 after = itemAbove;
-                tqparent = after->tqparent();
+                parent = after->parent();
                 return;
 
             }
             else
             {
                 after = m_separator;
-                tqparent = after->tqparent();
+                parent = after->parent();
                 return;
             }
         }
@@ -780,20 +780,20 @@ void ViewTree::findDrop(const TQPoint &pos, TQListViewItem *&tqparent, TQListVie
             if (itemAbove->sortLast())
             {
                 after = m_separator->itemAbove();
-                after = (!after || after->depth() == 0) ? after : after->tqparent();
+                after = (!after || after->depth() == 0) ? after : after->parent();
-                tqparent = 0L;
+                parent = 0L;
                 return;
             }
             else if (above->depth() == dragItem->depth())
             {
                 after = above;
-                tqparent = 0L;
+                parent = 0L;
                 return;
             }
             else
             {
-                after = above->tqparent();
+                after = above->parent();
-                tqparent = 0L;
+                parent = 0L;
                 return;
             }
         }
@@ -801,33 +801,33 @@ void ViewTree::findDrop(const TQPoint &pos, TQListViewItem *&tqparent, TQListVie
         {
             if (!itemAbove->getView() || itemAbove->sortLast())
             {
-                after = getLastChild(dragItem->tqparent());
+                after = getLastChild(dragItem->parent());
-                tqparent = after ? after->tqparent() : 0L;
+                parent = after ? after->parent() : 0L;
                 return;
             }
             else if (itemAbove->getView()->getServer() != dragItem->getView()->getServer())
             {
                 if (itemIndex(itemAbove) > itemIndex(dragItem))
                 {
-                    after = getLastChild(dragItem->tqparent());
+                    after = getLastChild(dragItem->parent());
-                    tqparent = after ? after->tqparent() : 0L;
+                    parent = after ? after->parent() : 0L;
                     return;
                 }
                 else
                 {
                     after = 0L;
-                    tqparent = dragItem->tqparent();
+                    parent = dragItem->parent();
                     return;
                 }
             }
             else
             {
-                if (above == dragItem->tqparent())
+                if (above == dragItem->parent())
                     after = 0L;
                 else
                     after = above;
 
-                tqparent = dragItem->tqparent();
+                parent = dragItem->parent();
                 return;
             }
         }
@@ -837,25 +837,25 @@ void ViewTree::findDrop(const TQPoint &pos, TQListViewItem *&tqparent, TQListVie
         if (dragItem->sortLast())
         {
             after = m_separator;
-            tqparent = after->tqparent();
+            parent = after->parent();
             return;
         }
         else if (dragItem->depth() == 0)
         {
             after = 0L;
-            tqparent = 0L;
+            parent = 0L;
             return;
         }
         else
         {
             after = 0L;
-            tqparent = dragItem->tqparent();
+            parent = dragItem->parent();
             return;
         }
     }
 
     after = 0L;
-    tqparent = 0L;
+    parent = 0L;
 }
 
 TQDragObject* ViewTree::dragObject()
@@ -927,9 +927,9 @@ ViewTreeItem* ViewTree::getParentItemForView(ChatWindow* view)
     return 0;
 }
 
-ViewTreeItem* ViewTree::getLastChild(TQListViewItem* tqparent)
+ViewTreeItem* ViewTree::getLastChild(TQListViewItem* parent)
 {
-    ViewTreeItem* item = static_cast<ViewTreeItem*>(tqparent);
+    ViewTreeItem* item = static_cast<ViewTreeItem*>(parent);
     Server* server = item->getView()->getServer();
     ViewTreeItem* lastChild = 0;
 

konversation/src/viewtree.h

@@ -24,7 +24,7 @@ class ViewTree : public KListView
   TQ_OBJECT
 
     public:
-        explicit ViewTree(TQWidget *tqparent);
+        explicit ViewTree(TQWidget *parent);
         ~ViewTree();
 
         void selectFirstView(bool select);
@@ -64,7 +64,7 @@ class ViewTree : public KListView
 
         void resizeEvent(TQResizeEvent* e);
 
-        void findDrop(const TQPoint &pos, TQListViewItem *&tqparent, TQListViewItem *&after);
+        void findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListViewItem *&after);
         TQDragObject* dragObject();
 
         void paintEmptyArea(TQPainter* p, const TQRect& rect);
@@ -85,7 +85,7 @@ class ViewTree : public KListView
 
         ViewTreeItem* getItemForView(ChatWindow* view);
         ViewTreeItem* getParentItemForView(ChatWindow* view);
-        ViewTreeItem* getLastChild(TQListViewItem* tqparent);
+        ViewTreeItem* getLastChild(TQListViewItem* parent);
 
         bool canMoveItemUp(ViewTreeItem* item);
         bool canMoveItemDown(ViewTreeItem* item);

konversation/src/viewtreeitem.cpp

@@ -28,8 +28,8 @@
 
 int ViewTreeItem::s_availableSortIndex = 0;
 
-ViewTreeItem::ViewTreeItem(TQListView* tqparent, const TQString& name, ChatWindow* view)
+ViewTreeItem::ViewTreeItem(TQListView* parent, const TQString& name, ChatWindow* view)
-    : TQListViewItem(tqparent, name)
+    : TQListViewItem(parent, name)
 {
     m_sortIndex = s_availableSortIndex;
     s_availableSortIndex++;
@@ -52,8 +52,8 @@ ViewTreeItem::ViewTreeItem(TQListView* tqparent, const TQString& name, ChatWindo
     m_closeButtonEnabled = false;
 }
 
-ViewTreeItem::ViewTreeItem(TQListViewItem* tqparent, const TQString& name, ChatWindow* view, int sortIndex)
+ViewTreeItem::ViewTreeItem(TQListViewItem* parent, const TQString& name, ChatWindow* view, int sortIndex)
-    : TQListViewItem(tqparent, name)
+    : TQListViewItem(parent, name)
 {
     if (sortIndex != -1)
         setSortIndex(sortIndex);
@@ -82,8 +82,8 @@ ViewTreeItem::ViewTreeItem(TQListViewItem* tqparent, const TQString& name, ChatW
     m_closeButtonEnabled = false;
 }
 
-ViewTreeItem::ViewTreeItem(TQListViewItem* tqparent, TQListViewItem* afterItem, const TQString& name, ChatWindow* view)
+ViewTreeItem::ViewTreeItem(TQListViewItem* parent, TQListViewItem* afterItem, const TQString& name, ChatWindow* view)
-    : TQListViewItem(tqparent, afterItem, name)
+    : TQListViewItem(parent, afterItem, name)
 {
     m_sortIndex = s_availableSortIndex;
     s_availableSortIndex++;
@@ -107,7 +107,7 @@ ViewTreeItem::ViewTreeItem(TQListViewItem* tqparent, TQListViewItem* afterItem,
     m_closeButtonEnabled = false;
 }
 
-ViewTreeItem::ViewTreeItem(TQListView* tqparent) : TQListViewItem(tqparent)
+ViewTreeItem::ViewTreeItem(TQListView* parent) : TQListViewItem(parent)
 {
     setView(0);
     setOpen(true);

konversation/src/viewtreeitem.h

@@ -28,11 +28,11 @@ class ViewTreeItem : public TQListViewItem
 {
 
     public:
-        ViewTreeItem(TQListView* tqparent, const TQString& name, ChatWindow* view);
+        ViewTreeItem(TQListView* parent, const TQString& name, ChatWindow* view);
-        ViewTreeItem(TQListViewItem* tqparent, const TQString& name, ChatWindow* view, int sortIndex = -1);
+        ViewTreeItem(TQListViewItem* parent, const TQString& name, ChatWindow* view, int sortIndex = -1);
-        ViewTreeItem(TQListViewItem* tqparent, TQListViewItem* afterItem, const TQString& name, ChatWindow* view);
+        ViewTreeItem(TQListViewItem* parent, TQListViewItem* afterItem, const TQString& name, ChatWindow* view);
         // Minimal constructor for separator items.
-        explicit ViewTreeItem(TQListView* tqparent);
+        explicit ViewTreeItem(TQListView* parent);
         ~ViewTreeItem();
 
         void setSortIndex(int newSortIndex);

konversation/src/warnings_preferences.cpp

@@ -24,8 +24,8 @@
 #include <klistview.h>
 
 
-Warnings_Config::Warnings_Config( TQWidget* tqparent, const char* name, WFlags fl )
+Warnings_Config::Warnings_Config( TQWidget* parent, const char* name, WFlags fl )
-    : Warnings_ConfigUI( tqparent, name, fl )
+    : Warnings_ConfigUI( parent, name, fl )
 {
   dialogListView->setSorting(1);
   loadSettings();

konversation/src/warnings_preferences.h

@@ -25,7 +25,7 @@ class Warnings_Config : public Warnings_ConfigUI, public KonviSettingsPage
   TQ_OBJECT
 
     public:
-        explicit Warnings_Config( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+        explicit Warnings_Config( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
         ~Warnings_Config();
 
         virtual void restorePageToDefaults();

konversation/src/watchednicknames_preferences.cpp

@@ -28,8 +28,8 @@
 #include <kdebug.h>
 
 
-WatchedNicknames_Config::WatchedNicknames_Config(TQWidget *tqparent, const char *name)
+WatchedNicknames_Config::WatchedNicknames_Config(TQWidget *parent, const char *name)
- : WatchedNicknames_ConfigUI(tqparent, name)
+ : WatchedNicknames_ConfigUI(parent, name)
 {
   notifyListView->setRenameable(0,false);
   notifyListView->setSorting(-1);
@@ -277,7 +277,7 @@ void WatchedNicknames_Config::newNotify()
   // just create the new entry inside of the first group
   if(item)
   {
-    if(item->tqparent()) item=item->tqparent();
+    if(item->parent()) item=item->parent();
   }
   else
     item=listView->firstChild();
@@ -335,7 +335,7 @@ void WatchedNicknames_Config::entrySelected(TQListViewItem* notifyEntry)
   if(notifyEntry)
   {
     // is this entry a nickname?
-    TQListViewItem* group=notifyEntry->tqparent();
+    TQListViewItem* group=notifyEntry->parent();
     if(group)
     {
       // all edit widgets may be enabled
@@ -374,7 +374,7 @@ void WatchedNicknames_Config::networkChanged(const TQString& newNetwork)
   if(item)
   {
     // get group the nickname is presently associated to
-    TQListViewItem* group=item->tqparent();
+    TQListViewItem* group=item->parent();
     // did the user actually change anything?
     if(group && group->text(0)!=newNetwork)
     {

konversation/src/watchednicknames_preferences.h

@@ -26,7 +26,7 @@ class WatchedNicknames_Config : public WatchedNicknames_ConfigUI, public KonviSe
   TQ_OBJECT
 
     public:
-        explicit WatchedNicknames_Config(TQWidget *tqparent = 0, const char *name = 0);
+        explicit WatchedNicknames_Config(TQWidget *parent = 0, const char *name = 0);
         ~WatchedNicknames_Config();
 
         virtual void saveSettings();