diff --git a/konversation/src/alias_preferences.h b/konversation/src/alias_preferences.h
index aeb3062..5ad7d7f 100644
--- a/konversation/src/alias_preferences.h
+++ b/konversation/src/alias_preferences.h
@@ -21,7 +21,7 @@
 class Alias_Config : public Alias_ConfigUI, public KonviSettingsPage
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit Alias_Config(TQWidget* parent, const char* name = 0);
diff --git a/konversation/src/autoreplace_preferences.h b/konversation/src/autoreplace_preferences.h
index 9cab1f0..f0e1a95 100644
--- a/konversation/src/autoreplace_preferences.h
+++ b/konversation/src/autoreplace_preferences.h
@@ -22,7 +22,7 @@
 class Autoreplace_Config : public Autoreplace_ConfigUI, public KonviSettingsPage
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     explicit Autoreplace_Config(TQWidget* parent, const char* name=NULL);
diff --git a/konversation/src/awaymanager.h b/konversation/src/awaymanager.h
index cf94c05..0839436 100644
--- a/konversation/src/awaymanager.h
+++ b/konversation/src/awaymanager.h
@@ -28,7 +28,7 @@ struct AwayManagerPrivate;
 class AwayManager : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit AwayManager(TQObject* parent = 0);
diff --git a/konversation/src/channel.h b/konversation/src/channel.h
index 2d366b9..e177ce2 100644
--- a/konversation/src/channel.h
+++ b/konversation/src/channel.h
@@ -74,7 +74,7 @@ class NickList : public TQPtrList<Nick>
 class Channel : public ChatWindow
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit Channel(TQWidget* parent, TQString name);
diff --git a/konversation/src/channeldialog.h b/konversation/src/channeldialog.h
index fede856..7ae3891 100644
--- a/konversation/src/channeldialog.h
+++ b/konversation/src/channeldialog.h
@@ -25,7 +25,7 @@ namespace Konversation
     class ChannelDialog : public KDialogBase
     {
         Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
             explicit ChannelDialog(const TQString& title, TQWidget *parent = 0, const char *name = 0);
diff --git a/konversation/src/channellistpanel.h b/konversation/src/channellistpanel.h
index 0cc6452..b0a7e69 100644
--- a/konversation/src/channellistpanel.h
+++ b/konversation/src/channellistpanel.h
@@ -34,7 +34,7 @@ class ChannelListViewItem;
 class ChannelListPanel : public ChatWindow
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit ChannelListPanel(TQWidget* parent);
diff --git a/konversation/src/channelnick.h b/konversation/src/channelnick.h
index 749e21b..9587a65 100644
--- a/konversation/src/channelnick.h
+++ b/konversation/src/channelnick.h
@@ -23,7 +23,7 @@
 class ChannelNick :  public TQObject, public KShared
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
         ChannelNick(const NickInfoPtr& nickInfo, const bool& isop, const bool& isadmin,
diff --git a/konversation/src/channeloptionsdialog.h b/konversation/src/channeloptionsdialog.h
index 1765c51..793a77f 100644
--- a/konversation/src/channeloptionsdialog.h
+++ b/konversation/src/channeloptionsdialog.h
@@ -27,7 +27,7 @@ namespace Konversation
     class ChannelOptionsDialog : public KDialogBase
     {
         Q_OBJECT
-  TQ_OBJECT
+  
             public:
             explicit ChannelOptionsDialog(Channel *channel);
             ~ChannelOptionsDialog();
diff --git a/konversation/src/chatwindow.h b/konversation/src/chatwindow.h
index 840a815..4ff3a6e 100644
--- a/konversation/src/chatwindow.h
+++ b/konversation/src/chatwindow.h
@@ -27,7 +27,7 @@ class KonversationMainWindow;
 class ChatWindow : public TQVBox
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit ChatWindow(TQWidget* parent);
diff --git a/konversation/src/config/preferences.h b/konversation/src/config/preferences.h
index 7ed3793..b7ae8ed 100644
--- a/konversation/src/config/preferences.h
+++ b/konversation/src/config/preferences.h
@@ -47,7 +47,7 @@ class Highlight;
 class Preferences : public TQObject, public PreferencesBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     protected:
         Preferences();
diff --git a/konversation/src/connectionmanager.h b/konversation/src/connectionmanager.h
index 6f5d17f..a625daf 100644
--- a/konversation/src/connectionmanager.h
+++ b/konversation/src/connectionmanager.h
@@ -23,7 +23,7 @@ class ConnectionSettings;
 class ConnectionManager : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit ConnectionManager(TQObject* parent = 0);
diff --git a/konversation/src/dcc_preferences.h b/konversation/src/dcc_preferences.h
index 6720e89..49bd39d 100644
--- a/konversation/src/dcc_preferences.h
+++ b/konversation/src/dcc_preferences.h
@@ -21,7 +21,7 @@ class TQComboBox;
 class DCC_Config : public DCC_ConfigUI
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         DCC_Config(TQWidget* parent, const char* name);
diff --git a/konversation/src/dccchat.h b/konversation/src/dccchat.h
index 822c48c..1259cdf 100644
--- a/konversation/src/dccchat.h
+++ b/konversation/src/dccchat.h
@@ -36,7 +36,7 @@ namespace Konversation
 class DccChat : public ChatWindow
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
         DccChat(TQWidget* parent, bool listen, Server* server, const TQString& ownNick, const TQString& partnerNick, const TQString& partnerHost = TQString(), int partnerPort = 0);
diff --git a/konversation/src/dccrecipientdialog.h b/konversation/src/dccrecipientdialog.h
index 164a9e3..951be18 100644
--- a/konversation/src/dccrecipientdialog.h
+++ b/konversation/src/dccrecipientdialog.h
@@ -23,7 +23,7 @@ class KLineEdit;
 class DccRecipientDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
         DccRecipientDialog(TQWidget* parent, const TQStringList &list, const TQSize &size);
diff --git a/konversation/src/dccresumedialog.h b/konversation/src/dccresumedialog.h
index 62e3a9a..2efc267 100644
--- a/konversation/src/dccresumedialog.h
+++ b/konversation/src/dccresumedialog.h
@@ -22,7 +22,7 @@ class DccTransferRecv;
 class DccResumeDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
         enum ReceiveAction
diff --git a/konversation/src/dcctransfer.h b/konversation/src/dcctransfer.h
index 5765bdd..af7bc97 100644
--- a/konversation/src/dcctransfer.h
+++ b/konversation/src/dcctransfer.h
@@ -30,7 +30,7 @@ typedef double transferspeed_t;
 class DccTransfer : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         enum DccType
diff --git a/konversation/src/dcctransferdetailedinfopanel.h b/konversation/src/dcctransferdetailedinfopanel.h
index 8433822..a0feec8 100644
--- a/konversation/src/dcctransferdetailedinfopanel.h
+++ b/konversation/src/dcctransferdetailedinfopanel.h
@@ -23,7 +23,7 @@ class DccTransferPanelItem;
 class DccTransferDetailedInfoPanel : public DccTransferDetailedInfoPanelUI
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit DccTransferDetailedInfoPanel( TQWidget* parent = 0, const char* name = 0 );
diff --git a/konversation/src/dcctransfermanager.h b/konversation/src/dcctransfermanager.h
index 0a34c3b..038c070 100644
--- a/konversation/src/dcctransfermanager.h
+++ b/konversation/src/dcctransfermanager.h
@@ -32,7 +32,7 @@ class DccTransferSend;
 class DccTransferManager : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         DccTransferManager( TQObject* parent = 0 );
diff --git a/konversation/src/dcctransferpanel.h b/konversation/src/dcctransferpanel.h
index 7b88bcb..52ed4ed 100644
--- a/konversation/src/dcctransferpanel.h
+++ b/konversation/src/dcctransferpanel.h
@@ -29,7 +29,7 @@ class DccTransferDetailedInfoPanel;
 class DccTransferPanel : public ChatWindow
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
         class Column
diff --git a/konversation/src/dcctransferpanelitem.h b/konversation/src/dcctransferpanelitem.h
index 5a50f61..af2601c 100644
--- a/konversation/src/dcctransferpanelitem.h
+++ b/konversation/src/dcctransferpanelitem.h
@@ -40,7 +40,7 @@ class DccTransferPanel;
 class DccTransferPanelItem : public TQObject, public KListViewItem
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         DccTransferPanelItem( DccTransferPanel* panel, DccTransfer* transfer );
diff --git a/konversation/src/dcctransferrecv.h b/konversation/src/dcctransferrecv.h
index 77f20dc..aed4624 100644
--- a/konversation/src/dcctransferrecv.h
+++ b/konversation/src/dcctransferrecv.h
@@ -44,7 +44,7 @@ class DccTransferRecvWriteCacheHandler;
 class DccTransferRecv : public DccTransfer
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         DccTransferRecv(TQObject* parent);
@@ -152,7 +152,7 @@ class DccTransferRecv : public DccTransfer
 class DccTransferRecvWriteCacheHandler : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
         explicit DccTransferRecvWriteCacheHandler( KIO::TransferJob* transferJob );
diff --git a/konversation/src/dcctransfersend.h b/konversation/src/dcctransfersend.h
index 49bc6bb..1a3e4ea 100644
--- a/konversation/src/dcctransfersend.h
+++ b/konversation/src/dcctransfersend.h
@@ -33,7 +33,7 @@ namespace KNetwork
 class DccTransferSend : public DccTransfer
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
         DccTransferSend(TQObject* parent);
diff --git a/konversation/src/editnotifydialog.h b/konversation/src/editnotifydialog.h
index c1a5a05..d0e06a9 100644
--- a/konversation/src/editnotifydialog.h
+++ b/konversation/src/editnotifydialog.h
@@ -31,7 +31,7 @@ class KComboBox;
 class EditNotifyDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit EditNotifyDialog(TQWidget* parent=0,const TQString& network=TQString(),
diff --git a/konversation/src/highlight_preferences.h b/konversation/src/highlight_preferences.h
index 89974ca..72b429c 100644
--- a/konversation/src/highlight_preferences.h
+++ b/konversation/src/highlight_preferences.h
@@ -25,7 +25,7 @@ class Highlight;
 class Highlight_Config : public Highlight_ConfigUI, public KonviSettingsPage
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit Highlight_Config(TQWidget *parent = 0, const char *name = 0);
diff --git a/konversation/src/identitydialog.h b/konversation/src/identitydialog.h
index 13c144e..d22170d 100644
--- a/konversation/src/identitydialog.h
+++ b/konversation/src/identitydialog.h
@@ -31,7 +31,7 @@ namespace Konversation
     class IdentityDialog : public KDialogBase
     {
         Q_OBJECT
-  TQ_OBJECT
+  
         public:
             explicit IdentityDialog(TQWidget *parent = 0, const char *name = 0);
             ~IdentityDialog();
diff --git a/konversation/src/ignore_preferences.h b/konversation/src/ignore_preferences.h
index a19ff03..19ab063 100644
--- a/konversation/src/ignore_preferences.h
+++ b/konversation/src/ignore_preferences.h
@@ -23,7 +23,7 @@ class Ignore;
 class Ignore_Config : public Ignore_ConfigUI, public KonviSettingsPage
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit Ignore_Config( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
diff --git a/konversation/src/images.h b/konversation/src/images.h
index 4688592..4f61c62 100644
--- a/konversation/src/images.h
+++ b/konversation/src/images.h
@@ -26,7 +26,7 @@
 class Images : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         enum NickPrivilege
diff --git a/konversation/src/inputfilter.h b/konversation/src/inputfilter.h
index ad04fe4..7c45b7f 100644
--- a/konversation/src/inputfilter.h
+++ b/konversation/src/inputfilter.h
@@ -28,7 +28,7 @@ class TQDateTime;
 class InputFilter : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         InputFilter();
diff --git a/konversation/src/insertchardialog.h b/konversation/src/insertchardialog.h
index 9330564..9941846 100644
--- a/konversation/src/insertchardialog.h
+++ b/konversation/src/insertchardialog.h
@@ -24,7 +24,7 @@ namespace Konversation
     class InsertCharDialog : public KDialogBase
     {
         Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
             explicit InsertCharDialog(const TQString& font = TQString(), TQWidget *parent = 0, const char *name = 0);
diff --git a/konversation/src/irccolorchooser.h b/konversation/src/irccolorchooser.h
index 3dc06db..ecd59d4 100644
--- a/konversation/src/irccolorchooser.h
+++ b/konversation/src/irccolorchooser.h
@@ -25,7 +25,7 @@ class Preferences;
 class IRCColorChooser : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
         public:
         explicit IRCColorChooser(TQWidget* parent, const char* name = 0);
         TQString color();
diff --git a/konversation/src/ircinput.h b/konversation/src/ircinput.h
index f4fa095..7ad4c03 100644
--- a/konversation/src/ircinput.h
+++ b/konversation/src/ircinput.h
@@ -26,7 +26,7 @@ class TQMouseEvent;
 class IRCInput : public KTextEdit
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit IRCInput(TQWidget* parent);
diff --git a/konversation/src/ircqueue.h b/konversation/src/ircqueue.h
index a263ba5..b1473d6 100644
--- a/konversation/src/ircqueue.h
+++ b/konversation/src/ircqueue.h
@@ -62,7 +62,7 @@ private:
 class IRCQueue: public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     struct EmptyingRate
diff --git a/konversation/src/ircview.h b/konversation/src/ircview.h
index 3011a40..26b6297 100644
--- a/konversation/src/ircview.h
+++ b/konversation/src/ircview.h
@@ -37,7 +37,7 @@ class SearchBar;
 class IRCView : public KTextBrowser
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         IRCView(TQWidget* parent,Server* newServer);
diff --git a/konversation/src/ircviewbox.h b/konversation/src/ircviewbox.h
index 5e75bef..14ff136 100644
--- a/konversation/src/ircviewbox.h
+++ b/konversation/src/ircviewbox.h
@@ -22,7 +22,7 @@ class Server;
 class IRCViewBox : public TQVBox
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
 
diff --git a/konversation/src/joinchanneldialog.h b/konversation/src/joinchanneldialog.h
index 0158959..00351ac 100644
--- a/konversation/src/joinchanneldialog.h
+++ b/konversation/src/joinchanneldialog.h
@@ -25,7 +25,7 @@ namespace Konversation
     class JoinChannelDialog : public KDialogBase
     {
         Q_OBJECT
-  TQ_OBJECT
+  
             public:
             explicit JoinChannelDialog(Server* server, TQWidget *parent = 0, const char *name = 0);
             ~JoinChannelDialog();
diff --git a/konversation/src/konsolepanel.h b/konversation/src/konsolepanel.h
index bd358c8..88c0f81 100644
--- a/konversation/src/konsolepanel.h
+++ b/konversation/src/konsolepanel.h
@@ -20,7 +20,7 @@
 class KonsolePanel : public ChatWindow
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit KonsolePanel(TQWidget *p);
diff --git a/konversation/src/konvdcop.h b/konversation/src/konvdcop.h
index c1ab02f..f94c256 100644
--- a/konversation/src/konvdcop.h
+++ b/konversation/src/konvdcop.h
@@ -25,7 +25,7 @@
 class KonvDCOP : public TQObject, virtual public KonvIface
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         KonvDCOP();
@@ -71,7 +71,7 @@ class KonvDCOP : public TQObject, virtual public KonvIface
 class KonvIdentDCOP : public TQObject, virtual public KonvIdentityIface
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
         KonvIdentDCOP();
diff --git a/konversation/src/konversationapplication.h b/konversation/src/konversationapplication.h
index 8651b19..d94d47e 100644
--- a/konversation/src/konversationapplication.h
+++ b/konversation/src/konversationapplication.h
@@ -59,7 +59,7 @@ namespace Konversation
 class KonversationApplication : public KUniqueApplication
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         /** This function in general shouldn't be called, because in the future there
diff --git a/konversation/src/konversationmainwindow.h b/konversation/src/konversationmainwindow.h
index 4253441..240eab7 100644
--- a/konversation/src/konversationmainwindow.h
+++ b/konversation/src/konversationmainwindow.h
@@ -48,7 +48,7 @@ namespace Konversation
 class KonversationMainWindow : public KMainWindow
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         KonversationMainWindow();
diff --git a/konversation/src/konversationsound.h b/konversation/src/konversationsound.h
index 094abc8..c4c5790 100644
--- a/konversation/src/konversationsound.h
+++ b/konversation/src/konversationsound.h
@@ -28,7 +28,7 @@ namespace Konversation
     class Sound : public TQObject
     {
         Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
             explicit Sound(TQObject *parent = 0, const char *name = 0);
diff --git a/konversation/src/konversationstatusbar.h b/konversation/src/konversationstatusbar.h
index 1354447..1e40186 100644
--- a/konversation/src/konversationstatusbar.h
+++ b/konversation/src/konversationstatusbar.h
@@ -25,7 +25,7 @@ class Server;
 class KonversationStatusBar : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit KonversationStatusBar(KonversationMainWindow* parent);
diff --git a/konversation/src/konvibookmarkhandler.h b/konversation/src/konvibookmarkhandler.h
index 9220855..515aa4a 100644
--- a/konversation/src/konvibookmarkhandler.h
+++ b/konversation/src/konvibookmarkhandler.h
@@ -29,7 +29,7 @@ class KonviBookmarkMenu;
 class KonviBookmarkHandler : public TQObject, public KBookmarkOwner
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
         explicit KonviBookmarkHandler(KonversationMainWindow *mainWindow);
diff --git a/konversation/src/konvibookmarkmenu.h b/konversation/src/konvibookmarkmenu.h
index 6a97926..4e68e75 100644
--- a/konversation/src/konvibookmarkmenu.h
+++ b/konversation/src/konvibookmarkmenu.h
@@ -38,7 +38,7 @@ class KonviBookmarkMenuPrivate;
 class KonviBookmarkMenu : public KBookmarkMenu
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
         KonviBookmarkMenu( KBookmarkManager* mgr,
diff --git a/konversation/src/konviconfigdialog.h b/konversation/src/konviconfigdialog.h
index ffbe3f4..6a7365c 100644
--- a/konversation/src/konviconfigdialog.h
+++ b/konversation/src/konviconfigdialog.h
@@ -51,7 +51,7 @@ class KConfigDialogManager;
 class KonviConfigDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     signals:
     void widgetModified();
diff --git a/konversation/src/konvisettingsdialog.h b/konversation/src/konvisettingsdialog.h
index b0d63f6..4a34225 100644
--- a/konversation/src/konvisettingsdialog.h
+++ b/konversation/src/konvisettingsdialog.h
@@ -45,7 +45,7 @@ class TabNotifications_Config;
 class TDEUI_EXPORT KonviSettingsDialog : public KonviConfigDialog
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     protected:
 	Warnings_Config* m_confWarningsWdg;
diff --git a/konversation/src/linkaddressbook/addressbook.h b/konversation/src/linkaddressbook/addressbook.h
index 95fc6c5..69dea7f 100644
--- a/konversation/src/linkaddressbook/addressbook.h
+++ b/konversation/src/linkaddressbook/addressbook.h
@@ -33,7 +33,7 @@ namespace Konversation
     class Addressbook : public AddressbookBase
     {
         Q_OBJECT
-  TQ_OBJECT
+  
             public:
 
             virtual ~Addressbook();               // This needs to be public so it can be deleted by our static pointer
diff --git a/konversation/src/linkaddressbook/addressbook_base.h b/konversation/src/linkaddressbook/addressbook_base.h
index cbd7d48..8fd9aac 100644
--- a/konversation/src/linkaddressbook/addressbook_base.h
+++ b/konversation/src/linkaddressbook/addressbook_base.h
@@ -34,7 +34,7 @@ namespace Konversation
     class AddressbookBase : public TQObject, public KIMIface
     {
         Q_OBJECT
-  TQ_OBJECT
+  
             public:
             virtual ~AddressbookBase();           // This needs to be public so it can be deleted by our static pointer
             KABC::Addressee getKABCAddresseeFromNick(const TQString &ircnick, const TQString &servername, const TQString &servergroup);
diff --git a/konversation/src/linkaddressbook/linkaddressbookui.h b/konversation/src/linkaddressbook/linkaddressbookui.h
index 9461fab..dd3cfba 100644
--- a/konversation/src/linkaddressbook/linkaddressbookui.h
+++ b/konversation/src/linkaddressbook/linkaddressbookui.h
@@ -38,7 +38,7 @@ class LinkAddressbookUI_Base;
 class LinkAddressbookUI : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
         LinkAddressbookUI( TQWidget *parent, const char *name, const TQString &ircnick, const TQString &servername, const TQString &servergroup, const TQString &suggested_realname);
diff --git a/konversation/src/logfilereader.h b/konversation/src/logfilereader.h
index d1337d2..c835280 100644
--- a/konversation/src/logfilereader.h
+++ b/konversation/src/logfilereader.h
@@ -26,7 +26,7 @@ class TQSpinBox;
 class LogfileReader : public ChatWindow
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
         LogfileReader(TQWidget* parent, const TQString& log);
diff --git a/konversation/src/modebutton.h b/konversation/src/modebutton.h
index f25de9b..9948e44 100644
--- a/konversation/src/modebutton.h
+++ b/konversation/src/modebutton.h
@@ -20,7 +20,7 @@
 class ModeButton : public TQPushButton
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
         ModeButton(const TQString& label,TQWidget* parent,int id);
diff --git a/konversation/src/multilineedit.h b/konversation/src/multilineedit.h
index a397b9e..152e157 100644
--- a/konversation/src/multilineedit.h
+++ b/konversation/src/multilineedit.h
@@ -21,7 +21,7 @@ class MultilineTextEdit;
 class MultilineEdit : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
         MultilineEdit(TQWidget* parent, const TQString& text);
diff --git a/konversation/src/multilinetextedit.h b/konversation/src/multilinetextedit.h
index 7c0d886..46ac13f 100644
--- a/konversation/src/multilinetextedit.h
+++ b/konversation/src/multilinetextedit.h
@@ -21,7 +21,7 @@ class TQWheelEvent;
 class MultilineTextEdit : public TQTextEdit
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit MultilineTextEdit(TQWidget* parent=0,const char* name=0);
diff --git a/konversation/src/nick.h b/konversation/src/nick.h
index c44c460..933061e 100644
--- a/konversation/src/nick.h
+++ b/konversation/src/nick.h
@@ -23,7 +23,7 @@
 class Nick : public TQObject, public KListViewItem
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
         Nick(KListView *listView,
             const ChannelNickPtr& channelnick);
diff --git a/konversation/src/nickinfo.h b/konversation/src/nickinfo.h
index eab5553..29bf006 100644
--- a/konversation/src/nickinfo.h
+++ b/konversation/src/nickinfo.h
@@ -36,7 +36,7 @@ class TQTimer;
 class NickInfo : public TQObject, public KShared
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
         NickInfo(const TQString& nick, Server* server);
diff --git a/konversation/src/nicklistbehavior_preferences.h b/konversation/src/nicklistbehavior_preferences.h
index 4b93be1..f705cbf 100644
--- a/konversation/src/nicklistbehavior_preferences.h
+++ b/konversation/src/nicklistbehavior_preferences.h
@@ -22,7 +22,7 @@
 class NicklistBehavior_Config : public NicklistBehavior_ConfigUI, public KonviSettingsPage
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit NicklistBehavior_Config(TQWidget *parent = 0, const char *name = 0);
diff --git a/konversation/src/nicklistview.h b/konversation/src/nicklistview.h
index 6b267a0..2f9906e 100644
--- a/konversation/src/nicklistview.h
+++ b/konversation/src/nicklistview.h
@@ -30,7 +30,7 @@ class TQTimer;
 class NickListView : public KListView
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
         NickListView(TQWidget* parent, Channel *chan);
diff --git a/konversation/src/nicksonline.h b/konversation/src/nicksonline.h
index d0b14a0..5f41730 100644
--- a/konversation/src/nicksonline.h
+++ b/konversation/src/nicksonline.h
@@ -34,7 +34,7 @@ class ChatWindow;
 class NicksOnline : public ChatWindow
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         // Columns of the NickListView.
diff --git a/konversation/src/notificationhandler.h b/konversation/src/notificationhandler.h
index 24beff9..1c48764 100644
--- a/konversation/src/notificationhandler.h
+++ b/konversation/src/notificationhandler.h
@@ -25,7 +25,7 @@ namespace Konversation
     class NotificationHandler : public TQObject
     {
         Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
             explicit NotificationHandler(KonversationApplication* parent = 0, const char* name = 0);
diff --git a/konversation/src/osd.h b/konversation/src/osd.h
index 9dac20a..5a9ce02 100644
--- a/konversation/src/osd.h
+++ b/konversation/src/osd.h
@@ -29,7 +29,7 @@ class MetaBundle;
 class OSDWidget : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         enum Alignment { Left, Middle, Center, Right };
@@ -104,7 +104,7 @@ class OSDWidget : public TQWidget
 class OSDPreviewWidget : public OSDWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit OSDPreviewWidget( const TQString &appName, TQWidget *parent = 0, const char *name = "osdpreview" );
diff --git a/konversation/src/osd_preferences.h b/konversation/src/osd_preferences.h
index a265136..26a5d68 100644
--- a/konversation/src/osd_preferences.h
+++ b/konversation/src/osd_preferences.h
@@ -25,7 +25,7 @@ class OSDPreviewWidget;
 class OSD_Config : public OSD_ConfigUI, public KonviSettingsPage
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit OSD_Config( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
diff --git a/konversation/src/outputfilter.h b/konversation/src/outputfilter.h
index eb7fab9..2324a71 100644
--- a/konversation/src/outputfilter.h
+++ b/konversation/src/outputfilter.h
@@ -52,7 +52,7 @@ namespace Konversation
     class OutputFilter : public TQObject
     {
         Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
             explicit OutputFilter(Server* server);
diff --git a/konversation/src/query.h b/konversation/src/query.h
index 010c6f1..513377e 100644
--- a/konversation/src/query.h
+++ b/konversation/src/query.h
@@ -35,7 +35,7 @@ namespace Konversation {
 class Query : public ChatWindow
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit Query(TQWidget* parent, TQString name);
diff --git a/konversation/src/queuetuner.h b/konversation/src/queuetuner.h
index 42ec19b..c918171 100644
--- a/konversation/src/queuetuner.h
+++ b/konversation/src/queuetuner.h
@@ -24,7 +24,7 @@ class TQTimer;
 class QueueTuner: public QueueTunerBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         QueueTuner(TQWidget* parent, ViewContainer *container);
diff --git a/konversation/src/quickbutton.h b/konversation/src/quickbutton.h
index 834d4ab..7bf9cf5 100644
--- a/konversation/src/quickbutton.h
+++ b/konversation/src/quickbutton.h
@@ -20,7 +20,7 @@
 class QuickButton : public TQPushButton
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
         QuickButton(const TQString &label,const TQString &newDefinition,TQWidget* parent);
diff --git a/konversation/src/quickbuttons_preferences.h b/konversation/src/quickbuttons_preferences.h
index ccf26af..ab04a55 100644
--- a/konversation/src/quickbuttons_preferences.h
+++ b/konversation/src/quickbuttons_preferences.h
@@ -22,7 +22,7 @@
 class QuickButtons_Config : public QuickButtons_ConfigUI, public KonviSettingsPage
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     explicit QuickButtons_Config(TQWidget* parent, const char* name=NULL);
diff --git a/konversation/src/quickconnectdialog.h b/konversation/src/quickconnectdialog.h
index b55d78d..b41922d 100644
--- a/konversation/src/quickconnectdialog.h
+++ b/konversation/src/quickconnectdialog.h
@@ -26,7 +26,7 @@ class KLineEdit;
 class QuickConnectDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit QuickConnectDialog(TQWidget* parent=0);
diff --git a/konversation/src/rawlog.h b/konversation/src/rawlog.h
index 465dbc3..52c3abc 100644
--- a/konversation/src/rawlog.h
+++ b/konversation/src/rawlog.h
@@ -21,7 +21,7 @@
 class RawLog : public ChatWindow
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
         explicit RawLog(TQWidget* parent);
diff --git a/konversation/src/scriptlauncher.h b/konversation/src/scriptlauncher.h
index e34ff04..9509030 100644
--- a/konversation/src/scriptlauncher.h
+++ b/konversation/src/scriptlauncher.h
@@ -21,7 +21,7 @@ class Server;
 class ScriptLauncher : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit ScriptLauncher(Server* server);
diff --git a/konversation/src/searchbar.h b/konversation/src/searchbar.h
index 6fa113f..5c6d680 100644
--- a/konversation/src/searchbar.h
+++ b/konversation/src/searchbar.h
@@ -27,7 +27,7 @@ class TQPopupMenu;
 class SearchBar : public SearchBarBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit SearchBar(TQWidget* parent);
diff --git a/konversation/src/server.h b/konversation/src/server.h
index 400b195..086c9dd 100644
--- a/konversation/src/server.h
+++ b/konversation/src/server.h
@@ -58,7 +58,7 @@ class IRCQueue;
 class Server : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     friend class IRCQueue;
     friend class QueueTuner;
 void resetNickSelection();
diff --git a/konversation/src/serverdialog.h b/konversation/src/serverdialog.h
index fc42827..e2206b6 100644
--- a/konversation/src/serverdialog.h
+++ b/konversation/src/serverdialog.h
@@ -26,7 +26,7 @@ namespace Konversation
     class ServerDialog : public KDialogBase
     {
         Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
             explicit ServerDialog(const TQString& title, TQWidget *parent = 0, const char *name = 0);
diff --git a/konversation/src/servergroupdialog.h b/konversation/src/servergroupdialog.h
index e51218b..713188d 100644
--- a/konversation/src/servergroupdialog.h
+++ b/konversation/src/servergroupdialog.h
@@ -31,7 +31,7 @@ namespace Konversation
     class ServerGroupDialog : public KDialogBase
     {
         Q_OBJECT
-  TQ_OBJECT
+  
         public:
             explicit ServerGroupDialog(const TQString& title, TQWidget* parent = 0, const char* name = 0);
             ~ServerGroupDialog();
diff --git a/konversation/src/serverison.h b/konversation/src/serverison.h
index 5a68ada..0594df6 100644
--- a/konversation/src/serverison.h
+++ b/konversation/src/serverison.h
@@ -33,7 +33,7 @@ typedef TQMap<TQString,KABC::Addressee> OfflineNickToAddresseeMap;
 class ServerISON : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit ServerISON(Server* server);
diff --git a/konversation/src/serverlistdialog.h b/konversation/src/serverlistdialog.h
index 549ff77..9d8ba24 100644
--- a/konversation/src/serverlistdialog.h
+++ b/konversation/src/serverlistdialog.h
@@ -58,7 +58,7 @@ namespace Konversation
     class ServerListDialog : public KDialogBase
     {
         Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
             explicit ServerListDialog(TQWidget *parent = 0, const char *name = 0);
diff --git a/konversation/src/serverlistview.h b/konversation/src/serverlistview.h
index 0a29a39..b8117a2 100644
--- a/konversation/src/serverlistview.h
+++ b/konversation/src/serverlistview.h
@@ -23,7 +23,7 @@ class TQDragObject;
 class ServerListView : public KListView
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit ServerListView(TQWidget *parent);
diff --git a/konversation/src/ssllabel.h b/konversation/src/ssllabel.h
index 58ef247..72db728 100644
--- a/konversation/src/ssllabel.h
+++ b/konversation/src/ssllabel.h
@@ -20,7 +20,7 @@
 class SSLLabel : public TQLabel
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
         SSLLabel(TQWidget* parent, const char* name);
diff --git a/konversation/src/sslsocket.h b/konversation/src/sslsocket.h
index f44a83f..de404db 100644
--- a/konversation/src/sslsocket.h
+++ b/konversation/src/sslsocket.h
@@ -27,7 +27,7 @@ struct SSLSocketPrivate;
 class SSLSocket : public KStreamSocket
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit SSLSocket(TQWidget* serverParent, TQObject* parent = 0L, const char* name = 0L);
diff --git a/konversation/src/statuspanel.h b/konversation/src/statuspanel.h
index 33794ca..fa1bb03 100644
--- a/konversation/src/statuspanel.h
+++ b/konversation/src/statuspanel.h
@@ -29,7 +29,7 @@ class NickChangeDialog;
 class StatusPanel : public ChatWindow
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit StatusPanel(TQWidget* parent);
diff --git a/konversation/src/tabs_preferences.h b/konversation/src/tabs_preferences.h
index 84deee2..c2401c1 100644
--- a/konversation/src/tabs_preferences.h
+++ b/konversation/src/tabs_preferences.h
@@ -18,7 +18,7 @@
 class Tabs_Config : public Tabs_PreferencesUI
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit Tabs_Config(TQWidget *parent = 0, const char *name = 0);
diff --git a/konversation/src/theme_preferences.h b/konversation/src/theme_preferences.h
index 78b54bd..28e124f 100644
--- a/konversation/src/theme_preferences.h
+++ b/konversation/src/theme_preferences.h
@@ -26,7 +26,7 @@ class TQStringList;
 class Theme_Config : public Theme_ConfigUI, public KonviSettingsPage
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit Theme_Config(TQWidget* parent, const char* name=NULL);
diff --git a/konversation/src/topiccombobox.h b/konversation/src/topiccombobox.h
index b0c25c9..0e9dfbf 100644
--- a/konversation/src/topiccombobox.h
+++ b/konversation/src/topiccombobox.h
@@ -20,7 +20,7 @@
 class TopicComboBox : public KComboBox
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit TopicComboBox(TQWidget* parent);
diff --git a/konversation/src/topiclabel.h b/konversation/src/topiclabel.h
index 0a649b6..8161656 100644
--- a/konversation/src/topiclabel.h
+++ b/konversation/src/topiclabel.h
@@ -27,7 +27,7 @@ namespace Konversation
     class TopicLabel : public KActiveLabel
     {
         Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
             explicit TopicLabel(TQWidget *parent = 0, const char *name = 0);
diff --git a/konversation/src/trayicon.h b/konversation/src/trayicon.h
index af02ec1..e92b921 100644
--- a/konversation/src/trayicon.h
+++ b/konversation/src/trayicon.h
@@ -30,7 +30,7 @@ namespace Konversation
     class TrayIcon : public KSystemTray
     {
         Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
             explicit TrayIcon(TQWidget* parent = 0);
diff --git a/konversation/src/urlcatcher.h b/konversation/src/urlcatcher.h
index 16fb304..8787d40 100644
--- a/konversation/src/urlcatcher.h
+++ b/konversation/src/urlcatcher.h
@@ -27,7 +27,7 @@ class KListViewSearchLineWidget;
 class UrlCatcher : public ChatWindow
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
         explicit UrlCatcher(TQWidget* parent);
diff --git a/konversation/src/viewcontainer.h b/konversation/src/viewcontainer.h
index a91b487..8e291fe 100644
--- a/konversation/src/viewcontainer.h
+++ b/konversation/src/viewcontainer.h
@@ -44,7 +44,7 @@ namespace Konversation
 class ViewContainer : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit ViewContainer(KonversationMainWindow* window);
diff --git a/konversation/src/viewtree.h b/konversation/src/viewtree.h
index 733e8ba..9dbabb4 100644
--- a/konversation/src/viewtree.h
+++ b/konversation/src/viewtree.h
@@ -21,7 +21,7 @@ class ChatWindow;
 class ViewTree : public KListView
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit ViewTree(TQWidget *parent);
diff --git a/konversation/src/warnings_preferences.h b/konversation/src/warnings_preferences.h
index bf2101f..bf5733d 100644
--- a/konversation/src/warnings_preferences.h
+++ b/konversation/src/warnings_preferences.h
@@ -22,7 +22,7 @@ class TQListViewItem;
 class Warnings_Config : public Warnings_ConfigUI, public KonviSettingsPage
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit Warnings_Config( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
diff --git a/konversation/src/watchednicknames_preferences.h b/konversation/src/watchednicknames_preferences.h
index eac3849..085a18e 100644
--- a/konversation/src/watchednicknames_preferences.h
+++ b/konversation/src/watchednicknames_preferences.h
@@ -23,7 +23,7 @@ class TQListViewItem;
 class WatchedNicknames_Config : public WatchedNicknames_ConfigUI, public KonviSettingsPage
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         explicit WatchedNicknames_Config(TQWidget *parent = 0, const char *name = 0);