diff --git a/akregator/src/actionmanagerimpl.h b/akregator/src/actionmanagerimpl.h
index 3b63ab95..76b30e29 100644
--- a/akregator/src/actionmanagerimpl.h
+++ b/akregator/src/actionmanagerimpl.h
@@ -50,7 +50,7 @@ class TabWidget;
 class ActionManagerImpl : public ActionManager
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         ActionManagerImpl(Part* part, TQObject* parent=0, const char* name=0);
diff --git a/akregator/src/addfeeddialog.h b/akregator/src/addfeeddialog.h
index 113d7f2a..51d93ba2 100644
--- a/akregator/src/addfeeddialog.h
+++ b/akregator/src/addfeeddialog.h
@@ -41,7 +41,7 @@ namespace Akregator
    class AddFeedWidget : public AddFeedWidgetBase
    {
       Q_OBJECT
-  TQ_OBJECT
+  
       public:
          AddFeedWidget(TQWidget *parent = 0, const char *name = 0);
          ~AddFeedWidget();
@@ -50,7 +50,7 @@ namespace Akregator
    class AddFeedDialog : public KDialogBase
    {
       Q_OBJECT
-  TQ_OBJECT
+  
       public:
          AddFeedDialog(TQWidget *parent = 0, const char *name = 0);
          ~AddFeedDialog();
diff --git a/akregator/src/akregator_part.h b/akregator/src/akregator_part.h
index 763aad84..d74d4d42 100644
--- a/akregator/src/akregator_part.h
+++ b/akregator/src/akregator_part.h
@@ -60,7 +60,7 @@ namespace Akregator
     class BrowserExtension : public KParts::BrowserExtension
     {
         Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
             BrowserExtension(Part *p, const char *name );
@@ -77,7 +77,7 @@ namespace Akregator
     class Part : public MyBasePart, virtual public AkregatorPartIface
     {
         Q_OBJECT
-  TQ_OBJECT
+  
         public:
            typedef MyBasePart inherited;
 
diff --git a/akregator/src/akregator_run.h b/akregator/src/akregator_run.h
index 35e80e4c..6f8308b9 100644
--- a/akregator/src/akregator_run.h
+++ b/akregator/src/akregator_run.h
@@ -35,7 +35,7 @@ class Viewer;
 class BrowserRun : public KParts::BrowserRun
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
         /** indicates how HTML pages should be opened. It is passed in the constructor and sent back via the openInViewer signal. This is a workaround to fix opening of non-HTML mimetypes in 3.5, which will be refactored for KDE4 anyway. For 3.5.x it's the easiest way to fix the problem without changing too much code TODO KDE4: refactor, remove this enum  */
         enum OpeningMode 
diff --git a/akregator/src/akregator_view.h b/akregator/src/akregator_view.h
index 8237759d..98950008 100644
--- a/akregator/src/akregator_view.h
+++ b/akregator/src/akregator_view.h
@@ -80,7 +80,7 @@ namespace Akregator {
     class View : public TQWidget
     {
         Q_OBJECT
-  TQ_OBJECT
+  
         public:
 
             /** constructor
diff --git a/akregator/src/articlelistview.h b/akregator/src/articlelistview.h
index 95fd64ad..47f34757 100644
--- a/akregator/src/articlelistview.h
+++ b/akregator/src/articlelistview.h
@@ -43,7 +43,7 @@ namespace Akregator
     class ArticleListView : public KListView
     {
         Q_OBJECT
-  TQ_OBJECT
+  
         public:
             ArticleListView(TQWidget *parent = 0, const char *name = 0);
             virtual ~ArticleListView();
diff --git a/akregator/src/articleviewer.h b/akregator/src/articleviewer.h
index 7b0e626e..ace931c8 100644
--- a/akregator/src/articleviewer.h
+++ b/akregator/src/articleviewer.h
@@ -48,7 +48,7 @@ namespace Akregator
      class ArticleViewer : public Viewer
     {
         Q_OBJECT
-  TQ_OBJECT
+  
         public:
             /** Constructor */
             ArticleViewer(TQWidget* parent, const char* name);
diff --git a/akregator/src/configdialog.h b/akregator/src/configdialog.h
index f6714001..a2842c3f 100644
--- a/akregator/src/configdialog.h
+++ b/akregator/src/configdialog.h
@@ -35,7 +35,7 @@ class SettingsAppearance;
 class ConfigDialog : public KConfigDialog
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
     
         ConfigDialog(TQWidget *parent, const char *name, KConfigSkeleton *config, DialogType dialogType=IconList, int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false);
diff --git a/akregator/src/feed.h b/akregator/src/feed.h
index 2c5bc768..2a6c5639 100644
--- a/akregator/src/feed.h
+++ b/akregator/src/feed.h
@@ -64,7 +64,7 @@ namespace Akregator
         friend class Article;
         
         Q_OBJECT
-  TQ_OBJECT
+  
         public:
             /** the archiving modes:
                 - globalDefault: use default from Settings (default)
diff --git a/akregator/src/feediconmanager.h b/akregator/src/feediconmanager.h
index b7bee57f..83df9d35 100644
--- a/akregator/src/feediconmanager.h
+++ b/akregator/src/feediconmanager.h
@@ -45,7 +45,7 @@ namespace Akregator
     class FeedIconManager:public TQObject, public DCOPObject
     {
         Q_OBJECT
-//        TQ_OBJECT
+//        
         K_DCOP
         
         public:
diff --git a/akregator/src/feedlist.h b/akregator/src/feedlist.h
index 683cdd15..0587e498 100644
--- a/akregator/src/feedlist.h
+++ b/akregator/src/feedlist.h
@@ -44,7 +44,7 @@ class TreeNode;
 class FeedList : public NodeList
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     FeedList(TQObject *parent = 0, const char *name = 0);
diff --git a/akregator/src/feedlistview.h b/akregator/src/feedlistview.h
index 8d4394e1..8a4cd775 100644
--- a/akregator/src/feedlistview.h
+++ b/akregator/src/feedlistview.h
@@ -39,7 +39,7 @@ class TagNodeList;
 class NodeListView : public KListView
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
     NodeListView( TQWidget *parent = 0, const char *name = 0 );
     virtual ~NodeListView();
@@ -193,7 +193,7 @@ public:         // compat with KDE-3.x assertions, remove for KDE 4
 class TagNodeListView : public NodeListView
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
         TagNodeListView(TQWidget *parent = 0, const char *name = 0) {} 
         virtual ~TagNodeListView() {}
diff --git a/akregator/src/fetchqueue.h b/akregator/src/fetchqueue.h
index 3b507b8b..1a0f449e 100644
--- a/akregator/src/fetchqueue.h
+++ b/akregator/src/fetchqueue.h
@@ -36,7 +36,7 @@ class TreeNode;
 class FetchQueue : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
 
diff --git a/akregator/src/folder.h b/akregator/src/folder.h
index f2a024dd..d8060386 100644
--- a/akregator/src/folder.h
+++ b/akregator/src/folder.h
@@ -44,7 +44,7 @@ namespace Akregator
     class Folder : public TreeNode
     {
         Q_OBJECT
-  TQ_OBJECT
+  
         public:
             /** creates a feed group parsed from a XML dom element.
             Child nodes are not inserted or parsed. 
diff --git a/akregator/src/frame.h b/akregator/src/frame.h
index 981a4661..4a0cb36d 100644
--- a/akregator/src/frame.h
+++ b/akregator/src/frame.h
@@ -43,7 +43,7 @@ namespace Akregator
     class Frame : public TQObject
     {
         Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
             Frame(TQObject *parent, KParts::ReadOnlyPart *part, TQWidget *w, const TQString& tit, bool watchSignals=true);
diff --git a/akregator/src/librss/image.h b/akregator/src/librss/image.h
index 1df799ff..350253b4 100644
--- a/akregator/src/librss/image.h
+++ b/akregator/src/librss/image.h
@@ -34,7 +34,7 @@ namespace RSS
    class KDE_EXPORT Image : public TQObject
    {
       Q_OBJECT
-  TQ_OBJECT
+  
       public:
          /**
           * Default constructor.
diff --git a/akregator/src/librss/loader.h b/akregator/src/librss/loader.h
index 59f47c9c..dab47f17 100644
--- a/akregator/src/librss/loader.h
+++ b/akregator/src/librss/loader.h
@@ -35,7 +35,7 @@ namespace RSS
 	class KDE_EXPORT DataRetriever : public TQObject
 	{
 		Q_OBJECT
-  TQ_OBJECT
+  
 		public:
 			/**
 			 * Default constructor.
@@ -90,7 +90,7 @@ namespace RSS
 	class KDE_EXPORT FileRetriever : public DataRetriever
 	{
 		Q_OBJECT
-  TQ_OBJECT
+  
 		public:
 			/**
 			 * Default constructor.
@@ -162,7 +162,7 @@ namespace RSS
 	class OutputRetriever : public DataRetriever
 	{
 		Q_OBJECT
-  TQ_OBJECT
+  
 		public:
 			/**
 			 * Default constructor.
@@ -257,7 +257,7 @@ namespace RSS
 	class KDE_EXPORT Loader : public TQObject
 	{
 		Q_OBJECT
-  TQ_OBJECT
+  
 		friend class someClassWhichDoesNotExist;
 		public:
 			/**
diff --git a/akregator/src/librss/testlibrss.h b/akregator/src/librss/testlibrss.h
index 3d3e963b..222943a6 100644
--- a/akregator/src/librss/testlibrss.h
+++ b/akregator/src/librss/testlibrss.h
@@ -15,7 +15,7 @@ using RSS::Status;
 class Tester : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		void test( const TQString &url );
 
diff --git a/akregator/src/listtabwidget.h b/akregator/src/listtabwidget.h
index 1dd4d92e..7e395167 100644
--- a/akregator/src/listtabwidget.h
+++ b/akregator/src/listtabwidget.h
@@ -46,7 +46,7 @@ class ListTabWidget : public TQWidget
 {
 
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 
diff --git a/akregator/src/mainwindow.h b/akregator/src/mainwindow.h
index e5f90cf4..c076cb33 100644
--- a/akregator/src/mainwindow.h
+++ b/akregator/src/mainwindow.h
@@ -54,7 +54,7 @@ class MainWindow;
 class BrowserInterface : public KParts::BrowserInterface
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     
 public:
     BrowserInterface(Akregator::MainWindow *shell, const char *name );
@@ -73,7 +73,7 @@ private:
 class MainWindow : public KParts::MainWindow
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     MainWindow();
diff --git a/akregator/src/mk4storage/mk4confwidget.h b/akregator/src/mk4storage/mk4confwidget.h
index 3fd71eba..194295de 100644
--- a/akregator/src/mk4storage/mk4confwidget.h
+++ b/akregator/src/mk4storage/mk4confwidget.h
@@ -33,7 +33,7 @@ namespace Backend {
 class MK4ConfWidget : public MK4ConfWidgetBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
         
         MK4ConfWidget();
diff --git a/akregator/src/mk4storage/storagemk4impl.h b/akregator/src/mk4storage/storagemk4impl.h
index aa0a92ee..182807a8 100644
--- a/akregator/src/mk4storage/storagemk4impl.h
+++ b/akregator/src/mk4storage/storagemk4impl.h
@@ -37,7 +37,7 @@ namespace Backend {
 class StorageMK4Impl : public Storage
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
 
         StorageMK4Impl();     
diff --git a/akregator/src/nodelist.h b/akregator/src/nodelist.h
index c441ead7..48703d7e 100644
--- a/akregator/src/nodelist.h
+++ b/akregator/src/nodelist.h
@@ -49,7 +49,7 @@ class NodeList : public TQObject
 {
 
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     NodeList(TQObject *parent=0, const char *name=0);
diff --git a/akregator/src/notificationmanager.h b/akregator/src/notificationmanager.h
index 96d898a0..0cc6db2e 100644
--- a/akregator/src/notificationmanager.h
+++ b/akregator/src/notificationmanager.h
@@ -36,7 +36,7 @@ namespace Akregator
 class NotificationManager : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
         /** singleton instance of notification manager */
         static NotificationManager* self();
diff --git a/akregator/src/pageviewer.h b/akregator/src/pageviewer.h
index 82b497d6..352a5914 100644
--- a/akregator/src/pageviewer.h
+++ b/akregator/src/pageviewer.h
@@ -40,7 +40,7 @@ namespace Akregator
     class PageViewer : public Viewer
     {
         Q_OBJECT
-  TQ_OBJECT
+  
         public:
             PageViewer(TQWidget* parent, const char* name);
             virtual ~PageViewer();
diff --git a/akregator/src/progressmanager.h b/akregator/src/progressmanager.h
index 5b31bbf2..2b5598f3 100644
--- a/akregator/src/progressmanager.h
+++ b/akregator/src/progressmanager.h
@@ -36,7 +36,7 @@ class ProgressItemHandler;
 class ProgressManager : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
         
         static ProgressManager* self();
@@ -67,7 +67,7 @@ class ProgressManager : public TQObject
 class ProgressItemHandler : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
         ProgressItemHandler(Feed* feed);
         virtual ~ProgressItemHandler();
diff --git a/akregator/src/propertiesdialog.h b/akregator/src/propertiesdialog.h
index 8be70c61..b9652221 100644
--- a/akregator/src/propertiesdialog.h
+++ b/akregator/src/propertiesdialog.h
@@ -33,7 +33,7 @@ namespace Akregator
    class FeedPropertiesWidget : public FeedPropertiesWidgetBase
    {
       Q_OBJECT
-  TQ_OBJECT
+  
       public:
          FeedPropertiesWidget(TQWidget *parent = 0, const char *name = 0);
          ~FeedPropertiesWidget();
@@ -45,7 +45,7 @@ namespace Akregator
    class FeedPropertiesDialog : public KDialogBase
    {
       Q_OBJECT
-  TQ_OBJECT
+  
       public:
          FeedPropertiesDialog(TQWidget *parent = 0, const char *name = 0);
          ~FeedPropertiesDialog();
diff --git a/akregator/src/searchbar.h b/akregator/src/searchbar.h
index ee919ae6..cbb01a6b 100644
--- a/akregator/src/searchbar.h
+++ b/akregator/src/searchbar.h
@@ -40,7 +40,7 @@ namespace Filters
 class SearchBar : public TQHBox
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
 
diff --git a/akregator/src/settings_advanced.h b/akregator/src/settings_advanced.h
index e8873cfa..cbb7b7f5 100644
--- a/akregator/src/settings_advanced.h
+++ b/akregator/src/settings_advanced.h
@@ -18,7 +18,7 @@ namespace Backend
 class SettingsAdvanced : public SettingsAdvancedBase
 {
     Q_OBJECT
-    TQ_OBJECT
+    
 
     public:
         SettingsAdvanced(TQWidget* parent=0, const char* name=0);
diff --git a/akregator/src/simplenodeselector.h b/akregator/src/simplenodeselector.h
index ccdacb84..1ac25b37 100644
--- a/akregator/src/simplenodeselector.h
+++ b/akregator/src/simplenodeselector.h
@@ -44,7 +44,7 @@ class SimpleNodeSelector;
 class SelectNodeDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
         SelectNodeDialog(FeedList* feedList, TQWidget* parent=0, char* name=0);
         virtual ~SelectNodeDialog();
@@ -67,7 +67,7 @@ class SelectNodeDialog : public KDialogBase
 class SimpleNodeSelector : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         SimpleNodeSelector(FeedList* feedList, TQWidget* parent=0, const char* name=0);
diff --git a/akregator/src/speechclient.h b/akregator/src/speechclient.h
index 5172130b..d4fe8f6f 100644
--- a/akregator/src/speechclient.h
+++ b/akregator/src/speechclient.h
@@ -42,7 +42,7 @@ class SpeechClient : public TQObject, public KSpeech_stub, virtual public KSpeec
 {
 
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
 
diff --git a/akregator/src/storagedummyimpl.h b/akregator/src/storagedummyimpl.h
index 05961ffc..3288737a 100644
--- a/akregator/src/storagedummyimpl.h
+++ b/akregator/src/storagedummyimpl.h
@@ -37,7 +37,7 @@ namespace Backend {
 class StorageDummyImpl : public Storage
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
 
         StorageDummyImpl();     
diff --git a/akregator/src/tabwidget.h b/akregator/src/tabwidget.h
index ec7168c5..70fdca04 100644
--- a/akregator/src/tabwidget.h
+++ b/akregator/src/tabwidget.h
@@ -38,7 +38,7 @@ class Frame;
 class TabWidget : public KTabWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         TabWidget(TQWidget * parent = 0, const char *name = 0);
diff --git a/akregator/src/tagaction.h b/akregator/src/tagaction.h
index 43142ecc..59ea3ccb 100644
--- a/akregator/src/tagaction.h
+++ b/akregator/src/tagaction.h
@@ -38,7 +38,7 @@ class Tag;
 class TagAction : public KToggleAction
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
 
diff --git a/akregator/src/tagnode.h b/akregator/src/tagnode.h
index db3d8225..a41439fc 100644
--- a/akregator/src/tagnode.h
+++ b/akregator/src/tagnode.h
@@ -45,7 +45,7 @@ class TreeNodeVisitor;
 class TagNode : public TreeNode
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 
diff --git a/akregator/src/tagnodelist.h b/akregator/src/tagnodelist.h
index 5f06f455..be85e7e8 100644
--- a/akregator/src/tagnodelist.h
+++ b/akregator/src/tagnodelist.h
@@ -44,7 +44,7 @@ namespace Akregator {
    class TagNodeList : public NodeList
    {
        Q_OBJECT
-  TQ_OBJECT
+  
        public:
 
 
diff --git a/akregator/src/tagpropertiesdialog.h b/akregator/src/tagpropertiesdialog.h
index 1dffd8da..24e6788d 100644
--- a/akregator/src/tagpropertiesdialog.h
+++ b/akregator/src/tagpropertiesdialog.h
@@ -34,7 +34,7 @@ class Tag;
 class TagPropertiesDialog : public KDialogBase 
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
 
diff --git a/akregator/src/tagset.h b/akregator/src/tagset.h
index 4a1c8324..f0814834 100644
--- a/akregator/src/tagset.h
+++ b/akregator/src/tagset.h
@@ -48,7 +48,7 @@ class TagSet : public TQObject
 {
     friend class Tag;
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
 
         TagSet(TQObject* parent=0);
diff --git a/akregator/src/trayicon.h b/akregator/src/trayicon.h
index 4af30613..e491fdac 100644
--- a/akregator/src/trayicon.h
+++ b/akregator/src/trayicon.h
@@ -35,7 +35,7 @@ namespace Akregator
     class TrayIcon : public KSystemTray
     {
         Q_OBJECT
-  TQ_OBJECT
+  
         public:
             static TrayIcon* getInstance();
             static void setInstance(TrayIcon* trayIcon);
diff --git a/akregator/src/treenode.h b/akregator/src/treenode.h
index 305bc5d4..02b64614 100644
--- a/akregator/src/treenode.h
+++ b/akregator/src/treenode.h
@@ -51,7 +51,7 @@ class FetchQueue;
 class TreeNode : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
         
diff --git a/akregator/src/viewer.h b/akregator/src/viewer.h
index d01949c9..41a2250e 100644
--- a/akregator/src/viewer.h
+++ b/akregator/src/viewer.h
@@ -39,7 +39,7 @@ namespace Akregator
     class Viewer : public KHTMLPart
     {
         Q_OBJECT
-  TQ_OBJECT
+  
         public:
 
            /**
diff --git a/certmanager/certificateinfowidgetimpl.h b/certmanager/certificateinfowidgetimpl.h
index f58553c1..fef55335 100644
--- a/certmanager/certificateinfowidgetimpl.h
+++ b/certmanager/certificateinfowidgetimpl.h
@@ -48,7 +48,7 @@ namespace GpgME {
 
 class CertificateInfoWidgetImpl : public CertificateInfoWidget {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   CertificateInfoWidgetImpl( const GpgME::Key & key, bool external,
 			     TQWidget * parent=0, const char * name=0);
diff --git a/certmanager/certificatewizardimpl.h b/certmanager/certificatewizardimpl.h
index 6db2d2ee..b2256297 100644
--- a/certmanager/certificatewizardimpl.h
+++ b/certmanager/certificatewizardimpl.h
@@ -49,7 +49,7 @@ namespace KIO {
 class CertificateWizardImpl : public CertificateWizard
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     CertificateWizardImpl( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
diff --git a/certmanager/certlistview.h b/certmanager/certlistview.h
index ad489a85..63154d9f 100644
--- a/certmanager/certlistview.h
+++ b/certmanager/certlistview.h
@@ -7,7 +7,7 @@
 /// We need to derive from Kleo::KeyListView simply to add support for drop events
 class CertKeyListView : public Kleo::KeyListView {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   CertKeyListView( const ColumnStrategy * strategy,
diff --git a/certmanager/certmanager.h b/certmanager/certmanager.h
index 07f9aa9e..8f992a00 100644
--- a/certmanager/certmanager.h
+++ b/certmanager/certmanager.h
@@ -78,7 +78,7 @@ namespace GpgME {
 
 class KDE_EXPORT CertManager : public KMainWindow {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
     CertManager( bool remote = false, const TQString& query = TQString(),
 		 const TQString& import=TQString(),
diff --git a/certmanager/conf/appearanceconfigpage.h b/certmanager/conf/appearanceconfigpage.h
index 927f4eaf..89c56cfc 100644
--- a/certmanager/conf/appearanceconfigpage.h
+++ b/certmanager/conf/appearanceconfigpage.h
@@ -43,7 +43,7 @@ namespace Kleo {
  */
 class AppearanceConfigurationPage : public KCModule {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   AppearanceConfigurationPage( TQWidget * parent=0, const char * name=0 );
 
diff --git a/certmanager/conf/appearanceconfigwidget.h b/certmanager/conf/appearanceconfigwidget.h
index 95c07c24..3840df13 100644
--- a/certmanager/conf/appearanceconfigwidget.h
+++ b/certmanager/conf/appearanceconfigwidget.h
@@ -42,7 +42,7 @@ namespace Kleo {
 
   class AppearanceConfigWidget : public AppearanceConfigWidgetBase {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AppearanceConfigWidget(
diff --git a/certmanager/conf/configuredialog.h b/certmanager/conf/configuredialog.h
index 55de6c5f..95d20d53 100644
--- a/certmanager/conf/configuredialog.h
+++ b/certmanager/conf/configuredialog.h
@@ -39,7 +39,7 @@
 class ConfigureDialog : public KCMultiDialog
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   ConfigureDialog( TQWidget *parent=0, const char *name=0, bool modal=true );
diff --git a/certmanager/conf/dirservconfigpage.h b/certmanager/conf/dirservconfigpage.h
index 0cb0547d..c5ebcad1 100644
--- a/certmanager/conf/dirservconfigpage.h
+++ b/certmanager/conf/dirservconfigpage.h
@@ -52,7 +52,7 @@ namespace Kleo {
  */
 class KDE_EXPORT DirectoryServicesConfigurationPage : public KCModule {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   DirectoryServicesConfigurationPage( TQWidget * parent=0, const char * name=0 );
 
diff --git a/certmanager/conf/dnorderconfigpage.h b/certmanager/conf/dnorderconfigpage.h
index 1fa5ba5c..b053c5cb 100644
--- a/certmanager/conf/dnorderconfigpage.h
+++ b/certmanager/conf/dnorderconfigpage.h
@@ -43,7 +43,7 @@ namespace Kleo {
  */
 class DNOrderConfigPage : public KCModule {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   DNOrderConfigPage( TQWidget * parent=0, const char * name=0 );
 
diff --git a/certmanager/crlview.h b/certmanager/crlview.h
index 8cf0c704..3de715e2 100644
--- a/certmanager/crlview.h
+++ b/certmanager/crlview.h
@@ -43,7 +43,7 @@ class TQTimer;
 
 class CRLView : public TQDialog {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   CRLView( TQWidget* parent = 0, const char* name = 0, bool modal = false );
   ~CRLView();
diff --git a/certmanager/customactions.h b/certmanager/customactions.h
index 9cc24298..7d8626d6 100644
--- a/certmanager/customactions.h
+++ b/certmanager/customactions.h
@@ -41,7 +41,7 @@ class TQLineEdit;
 
 class LabelAction : public KAction {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   LabelAction( const TQString & text, KActionCollection * parent,
 	       const char* name );
@@ -51,7 +51,7 @@ public:
 
 class LineEditAction : public KAction {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   LineEditAction( const TQString & text, KActionCollection * parent,
 		  TQObject * receiver, const char * member, const char * name );
@@ -69,7 +69,7 @@ private:
 
 class ComboAction : public KAction {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ComboAction( const TQStringList & lst,  KActionCollection * parent,
 	       TQObject * receiver, const char * member, const char * name,
diff --git a/certmanager/hierarchyanalyser.h b/certmanager/hierarchyanalyser.h
index ccf10ff4..dede3814 100644
--- a/certmanager/hierarchyanalyser.h
+++ b/certmanager/hierarchyanalyser.h
@@ -43,7 +43,7 @@
 
 class HierarchyAnalyser : public TQObject {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   HierarchyAnalyser( TQObject * parent=0, const char * name=0 );
   ~HierarchyAnalyser();
diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.h b/certmanager/kwatchgnupg/kwatchgnupgconfig.h
index 72be289d..3a58a99a 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgconfig.h
+++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.h
@@ -42,7 +42,7 @@ class KURLRequester;
 
 class KWatchGnuPGConfig : public KDialogBase {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KWatchGnuPGConfig( TQWidget* parent, const char* name = 0 );
 
diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h
index aa6feabc..01a5f123 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h
+++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h
@@ -42,7 +42,7 @@ class TQTextEdit;
 
 class KWatchGnuPGMainWindow : public KMainWindow {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KWatchGnuPGMainWindow( TQWidget* parent = 0, const char* name = 0 );
   virtual ~KWatchGnuPGMainWindow();
diff --git a/certmanager/kwatchgnupg/tray.h b/certmanager/kwatchgnupg/tray.h
index 6c94d85c..eb438aa3 100644
--- a/certmanager/kwatchgnupg/tray.h
+++ b/certmanager/kwatchgnupg/tray.h
@@ -40,7 +40,7 @@ class KWatchGnuPGMainWindow;
 
 class KWatchGnuPGTray : public KSystemTray {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KWatchGnuPGTray( KWatchGnuPGMainWindow* mainwin );
   virtual ~KWatchGnuPGTray();
diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.h b/certmanager/lib/backends/chiasmus/chiasmusjob.h
index 08b3ec1d..98d7d7f5 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusjob.h
+++ b/certmanager/lib/backends/chiasmus/chiasmusjob.h
@@ -51,7 +51,7 @@ namespace Kleo {
   */
   class ChiasmusJob : public Kleo::SpecialJob {
     Q_OBJECT
-  TQ_OBJECT
+  
     Q_ENUMS( Mode )
     TQ_PROPERTY( Mode mode READ mode )
     TQ_PROPERTY( TQString key READ key WRITE setKey )
diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.h b/certmanager/lib/backends/chiasmus/obtainkeysjob.h
index 6803bd7f..10ed5d5f 100644
--- a/certmanager/lib/backends/chiasmus/obtainkeysjob.h
+++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.h
@@ -64,7 +64,7 @@ namespace Kleo {
   */
   class ObtainKeysJob : public Kleo::SpecialJob {
     Q_OBJECT
-  TQ_OBJECT
+  
     TQ_PROPERTY( TQStringList result READ result )
   public:
     ObtainKeysJob();
diff --git a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h
index b3a025fd..281b8553 100644
--- a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h
+++ b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h
@@ -43,7 +43,7 @@ namespace Kleo {
 
 class SymCryptRunProcessBase : public KProcess {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   enum Operation {
     Encrypt, Decrypt
diff --git a/certmanager/lib/backends/kpgp/kpgpkeylistjob.h b/certmanager/lib/backends/kpgp/kpgpkeylistjob.h
index 2e35896f..d126ea67 100644
--- a/certmanager/lib/backends/kpgp/kpgpkeylistjob.h
+++ b/certmanager/lib/backends/kpgp/kpgpkeylistjob.h
@@ -51,7 +51,7 @@ namespace Kleo {
 
   class KpgpKeyListJob : public KeyListJob {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KpgpKeyListJob( Kpgp::Base * pgpBase );
     ~KpgpKeyListJob();
diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h
index 0cf9000a..4f6dc4ad 100644
--- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h
+++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h
@@ -47,7 +47,7 @@ namespace Kleo {
    */
   class GnuPGProcessBase : public KProcess {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     GnuPGProcessBase( TQObject * parent=0, const char * name=0 );
     ~GnuPGProcessBase();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h
index de766de3..712ce24e 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h
@@ -49,7 +49,7 @@ class QGpgMECryptoConfigEntry;
 class QGpgMECryptoConfig : public TQObject, public Kleo::CryptoConfig {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /**
    * Constructor
@@ -81,7 +81,7 @@ class QGpgMECryptoConfigGroup;
 class QGpgMECryptoConfigComponent : public TQObject, public Kleo::CryptoConfigComponent {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   QGpgMECryptoConfigComponent( QGpgMECryptoConfig*, const TQString& name, const TQString& description );
   ~QGpgMECryptoConfigComponent();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h
index 78e17304..e58ea326 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h
@@ -48,7 +48,7 @@ namespace Kleo {
 
   class QGpgMEDecryptJob : public DecryptJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEDecryptJob( GpgME::Context * context );
     ~QGpgMEDecryptJob();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h
index ed3dd07a..79ff268b 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h
@@ -49,7 +49,7 @@ namespace Kleo {
 
   class KDE_EXPORT QGpgMEDecryptVerifyJob : public DecryptVerifyJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEDecryptVerifyJob( GpgME::Context * context );
     ~QGpgMEDecryptVerifyJob();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h b/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h
index 992404a2..20dca974 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmedeletejob.h
@@ -47,7 +47,7 @@ namespace Kleo {
 
   class QGpgMEDeleteJob : public DeleteJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEDeleteJob( GpgME::Context * context );
     ~QGpgMEDeleteJob();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h b/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h
index 76baa88f..5317afd4 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h
@@ -46,7 +46,7 @@ namespace Kleo {
 
   class QGpgMEDownloadJob : public DownloadJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEDownloadJob( GpgME::Context * context );
     ~QGpgMEDownloadJob();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h
index c367c352..80b5e467 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h
@@ -51,7 +51,7 @@ namespace Kleo {
 
   class QGpgMEEncryptJob : public EncryptJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEEncryptJob( GpgME::Context * context );
     ~QGpgMEEncryptJob();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h b/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h
index 11bcec18..aa2e0c0a 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmeexportjob.h
@@ -48,7 +48,7 @@ namespace Kleo {
 
   class QGpgMEExportJob : public ExportJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEExportJob( GpgME::Context * context );
     ~QGpgMEExportJob();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h b/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h
index e98eab6e..2324da6d 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmeimportjob.h
@@ -48,7 +48,7 @@ namespace Kleo {
 
   class QGpgMEImportJob : public ImportJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEImportJob( GpgME::Context * context );
     ~QGpgMEImportJob();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h
index 4a728809..c9e16474 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h
@@ -53,7 +53,7 @@ namespace Kleo {
 
   class KDE_EXPORT QGpgMEKeyGenerationJob : public KeyGenerationJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEKeyGenerationJob( GpgME::Context * context );
     ~QGpgMEKeyGenerationJob();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h
index c695967e..8e26d791 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h
@@ -49,7 +49,7 @@ namespace Kleo {
 
   class QGpgMEKeyListJob : public KeyListJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEKeyListJob( GpgME::Context * context );
     ~QGpgMEKeyListJob();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
index 555a0bfe..ebe871ce 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
@@ -51,7 +51,7 @@ namespace Kleo {
 
   class QGpgMERefreshKeysJob : public RefreshKeysJob {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     QGpgMERefreshKeysJob();
     ~QGpgMERefreshKeysJob();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
index 73fae998..4c3c8b82 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
@@ -56,7 +56,7 @@ namespace Kleo {
 
   class QGpgMESecretKeyExportJob : public ExportJob {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     QGpgMESecretKeyExportJob( bool armour, const TQString& charset );
     ~QGpgMESecretKeyExportJob();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h
index 0f2e7657..24672d83 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h
@@ -55,7 +55,7 @@ namespace Kleo {
 
   class KDE_EXPORT QGpgMESignEncryptJob : public SignEncryptJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMESignEncryptJob( GpgME::Context * context );
     ~QGpgMESignEncryptJob();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignjob.h b/certmanager/lib/backends/qgpgme/qgpgmesignjob.h
index 2dd3230a..2b51eada 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesignjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmesignjob.h
@@ -51,7 +51,7 @@ namespace Kleo {
 
   class QGpgMESignJob : public SignJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMESignJob( GpgME::Context * context );
     ~QGpgMESignJob();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h b/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h
index 76d1715b..a62699d3 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h
@@ -48,7 +48,7 @@ namespace Kleo {
 
   class QGpgMEVerifyDetachedJob : public VerifyDetachedJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEVerifyDetachedJob( GpgME::Context * context );
     ~QGpgMEVerifyDetachedJob();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h b/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h
index e24b6bc6..87a19619 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h
@@ -48,7 +48,7 @@ namespace Kleo {
 
   class QGpgMEVerifyOpaqueJob : public VerifyOpaqueJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEVerifyOpaqueJob( GpgME::Context * context );
     ~QGpgMEVerifyOpaqueJob();
diff --git a/certmanager/lib/cryptplugfactory.h b/certmanager/lib/cryptplugfactory.h
index c7d2783a..3eb5f7e6 100644
--- a/certmanager/lib/cryptplugfactory.h
+++ b/certmanager/lib/cryptplugfactory.h
@@ -49,7 +49,7 @@ namespace KMail {
 
   class KDE_EXPORT CryptPlugFactory : public Kleo::CryptoBackendFactory {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     CryptPlugFactory();
     ~CryptPlugFactory();
diff --git a/certmanager/lib/kleo/cryptobackendfactory.h b/certmanager/lib/kleo/cryptobackendfactory.h
index f5076e95..e674de11 100644
--- a/certmanager/lib/kleo/cryptobackendfactory.h
+++ b/certmanager/lib/kleo/cryptobackendfactory.h
@@ -58,7 +58,7 @@ namespace Kleo {
 
   class KDE_EXPORT CryptoBackendFactory : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     CryptoBackendFactory();
     ~CryptoBackendFactory();
diff --git a/certmanager/lib/kleo/decryptjob.h b/certmanager/lib/kleo/decryptjob.h
index 72bf1b82..bce60b81 100644
--- a/certmanager/lib/kleo/decryptjob.h
+++ b/certmanager/lib/kleo/decryptjob.h
@@ -61,7 +61,7 @@ namespace Kleo {
   */
   class DecryptJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     DecryptJob( TQObject * parent, const char * name );
   public:
diff --git a/certmanager/lib/kleo/decryptverifyjob.h b/certmanager/lib/kleo/decryptverifyjob.h
index e1cdce04..94b016a0 100644
--- a/certmanager/lib/kleo/decryptverifyjob.h
+++ b/certmanager/lib/kleo/decryptverifyjob.h
@@ -64,7 +64,7 @@ namespace Kleo {
   */
   class DecryptVerifyJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     DecryptVerifyJob( TQObject * parent, const char * name );
   public:
diff --git a/certmanager/lib/kleo/deletejob.h b/certmanager/lib/kleo/deletejob.h
index c48852f9..15bd5a51 100644
--- a/certmanager/lib/kleo/deletejob.h
+++ b/certmanager/lib/kleo/deletejob.h
@@ -57,7 +57,7 @@ namespace Kleo {
   */
   class DeleteJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     DeleteJob( TQObject * parent, const char * name );
   public:
diff --git a/certmanager/lib/kleo/downloadjob.h b/certmanager/lib/kleo/downloadjob.h
index f3d568ae..e1f52cd7 100644
--- a/certmanager/lib/kleo/downloadjob.h
+++ b/certmanager/lib/kleo/downloadjob.h
@@ -60,7 +60,7 @@ namespace Kleo {
   */
   class DownloadJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     DownloadJob( TQObject * parent, const char * name );
   public:
diff --git a/certmanager/lib/kleo/encryptjob.h b/certmanager/lib/kleo/encryptjob.h
index c9e4d676..f55ab76d 100644
--- a/certmanager/lib/kleo/encryptjob.h
+++ b/certmanager/lib/kleo/encryptjob.h
@@ -63,7 +63,7 @@ namespace Kleo {
   */
   class EncryptJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     EncryptJob( TQObject * parent, const char * name );
   public:
diff --git a/certmanager/lib/kleo/exportjob.h b/certmanager/lib/kleo/exportjob.h
index 0d693a6a..69ad8e5c 100644
--- a/certmanager/lib/kleo/exportjob.h
+++ b/certmanager/lib/kleo/exportjob.h
@@ -60,7 +60,7 @@ namespace Kleo {
   */
   class ExportJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     ExportJob( TQObject * parent, const char * name );
   public:
diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.h b/certmanager/lib/kleo/hierarchicalkeylistjob.h
index 506b5477..0b74d2f9 100644
--- a/certmanager/lib/kleo/hierarchicalkeylistjob.h
+++ b/certmanager/lib/kleo/hierarchicalkeylistjob.h
@@ -70,7 +70,7 @@ namespace Kleo {
   */
   class KDE_EXPORT HierarchicalKeyListJob : public KeyListJob {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     HierarchicalKeyListJob( const CryptoBackend::Protocol * protocol,
 			    bool remote=false, bool includeSigs=false, bool validating=false );
diff --git a/certmanager/lib/kleo/importjob.h b/certmanager/lib/kleo/importjob.h
index c363276f..bd0a6f04 100644
--- a/certmanager/lib/kleo/importjob.h
+++ b/certmanager/lib/kleo/importjob.h
@@ -61,7 +61,7 @@ namespace Kleo {
   */
   class ImportJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     ImportJob( TQObject * parent, const char * name );
   public:
diff --git a/certmanager/lib/kleo/job.h b/certmanager/lib/kleo/job.h
index d4fe79b8..00087566 100644
--- a/certmanager/lib/kleo/job.h
+++ b/certmanager/lib/kleo/job.h
@@ -63,7 +63,7 @@ namespace Kleo {
   */
   class Job : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     Job( TQObject * parent, const char * name );
   public:
diff --git a/certmanager/lib/kleo/keyfiltermanager.h b/certmanager/lib/kleo/keyfiltermanager.h
index 7663cbb8..a573934d 100644
--- a/certmanager/lib/kleo/keyfiltermanager.h
+++ b/certmanager/lib/kleo/keyfiltermanager.h
@@ -47,7 +47,7 @@ namespace Kleo {
 
   class KDE_EXPORT KeyFilterManager : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     KeyFilterManager( TQObject * parent=0, const char * name=0 );
     ~KeyFilterManager();
diff --git a/certmanager/lib/kleo/keygenerationjob.h b/certmanager/lib/kleo/keygenerationjob.h
index 058f4127..b0d94993 100644
--- a/certmanager/lib/kleo/keygenerationjob.h
+++ b/certmanager/lib/kleo/keygenerationjob.h
@@ -60,7 +60,7 @@ namespace Kleo {
   */
   class KeyGenerationJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     KeyGenerationJob( TQObject * parent, const char * name );
   public:
diff --git a/certmanager/lib/kleo/keylistjob.h b/certmanager/lib/kleo/keylistjob.h
index 8d9cb6a3..3560f7b8 100644
--- a/certmanager/lib/kleo/keylistjob.h
+++ b/certmanager/lib/kleo/keylistjob.h
@@ -64,7 +64,7 @@ namespace Kleo {
   */
   class KeyListJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     KeyListJob( TQObject * parent, const char * name );
 
diff --git a/certmanager/lib/kleo/multideletejob.h b/certmanager/lib/kleo/multideletejob.h
index 73612e2d..d927c927 100644
--- a/certmanager/lib/kleo/multideletejob.h
+++ b/certmanager/lib/kleo/multideletejob.h
@@ -66,7 +66,7 @@ namespace Kleo {
   */
   class KDE_EXPORT MultiDeleteJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     MultiDeleteJob( const CryptoBackend::Protocol * protocol );
     ~MultiDeleteJob();
diff --git a/certmanager/lib/kleo/refreshkeysjob.h b/certmanager/lib/kleo/refreshkeysjob.h
index f5f7304b..7a55f106 100644
--- a/certmanager/lib/kleo/refreshkeysjob.h
+++ b/certmanager/lib/kleo/refreshkeysjob.h
@@ -61,7 +61,7 @@ namespace Kleo {
   */
   class RefreshKeysJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     RefreshKeysJob( TQObject * parent, const char * name );
 
diff --git a/certmanager/lib/kleo/signencryptjob.h b/certmanager/lib/kleo/signencryptjob.h
index 976c5d5c..0f31897e 100644
--- a/certmanager/lib/kleo/signencryptjob.h
+++ b/certmanager/lib/kleo/signencryptjob.h
@@ -66,7 +66,7 @@ namespace Kleo {
   */
   class SignEncryptJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     SignEncryptJob( TQObject * parent, const char * name );
   public:
diff --git a/certmanager/lib/kleo/signjob.h b/certmanager/lib/kleo/signjob.h
index f317fe58..fdeb9a84 100644
--- a/certmanager/lib/kleo/signjob.h
+++ b/certmanager/lib/kleo/signjob.h
@@ -64,7 +64,7 @@ namespace Kleo {
   */
   class SignJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     SignJob( TQObject * parent, const char * name );
   public:
diff --git a/certmanager/lib/kleo/specialjob.h b/certmanager/lib/kleo/specialjob.h
index d801bd4c..c5bc1896 100644
--- a/certmanager/lib/kleo/specialjob.h
+++ b/certmanager/lib/kleo/specialjob.h
@@ -64,7 +64,7 @@ namespace Kleo {
   */
   class SpecialJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     SpecialJob( TQObject * parent, const char * name );
 
diff --git a/certmanager/lib/kleo/verifydetachedjob.h b/certmanager/lib/kleo/verifydetachedjob.h
index 0bc801c7..01cc6377 100644
--- a/certmanager/lib/kleo/verifydetachedjob.h
+++ b/certmanager/lib/kleo/verifydetachedjob.h
@@ -61,7 +61,7 @@ namespace Kleo {
   */
   class VerifyDetachedJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     VerifyDetachedJob( TQObject * parent, const char * name );
   public:
diff --git a/certmanager/lib/kleo/verifyopaquejob.h b/certmanager/lib/kleo/verifyopaquejob.h
index 6092a32c..387782df 100644
--- a/certmanager/lib/kleo/verifyopaquejob.h
+++ b/certmanager/lib/kleo/verifyopaquejob.h
@@ -61,7 +61,7 @@ namespace Kleo {
   */
   class VerifyOpaqueJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     VerifyOpaqueJob( TQObject * parent, const char * name );
   public:
diff --git a/certmanager/lib/tests/gnupgviewer.h b/certmanager/lib/tests/gnupgviewer.h
index 055a874b..f5277473 100644
--- a/certmanager/lib/tests/gnupgviewer.h
+++ b/certmanager/lib/tests/gnupgviewer.h
@@ -44,7 +44,7 @@ class TQStringList;
 
 class GnuPGViewer : public TQTextEdit {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   GnuPGViewer( TQWidget * parent=0, const char * name=0 );
   ~GnuPGViewer();
diff --git a/certmanager/lib/tests/test_keygen.h b/certmanager/lib/tests/test_keygen.h
index 70ded0c7..4bf2acaa 100644
--- a/certmanager/lib/tests/test_keygen.h
+++ b/certmanager/lib/tests/test_keygen.h
@@ -45,7 +45,7 @@ class TQLineEdit;
 
 class KeyGenerator : public KDialogBase {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KeyGenerator( TQWidget * parent=0, const char * name=0, WFlags f=0 );
   ~KeyGenerator();
diff --git a/certmanager/lib/tests/test_keylister.h b/certmanager/lib/tests/test_keylister.h
index f5b9bd89..58eeac4a 100644
--- a/certmanager/lib/tests/test_keylister.h
+++ b/certmanager/lib/tests/test_keylister.h
@@ -41,7 +41,7 @@ namespace GpgME {
 
 class CertListView : public Kleo::KeyListView {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   CertListView( TQWidget * parent=0, const char * name=0, WFlags f=0 );
 
diff --git a/certmanager/lib/ui/adddirectoryservicedialogimpl.h b/certmanager/lib/ui/adddirectoryservicedialogimpl.h
index 0b1a0ca6..f8924dac 100644
--- a/certmanager/lib/ui/adddirectoryservicedialogimpl.h
+++ b/certmanager/lib/ui/adddirectoryservicedialogimpl.h
@@ -37,7 +37,7 @@
 class AddDirectoryServiceDialogImpl : public AddDirectoryServiceDialog
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     AddDirectoryServiceDialogImpl( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
diff --git a/certmanager/lib/ui/backendconfigwidget.h b/certmanager/lib/ui/backendconfigwidget.h
index 1cc9362f..f0131547 100644
--- a/certmanager/lib/ui/backendconfigwidget.h
+++ b/certmanager/lib/ui/backendconfigwidget.h
@@ -47,7 +47,7 @@ namespace Kleo {
 
   class KDE_EXPORT BackendConfigWidget : public TQWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     BackendConfigWidget( CryptoBackendFactory * factory, TQWidget * parent=0, const char * name=0, WFlags f=0 );
     ~BackendConfigWidget();
diff --git a/certmanager/lib/ui/cryptoconfigdialog.h b/certmanager/lib/ui/cryptoconfigdialog.h
index dc0dca75..3f6ba328 100644
--- a/certmanager/lib/ui/cryptoconfigdialog.h
+++ b/certmanager/lib/ui/cryptoconfigdialog.h
@@ -46,7 +46,7 @@ namespace Kleo {
   class KDE_EXPORT CryptoConfigDialog : public KDialogBase
   {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *parent = 0, const char* name = 0 );
 
diff --git a/certmanager/lib/ui/cryptoconfigmodule.h b/certmanager/lib/ui/cryptoconfigmodule.h
index b6f832b8..4d5042f5 100644
--- a/certmanager/lib/ui/cryptoconfigmodule.h
+++ b/certmanager/lib/ui/cryptoconfigmodule.h
@@ -47,7 +47,7 @@ namespace Kleo {
    */
   class CryptoConfigModule : public KJanusWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     CryptoConfigModule( Kleo::CryptoConfig* config, TQWidget * parent=0, const char * name=0 );
 
diff --git a/certmanager/lib/ui/cryptoconfigmodule_p.h b/certmanager/lib/ui/cryptoconfigmodule_p.h
index 0c5f0087..c841a092 100644
--- a/certmanager/lib/ui/cryptoconfigmodule_p.h
+++ b/certmanager/lib/ui/cryptoconfigmodule_p.h
@@ -58,7 +58,7 @@ namespace Kleo {
    */
   class CryptoConfigComponentGUI : public TQWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CryptoConfigComponentGUI( CryptoConfigModule* module, Kleo::CryptoConfigComponent* component,
@@ -78,7 +78,7 @@ namespace Kleo {
    */
   class CryptoConfigGroupGUI : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CryptoConfigGroupGUI( CryptoConfigModule* module, Kleo::CryptoConfigGroup* group,
@@ -110,7 +110,7 @@ namespace Kleo {
    */
   class CryptoConfigEntryGUI : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     CryptoConfigEntryGUI( CryptoConfigModule* module,
                           Kleo::CryptoConfigEntry* entry,
@@ -148,7 +148,7 @@ namespace Kleo {
    */
   class CryptoConfigEntryLineEdit : public CryptoConfigEntryGUI {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CryptoConfigEntryLineEdit( CryptoConfigModule* module,
@@ -168,7 +168,7 @@ namespace Kleo {
    */
   class CryptoConfigEntryPath : public CryptoConfigEntryGUI {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CryptoConfigEntryPath( CryptoConfigModule* module,
@@ -188,7 +188,7 @@ namespace Kleo {
    */
   class CryptoConfigEntryDirPath : public CryptoConfigEntryGUI {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CryptoConfigEntryDirPath( CryptoConfigModule* module,
@@ -208,7 +208,7 @@ namespace Kleo {
    */
   class CryptoConfigEntryURL : public CryptoConfigEntryGUI {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CryptoConfigEntryURL( CryptoConfigModule* module,
@@ -228,7 +228,7 @@ namespace Kleo {
    */
   class CryptoConfigEntrySpinBox : public CryptoConfigEntryGUI {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CryptoConfigEntrySpinBox( CryptoConfigModule* module,
@@ -248,7 +248,7 @@ namespace Kleo {
    */
   class CryptoConfigEntryCheckBox : public CryptoConfigEntryGUI {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CryptoConfigEntryCheckBox( CryptoConfigModule* module,
@@ -267,7 +267,7 @@ namespace Kleo {
    */
   class CryptoConfigEntryLDAPURL : public CryptoConfigEntryGUI {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CryptoConfigEntryLDAPURL( CryptoConfigModule* module,
diff --git a/certmanager/lib/ui/directoryserviceswidget.h b/certmanager/lib/ui/directoryserviceswidget.h
index 3b20bb32..a98bc5fe 100644
--- a/certmanager/lib/ui/directoryserviceswidget.h
+++ b/certmanager/lib/ui/directoryserviceswidget.h
@@ -44,7 +44,7 @@ class CryptoConfigEntry;
 class KDE_EXPORT DirectoryServicesWidget : public DirectoryServicesWidgetBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   DirectoryServicesWidget(
diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.h b/certmanager/lib/ui/dnattributeorderconfigwidget.h
index 4f87c4e6..b7ba1330 100644
--- a/certmanager/lib/ui/dnattributeorderconfigwidget.h
+++ b/certmanager/lib/ui/dnattributeorderconfigwidget.h
@@ -45,7 +45,7 @@ namespace Kleo {
 
   class KDE_EXPORT DNAttributeOrderConfigWidget : public TQWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     /*! Use Kleo::DNAttributeMapper::instance()->configWidget( parent, name ) instead. */
     DNAttributeOrderConfigWidget( DNAttributeMapper * mapper, TQWidget * parent=0, const char * name=0, WFlags f=0 );
diff --git a/certmanager/lib/ui/kdhorizontalline.h b/certmanager/lib/ui/kdhorizontalline.h
index 530b8908..71c1c928 100644
--- a/certmanager/lib/ui/kdhorizontalline.h
+++ b/certmanager/lib/ui/kdhorizontalline.h
@@ -46,7 +46,7 @@
 
 class KDHorizontalLine : public TQFrame {
   Q_OBJECT
-  TQ_OBJECT
+  
   TQ_PROPERTY( TQString title READ title WRITE setTitle )
 public:
   KDHorizontalLine( TQWidget * parent=0, const char * name=0,  WFlags f=0 );
diff --git a/certmanager/lib/ui/keyapprovaldialog.h b/certmanager/lib/ui/keyapprovaldialog.h
index 0b368635..bd953fa3 100644
--- a/certmanager/lib/ui/keyapprovaldialog.h
+++ b/certmanager/lib/ui/keyapprovaldialog.h
@@ -57,7 +57,7 @@ namespace Kleo {
 
   class KDE_EXPORT KeyApprovalDialog : public KDialogBase {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     struct Item {
       Item() : pref( UnknownPreference ) {}
diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h
index ada8354e..3f3edc03 100644
--- a/certmanager/lib/ui/keylistview.h
+++ b/certmanager/lib/ui/keylistview.h
@@ -200,7 +200,7 @@ namespace Kleo {
 
   class KDE_EXPORT KeyListView : public KListView {
     Q_OBJECT
-  TQ_OBJECT
+  
     friend class KeyListViewItem;
   public:
 
diff --git a/certmanager/lib/ui/keyrequester.h b/certmanager/lib/ui/keyrequester.h
index 5a3d5375..899d3cde 100644
--- a/certmanager/lib/ui/keyrequester.h
+++ b/certmanager/lib/ui/keyrequester.h
@@ -75,7 +75,7 @@ namespace Kleo {
   /// Base class for SigningKeyRequester and EncryptionKeyRequester
   class KDE_EXPORT KeyRequester : public TQWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KeyRequester( unsigned int allowedKeys, bool multipleKeys=false,
 		  TQWidget * parent=0, const char * name=0 );
@@ -161,7 +161,7 @@ namespace Kleo {
 
   class KDE_EXPORT EncryptionKeyRequester : public KeyRequester {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     enum { OpenPGP = 1, SMIME = 2, AllProtocols = OpenPGP|SMIME };
 
@@ -189,7 +189,7 @@ namespace Kleo {
 
   class KDE_EXPORT SigningKeyRequester : public KeyRequester {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     enum { OpenPGP = 1, SMIME = 2, AllProtocols = OpenPGP|SMIME };
 
diff --git a/certmanager/lib/ui/keyselectiondialog.h b/certmanager/lib/ui/keyselectiondialog.h
index b638947e..630255c1 100644
--- a/certmanager/lib/ui/keyselectiondialog.h
+++ b/certmanager/lib/ui/keyselectiondialog.h
@@ -65,7 +65,7 @@ namespace Kleo {
 
   class KDE_EXPORT KeySelectionDialog : public KDialogBase {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
 
     enum KeyUsage {
diff --git a/certmanager/lib/ui/messagebox.cpp b/certmanager/lib/ui/messagebox.cpp
index 5917fdee..96b710c3 100644
--- a/certmanager/lib/ui/messagebox.cpp
+++ b/certmanager/lib/ui/messagebox.cpp
@@ -75,7 +75,7 @@ static KGuiItem KGuiItem_showAuditLog() {
 
 class AuditLogViewer : public KDialogBase {
     // Q_OBJECT
-  TQ_OBJECT
+  
 public:
     explicit AuditLogViewer( const TQString & log, TQWidget * parent=0, const char * name=0, WFlags f=0 )
         : KDialogBase( parent, name, false, i18n("View GnuPG Audit Log"),
diff --git a/certmanager/lib/ui/passphrasedialog.h b/certmanager/lib/ui/passphrasedialog.h
index 5b969a1e..e83eca42 100644
--- a/certmanager/lib/ui/passphrasedialog.h
+++ b/certmanager/lib/ui/passphrasedialog.h
@@ -55,7 +55,7 @@ namespace Kleo {
 
   class PassphraseDialog : public KDialogBase {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     PassphraseDialog( const TQString & description,
 		      const TQString & caption=TQString(),
diff --git a/certmanager/lib/ui/progressbar.h b/certmanager/lib/ui/progressbar.h
index bf804b58..51f86dad 100644
--- a/certmanager/lib/ui/progressbar.h
+++ b/certmanager/lib/ui/progressbar.h
@@ -44,7 +44,7 @@ namespace Kleo {
   */
   class KDE_EXPORT ProgressBar : public TQProgressBar {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ProgressBar( TQWidget * parent=0, const char * name=0, WFlags f=0 );
 
diff --git a/certmanager/lib/ui/progressdialog.h b/certmanager/lib/ui/progressdialog.h
index 0c05cdbd..dadfd769 100644
--- a/certmanager/lib/ui/progressdialog.h
+++ b/certmanager/lib/ui/progressdialog.h
@@ -45,7 +45,7 @@ namespace Kleo {
   */
   class KDE_EXPORT ProgressDialog : public TQProgressDialog {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ProgressDialog( Job * job, const TQString & baseText,
 		    TQWidget * creator=0, const char * name=0, WFlags f=0  );
diff --git a/certmanager/storedtransferjob.h b/certmanager/storedtransferjob.h
index 59e007a3..ddc687fc 100644
--- a/certmanager/storedtransferjob.h
+++ b/certmanager/storedtransferjob.h
@@ -46,7 +46,7 @@ namespace KIOext {
  */
 class StoredTransferJob : public KIO::TransferJob {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
        /**
diff --git a/kabc/kabc2mutt/kabc2mutt.h b/kabc/kabc2mutt/kabc2mutt.h
index 6b41fe24..eb3ca733 100644
--- a/kabc/kabc2mutt/kabc2mutt.h
+++ b/kabc/kabc2mutt/kabc2mutt.h
@@ -25,7 +25,7 @@
 class KABC2Mutt : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
 
diff --git a/kaddressbook/addresseditwidget.h b/kaddressbook/addresseditwidget.h
index b68583f0..c6d5e858 100644
--- a/kaddressbook/addresseditwidget.h
+++ b/kaddressbook/addresseditwidget.h
@@ -52,7 +52,7 @@ typedef TypeCombo<KABC::Address> AddressTypeCombo;
 class AddressEditWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AddressEditWidget( TQWidget *parent, const char *name = 0 );
@@ -93,7 +93,7 @@ class AddressEditWidget : public TQWidget
 class AddressEditDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AddressEditDialog( const KABC::Address::List &list, int selected,
diff --git a/kaddressbook/addresseeeditorbase.h b/kaddressbook/addresseeeditorbase.h
index 3dc9749f..55eea432 100644
--- a/kaddressbook/addresseeeditorbase.h
+++ b/kaddressbook/addresseeeditorbase.h
@@ -31,7 +31,7 @@
 class AddresseeEditorBase : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AddresseeEditorBase( TQWidget *parent, const char *name = 0 )
diff --git a/kaddressbook/addresseeeditordialog.h b/kaddressbook/addresseeeditordialog.h
index eedb3ae4..43f06c20 100644
--- a/kaddressbook/addresseeeditordialog.h
+++ b/kaddressbook/addresseeeditordialog.h
@@ -35,7 +35,7 @@ namespace KAB { class Core; }
 class AddresseeEditorDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AddresseeEditorDialog( KAB::Core *core,
diff --git a/kaddressbook/addresseeeditorextension.h b/kaddressbook/addresseeeditorextension.h
index b54ef86a..5d152ca2 100644
--- a/kaddressbook/addresseeeditorextension.h
+++ b/kaddressbook/addresseeeditorextension.h
@@ -30,7 +30,7 @@
 class AddresseeEditorExtension : public KAB::ExtensionWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AddresseeEditorExtension( KAB::Core *core, TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/addresseeeditorwidget.h b/kaddressbook/addresseeeditorwidget.h
index 56a98adb..1097aafa 100644
--- a/kaddressbook/addresseeeditorwidget.h
+++ b/kaddressbook/addresseeeditorwidget.h
@@ -66,7 +66,7 @@ namespace KABC { class AddressBook; }
 class AddresseeEditorWidget : public AddresseeEditorBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AddresseeEditorWidget( TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/addviewdialog.h b/kaddressbook/addviewdialog.h
index 27a91682..2e5707a3 100644
--- a/kaddressbook/addviewdialog.h
+++ b/kaddressbook/addviewdialog.h
@@ -41,7 +41,7 @@ class ViewFactory;
 class AddViewDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AddViewDialog( TQDict<ViewFactory> *viewFactoryDict, TQWidget *parent,
diff --git a/kaddressbook/advancedcustomfields.h b/kaddressbook/advancedcustomfields.h
index ce7cef3b..bdd7fe68 100644
--- a/kaddressbook/advancedcustomfields.h
+++ b/kaddressbook/advancedcustomfields.h
@@ -39,7 +39,7 @@
 class AdvancedCustomFields : public KAB::ContactEditorWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AdvancedCustomFields( const TQString &uiFile, KABC::AddressBook *ab,
diff --git a/kaddressbook/common/locationmap.h b/kaddressbook/common/locationmap.h
index c244ce72..502aa01f 100644
--- a/kaddressbook/common/locationmap.h
+++ b/kaddressbook/common/locationmap.h
@@ -31,7 +31,7 @@
 class LocationMap : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     static LocationMap *instance();
diff --git a/kaddressbook/contacteditorwidgetmanager.h b/kaddressbook/contacteditorwidgetmanager.h
index 6bc418eb..26cf5052 100644
--- a/kaddressbook/contacteditorwidgetmanager.h
+++ b/kaddressbook/contacteditorwidgetmanager.h
@@ -37,7 +37,7 @@ class TQGridLayout;
 class ContactEditorWidgetManager : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     static ContactEditorWidgetManager *self();
@@ -67,7 +67,7 @@ class ContactEditorWidgetManager : public TQObject
 class ContactEditorTabPage : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ContactEditorTabPage( TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/customfieldswidget.h b/kaddressbook/customfieldswidget.h
index 07c5812e..414cea85 100644
--- a/kaddressbook/customfieldswidget.h
+++ b/kaddressbook/customfieldswidget.h
@@ -61,7 +61,7 @@ typedef TQValueList<FieldRecord> FieldRecordList;
 class AddFieldDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AddFieldDialog( TQWidget *parent, const char *name = 0 );
@@ -86,7 +86,7 @@ class AddFieldDialog : public KDialogBase
 class FieldWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     FieldWidget( TQWidget *parent, const char *name = 0 );
@@ -121,7 +121,7 @@ class FieldWidget : public TQWidget
 class CustomFieldsWidget : public KAB::ContactEditorWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CustomFieldsWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/distributionlisteditor.h b/kaddressbook/distributionlisteditor.h
index 6cbe9310..74aee7fe 100644
--- a/kaddressbook/distributionlisteditor.h
+++ b/kaddressbook/distributionlisteditor.h
@@ -39,7 +39,7 @@ class EditorWidgetPrivate;
 class EditorWidget : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     explicit EditorWidget( KABC::AddressBook* book, TQWidget* parent = 0 );
     ~EditorWidget();
diff --git a/kaddressbook/distributionlisteditor_p.h b/kaddressbook/distributionlisteditor_p.h
index 10a129fb..4bbb2436 100644
--- a/kaddressbook/distributionlisteditor_p.h
+++ b/kaddressbook/distributionlisteditor_p.h
@@ -42,7 +42,7 @@ namespace DistributionListEditor {
 class LineEdit : public KPIM::AddresseeLineEdit
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     explicit LineEdit( TQWidget* parent = 0 );
 };
@@ -51,7 +51,7 @@ public:
 class Line : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     explicit Line( KABC::AddressBook* book, TQWidget* parent = 0 );
 
diff --git a/kaddressbook/distributionlistentryview.h b/kaddressbook/distributionlistentryview.h
index 324f215a..6bd9d2c3 100644
--- a/kaddressbook/distributionlistentryview.h
+++ b/kaddressbook/distributionlistentryview.h
@@ -24,7 +24,7 @@ class Core;
 class DistributionListEntryView : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     explicit DistributionListEntryView( KAB::Core* core, TQWidget* parent = 0 );
diff --git a/kaddressbook/distributionlistpicker.h b/kaddressbook/distributionlistpicker.h
index 22e814f4..c101a3a4 100644
--- a/kaddressbook/distributionlistpicker.h
+++ b/kaddressbook/distributionlistpicker.h
@@ -38,7 +38,7 @@ namespace KPIM {
 class DistributionListPickerDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     explicit DistributionListPickerDialog( KABC::AddressBook* book, TQWidget* parent = 0 );
     TQString selectedDistributionList() const;
diff --git a/kaddressbook/editors/cryptowidget.h b/kaddressbook/editors/cryptowidget.h
index 4fda99d5..288920d1 100644
--- a/kaddressbook/editors/cryptowidget.h
+++ b/kaddressbook/editors/cryptowidget.h
@@ -36,7 +36,7 @@ class TQCheckBox;
 class CryptoWidget : public KAB::ContactEditorWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CryptoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/editors/imaddresswidget.h b/kaddressbook/editors/imaddresswidget.h
index 5ac2a196..9724ce77 100644
--- a/kaddressbook/editors/imaddresswidget.h
+++ b/kaddressbook/editors/imaddresswidget.h
@@ -42,7 +42,7 @@ class KPluginInfo;
 class IMAddressWidget : public IMAddressBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     IMAddressWidget( TQWidget *parent, TQValueList<KPluginInfo *> protocols);
diff --git a/kaddressbook/editors/imeditorwidget.h b/kaddressbook/editors/imeditorwidget.h
index 417e62f4..cca9b064 100644
--- a/kaddressbook/editors/imeditorwidget.h
+++ b/kaddressbook/editors/imeditorwidget.h
@@ -49,7 +49,7 @@ enum IMContext { Any, Home, Work };
 class IMEditorWidget : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     IMEditorWidget( TQWidget *parent, const TQString &preferredIM, const char *name = 0 );
diff --git a/kaddressbook/emaileditwidget.h b/kaddressbook/emaileditwidget.h
index 3f26bd9e..c818ed38 100644
--- a/kaddressbook/emaileditwidget.h
+++ b/kaddressbook/emaileditwidget.h
@@ -44,7 +44,7 @@ class KListView;
 class EmailEditWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     EmailEditWidget( TQWidget *parent, const char *name = 0 );
@@ -71,7 +71,7 @@ class EmailEditWidget : public TQWidget
 class EmailEditDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     EmailEditDialog( const TQStringList &list, TQWidget *parent,
diff --git a/kaddressbook/extensionmanager.h b/kaddressbook/extensionmanager.h
index f0af5ecc..ff2ce1a2 100644
--- a/kaddressbook/extensionmanager.h
+++ b/kaddressbook/extensionmanager.h
@@ -56,7 +56,7 @@ class ExtensionData
 class ExtensionManager : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ExtensionManager( TQWidget *extensionBar, TQWidgetStack *detailsStack, KAB::Core *core, TQObject *parent, const char *name = 0 );
diff --git a/kaddressbook/features/distributionlistngwidget.h b/kaddressbook/features/distributionlistngwidget.h
index aa6b9ddc..1121af45 100644
--- a/kaddressbook/features/distributionlistngwidget.h
+++ b/kaddressbook/features/distributionlistngwidget.h
@@ -47,7 +47,7 @@ namespace DistributionListNg {
 class ListBox : public KListBox
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     ListBox( TQWidget* parent = 0 );
 
@@ -67,7 +67,7 @@ protected:
 class MainWidget : public KAB::ExtensionWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     explicit MainWidget( KAB::Core *core, TQWidget *parent = 0, const char *name = 0 );
diff --git a/kaddressbook/features/distributionlistwidget.h b/kaddressbook/features/distributionlistwidget.h
index 1d82e99a..5d0a5097 100644
--- a/kaddressbook/features/distributionlistwidget.h
+++ b/kaddressbook/features/distributionlistwidget.h
@@ -48,7 +48,7 @@ class DistributionListManager;
 class DistributionListWidget : public KAB::ExtensionWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     DistributionListWidget( KAB::Core*, TQWidget *parent, const char *name = 0 );
@@ -108,7 +108,7 @@ class DistributionListWidget : public KAB::ExtensionWidget
 class DistributionListView : public KListView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     DistributionListView( TQWidget *parent, const char* name = 0 );
diff --git a/kaddressbook/features/resourceselection.h b/kaddressbook/features/resourceselection.h
index 609f942f..4d2f513e 100644
--- a/kaddressbook/features/resourceselection.h
+++ b/kaddressbook/features/resourceselection.h
@@ -38,7 +38,7 @@ class ResourceItem;
 class ResourceSelection : public KAB::ExtensionWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ResourceSelection( KAB::Core*, TQWidget *parent, const char *name );
diff --git a/kaddressbook/filtereditdialog.h b/kaddressbook/filtereditdialog.h
index 23dcfabd..063c2d67 100644
--- a/kaddressbook/filtereditdialog.h
+++ b/kaddressbook/filtereditdialog.h
@@ -40,7 +40,7 @@ class KListView;
 class FilterDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     FilterDialog( TQWidget *parent, const char *name = 0 );
@@ -71,7 +71,7 @@ class FilterDialog : public KDialogBase
 class FilterEditDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     FilterEditDialog( TQWidget *parent, const char *name = 0 );
     ~FilterEditDialog();
diff --git a/kaddressbook/filterselectionwidget.h b/kaddressbook/filterselectionwidget.h
index 162ea4cc..4e0c6728 100644
--- a/kaddressbook/filterselectionwidget.h
+++ b/kaddressbook/filterselectionwidget.h
@@ -36,7 +36,7 @@ class KComboBox;
 class FilterSelectionWidget : public TQHBox
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     FilterSelectionWidget( TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/freebusywidget.h b/kaddressbook/freebusywidget.h
index f06a574e..1a874176 100644
--- a/kaddressbook/freebusywidget.h
+++ b/kaddressbook/freebusywidget.h
@@ -31,7 +31,7 @@
 class FreeBusyWidget : public KAB::ContactEditorWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     FreeBusyWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/geowidget.h b/kaddressbook/geowidget.h
index 7021b4fd..4598b49c 100644
--- a/kaddressbook/geowidget.h
+++ b/kaddressbook/geowidget.h
@@ -51,7 +51,7 @@ typedef struct {
 class GeoWidget : public KAB::ContactEditorWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     GeoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
@@ -78,7 +78,7 @@ class GeoWidget : public KAB::ContactEditorWidget
 class GeoDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     GeoDialog( TQWidget *parent, const char *name = 0 );
@@ -124,7 +124,7 @@ class GeoDialog : public KDialogBase
 class GeoMapWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     GeoMapWidget( TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/imagewidget.h b/kaddressbook/imagewidget.h
index 6dbac195..8e4db9ae 100644
--- a/kaddressbook/imagewidget.h
+++ b/kaddressbook/imagewidget.h
@@ -38,7 +38,7 @@
 class ImageLoader : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ImageLoader( TQWidget *parent );
@@ -56,7 +56,7 @@ class ImageLoader : public TQObject
 class ImageButton : public TQPushButton
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ImageButton( const TQString &title, TQWidget *parent );
@@ -98,7 +98,7 @@ class ImageButton : public TQPushButton
 class ImageBaseWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ImageBaseWidget( const TQString &title, TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/imeditwidget.h b/kaddressbook/imeditwidget.h
index 03c25fcb..a70ed062 100644
--- a/kaddressbook/imeditwidget.h
+++ b/kaddressbook/imeditwidget.h
@@ -44,7 +44,7 @@ class KListView;
 class IMEditWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     IMEditWidget(TQWidget *parent, KABC::Addressee &addr, const char *name = 0 );
diff --git a/kaddressbook/incsearchwidget.h b/kaddressbook/incsearchwidget.h
index 4277828d..faafe94d 100644
--- a/kaddressbook/incsearchwidget.h
+++ b/kaddressbook/incsearchwidget.h
@@ -35,7 +35,7 @@ class KLineEdit;
 class IncSearchWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     IncSearchWidget( TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/interfaces/contacteditorwidget.h b/kaddressbook/interfaces/contacteditorwidget.h
index 6f57d200..8ac5d692 100644
--- a/kaddressbook/interfaces/contacteditorwidget.h
+++ b/kaddressbook/interfaces/contacteditorwidget.h
@@ -37,7 +37,7 @@ namespace KAB {
 class KDE_EXPORT ContactEditorWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     typedef TQValueList<ContactEditorWidget*> List;
diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h
index 3e2a175f..996044f4 100644
--- a/kaddressbook/interfaces/core.h
+++ b/kaddressbook/interfaces/core.h
@@ -55,7 +55,7 @@ class SearchManager;
 class KDE_EXPORT Core : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     Core( KXMLGUIClient *client, TQObject *parent, const char *name = 0 );
diff --git a/kaddressbook/interfaces/extensionwidget.h b/kaddressbook/interfaces/extensionwidget.h
index 400472e3..1cca99af 100644
--- a/kaddressbook/interfaces/extensionwidget.h
+++ b/kaddressbook/interfaces/extensionwidget.h
@@ -39,7 +39,7 @@ class ConfigureWidget;
 class KDE_EXPORT ExtensionWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ExtensionWidget( Core *core, TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h
index 377263fc..7307524d 100644
--- a/kaddressbook/interfaces/xxport.h
+++ b/kaddressbook/interfaces/xxport.h
@@ -68,7 +68,7 @@ namespace KAB {
 class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/jumpbuttonbar.h b/kaddressbook/jumpbuttonbar.h
index d7471cea..620c737b 100644
--- a/kaddressbook/jumpbuttonbar.h
+++ b/kaddressbook/jumpbuttonbar.h
@@ -47,7 +47,7 @@ class Field;
 class JumpButtonBar : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     JumpButtonBar( KAB::Core *core, TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index fb5d4733..bba0ec9c 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -83,7 +83,7 @@ typedef struct {
 class KDE_EXPORT KABCore : public KAB::Core
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent,
diff --git a/kaddressbook/kaddressbook_part.h b/kaddressbook/kaddressbook_part.h
index 366d65cb..92ad97c9 100644
--- a/kaddressbook/kaddressbook_part.h
+++ b/kaddressbook/kaddressbook_part.h
@@ -37,7 +37,7 @@ class KABCore;
 class KAddressbookPart: public KParts::ReadOnlyPart, virtual public KAddressBookIface
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KAddressbookPart( TQWidget *parentWidget, const char *widgetName,
diff --git a/kaddressbook/kaddressbookmain.h b/kaddressbook/kaddressbookmain.h
index 7867634d..2444b28e 100644
--- a/kaddressbook/kaddressbookmain.h
+++ b/kaddressbook/kaddressbookmain.h
@@ -45,7 +45,7 @@ class KABCore;
 class KAddressBookMain : public KMainWindow, virtual public KAddressBookIface
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KAddressBookMain( const TQString &file = TQString() );
diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h
index 3df35eac..86153200 100644
--- a/kaddressbook/kaddressbookview.h
+++ b/kaddressbook/kaddressbookview.h
@@ -56,7 +56,7 @@ namespace KABC { class AddressBook; }
 class KDE_EXPORT KAddressBookView : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     enum DefaultFilterType { None = 0, Active = 1, Specific = 2 };
diff --git a/kaddressbook/kcmconfigs/addhostdialog.h b/kaddressbook/kcmconfigs/addhostdialog.h
index 7d483167..da6cc392 100644
--- a/kaddressbook/kcmconfigs/addhostdialog.h
+++ b/kaddressbook/kcmconfigs/addhostdialog.h
@@ -35,7 +35,7 @@ class TQSpinBox;
 class AddHostDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AddHostDialog( KPIM::LdapServer* server, TQWidget* parent = 0, const char* name = 0 );
diff --git a/kaddressbook/kcmconfigs/addresseewidget.h b/kaddressbook/kcmconfigs/addresseewidget.h
index b7c55b9e..ec476096 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.h
+++ b/kaddressbook/kcmconfigs/addresseewidget.h
@@ -36,7 +36,7 @@ class TQPushButton;
 class NamePartWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     NamePartWidget( const TQString &title, const TQString &label, TQWidget *parent,
@@ -69,7 +69,7 @@ class NamePartWidget : public TQWidget
 class AddresseeWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AddresseeWidget( TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.h b/kaddressbook/kcmconfigs/extensionconfigdialog.h
index 6c595b44..93a3c850 100644
--- a/kaddressbook/kcmconfigs/extensionconfigdialog.h
+++ b/kaddressbook/kcmconfigs/extensionconfigdialog.h
@@ -35,7 +35,7 @@ class ConfigureWidget;
 class ExtensionConfigDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ExtensionConfigDialog( KAB::ExtensionFactory *factory, KConfig *config,
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.h b/kaddressbook/kcmconfigs/kabconfigwidget.h
index 1a4fc666..a3756320 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.h
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.h
@@ -39,7 +39,7 @@ class AddresseeWidget;
 class KABConfigWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KABConfigWidget( TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.h b/kaddressbook/kcmconfigs/kcmkabconfig.h
index 42348145..ceadd6c9 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.h
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.h
@@ -31,7 +31,7 @@ class KABConfigWidget;
 class KCMKabConfig : public KCModule
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KCMKabConfig( TQWidget *parent = 0, const char *name = 0 );
diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.h b/kaddressbook/kcmconfigs/kcmkabldapconfig.h
index cfa7028d..0325c88e 100644
--- a/kaddressbook/kcmconfigs/kcmkabldapconfig.h
+++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.h
@@ -33,7 +33,7 @@ class LDAPOptionsWidget;
 class KCMKabLdapConfig : public KCModule
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KCMKabLdapConfig( TQWidget *parent = 0, const char *name = 0 );
diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.h b/kaddressbook/kcmconfigs/ldapoptionswidget.h
index f8e834b6..8be3b83a 100644
--- a/kaddressbook/kcmconfigs/ldapoptionswidget.h
+++ b/kaddressbook/kcmconfigs/ldapoptionswidget.h
@@ -34,7 +34,7 @@ class TQPushButton;
 class LDAPOptionsWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     LDAPOptionsWidget( TQWidget* parent = 0, const char* name = 0 );
diff --git a/kaddressbook/keywidget.h b/kaddressbook/keywidget.h
index 700a2fc8..5f5153d4 100644
--- a/kaddressbook/keywidget.h
+++ b/kaddressbook/keywidget.h
@@ -34,7 +34,7 @@ class TQPushButton;
 class KeyWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KeyWidget( TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/ldapsearchdialog.h b/kaddressbook/ldapsearchdialog.h
index bc24de92..613a28b8 100644
--- a/kaddressbook/ldapsearchdialog.h
+++ b/kaddressbook/ldapsearchdialog.h
@@ -50,7 +50,7 @@ namespace KABC {
 class LDAPSearchDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core, TQWidget* parent, const char* name = 0 );
diff --git a/kaddressbook/nameeditdialog.h b/kaddressbook/nameeditdialog.h
index 09d13c78..f43e56b0 100644
--- a/kaddressbook/nameeditdialog.h
+++ b/kaddressbook/nameeditdialog.h
@@ -40,7 +40,7 @@ class KComboBox;
 class NameEditDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     enum FormattedNameType
diff --git a/kaddressbook/phoneeditwidget.h b/kaddressbook/phoneeditwidget.h
index a49f4aa9..f9ca8ed4 100644
--- a/kaddressbook/phoneeditwidget.h
+++ b/kaddressbook/phoneeditwidget.h
@@ -39,7 +39,7 @@ class KComboBox;
 class PhoneTypeCombo : public KComboBox
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PhoneTypeCombo( TQWidget *parent );
@@ -66,7 +66,7 @@ class PhoneTypeCombo : public KComboBox
 class PhoneNumberWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PhoneNumberWidget( TQWidget *parent );
@@ -91,7 +91,7 @@ class PhoneNumberWidget : public TQWidget
 class PhoneEditWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PhoneEditWidget( TQWidget *parent, const char *name = 0 );
@@ -131,7 +131,7 @@ class PhoneEditWidget : public TQWidget
 class PhoneTypeDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     PhoneTypeDialog( int type, TQWidget *parent );
 
diff --git a/kaddressbook/printing/detailledstyle.h b/kaddressbook/printing/detailledstyle.h
index 7ae1afde..e8600e56 100644
--- a/kaddressbook/printing/detailledstyle.h
+++ b/kaddressbook/printing/detailledstyle.h
@@ -36,7 +36,7 @@ namespace KABPrinting {
 class DetailledPrintStyle : public PrintStyle
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     DetailledPrintStyle( PrintingWizard *parent, const char *name = 0 );
diff --git a/kaddressbook/printing/mikesstyle.h b/kaddressbook/printing/mikesstyle.h
index d8c4e5ce..f94dce30 100644
--- a/kaddressbook/printing/mikesstyle.h
+++ b/kaddressbook/printing/mikesstyle.h
@@ -36,7 +36,7 @@ class PrintProgress;
 class MikesStyle : public PrintStyle
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     MikesStyle( PrintingWizard *parent, const char *name );
diff --git a/kaddressbook/printing/printingwizard.h b/kaddressbook/printing/printingwizard.h
index 16b8e982..73d96bb2 100644
--- a/kaddressbook/printing/printingwizard.h
+++ b/kaddressbook/printing/printingwizard.h
@@ -50,7 +50,7 @@ namespace KABPrinting {
 class PrintingWizard : public KWizard
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     /**
diff --git a/kaddressbook/printing/printprogress.h b/kaddressbook/printing/printprogress.h
index f4e72658..481543a2 100644
--- a/kaddressbook/printing/printprogress.h
+++ b/kaddressbook/printing/printprogress.h
@@ -40,7 +40,7 @@ namespace KABPrinting {
 class PrintProgress : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PrintProgress( TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/printing/printstyle.h b/kaddressbook/printing/printstyle.h
index e7e6d931..65fea06a 100644
--- a/kaddressbook/printing/printstyle.h
+++ b/kaddressbook/printing/printstyle.h
@@ -60,7 +60,7 @@ class PrintProgress;
 class PrintStyle : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PrintStyle( PrintingWizard* parent, const char* name = 0 );
diff --git a/kaddressbook/printing/selectionpage.h b/kaddressbook/printing/selectionpage.h
index 8e566f33..a7b10d26 100644
--- a/kaddressbook/printing/selectionpage.h
+++ b/kaddressbook/printing/selectionpage.h
@@ -35,7 +35,7 @@ class TQRadioButton;
 class SelectionPage : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     SelectionPage( TQWidget* parent = 0, const char* name = 0 );
diff --git a/kaddressbook/printing/stylepage.h b/kaddressbook/printing/stylepage.h
index 920d9a9d..8f664271 100644
--- a/kaddressbook/printing/stylepage.h
+++ b/kaddressbook/printing/stylepage.h
@@ -38,7 +38,7 @@ class KComboBox;
 class StylePage : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     StylePage( KABC::AddressBook *ab, TQWidget* parent = 0, const char* name = 0 );
diff --git a/kaddressbook/searchmanager.h b/kaddressbook/searchmanager.h
index e038b463..539619db 100644
--- a/kaddressbook/searchmanager.h
+++ b/kaddressbook/searchmanager.h
@@ -37,7 +37,7 @@ namespace KAB {
 class SearchManager : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     enum Type {
diff --git a/kaddressbook/secrecywidget.h b/kaddressbook/secrecywidget.h
index c872eb2c..46f76ba4 100644
--- a/kaddressbook/secrecywidget.h
+++ b/kaddressbook/secrecywidget.h
@@ -32,7 +32,7 @@ class KComboBox;
 class SecrecyWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     SecrecyWidget( TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/simpleaddresseeeditor.h b/kaddressbook/simpleaddresseeeditor.h
index fbc5d60d..81280ca6 100644
--- a/kaddressbook/simpleaddresseeeditor.h
+++ b/kaddressbook/simpleaddresseeeditor.h
@@ -32,7 +32,7 @@ class KLineEdit;
 class SimpleAddresseeEditor : public AddresseeEditorBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     SimpleAddresseeEditor( TQWidget *parent, const char *name = 0 );
     ~SimpleAddresseeEditor();
diff --git a/kaddressbook/soundwidget.h b/kaddressbook/soundwidget.h
index c589ec5b..50f4a584 100644
--- a/kaddressbook/soundwidget.h
+++ b/kaddressbook/soundwidget.h
@@ -36,7 +36,7 @@ class TQPushButton;
 class SoundWidget : public KAB::ContactEditorWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     SoundWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/viewconfigurefieldspage.h b/kaddressbook/viewconfigurefieldspage.h
index 3eac607e..0ac75709 100644
--- a/kaddressbook/viewconfigurefieldspage.h
+++ b/kaddressbook/viewconfigurefieldspage.h
@@ -38,7 +38,7 @@ class TQToolButton;
 class ViewConfigureFieldsPage : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ViewConfigureFieldsPage( KABC::AddressBook *ab, TQWidget *parent = 0,
diff --git a/kaddressbook/viewconfigurefilterpage.h b/kaddressbook/viewconfigurefilterpage.h
index 104db3ed..7367d59d 100644
--- a/kaddressbook/viewconfigurefilterpage.h
+++ b/kaddressbook/viewconfigurefilterpage.h
@@ -34,7 +34,7 @@ class KConfig;
 class ViewConfigureFilterPage : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ViewConfigureFilterPage( TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/viewconfigurewidget.h b/kaddressbook/viewconfigurewidget.h
index d5f8a1d4..e65e095d 100644
--- a/kaddressbook/viewconfigurewidget.h
+++ b/kaddressbook/viewconfigurewidget.h
@@ -48,7 +48,7 @@ class ViewConfigureFilterPage;
 class KDE_EXPORT ViewConfigureWidget : public KAB::ConfigureWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
@@ -88,7 +88,7 @@ class KDE_EXPORT ViewConfigureWidget : public KAB::ConfigureWidget
 class ViewConfigureDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ViewConfigureDialog( ViewConfigureWidget *wdg, const TQString &viewName,
diff --git a/kaddressbook/viewmanager.h b/kaddressbook/viewmanager.h
index d0a13340..699d1d17 100644
--- a/kaddressbook/viewmanager.h
+++ b/kaddressbook/viewmanager.h
@@ -50,7 +50,7 @@ namespace KABC { class AddressBook; }
 class ViewManager : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ViewManager( KAB::Core *core, TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/views/cardview.h b/kaddressbook/views/cardview.h
index 0bd70e1d..d064e03d 100644
--- a/kaddressbook/views/cardview.h
+++ b/kaddressbook/views/cardview.h
@@ -196,7 +196,7 @@ class CardView : public TQScrollView
   friend class CardViewItem;
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     /**
diff --git a/kaddressbook/views/colorlistbox.h b/kaddressbook/views/colorlistbox.h
index acccd0b0..63495e93 100644
--- a/kaddressbook/views/colorlistbox.h
+++ b/kaddressbook/views/colorlistbox.h
@@ -26,7 +26,7 @@
 class ColorListBox : public KListBox
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ColorListBox( TQWidget *parent=0, const char * name=0, WFlags f=0 );
diff --git a/kaddressbook/views/configurecardviewdialog.h b/kaddressbook/views/configurecardviewdialog.h
index 40ddfe4f..9c079d88 100644
--- a/kaddressbook/views/configurecardviewdialog.h
+++ b/kaddressbook/views/configurecardviewdialog.h
@@ -80,7 +80,7 @@ class ConfigureCardViewWidget : public ViewConfigureWidget
 class CardViewLookNFeelPage : public TQVBox {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CardViewLookNFeelPage( TQWidget *parent=0, const char *name=0 );
diff --git a/kaddressbook/views/configuretableviewdialog.h b/kaddressbook/views/configuretableviewdialog.h
index 3533ae0d..9dbec3ee 100644
--- a/kaddressbook/views/configuretableviewdialog.h
+++ b/kaddressbook/views/configuretableviewdialog.h
@@ -63,7 +63,7 @@ class ConfigureTableViewWidget : public ViewConfigureWidget
 class LookAndFeelPage : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     LookAndFeelPage( TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/views/contactlistview.h b/kaddressbook/views/contactlistview.h
index 96966d5c..2da52d23 100644
--- a/kaddressbook/views/contactlistview.h
+++ b/kaddressbook/views/contactlistview.h
@@ -85,7 +85,7 @@ private:
 class ContactListView : public KListView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   ContactListView(KAddressBookTableView *view,
diff --git a/kaddressbook/views/kaddressbookcardview.h b/kaddressbook/views/kaddressbookcardview.h
index 128b146a..f14b12fc 100644
--- a/kaddressbook/views/kaddressbookcardview.h
+++ b/kaddressbook/views/kaddressbookcardview.h
@@ -43,7 +43,7 @@ class AddresseeCardView;
 class KAddressBookCardView : public KAddressBookView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KAddressBookCardView( KAB::Core *core, TQWidget *parent,
@@ -78,7 +78,7 @@ class KAddressBookCardView : public KAddressBookView
 class AddresseeCardView : public CardView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     AddresseeCardView( TQWidget *parent, const char *name = 0 );
     ~AddresseeCardView();
diff --git a/kaddressbook/views/kaddressbookiconview.h b/kaddressbook/views/kaddressbookiconview.h
index 614920c2..8cbc98a9 100644
--- a/kaddressbook/views/kaddressbookiconview.h
+++ b/kaddressbook/views/kaddressbookiconview.h
@@ -42,7 +42,7 @@ namespace KABC { class AddressBook; }
 class KAddressBookIconView : public KAddressBookView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KAddressBookIconView( KAB::Core *core, TQWidget *parent,
@@ -76,7 +76,7 @@ class KAddressBookIconView : public KAddressBookView
 class AddresseeIconView : public KIconView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AddresseeIconView( TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/views/kaddressbooktableview.h b/kaddressbook/views/kaddressbooktableview.h
index 5c9a7510..3b2e0df1 100644
--- a/kaddressbook/views/kaddressbooktableview.h
+++ b/kaddressbook/views/kaddressbooktableview.h
@@ -62,7 +62,7 @@ class KAddressBookTableView : public KAddressBookView
 friend class ContactListView;
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KAddressBookTableView( KAB::Core *core, TQWidget *parent,
diff --git a/kaddressbook/xxport/bookmark_xxport.h b/kaddressbook/xxport/bookmark_xxport.h
index 85fd602b..3c74dc68 100644
--- a/kaddressbook/xxport/bookmark_xxport.h
+++ b/kaddressbook/xxport/bookmark_xxport.h
@@ -30,7 +30,7 @@
 class BookmarkXXPort : public KAB::XXPort
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     BookmarkXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/xxport/csv_xxport.h b/kaddressbook/xxport/csv_xxport.h
index f08fa93d..c7bea01b 100644
--- a/kaddressbook/xxport/csv_xxport.h
+++ b/kaddressbook/xxport/csv_xxport.h
@@ -29,7 +29,7 @@
 class CSVXXPort : public KAB::XXPort
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CSVXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/xxport/csvimportdialog.h b/kaddressbook/xxport/csvimportdialog.h
index 95fd8a48..bf0cc774 100644
--- a/kaddressbook/xxport/csvimportdialog.h
+++ b/kaddressbook/xxport/csvimportdialog.h
@@ -41,7 +41,7 @@ class TQTable;
 class CSVImportDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CSVImportDialog( KABC::AddressBook *ab, TQWidget *parent,
diff --git a/kaddressbook/xxport/eudora_xxport.h b/kaddressbook/xxport/eudora_xxport.h
index 59937fcb..b1b6ebf8 100644
--- a/kaddressbook/xxport/eudora_xxport.h
+++ b/kaddressbook/xxport/eudora_xxport.h
@@ -29,7 +29,7 @@
 class EudoraXXPort : public KAB::XXPort
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     EudoraXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/xxport/gnokii_xxport.h b/kaddressbook/xxport/gnokii_xxport.h
index 6b5361c8..898d1600 100644
--- a/kaddressbook/xxport/gnokii_xxport.h
+++ b/kaddressbook/xxport/gnokii_xxport.h
@@ -29,7 +29,7 @@
 class GNOKIIXXPort : public KAB::XXPort
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     GNOKIIXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/xxport/kde2_xxport.h b/kaddressbook/xxport/kde2_xxport.h
index dc067524..b66440df 100644
--- a/kaddressbook/xxport/kde2_xxport.h
+++ b/kaddressbook/xxport/kde2_xxport.h
@@ -29,7 +29,7 @@
 class KDE2XXPort : public KAB::XXPort
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KDE2XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/xxport/ldif_xxport.h b/kaddressbook/xxport/ldif_xxport.h
index 167f4430..06c3c915 100644
--- a/kaddressbook/xxport/ldif_xxport.h
+++ b/kaddressbook/xxport/ldif_xxport.h
@@ -30,7 +30,7 @@
 class LDIFXXPort : public KAB::XXPort
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     LDIFXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/xxport/opera_xxport.h b/kaddressbook/xxport/opera_xxport.h
index 2395f5a2..730e4972 100644
--- a/kaddressbook/xxport/opera_xxport.h
+++ b/kaddressbook/xxport/opera_xxport.h
@@ -30,7 +30,7 @@
 class OperaXXPort : public KAB::XXPort
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     OperaXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/xxport/pab_xxport.h b/kaddressbook/xxport/pab_xxport.h
index c0450df6..04395f41 100644
--- a/kaddressbook/xxport/pab_xxport.h
+++ b/kaddressbook/xxport/pab_xxport.h
@@ -30,7 +30,7 @@
 class PABXXPort : public KAB::XXPort
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PABXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/xxport/vcard_xxport.h b/kaddressbook/xxport/vcard_xxport.h
index 44374432..a2aa8be3 100644
--- a/kaddressbook/xxport/vcard_xxport.h
+++ b/kaddressbook/xxport/vcard_xxport.h
@@ -30,7 +30,7 @@
 class VCardXXPort : public KAB::XXPort
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     VCardXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/xxportmanager.h b/kaddressbook/xxportmanager.h
index 593436ed..3da145d4 100644
--- a/kaddressbook/xxportmanager.h
+++ b/kaddressbook/xxportmanager.h
@@ -40,7 +40,7 @@ class Core;
 class KDE_EXPORT XXPortManager : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     XXPortManager( KAB::Core *core, TQObject *parent, const char *name = 0 );
diff --git a/kaddressbook/xxportselectdialog.h b/kaddressbook/xxportselectdialog.h
index 3e535926..adfcfd02 100644
--- a/kaddressbook/xxportselectdialog.h
+++ b/kaddressbook/xxportselectdialog.h
@@ -45,7 +45,7 @@ class KComboBox;
 class XXPortSelectDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     XXPortSelectDialog( KAB::Core *core, bool sort, TQWidget* parent,
diff --git a/kalarm/alarmcalendar.h b/kalarm/alarmcalendar.h
index 1b7ffc02..cebd6460 100644
--- a/kalarm/alarmcalendar.h
+++ b/kalarm/alarmcalendar.h
@@ -36,7 +36,7 @@ class KConfig;
 class AlarmCalendar : public TQObject
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		virtual ~AlarmCalendar();
 		bool                  valid() const                       { return mUrl.isValid(); }
diff --git a/kalarm/alarmlistview.h b/kalarm/alarmlistview.h
index 7e78cbd5..a48def33 100644
--- a/kalarm/alarmlistview.h
+++ b/kalarm/alarmlistview.h
@@ -64,7 +64,7 @@ class AlarmListViewItem : public EventListViewItemBase
 class AlarmListView : public EventListViewBase
 {
 		Q_OBJECT
-		TQ_OBJECT       // needed by TQObject::isA() calls
+		       // needed by TQObject::isA() calls
 	public:
 		enum ColumnIndex {    // default column order
 			TIME_COLUMN, TIME_TO_COLUMN, REPEAT_COLUMN, COLOUR_COLUMN, TYPE_COLUMN, MESSAGE_COLUMN,
diff --git a/kalarm/alarmtimewidget.h b/kalarm/alarmtimewidget.h
index 3525acf6..47659adb 100644
--- a/kalarm/alarmtimewidget.h
+++ b/kalarm/alarmtimewidget.h
@@ -34,7 +34,7 @@ class TimeSpinBox;
 class AlarmTimeWidget : public ButtonGroup
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		enum {       // 'mode' values for constructor. May be OR'ed together.
 			AT_TIME      = 0x00,   // "At ..."
diff --git a/kalarm/birthdaydlg.h b/kalarm/birthdaydlg.h
index 1abd4c8a..c8851f1b 100644
--- a/kalarm/birthdaydlg.h
+++ b/kalarm/birthdaydlg.h
@@ -43,7 +43,7 @@ class BListView;
 class BirthdayDlg : public KDialogBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		BirthdayDlg(TQWidget* parent = 0);
 		TQValueList<KAEvent> events() const;
@@ -80,7 +80,7 @@ class BirthdayDlg : public KDialogBase
 class BLineEdit : public TQLineEdit
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		BLineEdit(TQWidget* parent = 0, const char* name = 0)
 			     : TQLineEdit(parent, name) {}
@@ -95,7 +95,7 @@ class BLineEdit : public TQLineEdit
 class BListView : public KListView
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		BListView(TQWidget* parent = 0, const char* name = 0);
 	public slots:
diff --git a/kalarm/daemon.h b/kalarm/daemon.h
index a43d7a42..775833d3 100644
--- a/kalarm/daemon.h
+++ b/kalarm/daemon.h
@@ -37,7 +37,7 @@ class NotificationHandler;
 class Daemon : public TQObject
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		static void      initialise();
 		static void      createDcopHandler();
@@ -120,7 +120,7 @@ class Daemon : public TQObject
 class AlarmEnableAction : public KToggleAction
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		AlarmEnableAction(int accel, TQObject* parent, const char* name = 0);
 	public slots:
diff --git a/kalarm/deferdlg.h b/kalarm/deferdlg.h
index f7a09f47..37f8b144 100644
--- a/kalarm/deferdlg.h
+++ b/kalarm/deferdlg.h
@@ -30,7 +30,7 @@ class AlarmTimeWidget;
 class DeferAlarmDlg : public KDialogBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		DeferAlarmDlg(const TQString& caption, const DateTime& initialDT,
 		              bool cancelButton, TQWidget* parent = 0, const char* name = 0);
diff --git a/kalarm/editdlg.h b/kalarm/editdlg.h
index 626ea5d6..1b2b0a49 100644
--- a/kalarm/editdlg.h
+++ b/kalarm/editdlg.h
@@ -58,7 +58,7 @@ class PickAlarmFileRadio;
 class EditAlarmDlg : public KDialogBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		enum MessageType { MESSAGE, FILE };
 		enum CmdLogType { DISCARD_OUTPUT, LOG_TO_FILE, EXEC_IN_TERMINAL };
diff --git a/kalarm/editdlgprivate.h b/kalarm/editdlgprivate.h
index ec2bc73d..8851b58b 100644
--- a/kalarm/editdlgprivate.h
+++ b/kalarm/editdlgprivate.h
@@ -27,7 +27,7 @@
 class PageFrame : public TQFrame
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		PageFrame(TQWidget* parent = 0, const char* name = 0) : TQFrame(parent, name) { }
 	protected:
@@ -39,7 +39,7 @@ class PageFrame : public TQFrame
 class TextEdit : public KTextEdit
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		TextEdit(TQWidget* parent, const char* name = 0);
 	protected:
diff --git a/kalarm/emailidcombo.h b/kalarm/emailidcombo.h
index 1d2c2785..a2cbabc2 100644
--- a/kalarm/emailidcombo.h
+++ b/kalarm/emailidcombo.h
@@ -28,7 +28,7 @@
 class EmailIdCombo : public KPIM::IdentityCombo
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		explicit EmailIdCombo(KPIM::IdentityManager*, TQWidget* parent = 0, const char* name = 0);
 		void  setReadOnly(bool ro)    { mReadOnly = ro; }
diff --git a/kalarm/eventlistviewbase.h b/kalarm/eventlistviewbase.h
index 86263a7a..6024a4b5 100644
--- a/kalarm/eventlistviewbase.h
+++ b/kalarm/eventlistviewbase.h
@@ -36,7 +36,7 @@ class Find;
 class EventListViewBase : public KListView
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		typedef TQValueList<EventListViewBase*>              InstanceList;
 		typedef TQValueListIterator<EventListViewBase*>      InstanceListIterator;
diff --git a/kalarm/find.h b/kalarm/find.h
index c1eff2ad..493f10cc 100644
--- a/kalarm/find.h
+++ b/kalarm/find.h
@@ -36,7 +36,7 @@ class EventListViewItemBase;
 class Find : public TQObject
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		explicit Find(EventListViewBase* parent);
 		~Find();
diff --git a/kalarm/fontcolour.h b/kalarm/fontcolour.h
index 15c05107..4c36113c 100644
--- a/kalarm/fontcolour.h
+++ b/kalarm/fontcolour.h
@@ -35,7 +35,7 @@ class CheckBox;
 class FontColourChooser : public TQWidget
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	explicit FontColourChooser(TQWidget* parent = 0, const char* name = 0,
 	       bool onlyFixed = false,
diff --git a/kalarm/fontcolourbutton.h b/kalarm/fontcolourbutton.h
index be9fff6f..6126ad64 100644
--- a/kalarm/fontcolourbutton.h
+++ b/kalarm/fontcolourbutton.h
@@ -34,7 +34,7 @@ class PushButton;
 class FontColourButton : public TQFrame
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		FontColourButton(TQWidget* parent = 0, const char* name = 0);
 		void          setDefaultFont();
@@ -68,7 +68,7 @@ class FontColourButton : public TQFrame
 class FontColourDlg : public KDialogBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		FontColourDlg(const TQColor& bg, const TQColor& fg, const TQFont&, bool defaultFont,
 		              const TQString& caption, TQWidget* parent = 0, const char* name = 0);
diff --git a/kalarm/kalarmapp.h b/kalarm/kalarmapp.h
index 6653e810..22e51324 100644
--- a/kalarm/kalarmapp.h
+++ b/kalarm/kalarmapp.h
@@ -48,7 +48,7 @@ class ShellProcess;
 class KAlarmApp : public KUniqueApplication
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		~KAlarmApp();
 		virtual int        newInstance();
diff --git a/kalarm/kalarmd/adapp.h b/kalarm/kalarmd/adapp.h
index 9e0cdc1d..96b24d92 100644
--- a/kalarm/kalarmd/adapp.h
+++ b/kalarm/kalarmd/adapp.h
@@ -31,7 +31,7 @@ class AlarmDaemon;
 class AlarmDaemonApp : public KUniqueApplication
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		AlarmDaemonApp();
 		virtual int  newInstance();
diff --git a/kalarm/kalarmd/adcalendar.h b/kalarm/kalarmd/adcalendar.h
index 51506d46..965be105 100644
--- a/kalarm/kalarmd/adcalendar.h
+++ b/kalarm/kalarmd/adcalendar.h
@@ -30,7 +30,7 @@ class ADCalendar;
 class ADCalendar : public KCal::CalendarLocal
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		typedef TQValueList<ADCalendar*>::ConstIterator ConstIterator;
 
diff --git a/kalarm/kalarmd/alarmdaemon.h b/kalarm/kalarmd/alarmdaemon.h
index fbbb8f30..a3260a58 100644
--- a/kalarm/kalarmd/alarmdaemon.h
+++ b/kalarm/kalarmd/alarmdaemon.h
@@ -32,7 +32,7 @@ class ADCalendar;
 class AlarmDaemon : public TQObject, virtual public AlarmDaemonIface
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		AlarmDaemon(bool autostart, TQObject* parent = 0, const char* name = 0);
 
diff --git a/kalarm/latecancel.h b/kalarm/latecancel.h
index 08fcf2c3..73bf7130 100644
--- a/kalarm/latecancel.h
+++ b/kalarm/latecancel.h
@@ -33,7 +33,7 @@ class CheckBox;
 class LateCancelSelector : public TQFrame
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		LateCancelSelector(bool allowHourMinute, TQWidget* parent, const char* name = 0);
 		int            minutes() const;
diff --git a/kalarm/lib/buttongroup.h b/kalarm/lib/buttongroup.h
index f4d81265..d1038918 100644
--- a/kalarm/lib/buttongroup.h
+++ b/kalarm/lib/buttongroup.h
@@ -38,7 +38,7 @@
 class ButtonGroup : public TQButtonGroup
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/** Constructor.
 		 *  @param parent The parent object of this widget.
diff --git a/kalarm/lib/checkbox.h b/kalarm/lib/checkbox.h
index 7759f622..020f9594 100644
--- a/kalarm/lib/checkbox.h
+++ b/kalarm/lib/checkbox.h
@@ -42,7 +42,7 @@
 class CheckBox : public TQCheckBox
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/** Constructor.
 		 *  @param parent The parent object of this widget.
diff --git a/kalarm/lib/colourcombo.h b/kalarm/lib/colourcombo.h
index 2a075d23..10be36da 100644
--- a/kalarm/lib/colourcombo.h
+++ b/kalarm/lib/colourcombo.h
@@ -43,7 +43,7 @@
 class ColourCombo : public TQComboBox
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 		TQ_PROPERTY(TQColor color READ color WRITE setColor)
 	public:
 		/** Constructor.
diff --git a/kalarm/lib/combobox.h b/kalarm/lib/combobox.h
index 3d5ff13e..f0402c72 100644
--- a/kalarm/lib/combobox.h
+++ b/kalarm/lib/combobox.h
@@ -37,7 +37,7 @@
 class ComboBox : public TQComboBox
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/** Constructor.
 		 *  @param parent The parent object of this widget.
diff --git a/kalarm/lib/dateedit.h b/kalarm/lib/dateedit.h
index 525dc5c6..405566ec 100644
--- a/kalarm/lib/dateedit.h
+++ b/kalarm/lib/dateedit.h
@@ -37,7 +37,7 @@
 class DateEdit : public KDateEdit
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/** Constructor.
 		 *  @param parent The parent object of this widget.
diff --git a/kalarm/lib/label.h b/kalarm/lib/label.h
index ba418aee..5f26adc8 100644
--- a/kalarm/lib/label.h
+++ b/kalarm/lib/label.h
@@ -41,7 +41,7 @@ class LabelFocusWidget;
 class Label : public TQLabel
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 		friend class LabelFocusWidget;
 	public:
 		/** Constructs an empty label.
@@ -88,7 +88,7 @@ class Label : public TQLabel
 class LabelFocusWidget : public TQWidget
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		LabelFocusWidget(TQWidget* parent, const char* name = 0);
 	protected:
diff --git a/kalarm/lib/lineedit.h b/kalarm/lib/lineedit.h
index 660d4537..ecfd5242 100644
--- a/kalarm/lib/lineedit.h
+++ b/kalarm/lib/lineedit.h
@@ -43,7 +43,7 @@
 class LineEdit : public KLineEdit
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/** Types of drag and drop content which will be accepted.
 		 *  @li Text   - the line edit contains general text. It accepts text, a URL
diff --git a/kalarm/lib/pushbutton.h b/kalarm/lib/pushbutton.h
index d3aee32c..fd357402 100644
--- a/kalarm/lib/pushbutton.h
+++ b/kalarm/lib/pushbutton.h
@@ -37,7 +37,7 @@
 class PushButton : public TQPushButton
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 		TQ_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly)
 	public:
 		/** Constructor.
diff --git a/kalarm/lib/radiobutton.h b/kalarm/lib/radiobutton.h
index 3af80343..e983ebac 100644
--- a/kalarm/lib/radiobutton.h
+++ b/kalarm/lib/radiobutton.h
@@ -42,7 +42,7 @@
 class RadioButton : public TQRadioButton
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/** Constructor.
 		 *  @param parent The parent object of this widget.
diff --git a/kalarm/lib/shellprocess.h b/kalarm/lib/shellprocess.h
index a4ff7988..8c577d85 100644
--- a/kalarm/lib/shellprocess.h
+++ b/kalarm/lib/shellprocess.h
@@ -50,7 +50,7 @@
 class ShellProcess : public KShellProcess
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/** Current status of the shell process.
 		 *  @li INACTIVE - start() has not yet been called to run the command.
diff --git a/kalarm/lib/slider.h b/kalarm/lib/slider.h
index 6b72c5ba..bd8e750a 100644
--- a/kalarm/lib/slider.h
+++ b/kalarm/lib/slider.h
@@ -37,7 +37,7 @@
 class Slider : public TQSlider
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 		TQ_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly)
 	public:
 		/** Constructor.
diff --git a/kalarm/lib/spinbox.h b/kalarm/lib/spinbox.h
index 081087db..7712cdec 100644
--- a/kalarm/lib/spinbox.h
+++ b/kalarm/lib/spinbox.h
@@ -42,7 +42,7 @@
 class SpinBox : public TQSpinBox
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/** Constructor.
 		 *  @param parent The parent object of this widget.
diff --git a/kalarm/lib/spinbox2.h b/kalarm/lib/spinbox2.h
index 14c2f16e..fe082524 100644
--- a/kalarm/lib/spinbox2.h
+++ b/kalarm/lib/spinbox2.h
@@ -56,7 +56,7 @@ class ExtraSpinBox;
 class SpinBox2 : public TQFrame
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/** Constructor.
 		 *  @param parent The parent object of this widget.
diff --git a/kalarm/lib/spinbox2private.h b/kalarm/lib/spinbox2private.h
index c1c116b0..093d8c8a 100644
--- a/kalarm/lib/spinbox2private.h
+++ b/kalarm/lib/spinbox2private.h
@@ -34,7 +34,7 @@
 class ExtraSpinBox : public SpinBox
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		explicit ExtraSpinBox(TQWidget* parent, const char* name = 0)
 		             : SpinBox(parent, name), mNewStylePending(false) { }
@@ -61,7 +61,7 @@ class ExtraSpinBox : public SpinBox
 class SpinMirror : public TQCanvasView
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		explicit SpinMirror(SpinBox*, TQFrame* spinFrame, TQWidget* parent = 0, const char* name = 0);
 		void         setReadOnly(bool ro)        { mReadOnly = ro; }
diff --git a/kalarm/lib/synchtimer.h b/kalarm/lib/synchtimer.h
index 144c8a83..8d640f0b 100644
--- a/kalarm/lib/synchtimer.h
+++ b/kalarm/lib/synchtimer.h
@@ -37,7 +37,7 @@ class TQTimer;
 class SynchTimer : public TQObject
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		virtual ~SynchTimer();
 
@@ -77,7 +77,7 @@ class SynchTimer : public TQObject
 class MinuteTimer : public SynchTimer
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		virtual ~MinuteTimer()  { mInstance = 0; }
 		/** Connect to the timer signal.
@@ -117,7 +117,7 @@ class MinuteTimer : public SynchTimer
 class DailyTimer : public SynchTimer
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		virtual ~DailyTimer();
 		/** Connect to the timer signal which triggers at the given fixed time of day.
diff --git a/kalarm/lib/timeedit.h b/kalarm/lib/timeedit.h
index 658fe780..4a74d576 100644
--- a/kalarm/lib/timeedit.h
+++ b/kalarm/lib/timeedit.h
@@ -50,7 +50,7 @@ class TimeSpinBox;
 class TimeEdit : public TQHBox
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/** Constructor.
 		 *  @param parent The parent object of this widget.
diff --git a/kalarm/lib/timeperiod.h b/kalarm/lib/timeperiod.h
index 9c4152b7..e2e24819 100644
--- a/kalarm/lib/timeperiod.h
+++ b/kalarm/lib/timeperiod.h
@@ -50,7 +50,7 @@ class TimeSpinBox;
 class TimePeriod : public TQHBox
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/** Units for the time period.
 		 *  @li MINUTES - the time period is entered as a number of minutes.
diff --git a/kalarm/lib/timespinbox.h b/kalarm/lib/timespinbox.h
index fe45efab..6d9f5dbe 100644
--- a/kalarm/lib/timespinbox.h
+++ b/kalarm/lib/timespinbox.h
@@ -45,7 +45,7 @@
 class TimeSpinBox : public SpinBox2
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/** Constructor for a wrapping time spin box which can be used to enter a time of day.
 		 *  @param use24hour True for entry of 24-hour clock times (range 00:00 to 23:59).
diff --git a/kalarm/mainwindow.h b/kalarm/mainwindow.h
index 08fcfaca..d8ca5181 100644
--- a/kalarm/mainwindow.h
+++ b/kalarm/mainwindow.h
@@ -42,7 +42,7 @@ class TemplateMenuAction;
 class MainWindow : public MainWindowBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 
 	public:
 		static MainWindow* create(bool restored = false);
diff --git a/kalarm/mainwindowbase.h b/kalarm/mainwindowbase.h
index a6ba5ed3..80e4cad2 100644
--- a/kalarm/mainwindowbase.h
+++ b/kalarm/mainwindowbase.h
@@ -34,7 +34,7 @@
 class MainWindowBase : public KMainWindow
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 
 	public:
 		explicit MainWindowBase(TQWidget* parent = 0, const char* name = 0, WFlags f = WType_TopLevel | WDestructiveClose)
diff --git a/kalarm/messagewin.h b/kalarm/messagewin.h
index b941307d..03deea6b 100644
--- a/kalarm/messagewin.h
+++ b/kalarm/messagewin.h
@@ -44,7 +44,7 @@ namespace KDE { class PlayObject; }
 class MessageWin : public MainWindowBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		MessageWin();     // for session management restoration only
 		MessageWin(const KAEvent&, const KAAlarm&, bool reschedule_event = true, bool allowDefer = true);
diff --git a/kalarm/pickfileradio.h b/kalarm/pickfileradio.h
index 72b43110..f30ca7f6 100644
--- a/kalarm/pickfileradio.h
+++ b/kalarm/pickfileradio.h
@@ -50,7 +50,7 @@ class LineEdit;
 class PickFileRadio : public RadioButton
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/** Constructor.
 		 *  @param button Push button to invoke the file picker dialogue.
diff --git a/kalarm/prefdlg.h b/kalarm/prefdlg.h
index 5f8f5543..a58e22d7 100644
--- a/kalarm/prefdlg.h
+++ b/kalarm/prefdlg.h
@@ -54,7 +54,7 @@ class MiscPrefTab;
 class KAlarmPrefDlg : public KDialogBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		static void display();
 		~KAlarmPrefDlg();
@@ -84,7 +84,7 @@ class KAlarmPrefDlg : public KDialogBase
 class PrefsTabBase : public TQWidget
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		PrefsTabBase(TQVBox*);
 
@@ -106,7 +106,7 @@ class PrefsTabBase : public TQWidget
 class MiscPrefTab : public PrefsTabBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		MiscPrefTab(TQVBox*);
 
@@ -152,7 +152,7 @@ class MiscPrefTab : public PrefsTabBase
 class EmailPrefTab : public PrefsTabBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		EmailPrefTab(TQVBox*);
 
@@ -188,7 +188,7 @@ class EmailPrefTab : public PrefsTabBase
 class EditPrefTab : public PrefsTabBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		EditPrefTab(TQVBox*);
 
@@ -227,7 +227,7 @@ class EditPrefTab : public PrefsTabBase
 class ViewPrefTab : public PrefsTabBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		ViewPrefTab(TQVBox*);
 
@@ -260,7 +260,7 @@ class ViewPrefTab : public PrefsTabBase
 class FontColourPrefTab : public PrefsTabBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		FontColourPrefTab(TQVBox*);
 
diff --git a/kalarm/preferences.h b/kalarm/preferences.h
index e7e3e90a..77adeb58 100644
--- a/kalarm/preferences.h
+++ b/kalarm/preferences.h
@@ -42,7 +42,7 @@ class TQWidget;
 class Preferences : public TQObject
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		enum MailClient { SENDMAIL, KMAIL };
 		enum MailFrom   { MAIL_FROM_KMAIL, MAIL_FROM_CONTROL_CENTRE, MAIL_FROM_ADDR };
diff --git a/kalarm/recurrenceedit.h b/kalarm/recurrenceedit.h
index 5b3aae47..82ab954c 100644
--- a/kalarm/recurrenceedit.h
+++ b/kalarm/recurrenceedit.h
@@ -56,7 +56,7 @@ class YearlyRule;
 class RecurrenceEdit : public TQFrame
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		// Don't alter the order of these recurrence types
 		enum RepeatType { INVALID_RECUR = -1, NO_RECUR, AT_LOGIN, SUBDAILY, DAILY, WEEKLY, MONTHLY, ANNUAL };
diff --git a/kalarm/recurrenceeditprivate.h b/kalarm/recurrenceeditprivate.h
index 94472c37..6a239ae7 100644
--- a/kalarm/recurrenceeditprivate.h
+++ b/kalarm/recurrenceeditprivate.h
@@ -47,7 +47,7 @@ class NoRule : public TQFrame
 class Rule : public NoRule
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		Rule(const TQString& freqText, const TQString& freqWhatsThis, bool time, bool readOnly,
 		     TQWidget* parent, const char* name = 0);
@@ -73,7 +73,7 @@ class Rule : public NoRule
 class SubDailyRule : public Rule
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		SubDailyRule(bool readOnly, TQWidget* parent, const char* name = 0);
 };
@@ -82,7 +82,7 @@ class SubDailyRule : public Rule
 class DayWeekRule : public Rule
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis, const TQString& daysWhatsThis,
 		            bool readOnly, TQWidget* parent, const char* name = 0);
@@ -117,7 +117,7 @@ class WeeklyRule : public DayWeekRule
 class MonthYearRule : public Rule
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		enum DayPosType { DATE, POS };
 
@@ -172,7 +172,7 @@ class MonthlyRule : public MonthYearRule
 class YearlyRule : public MonthYearRule
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		YearlyRule(bool readOnly, TQWidget* parent, const char* name = 0);
 		TQValueList<int>  months() const;
diff --git a/kalarm/reminder.h b/kalarm/reminder.h
index 7e58e8b7..14e2e9df 100644
--- a/kalarm/reminder.h
+++ b/kalarm/reminder.h
@@ -30,7 +30,7 @@ class CheckBox;
 class Reminder : public TQFrame
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		Reminder(const TQString& caption, const TQString& reminderWhatsThis, const TQString& valueWhatsThis,
 		         bool allowHourMinute, bool showOnceOnly, TQWidget* parent, const char* name = 0);
diff --git a/kalarm/repetition.h b/kalarm/repetition.h
index a98493c5..b28293c3 100644
--- a/kalarm/repetition.h
+++ b/kalarm/repetition.h
@@ -35,7 +35,7 @@ class RepetitionDlg;
 class RepetitionButton : public TQPushButton
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		RepetitionButton(const TQString& caption, bool waitForInitialisation, TQWidget* parent, const char* name = 0);
 		void           set(int interval, int count);
@@ -71,7 +71,7 @@ class RepetitionButton : public TQPushButton
 class RepetitionDlg : public KDialogBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* parent = 0, const char* name = 0);
 		void           setReadOnly(bool);
diff --git a/kalarm/sounddlg.h b/kalarm/sounddlg.h
index 53dd2f96..70f01add 100644
--- a/kalarm/sounddlg.h
+++ b/kalarm/sounddlg.h
@@ -39,7 +39,7 @@ class Slider;
 class SoundDlg : public KDialogBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		SoundDlg(const TQString& file, float volume, float fadeVolume, int fadeSeconds, bool repeat,
 		         const TQString& caption, TQWidget* parent, const char* name = 0);
diff --git a/kalarm/soundpicker.h b/kalarm/soundpicker.h
index 5f89d535..3f150b19 100644
--- a/kalarm/soundpicker.h
+++ b/kalarm/soundpicker.h
@@ -33,7 +33,7 @@ class PushButton;
 class SoundPicker : public TQFrame
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/** Sound options which can be selected for when the alarm is displayed.
 		 *  @li NONE      - silence.
diff --git a/kalarm/specialactions.h b/kalarm/specialactions.h
index 43d8cdf9..31df5545 100644
--- a/kalarm/specialactions.h
+++ b/kalarm/specialactions.h
@@ -31,7 +31,7 @@ class KLineEdit;
 class SpecialActionsButton : public TQPushButton
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		SpecialActionsButton(const TQString& caption, TQWidget* parent = 0, const char* name = 0);
 		void           setActions(const TQString& pre, const TQString& post);
@@ -57,7 +57,7 @@ class SpecialActionsButton : public TQPushButton
 class SpecialActions : public TQWidget
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		SpecialActions(TQWidget* parent = 0, const char* name = 0);
 		void         setActions(const TQString& pre, const TQString& post);
@@ -77,7 +77,7 @@ class SpecialActions : public TQWidget
 class SpecialActionsDlg : public KDialogBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		SpecialActionsDlg(const TQString& preAction, const TQString& postAction,
 		                  const TQString& caption, TQWidget* parent = 0, const char* name = 0);
diff --git a/kalarm/startdaytimer.h b/kalarm/startdaytimer.h
index ae0a5580..e422f617 100644
--- a/kalarm/startdaytimer.h
+++ b/kalarm/startdaytimer.h
@@ -35,7 +35,7 @@
 class StartOfDayTimer : public DailyTimer
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		virtual ~StartOfDayTimer()  { }
 		/** Connect to the timer signal.
diff --git a/kalarm/templatedlg.h b/kalarm/templatedlg.h
index 7ea6fbef..f85c1058 100644
--- a/kalarm/templatedlg.h
+++ b/kalarm/templatedlg.h
@@ -30,7 +30,7 @@ class KAEvent;
 class TemplateDlg : public KDialogBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		static TemplateDlg*  create(TQWidget* parent = 0, const char* name = 0);
 		~TemplateDlg();
diff --git a/kalarm/templatelistview.h b/kalarm/templatelistview.h
index 0ac98dea..2127bce3 100644
--- a/kalarm/templatelistview.h
+++ b/kalarm/templatelistview.h
@@ -49,7 +49,7 @@ class TemplateListViewItem : public EventListViewItemBase
 class TemplateListView : public EventListViewBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		explicit TemplateListView(bool includeCmdAlarms, const TQString& whatsThisText, TQWidget* parent = 0, const char* name = 0);
 		~TemplateListView();
diff --git a/kalarm/templatemenuaction.h b/kalarm/templatemenuaction.h
index 3859a29a..7f86a4d0 100644
--- a/kalarm/templatemenuaction.h
+++ b/kalarm/templatemenuaction.h
@@ -28,7 +28,7 @@ class KAEvent;
 class TemplateMenuAction : public KActionMenu
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		TemplateMenuAction(const TQString& label, const TQString& icon, TQObject* receiver,
 		                   const char* slot, KActionCollection* parent, const char* name = 0);
diff --git a/kalarm/templatepickdlg.h b/kalarm/templatepickdlg.h
index 4cbfc3d1..d0a68536 100644
--- a/kalarm/templatepickdlg.h
+++ b/kalarm/templatepickdlg.h
@@ -29,7 +29,7 @@ class KAEvent;
 class TemplatePickDlg : public KDialogBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		TemplatePickDlg(TQWidget* parent = 0, const char* name = 0);
 		const KAEvent*    selectedTemplate() const;
diff --git a/kalarm/timeselector.h b/kalarm/timeselector.h
index 1e8304f9..00cf15c5 100644
--- a/kalarm/timeselector.h
+++ b/kalarm/timeselector.h
@@ -31,7 +31,7 @@ class CheckBox;
 class TimeSelector : public TQFrame
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		TimeSelector(const TQString& selectText, const TQString& postfix, const TQString& selectWhatsThis,
 		             const TQString& valueWhatsThis, bool allowHourMinute, TQWidget* parent, const char* name = 0);
diff --git a/kalarm/traywindow.h b/kalarm/traywindow.h
index e69e1b56..b5deb09c 100644
--- a/kalarm/traywindow.h
+++ b/kalarm/traywindow.h
@@ -32,7 +32,7 @@ class TrayTooltip;
 class TrayWindow : public KSystemTray
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		TrayWindow(MainWindow* parent, const char* name = 0);
 		~TrayWindow();
diff --git a/kalarm/undo.h b/kalarm/undo.h
index 6ad5dd51..0f76408a 100644
--- a/kalarm/undo.h
+++ b/kalarm/undo.h
@@ -33,7 +33,7 @@ class UndoItem;
 class Undo : public TQObject
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		enum Type { NONE, UNDO, REDO };
 
diff --git a/kandy/src/cmdpropertiesdialog.h b/kandy/src/cmdpropertiesdialog.h
index 9edf76c9..62ab0e3e 100644
--- a/kandy/src/cmdpropertiesdialog.h
+++ b/kandy/src/cmdpropertiesdialog.h
@@ -31,7 +31,7 @@ class ATCommand;
 class CmdPropertiesDialog : public CmdPropertiesDialog_base
 { 
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     CmdPropertiesDialog(ATCommand *cmd,TQWidget* parent=0,const char* name=0,
                         bool modal=false,WFlags fl=0);
diff --git a/kandy/src/commandscheduler.h b/kandy/src/commandscheduler.h
index c99476bd..5e3323e0 100644
--- a/kandy/src/commandscheduler.h
+++ b/kandy/src/commandscheduler.h
@@ -34,7 +34,7 @@ class Modem;
 
 class CommandScheduler : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     CommandScheduler (Modem *modem,TQObject *parent = 0, const char *name = 0);
 
diff --git a/kandy/src/kandy.h b/kandy/src/kandy.h
index a81208de..8a2cd0b3 100644
--- a/kandy/src/kandy.h
+++ b/kandy/src/kandy.h
@@ -48,7 +48,7 @@ class KandyPrefsDialog;
 class Kandy : public KMainWindow
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     /**
      * Default Constructor
diff --git a/kandy/src/kandyprefsdialog.h b/kandy/src/kandyprefsdialog.h
index 0d32b301..b927083b 100644
--- a/kandy/src/kandyprefsdialog.h
+++ b/kandy/src/kandyprefsdialog.h
@@ -42,7 +42,7 @@
 class KandyPrefsDialog : public KPrefsDialog
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     /** Initialize dialog and pages */
     KandyPrefsDialog(TQWidget *parent=0,char *name=0,bool modal=false);
diff --git a/kandy/src/kandyview.h b/kandy/src/kandyview.h
index 8547dbf4..5e6461d3 100644
--- a/kandy/src/kandyview.h
+++ b/kandy/src/kandyview.h
@@ -51,7 +51,7 @@ class CmdPropertiesDialog;
 class KandyView : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	/**
 	 * Default constructor
diff --git a/kandy/src/mobilegui.h b/kandy/src/mobilegui.h
index ea5f2896..16431ae4 100644
--- a/kandy/src/mobilegui.h
+++ b/kandy/src/mobilegui.h
@@ -39,7 +39,7 @@ class AddressSyncer;
 class MobileGui : public MobileGui_base, virtual public KandyIface
 { 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     MobileGui( CommandScheduler *, KandyPrefs *kprefs, TQWidget* parent=0,
diff --git a/kandy/src/mobilemain.h b/kandy/src/mobilemain.h
index 01ff1888..7c7c4845 100644
--- a/kandy/src/mobilemain.h
+++ b/kandy/src/mobilemain.h
@@ -46,7 +46,7 @@ class CommandScheduler;
 class MobileMain : public KMainWindow
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     /**
      * Default Constructor
diff --git a/kandy/src/modem.h b/kandy/src/modem.h
index 5c8521c1..65a5dd37 100644
--- a/kandy/src/modem.h
+++ b/kandy/src/modem.h
@@ -46,7 +46,7 @@
 class Modem : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	Modem(KandyPrefs *kprefs, TQObject *parent = 0, const char *name = 0);
 	virtual ~Modem();
diff --git a/karm/csvexportdialog.h b/karm/csvexportdialog.h
index 8e4966b5..08bebd9d 100644
--- a/karm/csvexportdialog.h
+++ b/karm/csvexportdialog.h
@@ -27,7 +27,7 @@
 class CSVExportDialog : public CSVExportDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CSVExportDialog( ReportCriteria::REPORTTYPE rt,
diff --git a/karm/desktoptracker.h b/karm/desktoptracker.h
index 00b2cc49..78bc7fb8 100644
--- a/karm/desktoptracker.h
+++ b/karm/desktoptracker.h
@@ -21,7 +21,7 @@ const int maxDesktops = 20;
 class DesktopTracker: public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     DesktopTracker();
diff --git a/karm/edittaskdialog.h b/karm/edittaskdialog.h
index 6b928925..f913c978 100644
--- a/karm/edittaskdialog.h
+++ b/karm/edittaskdialog.h
@@ -43,7 +43,7 @@ class KArmTimeWidget;
 class EditTaskDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     EditTaskDialog(TQString caption, bool editDlg, DesktopList* desktopList=0);
diff --git a/karm/idletimedetector.h b/karm/idletimedetector.h
index 185bc5f2..1b0b4497 100644
--- a/karm/idletimedetector.h
+++ b/karm/idletimedetector.h
@@ -28,7 +28,7 @@ const int testInterval= secsPerMinute * 1000;
 class IdleTimeDetector :public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   /**
diff --git a/karm/kaccelmenuwatch.h b/karm/kaccelmenuwatch.h
index a9956d08..010d7c46 100644
--- a/karm/kaccelmenuwatch.h
+++ b/karm/kaccelmenuwatch.h
@@ -35,7 +35,7 @@ class TQPopupMenu;
 class KAccelMenuWatch : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   private:
     enum AccelType { StdAccel, StringAccel };
diff --git a/karm/karm_part.h b/karm/karm_part.h
index 7c679ee6..797ae47f 100644
--- a/karm/karm_part.h
+++ b/karm/karm_part.h
@@ -30,7 +30,7 @@ class TaskView;
 class karmPart : public KParts::ReadWritePart, virtual public KarmDCOPIface
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   private:
     void             makeMenus();
@@ -122,7 +122,7 @@ class KAboutData;
 class karmPartFactory : public KParts::Factory
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     karmPartFactory();
     virtual ~karmPartFactory();
diff --git a/karm/mainwindow.h b/karm/mainwindow.h
index 63479c92..d5a53a20 100644
--- a/karm/mainwindow.h
+++ b/karm/mainwindow.h
@@ -26,7 +26,7 @@ class TaskView;
 class MainWindow : public KParts::MainWindow, virtual public KarmDCOPIface
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   private:
     void             makeMenus();
diff --git a/karm/preferences.h b/karm/preferences.h
index 0cd11638..8ac92fed 100644
--- a/karm/preferences.h
+++ b/karm/preferences.h
@@ -16,7 +16,7 @@ class KURLRequester;
 class Preferences :public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     static Preferences *instance( const TQString& icsfile = "" );
diff --git a/karm/printdialog.h b/karm/printdialog.h
index e041812d..18eb2695 100644
--- a/karm/printdialog.h
+++ b/karm/printdialog.h
@@ -31,7 +31,7 @@ class KDateEdit;
 class PrintDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PrintDialog();
diff --git a/karm/task.h b/karm/task.h
index 2d3d5a55..f375e271 100644
--- a/karm/task.h
+++ b/karm/task.h
@@ -41,7 +41,7 @@ class TQPixmap;
 class Task : public TQObject, public TQListViewItem
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     //@{ constructors
diff --git a/karm/taskview.h b/karm/taskview.h
index 9d6d84c0..a6444c38 100644
--- a/karm/taskview.h
+++ b/karm/taskview.h
@@ -42,7 +42,7 @@ using namespace KCal;
 class TaskView : public KListView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     TaskView( TQWidget *parent = 0, const char *name = 0, const TQString &icsfile = "" );
diff --git a/karm/test/script.h b/karm/test/script.h
index 2f564750..3aad9c87 100644
--- a/karm/test/script.h
+++ b/karm/test/script.h
@@ -31,7 +31,7 @@ class TQStringList;
 class Script : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   Script( const TQDir& workingDirectory );
   virtual ~Script();
diff --git a/karm/tray.h b/karm/tray.h
index d0fbd8ca..e9b537b9 100644
--- a/karm/tray.h
+++ b/karm/tray.h
@@ -24,7 +24,7 @@ class MainWindow;
 class KarmTray : public KSystemTray
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KarmTray(MainWindow * parent);
diff --git a/kdgantt/KDGanttMinimizeSplitter.h b/kdgantt/KDGanttMinimizeSplitter.h
index 1ebf7b54..14731695 100644
--- a/kdgantt/KDGanttMinimizeSplitter.h
+++ b/kdgantt/KDGanttMinimizeSplitter.h
@@ -43,7 +43,7 @@ class TQSplitterLayoutStruct;
 class KDGanttMinimizeSplitter : public TQFrame
 {
     Q_OBJECT
-    TQ_OBJECT
+    
     Q_ENUMS( Direction )
     TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
     TQ_PROPERTY( Direction minimizeDirection READ minimizeDirection WRITE setMinimizeDirection )
@@ -138,7 +138,7 @@ private:	// Disabled copy constructor and operator=
 class KDGanttSplitterHandle : public TQWidget
 {
     Q_OBJECT
-    TQ_OBJECT
+    
 public:
     KDGanttSplitterHandle( Qt::Orientation o,
 		       KDGanttMinimizeSplitter *parent, const char* name=0 );
diff --git a/kdgantt/KDGanttSemiSizingControl.h b/kdgantt/KDGanttSemiSizingControl.h
index 34b11a23..5b83657d 100644
--- a/kdgantt/KDGanttSemiSizingControl.h
+++ b/kdgantt/KDGanttSemiSizingControl.h
@@ -45,7 +45,7 @@ class KDGanttSemiSizingControl : public KDGanttSizingControl
     TQ_PROPERTY( ArrowPosition arrowPosition READ arrowPosition WRITE setArrowPosition )
     Q_ENUMS( ArrowPosition )
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     enum ArrowPosition { Before, After };
diff --git a/kdgantt/KDGanttSizingControl.h b/kdgantt/KDGanttSizingControl.h
index ffdb0fa7..733f6035 100644
--- a/kdgantt/KDGanttSizingControl.h
+++ b/kdgantt/KDGanttSizingControl.h
@@ -38,7 +38,7 @@
 class KDGanttSizingControl : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     bool isMinimized() const;
diff --git a/kdgantt/KDGanttView.h b/kdgantt/KDGanttView.h
index b0acc96b..30a84abb 100644
--- a/kdgantt/KDGanttView.h
+++ b/kdgantt/KDGanttView.h
@@ -70,7 +70,7 @@ class KDGanttMinimizeSplitter;
 class KDGanttView : public KDGanttMinimizeSplitter
 {
     Q_OBJECT
-    TQ_OBJECT
+    
 
     TQ_PROPERTY( bool showLegend READ showLegend WRITE setShowLegend )
     TQ_PROPERTY( bool showListView READ showListView WRITE setShowListView )
diff --git a/kdgantt/KDGanttViewSubwidgets.h b/kdgantt/KDGanttViewSubwidgets.h
index 30ed39d4..b793ac4b 100644
--- a/kdgantt/KDGanttViewSubwidgets.h
+++ b/kdgantt/KDGanttViewSubwidgets.h
@@ -76,7 +76,7 @@ class KDTimeHeaderToolTip;
 class KDTimeHeaderWidget : public TQWidget
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
    typedef KDGanttView::Scale Scale;
@@ -254,7 +254,7 @@ class KDListView ;
 class KDTimeTableWidget : public TQCanvas
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
    KDTimeTableWidget (TQWidget* parent,KDGanttView* my);
@@ -331,7 +331,7 @@ private:
 class KDLegendWidget : public KDGanttSemiSizingControl
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KDLegendWidget ( TQWidget* parent, KDGanttMinimizeSplitter* legendParent );
@@ -358,7 +358,7 @@ class KDGanttView;
 class KDListView : public TQListView
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
    KDListView (TQWidget* parent,KDGanttView* gv );
@@ -487,7 +487,7 @@ class KDCanvasToolTip;
 class KDGanttCanvasView : public TQCanvasView
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     KDGanttCanvasView(KDGanttView* sender, TQCanvas* canvas = 0, TQWidget* parent = 0, const char* name = 0 );
diff --git a/kfile-plugins/ics/kfile_ics.h b/kfile-plugins/ics/kfile_ics.h
index ad807860..27682034 100644
--- a/kfile-plugins/ics/kfile_ics.h
+++ b/kfile-plugins/ics/kfile_ics.h
@@ -27,7 +27,7 @@ class TQStringList;
 class ICSPlugin : public KFilePlugin
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ICSPlugin( TQObject *parent, const char *name, const TQStringList& args );
 
diff --git a/kfile-plugins/palm-databases/kfile_palm.h b/kfile-plugins/palm-databases/kfile_palm.h
index edd9441b..ef91a3f0 100644
--- a/kfile-plugins/palm-databases/kfile_palm.h
+++ b/kfile-plugins/palm-databases/kfile_palm.h
@@ -29,7 +29,7 @@ class TQStringList;
 class KPalmPlugin: public KFilePlugin
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     
 public:
     KPalmPlugin( TQObject *parent, const char *name, const TQStringList& args );
diff --git a/kfile-plugins/rfc822/kfile_rfc822.h b/kfile-plugins/rfc822/kfile_rfc822.h
index fee88d63..2fcfaa18 100644
--- a/kfile-plugins/rfc822/kfile_rfc822.h
+++ b/kfile-plugins/rfc822/kfile_rfc822.h
@@ -27,7 +27,7 @@ class TQStringList;
 class KRfc822Plugin: public KFilePlugin
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     
 public:
     KRfc822Plugin( TQObject *parent, const char *name, const TQStringList& args );
diff --git a/kfile-plugins/vcf/kfile_vcf.h b/kfile-plugins/vcf/kfile_vcf.h
index 4f039e5d..0a66e880 100644
--- a/kfile-plugins/vcf/kfile_vcf.h
+++ b/kfile-plugins/vcf/kfile_vcf.h
@@ -27,7 +27,7 @@ class TQStringList;
 class KVcfPlugin: public KFilePlugin
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     
 public:
     KVcfPlugin( TQObject *parent, const char *name, const TQStringList& args );
diff --git a/kgantt/kgantt/KGantt.h b/kgantt/kgantt/KGantt.h
index 2475b121..200b5a43 100644
--- a/kgantt/kgantt/KGantt.h
+++ b/kgantt/kgantt/KGantt.h
@@ -92,7 +92,7 @@ class KDE_EXPORT KGantt : public TQWidget
 {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
 
 public:  
diff --git a/kgantt/kgantt/KGanttBarConfig.h b/kgantt/kgantt/KGanttBarConfig.h
index fae399d0..2cd0f11d 100644
--- a/kgantt/kgantt/KGanttBarConfig.h
+++ b/kgantt/kgantt/KGanttBarConfig.h
@@ -38,7 +38,7 @@ class KGanttBarConfig : public TQWidget
 {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 
diff --git a/kgantt/kgantt/KGanttItem.h b/kgantt/kgantt/KGanttItem.h
index 1113c9d0..99a63ee3 100644
--- a/kgantt/kgantt/KGanttItem.h
+++ b/kgantt/kgantt/KGanttItem.h
@@ -56,7 +56,7 @@ class KDE_EXPORT KGanttItem : public TQObject
 {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
 
 public:
diff --git a/kgantt/kgantt/KGanttRelation.h b/kgantt/kgantt/KGanttRelation.h
index 42323026..08080bea 100644
--- a/kgantt/kgantt/KGanttRelation.h
+++ b/kgantt/kgantt/KGanttRelation.h
@@ -50,7 +50,7 @@ class KGanttRelation : public TQObject
 {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   friend class KGanttItem;
 
diff --git a/kgantt/kgantt/xQGanttBarView.h b/kgantt/kgantt/xQGanttBarView.h
index b22753c5..bec47a61 100644
--- a/kgantt/kgantt/xQGanttBarView.h
+++ b/kgantt/kgantt/xQGanttBarView.h
@@ -52,7 +52,7 @@ class xQGanttBarView : public TQScrollView
 {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
 
 public:
diff --git a/kgantt/kgantt/xQGanttBarViewPort.h b/kgantt/kgantt/xQGanttBarViewPort.h
index fa6b7483..52244ea4 100644
--- a/kgantt/kgantt/xQGanttBarViewPort.h
+++ b/kgantt/kgantt/xQGanttBarViewPort.h
@@ -90,7 +90,7 @@ class KDE_EXPORT xQGanttBarViewPort : public TQFrame
 {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   friend class xQGanttBarView;
   friend class KGantt;
diff --git a/kgantt/kgantt/xQGanttListView.h b/kgantt/kgantt/xQGanttListView.h
index 3842abe8..34a89eb8 100644
--- a/kgantt/kgantt/xQGanttListView.h
+++ b/kgantt/kgantt/xQGanttListView.h
@@ -49,7 +49,7 @@ class xQGanttListView : public TQScrollView
 {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
 
 public:
diff --git a/kgantt/kgantt/xQGanttListViewPort.h b/kgantt/kgantt/xQGanttListViewPort.h
index 365b316b..ee2f4924 100644
--- a/kgantt/kgantt/xQGanttListViewPort.h
+++ b/kgantt/kgantt/xQGanttListViewPort.h
@@ -49,7 +49,7 @@ class xQGanttListViewPort : public TQFrame
 {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   friend class xQGanttListView;
  
diff --git a/kioslaves/opengroupware/opengroupware.h b/kioslaves/opengroupware/opengroupware.h
index 3f48ff88..075af372 100644
--- a/kioslaves/opengroupware/opengroupware.h
+++ b/kioslaves/opengroupware/opengroupware.h
@@ -33,7 +33,7 @@ namespace KIO {
 class OpenGroupware : public TQObject, public KIO::SlaveBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     OpenGroupware( const TQCString &protocol, const TQCString &pool,
                    const TQCString &app );
diff --git a/kitchensync/libqopensync/callbackhandler.h b/kitchensync/libqopensync/callbackhandler.h
index f0971fd6..703e81fb 100644
--- a/kitchensync/libqopensync/callbackhandler.h
+++ b/kitchensync/libqopensync/callbackhandler.h
@@ -43,7 +43,7 @@ class Engine;
 class CallbackHandler : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CallbackHandler();
diff --git a/kitchensync/src/aboutpage.h b/kitchensync/src/aboutpage.h
index ce813c20..b364e0fe 100644
--- a/kitchensync/src/aboutpage.h
+++ b/kitchensync/src/aboutpage.h
@@ -28,7 +28,7 @@
 class AboutPage : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AboutPage( TQWidget *parent );
diff --git a/kitchensync/src/configguignokii.h b/kitchensync/src/configguignokii.h
index d99e19f8..9dbbdd9a 100644
--- a/kitchensync/src/configguignokii.h
+++ b/kitchensync/src/configguignokii.h
@@ -34,7 +34,7 @@ class TQComboBox;
 class ConfigGuiGnokii : public ConfigGui
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ConfigGuiGnokii( const QSync::Member &, TQWidget *parent );
diff --git a/kitchensync/src/configguiirmc.h b/kitchensync/src/configguiirmc.h
index 572b714c..a76dd782 100644
--- a/kitchensync/src/configguiirmc.h
+++ b/kitchensync/src/configguiirmc.h
@@ -37,7 +37,7 @@ class TQSpinBox;
 class ConfigGuiIRMC : public ConfigGui
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ConfigGuiIRMC( const QSync::Member &, TQWidget *parent );
diff --git a/kitchensync/src/configguildap.h b/kitchensync/src/configguildap.h
index 07d97f09..eea22f02 100644
--- a/kitchensync/src/configguildap.h
+++ b/kitchensync/src/configguildap.h
@@ -36,7 +36,7 @@ class KLineEdit;
 class ConfigGuiLdap : public ConfigGui
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ConfigGuiLdap( const QSync::Member &, TQWidget *parent );
diff --git a/kitchensync/src/configguisunbird.h b/kitchensync/src/configguisunbird.h
index 5095a4e0..67d61bf6 100644
--- a/kitchensync/src/configguisunbird.h
+++ b/kitchensync/src/configguisunbird.h
@@ -39,7 +39,7 @@ class KLineEdit;
 class LocalCalendar : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     LocalCalendar( TQWidget *parent = 0 );
@@ -66,7 +66,7 @@ class LocalCalendar : public TQWidget
 class WebdavCalendar : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     WebdavCalendar( TQWidget *parent = 0 );
@@ -97,7 +97,7 @@ class WebdavCalendar : public TQWidget
 class ConfigGuiSunbird : public ConfigGui
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ConfigGuiSunbird( const QSync::Member &, TQWidget *parent );
diff --git a/kitchensync/src/configguisyncmlhttp.h b/kitchensync/src/configguisyncmlhttp.h
index accff70e..aad3a937 100644
--- a/kitchensync/src/configguisyncmlhttp.h
+++ b/kitchensync/src/configguisyncmlhttp.h
@@ -36,7 +36,7 @@ class ConfigGuiSyncmlHttp : public ConfigGui
 {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ConfigGuiSyncmlHttp( const QSync::Member &, TQWidget *parent );
diff --git a/kitchensync/src/configguisyncmlobex.h b/kitchensync/src/configguisyncmlobex.h
index 7ee4d3f3..9c873db8 100644
--- a/kitchensync/src/configguisyncmlobex.h
+++ b/kitchensync/src/configguisyncmlobex.h
@@ -38,7 +38,7 @@ class KURLRequester;
 class ConfigGuiSyncmlObex : public ConfigGui
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ConfigGuiSyncmlObex( const QSync::Member &, TQWidget *parent = 0 );
diff --git a/kitchensync/src/connectionwidgets.h b/kitchensync/src/connectionwidgets.h
index ec514cb4..4f51c168 100644
--- a/kitchensync/src/connectionwidgets.h
+++ b/kitchensync/src/connectionwidgets.h
@@ -38,7 +38,7 @@ class KLineEdit;
 class BluetoothWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     BluetoothWidget( TQWidget *parent );
@@ -60,7 +60,7 @@ class BluetoothWidget : public TQWidget
 class IRWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     IRWidget( TQWidget *parent );
diff --git a/kitchensync/src/groupconfig.h b/kitchensync/src/groupconfig.h
index 151fe794..6cf6da2e 100644
--- a/kitchensync/src/groupconfig.h
+++ b/kitchensync/src/groupconfig.h
@@ -34,7 +34,7 @@ class SyncProcess;
 class GroupConfig : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     GroupConfig( TQWidget *parent );
diff --git a/kitchensync/src/groupconfigdialog.h b/kitchensync/src/groupconfigdialog.h
index 2871853c..988c2487 100644
--- a/kitchensync/src/groupconfigdialog.h
+++ b/kitchensync/src/groupconfigdialog.h
@@ -28,7 +28,7 @@ class SyncProcess;
 class GroupConfigDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     GroupConfigDialog( TQWidget *parent, SyncProcess * );
diff --git a/kitchensync/src/groupitem.h b/kitchensync/src/groupitem.h
index 94eb0fc3..469b8329 100644
--- a/kitchensync/src/groupitem.h
+++ b/kitchensync/src/groupitem.h
@@ -40,7 +40,7 @@ class TQVBox;
 class GroupItem : public KWidgetListItem
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     GroupItem( KWidgetList*, SyncProcess *syncProcess );
diff --git a/kitchensync/src/groupview.h b/kitchensync/src/groupview.h
index b3891f67..63a14279 100644
--- a/kitchensync/src/groupview.h
+++ b/kitchensync/src/groupview.h
@@ -29,7 +29,7 @@ class TQVBoxLayout;
 class GroupView : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     GroupView( TQWidget *parent );
diff --git a/kitchensync/src/kwidgetlist.h b/kitchensync/src/kwidgetlist.h
index 9fb4915c..54eaf88b 100644
--- a/kitchensync/src/kwidgetlist.h
+++ b/kitchensync/src/kwidgetlist.h
@@ -29,7 +29,7 @@ class KWidgetListItem;
 class KWidgetList : public TQScrollView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KWidgetList( TQWidget *parent = 0, const char *name = 0 );
diff --git a/kitchensync/src/mainwidget.h b/kitchensync/src/mainwidget.h
index 1378e1dc..28df4f5d 100644
--- a/kitchensync/src/mainwidget.h
+++ b/kitchensync/src/mainwidget.h
@@ -39,7 +39,7 @@ class Environment;
 class KDE_EXPORT MainWidget : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     MainWidget( KXMLGUIClient *guiClient, TQWidget *widget = 0, const char *name = 0 );
     ~MainWidget();
diff --git a/kitchensync/src/mainwindow.h b/kitchensync/src/mainwindow.h
index 90cc1ff9..61bff155 100644
--- a/kitchensync/src/mainwindow.h
+++ b/kitchensync/src/mainwindow.h
@@ -32,7 +32,7 @@ class MainWidget;
 class MainWindow : public KMainWindow
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     MainWindow();
diff --git a/kitchensync/src/memberconfig.h b/kitchensync/src/memberconfig.h
index 2abc4f4c..b79fc644 100644
--- a/kitchensync/src/memberconfig.h
+++ b/kitchensync/src/memberconfig.h
@@ -30,7 +30,7 @@ class ConfigGui;
 class MemberConfig : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     MemberConfig( TQWidget *parent, const QSync::Member & );
diff --git a/kitchensync/src/multiconflictdialog.h b/kitchensync/src/multiconflictdialog.h
index 8709ee63..64455311 100644
--- a/kitchensync/src/multiconflictdialog.h
+++ b/kitchensync/src/multiconflictdialog.h
@@ -28,7 +28,7 @@ class KWidgetList;
 class MultiConflictDialog : public ConflictDialog
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent );
diff --git a/kitchensync/src/part.h b/kitchensync/src/part.h
index eeb113c9..ff9685c6 100644
--- a/kitchensync/src/part.h
+++ b/kitchensync/src/part.h
@@ -30,7 +30,7 @@ class KAboutData;
 class KitchenSyncPart: public KParts::ReadOnlyPart
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KitchenSyncPart( TQWidget *parentWidget, const char *widgetName,
diff --git a/kitchensync/src/pluginpicker.h b/kitchensync/src/pluginpicker.h
index 44564ddb..04e8d9fb 100644
--- a/kitchensync/src/pluginpicker.h
+++ b/kitchensync/src/pluginpicker.h
@@ -42,7 +42,7 @@ class PluginItem : public KWidgetListItem
 class PluginPicker : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PluginPicker( TQWidget *parent );
@@ -62,7 +62,7 @@ class PluginPicker : public TQWidget
 class PluginPickerDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PluginPickerDialog( TQWidget *parent );
diff --git a/kitchensync/src/singleconflictdialog.h b/kitchensync/src/singleconflictdialog.h
index 06e4b0f3..4422a3c2 100644
--- a/kitchensync/src/singleconflictdialog.h
+++ b/kitchensync/src/singleconflictdialog.h
@@ -33,7 +33,7 @@ class HTMLDiffAlgoDisplay;
 class SingleConflictDialog : public ConflictDialog
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent );
diff --git a/kitchensync/src/syncprocess.h b/kitchensync/src/syncprocess.h
index 0bf9b803..f510875c 100644
--- a/kitchensync/src/syncprocess.h
+++ b/kitchensync/src/syncprocess.h
@@ -32,7 +32,7 @@ class Engine;
 class SyncProcess : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     SyncProcess( const QSync::Group &group );
diff --git a/kitchensync/src/syncprocessmanager.h b/kitchensync/src/syncprocessmanager.h
index f29d8a11..17adf19d 100644
--- a/kitchensync/src/syncprocessmanager.h
+++ b/kitchensync/src/syncprocessmanager.h
@@ -34,7 +34,7 @@ class SyncProcess;
 class SyncProcessManager : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     static SyncProcessManager *self();
 
diff --git a/kmail/accountcombobox.h b/kmail/accountcombobox.h
index 48c5d6a8..c2e85cf6 100644
--- a/kmail/accountcombobox.h
+++ b/kmail/accountcombobox.h
@@ -42,7 +42,7 @@ namespace KMail {
 class AccountComboBox : public TQComboBox
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   AccountComboBox( TQWidget* parent, const char* name = 0 );
diff --git a/kmail/accountdialog.h b/kmail/accountdialog.h
index 8a65d418..cf63c110 100644
--- a/kmail/accountdialog.h
+++ b/kmail/accountdialog.h
@@ -55,7 +55,7 @@ class FolderRequester;
 class AccountDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AccountDialog( const TQString & caption, KMAccount *account,
@@ -303,7 +303,7 @@ class AccountDialog : public KDialogBase
 class NamespaceLineEdit: public KLineEdit
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     NamespaceLineEdit( TQWidget* parent );
@@ -320,7 +320,7 @@ class NamespaceLineEdit: public KLineEdit
 class NamespaceEditDialog: public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     NamespaceEditDialog( TQWidget* parent, ImapAccountBase::imapNamespace type,
diff --git a/kmail/accountmanager.h b/kmail/accountmanager.h
index a9ba747d..4afe8bb9 100644
--- a/kmail/accountmanager.h
+++ b/kmail/accountmanager.h
@@ -35,7 +35,7 @@ namespace KMail {
 class KDE_EXPORT AccountManager: public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class ::KMAccount;
 
 public:
diff --git a/kmail/accountwizard.h b/kmail/accountwizard.h
index 6e77dd6e..b6cfe158 100644
--- a/kmail/accountwizard.h
+++ b/kmail/accountwizard.h
@@ -45,7 +45,7 @@ class KMTransportInfo;
 class AccountWizard : public KWizard
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     /**
diff --git a/kmail/acljobs.h b/kmail/acljobs.h
index d548c621..6404a228 100644
--- a/kmail/acljobs.h
+++ b/kmail/acljobs.h
@@ -108,7 +108,7 @@ namespace ACLJobs {
   class GetACLJob : public KIO::SimpleJob
   {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     GetACLJob( const KURL& url, const TQByteArray &packedArgs,
                bool showProgressInfo );
@@ -125,7 +125,7 @@ namespace ACLJobs {
   class GetUserRightsJob : public KIO::SimpleJob
   {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     GetUserRightsJob( const KURL& url, const TQByteArray &packedArgs,
                       bool showProgressInfo );
@@ -142,7 +142,7 @@ namespace ACLJobs {
   class DeleteACLJob : public KIO::SimpleJob
   {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     DeleteACLJob( const KURL& url, const TQString& userId,
                   const TQByteArray &packedArgs,
@@ -157,7 +157,7 @@ namespace ACLJobs {
   /// Set and delete a list of permissions for different users on a given url
   class MultiSetACLJob : public KIO::Job {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     MultiSetACLJob( KIO::Slave* slave, const KURL& url, const ACLList& acl, bool showProgressInfo );
diff --git a/kmail/actionscheduler.h b/kmail/actionscheduler.h
index 797b9963..54303960 100644
--- a/kmail/actionscheduler.h
+++ b/kmail/actionscheduler.h
@@ -49,7 +49,7 @@ namespace KMail {
 class ActionScheduler : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   enum ReturnCode { ResultOk, ResultError, ResultCriticalError };
diff --git a/kmail/annotationjobs.h b/kmail/annotationjobs.h
index c700a4b4..3972a80b 100644
--- a/kmail/annotationjobs.h
+++ b/kmail/annotationjobs.h
@@ -108,7 +108,7 @@ MultiUrlGetAnnotationJob* multiUrlGetAnnotation( KIO::Slave* slave,
 class GetAnnotationJob : public KIO::SimpleJob
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   GetAnnotationJob( const KURL& url, const TQString& entry, const TQByteArray &packedArgs,
                     bool showProgressInfo );
@@ -126,7 +126,7 @@ private:
 class MultiGetAnnotationJob : public KIO::Job
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   MultiGetAnnotationJob( KIO::Slave* slave, const KURL& url, const TQStringList& entries, bool showProgressInfo );
@@ -150,7 +150,7 @@ private:
 class MultiUrlGetAnnotationJob : public KIO::Job
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   MultiUrlGetAnnotationJob( KIO::Slave* slave, const KURL& baseUrl,
@@ -175,7 +175,7 @@ private:
 class MultiSetAnnotationJob : public KIO::Job
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   MultiSetAnnotationJob( KIO::Slave* slave, const KURL& url, const AnnotationList& annotations, bool showProgressInfo );
diff --git a/kmail/antispamwizard.h b/kmail/antispamwizard.h
index 04ec4104..e66d2f35 100644
--- a/kmail/antispamwizard.h
+++ b/kmail/antispamwizard.h
@@ -104,7 +104,7 @@ namespace KMail {
   class AntiSpamWizard : public KWizard
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
       /** The wizard can be used for setting up anti-spam tools and for
@@ -299,7 +299,7 @@ namespace KMail {
   class ASWizInfoPage : public ASWizPage
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
       ASWizInfoPage( AntiSpamWizard::WizardMode mode,
@@ -326,7 +326,7 @@ namespace KMail {
   class ASWizSpamRulesPage : public ASWizPage
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
       ASWizSpamRulesPage( TQWidget * parent, const char * name, KMFolderTree * mainFolderTree );
@@ -359,7 +359,7 @@ namespace KMail {
   class ASWizVirusRulesPage : public ASWizPage
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
       ASWizVirusRulesPage( TQWidget * parent, const char * name, KMFolderTree * mainFolderTree );
@@ -386,7 +386,7 @@ namespace KMail {
   class ASWizSummaryPage : public ASWizPage
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
       ASWizSummaryPage( TQWidget * parent, const char * name );
diff --git a/kmail/archivefolderdialog.h b/kmail/archivefolderdialog.h
index b38d0aee..cf9133e6 100644
--- a/kmail/archivefolderdialog.h
+++ b/kmail/archivefolderdialog.h
@@ -33,7 +33,7 @@ class FolderRequester;
 class ArchiveFolderDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
 
diff --git a/kmail/attachmentlistview.h b/kmail/attachmentlistview.h
index 3f1f83fe..68e39c2d 100644
--- a/kmail/attachmentlistview.h
+++ b/kmail/attachmentlistview.h
@@ -30,7 +30,7 @@ class Composer;
 class AttachmentListView : public KListView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   AttachmentListView( KMail::Composer * composer = 0, TQWidget* parent = 0,
                       const char* name = 0 );
diff --git a/kmail/backupjob.h b/kmail/backupjob.h
index 7a56be17..41aa429b 100644
--- a/kmail/backupjob.h
+++ b/kmail/backupjob.h
@@ -48,7 +48,7 @@ namespace KMail
 class BackupJob : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
 
diff --git a/kmail/cachedimapjob.h b/kmail/cachedimapjob.h
index 9931df70..f37953d3 100644
--- a/kmail/cachedimapjob.h
+++ b/kmail/cachedimapjob.h
@@ -60,7 +60,7 @@ namespace KMail {
 
 class CachedImapJob : public FolderJob {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /** Information about a message to be downloaded (from the 'IMAP envelope') */
   struct MsgForDownload {
diff --git a/kmail/chiasmuskeyselector.h b/kmail/chiasmuskeyselector.h
index d136305f..46349796 100644
--- a/kmail/chiasmuskeyselector.h
+++ b/kmail/chiasmuskeyselector.h
@@ -9,7 +9,7 @@ class TQLabel;
 class ChiasmusKeySelector : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   ChiasmusKeySelector( TQWidget* parent, const TQString& caption,
diff --git a/kmail/colorlistbox.h b/kmail/colorlistbox.h
index 384647f6..dd4cee7c 100644
--- a/kmail/colorlistbox.h
+++ b/kmail/colorlistbox.h
@@ -26,7 +26,7 @@
 class ColorListBox : public KListBox
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ColorListBox( TQWidget *parent=0, const char * name=0, WFlags f=0 );
diff --git a/kmail/compactionjob.h b/kmail/compactionjob.h
index e11e6ece..2b80f006 100644
--- a/kmail/compactionjob.h
+++ b/kmail/compactionjob.h
@@ -39,7 +39,7 @@ namespace KMail {
 class MboxCompactionJob : public ScheduledJob
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /// @p folder should be a folder with a KMFolderMbox storage.
   MboxCompactionJob( KMFolder* folder, bool immediate );
@@ -73,7 +73,7 @@ private:
 class MaildirCompactionJob : public ScheduledJob
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /// @p folder should be a folder with a KMFolderMaildir storage.
   MaildirCompactionJob( KMFolder* folder, bool immediate );
diff --git a/kmail/composer.h b/kmail/composer.h
index ac903b37..4bbad316 100644
--- a/kmail/composer.h
+++ b/kmail/composer.h
@@ -35,7 +35,7 @@ namespace KMail {
 
   class Composer : public KMail::SecondaryWindow {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     Composer( const char * name=0 ) : KMail::SecondaryWindow( name ) {}
   public: // mailserviceimpl
diff --git a/kmail/configuredialog.h b/kmail/configuredialog.h
index ece1d83f..a3ffff0b 100644
--- a/kmail/configuredialog.h
+++ b/kmail/configuredialog.h
@@ -34,7 +34,7 @@ namespace KMail {
 class ConfigureDialog : public KCMultiDialog
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   ConfigureDialog( TQWidget *parent=0, const char *name=0, bool modal=true );
@@ -79,7 +79,7 @@ private:
  */
 class AccountUpdater : public TQObject {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     AccountUpdater(KMail::ImapAccountBase *account);
     void update();
diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h
index 51dca5e1..290c9f9d 100644
--- a/kmail/configuredialog_p.h
+++ b/kmail/configuredialog_p.h
@@ -78,7 +78,7 @@ namespace Kleo {
 class NewIdentityDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   enum DuplicateMode { Empty, ControlCenter, ExistingEntry };
@@ -124,7 +124,7 @@ typedef TQValueList<LanguageItem> LanguageItemList;
 class NewLanguageDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     NewLanguageDialog( LanguageItemList & suppressedLangs, TQWidget *parent=0,
@@ -139,7 +139,7 @@ class NewLanguageDialog : public KDialogBase
 class LanguageComboBox : public TQComboBox
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     LanguageComboBox( bool rw, TQWidget *parent=0, const char *name=0 );
@@ -156,7 +156,7 @@ class LanguageComboBox : public TQComboBox
 
 class ProfileDialog : public KDialogBase {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ProfileDialog( TQWidget * parent=0, const char * name=0, bool modal=false );
 
@@ -178,7 +178,7 @@ private:
 #include <kdialog.h>
 class ConfigModule : public KCModule {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ConfigModule( TQWidget * parent=0, const char * name=0 )
      : KCModule ( parent, name )
@@ -206,7 +206,7 @@ signals:
 // Individual tab of a ConfigModuleWithTabs
 class ConfigModuleTab : public TQWidget {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
    ConfigModuleTab( TQWidget *parent=0, const char* name=0 )
       :TQWidget( parent, name )
@@ -241,7 +241,7 @@ private:
  */
 class ConfigModuleWithTabs : public ConfigModule {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ConfigModuleWithTabs( TQWidget * parent=0, const char * name=0 );
    ~ConfigModuleWithTabs() {}
@@ -269,7 +269,7 @@ private:
 
 class KDE_EXPORT IdentityPage : public ConfigModule {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   IdentityPage( TQWidget * parent=0, const char * name=0 );
   ~IdentityPage() {}
@@ -320,7 +320,7 @@ private: // data members
 // subclasses: one class per tab:
 class AccountsPageSendingTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   AccountsPageSendingTab( TQWidget * parent=0, const char * name=0 );
   TQString helpAnchor() const;
@@ -358,7 +358,7 @@ private:
 
 class AccountsPageReceivingTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   AccountsPageReceivingTab( TQWidget * parent=0, const char * name=0 );
   ~AccountsPageReceivingTab();
@@ -403,7 +403,7 @@ private:
 
 class KDE_EXPORT AccountsPage : public ConfigModuleWithTabs {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   AccountsPage( TQWidget * parent=0, const char * name=0 );
   TQString helpAnchor() const;
@@ -431,7 +431,7 @@ private:
 
 class AppearancePageFontsTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   AppearancePageFontsTab( TQWidget * parent=0, const char * name=0 );
   TQString helpAnchor() const;
@@ -459,7 +459,7 @@ private:
 
 class AppearancePageColorsTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   AppearancePageColorsTab( TQWidget * parent=0, const char * name=0 );
   TQString helpAnchor() const;
@@ -481,7 +481,7 @@ private:
 
 class AppearancePageLayoutTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   AppearancePageLayoutTab( TQWidget * parent=0, const char * name=0 );
   TQString helpAnchor() const;
@@ -504,7 +504,7 @@ private: // data
 
 class AppearancePageHeadersTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   AppearancePageHeadersTab( TQWidget * parent=0, const char * name=0 );
 
@@ -531,7 +531,7 @@ private: // data
 
 class AppearancePageReaderTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   AppearancePageReaderTab( TQWidget * parent=0, const char * name=0 );
 
@@ -563,7 +563,7 @@ private: // data
 
 class AppearancePageSystemTrayTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   AppearancePageSystemTrayTab( TQWidget * parent=0, const char * name=0 );
 
@@ -582,7 +582,7 @@ private: // data
 
 class KDE_EXPORT AppearancePage : public ConfigModuleWithTabs {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   AppearancePage( TQWidget * parent=0, const char * name=0 );
 
@@ -613,7 +613,7 @@ private:
 
 class ComposerPageGeneralTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ComposerPageGeneralTab( TQWidget * parent=0, const char * name=0 );
   TQString helpAnchor() const;
@@ -647,7 +647,7 @@ private:
 
 class ComposerPagePhrasesTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ComposerPagePhrasesTab( TQWidget * parent=0, const char * name=0 );
   TQString helpAnchor() const;
@@ -679,7 +679,7 @@ private:
 
 class ComposerPageTemplatesTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ComposerPageTemplatesTab( TQWidget * parent=0, const char * name=0 );
   TQString helpAnchor() const;
@@ -697,7 +697,7 @@ private:
 
 class ComposerPageCustomTemplatesTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ComposerPageCustomTemplatesTab( TQWidget * parent=0, const char * name=0 );
   TQString helpAnchor() const;
@@ -715,7 +715,7 @@ private:
 
 class ComposerPageSubjectTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ComposerPageSubjectTab( TQWidget * parent=0, const char * name=0 );
   TQString helpAnchor() const;
@@ -734,7 +734,7 @@ private:
 
 class ComposerPageCharsetTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ComposerPageCharsetTab( TQWidget * parent=0, const char * name=0 );
   TQString helpAnchor() const;
@@ -756,7 +756,7 @@ private:
 
 class ComposerPageHeadersTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ComposerPageHeadersTab( TQWidget * parent=0, const char * name=0 );
   TQString helpAnchor() const;
@@ -789,7 +789,7 @@ private:
 
 class ComposerPageAttachmentsTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ComposerPageAttachmentsTab( TQWidget * parent=0, const char * name=0 );
   TQString helpAnchor() const;
@@ -811,7 +811,7 @@ private:
 
 class KDE_EXPORT ComposerPage : public ConfigModuleWithTabs {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ComposerPage( TQWidget * parent=0, const char * name=0 );
 
@@ -846,7 +846,7 @@ private:
 
 class SecurityPageGeneralTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   SecurityPageGeneralTab( TQWidget * parent=0, const char * name=0 );
   TQString helpAnchor() const;
@@ -872,7 +872,7 @@ private:
 
 class SecurityPageComposerCryptoTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   SecurityPageComposerCryptoTab( TQWidget * parent=0, const char * name=0 );
 
@@ -892,7 +892,7 @@ private:
 
 class SecurityPageWarningTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   SecurityPageWarningTab( TQWidget * parent=0, const char * name=0 );
 
@@ -915,7 +915,7 @@ private:
 
 class SecurityPageSMimeTab : public ConfigModuleTab, public DCOPObject {
   Q_OBJECT
-  TQ_OBJECT
+  
   K_DCOP
 public:
   SecurityPageSMimeTab( TQWidget * parent=0, const char * name=0 );
@@ -943,7 +943,7 @@ private:
 class SecurityPageCryptPlugTab : public ConfigModuleTab
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   SecurityPageCryptPlugTab( TQWidget * parent = 0, const char* name = 0 );
   ~SecurityPageCryptPlugTab();
@@ -962,7 +962,7 @@ private:
 
 class KDE_EXPORT SecurityPage : public ConfigModuleWithTabs {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   SecurityPage( TQWidget * parent=0, const char * name=0 );
 
@@ -994,7 +994,7 @@ private:
 
 class MiscPageFolderTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   MiscPageFolderTab( TQWidget * parent=0, const char * name=0 );
 
@@ -1025,7 +1025,7 @@ private:
 
 class MiscPageGroupwareTab : public ConfigModuleTab  {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   MiscPageGroupwareTab( TQWidget * parent=0, const char * name=0 );
   void save();
@@ -1067,7 +1067,7 @@ private:
 
 class KDE_EXPORT MiscPage : public ConfigModuleWithTabs {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   MiscPage( TQWidget * parent=0, const char * name=0 );
   TQString helpAnchor() const;
@@ -1088,7 +1088,7 @@ private:
 
 class ListView : public KListView {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ListView( TQWidget *parent=0, const char *name=0, int visibleItem=10 );
   void resizeColums();
diff --git a/kmail/copyfolderjob.h b/kmail/copyfolderjob.h
index 61726cdc..02f05d2d 100644
--- a/kmail/copyfolderjob.h
+++ b/kmail/copyfolderjob.h
@@ -50,7 +50,7 @@ namespace KMail {
 class CopyFolderJob : public FolderJob
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /**
    * Create a new job
diff --git a/kmail/customtemplates.h b/kmail/customtemplates.h
index c850723f..09c8c8fb 100644
--- a/kmail/customtemplates.h
+++ b/kmail/customtemplates.h
@@ -35,7 +35,7 @@ class KShortcut;
 class CustomTemplates : public CustomTemplatesBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
 
diff --git a/kmail/dictionarycombobox.h b/kmail/dictionarycombobox.h
index c847baa0..0a8d5c0f 100644
--- a/kmail/dictionarycombobox.h
+++ b/kmail/dictionarycombobox.h
@@ -47,7 +47,7 @@ namespace KMail {
 
   class DictionaryComboBox : public TQComboBox {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     DictionaryComboBox( TQWidget * parent=0, const char * name=0 );
     ~DictionaryComboBox();
diff --git a/kmail/editorwatcher.h b/kmail/editorwatcher.h
index d98faa4e..fc08c4db 100644
--- a/kmail/editorwatcher.h
+++ b/kmail/editorwatcher.h
@@ -38,7 +38,7 @@ namespace KMail {
 class EditorWatcher : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     /**
      * Constructs an EditorWatcher.
diff --git a/kmail/expirejob.h b/kmail/expirejob.h
index 49a11a03..dbec3d52 100644
--- a/kmail/expirejob.h
+++ b/kmail/expirejob.h
@@ -36,7 +36,7 @@ namespace KMail {
 class ExpireJob : public ScheduledJob
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ExpireJob( KMFolder* folder, bool immediate );
   virtual ~ExpireJob();
diff --git a/kmail/expirypropertiesdialog.h b/kmail/expirypropertiesdialog.h
index 2fd55023..b50a73db 100644
--- a/kmail/expirypropertiesdialog.h
+++ b/kmail/expirypropertiesdialog.h
@@ -33,7 +33,7 @@ namespace KMail {
 class ExpiryPropertiesDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* folder );
diff --git a/kmail/favoritefolderview.h b/kmail/favoritefolderview.h
index 2119f13d..19fd49a9 100644
--- a/kmail/favoritefolderview.h
+++ b/kmail/favoritefolderview.h
@@ -28,7 +28,7 @@ class FavoriteFolderView;
 class FavoriteFolderViewItem : public KMFolderTreeItem
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     FavoriteFolderViewItem( FavoriteFolderView *parent, const TQString & name, KMFolder* folder );
 
@@ -46,7 +46,7 @@ class FavoriteFolderViewItem : public KMFolderTreeItem
 class FavoriteFolderView : public FolderTreeBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     FavoriteFolderView( KMMainWidget *mainWidget, TQWidget *parent = 0 );
diff --git a/kmail/filterimporterexporter.h b/kmail/filterimporterexporter.h
index 0c11d34b..1b46ac02 100644
--- a/kmail/filterimporterexporter.h
+++ b/kmail/filterimporterexporter.h
@@ -68,7 +68,7 @@ private:
 class FilterSelectionDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   FilterSelectionDialog( TQWidget * parent = 0 );
 
diff --git a/kmail/filterlog.h b/kmail/filterlog.h
index 83a2b383..6e84d6f1 100644
--- a/kmail/filterlog.h
+++ b/kmail/filterlog.h
@@ -53,7 +53,7 @@ namespace KMail {
   class FilterLog : public TQObject
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
       /** access to the singleton instance */
diff --git a/kmail/filterlogdlg.h b/kmail/filterlogdlg.h
index 724c6214..d7b6a6dc 100644
--- a/kmail/filterlogdlg.h
+++ b/kmail/filterlogdlg.h
@@ -48,7 +48,7 @@ namespace KMail {
   class FilterLogDialog : public KDialogBase
   {
     Q_OBJECT
-  TQ_OBJECT
+  
     
     public:
       /** constructor */
diff --git a/kmail/folderIface.h b/kmail/folderIface.h
index 645ab541..e348ea6b 100644
--- a/kmail/folderIface.h
+++ b/kmail/folderIface.h
@@ -43,7 +43,7 @@ namespace KMail {
                       public DCOPObject
   {
     Q_OBJECT
-//  TQ_OBJECT
+//  
     K_DCOP
 
   public:
diff --git a/kmail/folderdiaacltab.h b/kmail/folderdiaacltab.h
index f518cbd3..b5484d7c 100644
--- a/kmail/folderdiaacltab.h
+++ b/kmail/folderdiaacltab.h
@@ -59,7 +59,7 @@ class ImapAccountBase;
  */
 class ACLEntryDialog :public KDialogBase {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQString& caption, TQWidget* parent, const char* name = 0 );
@@ -87,7 +87,7 @@ private:
 class FolderDiaACLTab : public FolderDiaTab
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent, const char* name = 0 );
diff --git a/kmail/folderdiaquotatab.h b/kmail/folderdiaquotatab.h
index b75ae53d..222b7efc 100644
--- a/kmail/folderdiaquotatab.h
+++ b/kmail/folderdiaquotatab.h
@@ -53,7 +53,7 @@ class ImapAccountBase;
 class FolderDiaQuotaTab : public FolderDiaTab
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* parent, const char* name = 0 );
diff --git a/kmail/folderdiaquotatab_p.h b/kmail/folderdiaquotatab_p.h
index 90eba639..16b6cb5a 100644
--- a/kmail/folderdiaquotatab_p.h
+++ b/kmail/folderdiaquotatab_p.h
@@ -45,7 +45,7 @@ namespace KMail {
 class QuotaWidget : public TQWidget {
 
  Q_OBJECT
-  TQ_OBJECT
+  
 public:
     QuotaWidget( TQWidget* parent, const char* name = 0 );
     virtual ~QuotaWidget() { }
diff --git a/kmail/folderjob.h b/kmail/folderjob.h
index c3e54e68..47838044 100644
--- a/kmail/folderjob.h
+++ b/kmail/folderjob.h
@@ -44,7 +44,7 @@ namespace KMail {
 class FolderJob : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   enum JobType { tListMessages, tGetFolder, tCreateFolder, tExpungeFolder,
diff --git a/kmail/folderrequester.h b/kmail/folderrequester.h
index 4c32aaf8..7434d82a 100644
--- a/kmail/folderrequester.h
+++ b/kmail/folderrequester.h
@@ -46,7 +46,7 @@ namespace KMail {
   class FolderRequester: public TQWidget
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
       /** 
diff --git a/kmail/foldersetselector.h b/kmail/foldersetselector.h
index 9c352fc2..bd4fce70 100644
--- a/kmail/foldersetselector.h
+++ b/kmail/foldersetselector.h
@@ -29,7 +29,7 @@ namespace KMail {
 class FolderSetSelector : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     FolderSetSelector( KMFolderTree *ft, TQWidget *parent = 0 );
diff --git a/kmail/foldershortcutdialog.h b/kmail/foldershortcutdialog.h
index c3b76073..c94bce17 100644
--- a/kmail/foldershortcutdialog.h
+++ b/kmail/foldershortcutdialog.h
@@ -51,7 +51,7 @@ namespace KMail
 class FolderShortcutDialog : public KDialogBase
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	FolderShortcutDialog( KMFolder *folder, KMMainWidget *mw, 
                         TQWidget *parent=0, const char *name=0 );
diff --git a/kmail/folderstorage.h b/kmail/folderstorage.h
index 3aeefbc4..9771a708 100644
--- a/kmail/folderstorage.h
+++ b/kmail/folderstorage.h
@@ -79,7 +79,7 @@ typedef TQValueList<TQ_UINT32> SerNumList;
 class FolderStorage : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 
diff --git a/kmail/foldertreebase.h b/kmail/foldertreebase.h
index b8ee7149..7f5c8545 100644
--- a/kmail/foldertreebase.h
+++ b/kmail/foldertreebase.h
@@ -29,7 +29,7 @@ namespace KMail {
 class FolderTreeBase : public KFolderTree
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     FolderTreeBase( KMMainWidget *mainWidget, TQWidget *parent = 0, const char *name = 0 );
 
diff --git a/kmail/globalsettings.h b/kmail/globalsettings.h
index 6b3df406..f0b16f0c 100644
--- a/kmail/globalsettings.h
+++ b/kmail/globalsettings.h
@@ -31,7 +31,7 @@ class TQTimer;
 class GlobalSettings : public TQObject, public GlobalSettingsBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   virtual ~GlobalSettings();
 
diff --git a/kmail/headerlistquicksearch.h b/kmail/headerlistquicksearch.h
index 992c3515..d4ae8163 100644
--- a/kmail/headerlistquicksearch.h
+++ b/kmail/headerlistquicksearch.h
@@ -45,7 +45,7 @@ namespace KMail {
 class HeaderListQuickSearch : public KListViewSearchLine
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
     HeaderListQuickSearch( TQWidget *parent,
                                              KListView *listView,
diff --git a/kmail/htmlstatusbar.h b/kmail/htmlstatusbar.h
index 20954b82..95af5206 100644
--- a/kmail/htmlstatusbar.h
+++ b/kmail/htmlstatusbar.h
@@ -60,7 +60,7 @@ namespace KMail {
    **/
   class HtmlStatusBar : public TQLabel {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     HtmlStatusBar( TQWidget * parent=0, const char * name=0, WFlags f=0 );
     virtual ~HtmlStatusBar();
diff --git a/kmail/identitydialog.h b/kmail/identitydialog.h
index 61716983..29b50f05 100644
--- a/kmail/identitydialog.h
+++ b/kmail/identitydialog.h
@@ -61,7 +61,7 @@ namespace KMail {
 
   class IdentityDialog : public KDialogBase {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     IdentityDialog( TQWidget * parent=0, const char * name = 0 );
     virtual ~IdentityDialog();
diff --git a/kmail/identitydrag.h b/kmail/identitydrag.h
index d0e468a1..1c2ddb0d 100644
--- a/kmail/identitydrag.h
+++ b/kmail/identitydrag.h
@@ -43,7 +43,7 @@ namespace KMail {
   **/
   class IdentityDrag : public TQDragObject {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     IdentityDrag( const KPIM::Identity & ident,
 		  TQWidget * dragSource=0, const char * name=0 );
diff --git a/kmail/identitylistview.h b/kmail/identitylistview.h
index 31b80a77..aa203727 100644
--- a/kmail/identitylistview.h
+++ b/kmail/identitylistview.h
@@ -68,7 +68,7 @@ namespace KMail {
   **/
   class IdentityListView : public KListView {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     IdentityListView( TQWidget * parent=0, const char * name=0 );
     virtual ~IdentityListView() {}
diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h
index 95342f9e..26e5f5e3 100644
--- a/kmail/imapaccountbase.h
+++ b/kmail/imapaccountbase.h
@@ -58,7 +58,7 @@ namespace KMail {
 
   class ImapAccountBase : public KMail::NetworkAccount {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     ImapAccountBase( AccountManager * parent, const TQString & name, uint id );
   public:
diff --git a/kmail/imapjob.h b/kmail/imapjob.h
index 04438eb6..5cbbd69e 100644
--- a/kmail/imapjob.h
+++ b/kmail/imapjob.h
@@ -54,7 +54,7 @@ class AttachmentStrategy;
 class ImapJob : public FolderJob
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class ::KMAcctImap;
 
 public:
diff --git a/kmail/importarchivedialog.h b/kmail/importarchivedialog.h
index c5b8a227..b37c519c 100644
--- a/kmail/importarchivedialog.h
+++ b/kmail/importarchivedialog.h
@@ -32,7 +32,7 @@ class FolderRequester;
 class ImportArchiveDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
 
diff --git a/kmail/importjob.h b/kmail/importjob.h
index 74d1d9f5..01b60bef 100644
--- a/kmail/importjob.h
+++ b/kmail/importjob.h
@@ -52,7 +52,7 @@ namespace KMail
 class ImportJob : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
 
diff --git a/kmail/index.h b/kmail/index.h
index bd774944..300d511f 100644
--- a/kmail/index.h
+++ b/kmail/index.h
@@ -51,7 +51,7 @@ class KMSearchPattern;
 
 class KMMsgIndex : public TQObject {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		explicit KMMsgIndex( TQObject* parent );
 		~KMMsgIndex();
@@ -195,7 +195,7 @@ class KMMsgIndex : public TQObject {
 
 class KMMsgIndex::Search : public TQObject {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		explicit Search( KMSearch* s );
 		~Search();
diff --git a/kmail/jobscheduler.h b/kmail/jobscheduler.h
index c0feed34..52e2cb85 100644
--- a/kmail/jobscheduler.h
+++ b/kmail/jobscheduler.h
@@ -96,7 +96,7 @@ private:
 class JobScheduler : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   JobScheduler( TQObject* parent, const char* name = 0 );
   ~JobScheduler();
diff --git a/kmail/khtmlparthtmlwriter.h b/kmail/khtmlparthtmlwriter.h
index 7a551584..52fad112 100644
--- a/kmail/khtmlparthtmlwriter.h
+++ b/kmail/khtmlparthtmlwriter.h
@@ -45,7 +45,7 @@ namespace KMail {
 
   class KHtmlPartHtmlWriter : public TQObject, public HtmlWriter {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     // Key is Content-Id, value is URL
     typedef TQMap<TQString, TQString> EmbeddedPartMap;
diff --git a/kmail/klistboxdialog.h b/kmail/klistboxdialog.h
index efb73caf..1ef8ce28 100644
--- a/kmail/klistboxdialog.h
+++ b/kmail/klistboxdialog.h
@@ -9,7 +9,7 @@ class TQListBox;
 class KListBoxDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     KListBoxDialog( TQString& _selectedString,
diff --git a/kmail/klistviewindexedsearchline.h b/kmail/klistviewindexedsearchline.h
index e8ba35c4..9dfd227b 100644
--- a/kmail/klistviewindexedsearchline.h
+++ b/kmail/klistviewindexedsearchline.h
@@ -49,7 +49,7 @@ class KListViewSearchLine;
 class TDEUI_EXPORT KListViewIndexedSearchLine: public KMail::HeaderListQuickSearch
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 
diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h
index 1c12042b..618fa130 100644
--- a/kmail/kmaccount.h
+++ b/kmail/kmaccount.h
@@ -52,7 +52,7 @@ typedef TQValueList< ::KMAccount* > AccountList;
 class KMPrecommand : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMPrecommand(const TQString &precommand, TQObject *parent = 0);
@@ -74,7 +74,7 @@ protected:
 class KMAccount: public TQObject, public KAccount
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class KMail::AccountManager;
   friend class ::KMail::FolderJob;
   friend class ::AccountsPageReceivingTab; // part of the config dialog
diff --git a/kmail/kmacctcachedimap.h b/kmail/kmacctcachedimap.h
index a9350c3c..a896fc42 100644
--- a/kmail/kmacctcachedimap.h
+++ b/kmail/kmacctcachedimap.h
@@ -54,7 +54,7 @@ namespace KIO {
 class KMAcctCachedImap: public KMail::ImapAccountBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class ::KMail::ImapJob;
   friend class ::KMail::CachedImapJob;
 
diff --git a/kmail/kmacctimap.h b/kmail/kmacctimap.h
index 1a6c4882..455ab931 100644
--- a/kmail/kmacctimap.h
+++ b/kmail/kmacctimap.h
@@ -40,7 +40,7 @@ class FolderStorage;
 class KMAcctImap: public KMail::ImapAccountBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class KMail::ImapJob;
 
 public:
diff --git a/kmail/kmacctseldlg.h b/kmail/kmacctseldlg.h
index 1430fe15..b28e1f52 100644
--- a/kmail/kmacctseldlg.h
+++ b/kmail/kmacctseldlg.h
@@ -30,7 +30,7 @@
 class KMAcctSelDlg: public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KMAcctSelDlg( TQWidget *parent=0, const char *name=0, bool modal=true );
diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h
index 6d0a5382..8501519f 100644
--- a/kmail/kmail_part.h
+++ b/kmail/kmail_part.h
@@ -52,7 +52,7 @@ class ActionManager;
 class KDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPartIface
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KMailPart(TQWidget *parentWidget, const char *widgetName,
               TQObject *parent, const char *name, const TQStringList &);
diff --git a/kmail/kmailicalifaceimpl.h b/kmail/kmailicalifaceimpl.h
index 90765ed7..3b4a194c 100644
--- a/kmail/kmailicalifaceimpl.h
+++ b/kmail/kmailicalifaceimpl.h
@@ -83,7 +83,7 @@ public:
 /** The implementation of the interface. */
 class KMailICalIfaceImpl : public TQObject, virtual public KMailICalIface {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KMailICalIfaceImpl();
 
diff --git a/kmail/kmatmlistview.h b/kmail/kmatmlistview.h
index f69ea96a..f4d86595 100644
--- a/kmail/kmatmlistview.h
+++ b/kmail/kmatmlistview.h
@@ -15,7 +15,7 @@ class TQCheckBox;
 class KMAtmListViewItem : public TQObject, public TQListViewItem
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMAtmListViewItem( TQListView *parent );
diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h
index 8f03571b..17c5512e 100644
--- a/kmail/kmcommands.h
+++ b/kmail/kmcommands.h
@@ -51,7 +51,7 @@ typedef TQMap<partNode*, KMMessage*> PartNodeMessageMap;
 class KDE_EXPORT KMCommand : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
     friend class LaterDeleterWithCommandCompletion;
 
 public:
@@ -165,7 +165,7 @@ private:
 class KDE_EXPORT KMMailtoComposeCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMMailtoComposeCommand( const KURL &url, KMMessage *msg=0 );
@@ -180,7 +180,7 @@ private:
 class KDE_EXPORT KMMailtoReplyCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMMailtoReplyCommand( TQWidget *parent, const KURL &url,
@@ -196,7 +196,7 @@ private:
 class KDE_EXPORT KMMailtoForwardCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMMailtoForwardCommand( TQWidget *parent, const KURL &url,
@@ -211,7 +211,7 @@ private:
 class KDE_EXPORT KMMailtoAddAddrBookCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMMailtoAddAddrBookCommand( const KURL &url, TQWidget *parent );
@@ -225,7 +225,7 @@ private:
 class KDE_EXPORT KMAddBookmarksCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMAddBookmarksCommand( const KURL &url, TQWidget *parent );
@@ -240,7 +240,7 @@ private:
 class KDE_EXPORT KMMailtoOpenAddrBookCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMMailtoOpenAddrBookCommand( const KURL &url, TQWidget *parent );
@@ -254,7 +254,7 @@ private:
 class KDE_EXPORT KMUrlCopyCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMUrlCopyCommand( const KURL &url, KMMainWidget *mainWidget = 0 );
@@ -269,7 +269,7 @@ private:
 class KDE_EXPORT KMUrlOpenCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMUrlOpenCommand( const KURL &url, KMReaderWin *readerWin );
@@ -284,7 +284,7 @@ private:
 class KDE_EXPORT KMUrlSaveCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMUrlSaveCommand( const KURL &url, TQWidget *parent );
@@ -301,7 +301,7 @@ private:
 class KDE_EXPORT KMEditMsgCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMEditMsgCommand( TQWidget *parent, KMMessage *msg );
@@ -313,7 +313,7 @@ private:
 class KDE_EXPORT KMUseTemplateCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMUseTemplateCommand( TQWidget *parent, KMMessage *msg );
@@ -325,7 +325,7 @@ private:
 class KDE_EXPORT KMShowMsgSrcCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMShowMsgSrcCommand( TQWidget *parent, KMMessage *msg,
@@ -340,7 +340,7 @@ private:
 class KDE_EXPORT KMSaveMsgCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMSaveMsgCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList );
@@ -372,7 +372,7 @@ private:
 class KDE_EXPORT KMOpenMsgCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMOpenMsgCommand( TQWidget *parent, const KURL & url = KURL(),
@@ -396,7 +396,7 @@ private:
 class KDE_EXPORT KMSaveAttachmentsCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /** Use this to save all attachments of the given message.
       @param parent  The parent widget of the command used for message boxes.
@@ -435,7 +435,7 @@ private:
 class KDE_EXPORT KMReplyToCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMReplyToCommand( TQWidget *parent, KMMessage *msg,
@@ -451,7 +451,7 @@ private:
 class KDE_EXPORT KMNoQuoteReplyToCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMNoQuoteReplyToCommand( TQWidget *parent, KMMessage *msg );
@@ -463,7 +463,7 @@ private:
 class KMReplyListCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMReplyListCommand( TQWidget *parent, KMMessage *msg,
@@ -479,7 +479,7 @@ private:
 class KDE_EXPORT KMReplyToAllCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMReplyToAllCommand( TQWidget *parent, KMMessage *msg,
@@ -495,7 +495,7 @@ private:
 class KDE_EXPORT KMReplyAuthorCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMReplyAuthorCommand( TQWidget *parent, KMMessage *msg,
@@ -511,7 +511,7 @@ private:
 class KDE_EXPORT KMForwardInlineCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMForwardInlineCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList,
@@ -529,7 +529,7 @@ private:
 class KDE_EXPORT KMForwardAttachedCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMForwardAttachedCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList,
@@ -547,7 +547,7 @@ private:
 class KDE_EXPORT KMForwardDigestCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMForwardDigestCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList,
@@ -565,7 +565,7 @@ private:
 class KDE_EXPORT KMRedirectCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMRedirectCommand( TQWidget *parent, KMMessage *msg );
@@ -577,7 +577,7 @@ private:
 class KDE_EXPORT KMCustomReplyToCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMCustomReplyToCommand( TQWidget *parent, KMMessage *msg,
@@ -595,7 +595,7 @@ private:
 class KDE_EXPORT KMCustomReplyAllToCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMCustomReplyAllToCommand( TQWidget *parent, KMMessage *msg,
@@ -613,7 +613,7 @@ private:
 class KDE_EXPORT KMCustomForwardCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMCustomForwardCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList,
@@ -631,7 +631,7 @@ private:
 class KDE_EXPORT KMPrintCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMPrintCommand( TQWidget *parent, KMMessage *msg,
@@ -659,7 +659,7 @@ private:
 class KDE_EXPORT KMSeStatusCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   // Serial numbers
@@ -678,7 +678,7 @@ private:
 class KDE_EXPORT KMFilterCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMFilterCommand( const TQCString &field, const TQString &value );
@@ -694,7 +694,7 @@ private:
 class KDE_EXPORT KMFilterActionCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMFilterActionCommand( TQWidget *parent,
@@ -711,7 +711,7 @@ private:
 class KDE_EXPORT KMMetaFilterActionCommand : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMMetaFilterActionCommand( KMFilter *filter, KMHeaders *headers,
@@ -729,7 +729,7 @@ private:
 class KDE_EXPORT FolderShortcutCommand : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   FolderShortcutCommand( KMMainWidget* mainwidget, KMFolder *folder );
@@ -752,7 +752,7 @@ private:
 class KDE_EXPORT KMMailingListFilterCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMMailingListFilterCommand( TQWidget *parent, KMMessage *msg );
@@ -772,7 +772,7 @@ private:
 class KDE_EXPORT KMMenuCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   static void folderToPopupMenu(bool move, TQObject *receiver,
@@ -785,7 +785,7 @@ public:
 class KDE_EXPORT KMCopyCommand : public KMMenuCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMCopyCommand( KMFolder* destFolder,
@@ -811,7 +811,7 @@ namespace KPIM {
 class KDE_EXPORT KMMoveCommand : public KMMenuCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMMoveCommand( KMFolder* destFolder, const TQPtrList<KMMsgBase> &msgList );
@@ -847,7 +847,7 @@ private:
 class KDE_EXPORT KMDeleteMsgCommand : public KMMoveCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMDeleteMsgCommand( KMFolder* srcFolder, const TQPtrList<KMMsgBase> &msgList );
@@ -862,7 +862,7 @@ private:
 class KDE_EXPORT KMUrlClickedCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMUrlClickedCommand( const KURL &url, uint identity,
@@ -881,7 +881,7 @@ private:
 class KDE_EXPORT KMLoadPartsCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMLoadPartsCommand( TQPtrList<partNode>& parts, KMMessage* msg );
@@ -907,7 +907,7 @@ private:
 class KDE_EXPORT KMResendMessageCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMResendMessageCommand( TQWidget *parent, KMMessage *msg=0 );
@@ -919,7 +919,7 @@ private:
 class KDE_EXPORT KMMailingListCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KMMailingListCommand( TQWidget *parent, KMFolder *folder );
 private:
@@ -935,7 +935,7 @@ protected:
 class KDE_EXPORT KMMailingListPostCommand : public KMMailingListCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KMMailingListPostCommand( TQWidget *parent, KMFolder *folder );
 protected:
@@ -945,7 +945,7 @@ protected:
 class KDE_EXPORT KMMailingListSubscribeCommand : public KMMailingListCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KMMailingListSubscribeCommand( TQWidget *parent, KMFolder *folder );
 protected:
@@ -955,7 +955,7 @@ protected:
 class KDE_EXPORT KMMailingListUnsubscribeCommand : public KMMailingListCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KMMailingListUnsubscribeCommand( TQWidget *parent, KMFolder *folder );
 protected:
@@ -965,7 +965,7 @@ protected:
 class KDE_EXPORT KMMailingListArchivesCommand : public KMMailingListCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KMMailingListArchivesCommand( TQWidget *parent, KMFolder *folder );
 protected:
@@ -975,7 +975,7 @@ protected:
 class KDE_EXPORT KMMailingListHelpCommand : public KMMailingListCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KMMailingListHelpCommand( TQWidget *parent, KMFolder *folder );
 protected:
@@ -985,7 +985,7 @@ protected:
 class KDE_EXPORT KMIMChatCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMIMChatCommand( const KURL &url, KMMessage *msg=0 );
@@ -1006,7 +1006,7 @@ private:
 class KDE_EXPORT KMHandleAttachmentCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   /** Supported types of attachment handling */
@@ -1093,7 +1093,7 @@ private:
 class KDE_EXPORT AttachmentModifyCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     AttachmentModifyCommand( partNode *node, KMMessage *msg, TQWidget *parent );
     AttachmentModifyCommand( int nodeId, KMMessage *msg, TQWidget *parent );
@@ -1121,7 +1121,7 @@ class KDE_EXPORT AttachmentModifyCommand : public KMCommand
 class KDE_EXPORT KMDeleteAttachmentCommand : public AttachmentModifyCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KMDeleteAttachmentCommand( partNode *node, KMMessage *msg, TQWidget *parent );
     KMDeleteAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *parent );
@@ -1135,7 +1135,7 @@ class KDE_EXPORT KMDeleteAttachmentCommand : public AttachmentModifyCommand
 class KDE_EXPORT KMEditAttachmentCommand : public AttachmentModifyCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KMEditAttachmentCommand( partNode *node, KMMessage *msg, TQWidget *parent );
     KMEditAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *parent );
@@ -1154,7 +1154,7 @@ class KDE_EXPORT KMEditAttachmentCommand : public AttachmentModifyCommand
 class KDE_EXPORT CreateTodoCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     CreateTodoCommand( TQWidget *parent, KMMessage *msg );
 
diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h
index 1115a846..9918c5c0 100644
--- a/kmail/kmcomposewin.h
+++ b/kmail/kmcomposewin.h
@@ -99,7 +99,7 @@ namespace GpgME {
 class KMComposeWin : public KMail::Composer, public MailComposerIface
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class ::KMEdit;
   friend class ::MessageComposer;
 
diff --git a/kmail/kmedit.h b/kmail/kmedit.h
index 4d2535e4..2f51f435 100644
--- a/kmail/kmedit.h
+++ b/kmail/kmedit.h
@@ -65,7 +65,7 @@ class KMSyntaxHighter : public KDictSpellingHighlighter
 
 class KMEdit : public KEdit {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KMEdit(TQWidget *parent=0,KMComposeWin* composer=0,
          KSpellConfig* spellConfig = 0,
diff --git a/kmail/kmfawidgets.h b/kmail/kmfawidgets.h
index 2528f2ba..f5602f5e 100644
--- a/kmail/kmfawidgets.h
+++ b/kmail/kmfawidgets.h
@@ -18,7 +18,7 @@ class KURLRequester;
 class KMFilterActionWithAddressWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KMFilterActionWithAddressWidget( TQWidget* parent=0, const char* name=0 );
 
@@ -41,7 +41,7 @@ private:
 class KMSoundTestWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KMSoundTestWidget( TQWidget * parent, const char * name=0 );
   ~KMSoundTestWidget();
diff --git a/kmail/kmfilterdlg.h b/kmail/kmfilterdlg.h
index ed72d991..4742ff40 100644
--- a/kmail/kmfilterdlg.h
+++ b/kmail/kmfilterdlg.h
@@ -60,7 +60,7 @@ class KListView;
 class KMFilterListBox : public TQGroupBox
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /** Constuctor. */
   KMFilterListBox( const TQString & title, TQWidget* parent=0, const char* name=0, bool popFilter = false);
@@ -196,7 +196,7 @@ private:
 class KMFilterActionWidget : public TQHBox
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /** Constructor. Creates a filter action widget with no type
       selected. */
@@ -230,7 +230,7 @@ private:
 class KMPopFilterActionWidget : public TQVButtonGroup
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KMPopFilterActionWidget( const TQString &title, TQWidget* parent=0, const char* name=0 );
   void setAction( KMPopFilterAction aAction );
@@ -255,7 +255,7 @@ signals: // Signals
 class KMFilterActionWidgetLister : public KWidgetLister
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KMFilterActionWidgetLister( TQWidget *parent=0, const char* name=0 );
 
@@ -339,7 +339,7 @@ private:
 class KMFilterDlg: public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /** Create the filter dialog. The only class which should be able to
       do this is KMFilterMgr. This ensures that there is only a
diff --git a/kmail/kmfiltermgr.h b/kmail/kmfiltermgr.h
index 6b0130af..45e77863 100644
--- a/kmail/kmfiltermgr.h
+++ b/kmail/kmfiltermgr.h
@@ -34,7 +34,7 @@ template <typename T> class TQValueList;
 class KMFilterMgr: public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMFilterMgr(bool popFilter = false);
diff --git a/kmail/kmfolder.h b/kmail/kmfolder.h
index abf0a2da..fe290000 100644
--- a/kmail/kmfolder.h
+++ b/kmail/kmfolder.h
@@ -68,7 +68,7 @@ typedef TQValueList<TQ_UINT32> SerNumList;
 class KMFolder: public KMFolderNode
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class ::KMFolderJob;
 public:
 
diff --git a/kmail/kmfoldercachedimap.h b/kmail/kmfoldercachedimap.h
index 613b3752..59c444e6 100644
--- a/kmail/kmfoldercachedimap.h
+++ b/kmail/kmfoldercachedimap.h
@@ -66,7 +66,7 @@ using KMail::AttachmentStrategy;
 class DImapTroubleShootDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   enum SelectedOperation {
     None = -1,
@@ -93,7 +93,7 @@ private:
 class KMFolderCachedImap : public KMFolderMaildir
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   static TQString cacheLocation() {
diff --git a/kmail/kmfoldercombobox.h b/kmail/kmfoldercombobox.h
index 7537c5af..ae90497a 100644
--- a/kmail/kmfoldercombobox.h
+++ b/kmail/kmfoldercombobox.h
@@ -14,7 +14,7 @@
 class KMFolderComboBox : public TQComboBox
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMFolderComboBox( TQWidget *parent = 0, char *name = 0 );
diff --git a/kmail/kmfolderdia.h b/kmail/kmfolderdia.h
index baec75f8..95f7b31b 100644
--- a/kmail/kmfolderdia.h
+++ b/kmail/kmfolderdia.h
@@ -70,7 +70,7 @@ namespace KMail {
 class FolderDiaTab : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
    FolderDiaTab( TQWidget *parent=0, const char* name=0 )
      : TQWidget( parent, name ) {}
@@ -112,7 +112,7 @@ signals:
 class FolderDiaGeneralTab : public FolderDiaTab
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   FolderDiaGeneralTab( KMFolderDialog* dlg,
@@ -164,7 +164,7 @@ private:
 class FolderDiaTemplatesTab : public FolderDiaTab
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   FolderDiaTemplatesTab( KMFolderDialog *dlg, TQWidget *parent );
@@ -199,7 +199,7 @@ private:
 class KMFolderDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMFolderDialog( KMFolder *folder, KMFolderDir *aFolderDir,
diff --git a/kmail/kmfolderdir.h b/kmail/kmfolderdir.h
index 6d33add3..7fe81689 100644
--- a/kmail/kmfolderdir.h
+++ b/kmail/kmfolderdir.h
@@ -15,7 +15,7 @@ class KMFolderMgr;
 class KMFolderDir: public KMFolderNode, public KMFolderNodeList
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMFolderDir( KMFolder * owner, KMFolderDir * parent = 0,
@@ -71,7 +71,7 @@ protected:
 class KMFolderRootDir: public KMFolderDir
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMFolderRootDir( KMFolderMgr* manager,
diff --git a/kmail/kmfolderimap.h b/kmail/kmfolderimap.h
index 14b7d3b9..059e1a4c 100644
--- a/kmail/kmfolderimap.h
+++ b/kmail/kmfolderimap.h
@@ -78,7 +78,7 @@ private:
 class KMFolderImap : public KMFolderMbox
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class ::KMail::ImapJob;
 public:
 
diff --git a/kmail/kmfolderindex.h b/kmail/kmfolderindex.h
index 563fe5d6..8a8176e6 100644
--- a/kmail/kmfolderindex.h
+++ b/kmail/kmfolderindex.h
@@ -37,7 +37,7 @@
 class KMFolderIndex: public FolderStorage
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   //TODO:Have to get rid of this friend declaration and add necessary pure
   //virtuals to kmfolder.h so that KMMsgBase::parent() can be a plain KMFolder
   //rather than a KMFolderIndex. Need this for database indices.
diff --git a/kmail/kmfoldermaildir.h b/kmail/kmfoldermaildir.h
index 1f8dc6ab..832638ad 100644
--- a/kmail/kmfoldermaildir.h
+++ b/kmail/kmfoldermaildir.h
@@ -24,7 +24,7 @@ using KMail::AttachmentStrategy;
 class KMFolderMaildir : public KMFolderIndex
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class ::KMail::MaildirJob;
 public:
   /** Usually a parent is given. But in some cases there is no
diff --git a/kmail/kmfoldermbox.h b/kmail/kmfoldermbox.h
index 68b52aca..d1993b17 100644
--- a/kmail/kmfoldermbox.h
+++ b/kmail/kmfoldermbox.h
@@ -47,7 +47,7 @@ using KMail::AttachmentStrategy;
 class KMFolderMbox : public KMFolderIndex
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class ::KMail::MboxJob;
 public:
 
diff --git a/kmail/kmfoldermgr.h b/kmail/kmfoldermgr.h
index 2a0808bb..b6b80ad9 100644
--- a/kmail/kmfoldermgr.h
+++ b/kmail/kmfoldermgr.h
@@ -16,7 +16,7 @@ class KMFolder;
 class KMFolderMgr: public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMFolderMgr(const TQString& basePath, KMFolderDirType dirType = KMStandardDir);
diff --git a/kmail/kmfoldernode.h b/kmail/kmfoldernode.h
index aec47e3b..b4542c96 100644
--- a/kmail/kmfoldernode.h
+++ b/kmail/kmfoldernode.h
@@ -29,7 +29,7 @@ class KMFolderDir;
 class KMFolderNode: public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMFolderNode( KMFolderDir * parent, const TQString & name );
diff --git a/kmail/kmfoldersearch.h b/kmail/kmfoldersearch.h
index 3dc9462e..a3fb9706 100644
--- a/kmail/kmfoldersearch.h
+++ b/kmail/kmfoldersearch.h
@@ -52,7 +52,7 @@ using KMail::AttachmentStrategy;
 class KMSearch: public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMSearch(TQObject * parent = 0, const char * name = 0);
@@ -110,7 +110,7 @@ private:
 class KMFolderSearch: public FolderStorage
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class ::KMFolderSearchJob;
 public:
   KMFolderSearch(KMFolder* folder, const char* name=0);
diff --git a/kmail/kmfolderseldlg.h b/kmail/kmfolderseldlg.h
index 2d699b80..1a7f7508 100644
--- a/kmail/kmfolderseldlg.h
+++ b/kmail/kmfolderseldlg.h
@@ -21,7 +21,7 @@ namespace KMail {
   class KMFolderSelDlg: public KDialogBase
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
       /** 
diff --git a/kmail/kmfoldertree.h b/kmail/kmfoldertree.h
index 58932c17..696c7cca 100644
--- a/kmail/kmfoldertree.h
+++ b/kmail/kmfoldertree.h
@@ -45,7 +45,7 @@ template <typename T> class TQGuardedPtr;
 class KDE_EXPORT KMFolderTreeItem : public TQObject, public KFolderTreeItem
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /** Construct a root item _without_ folder */
   KMFolderTreeItem( KFolderTree *parent, const TQString & name,
@@ -109,7 +109,7 @@ private:
 class KMFolderTree : public KMail::FolderTreeBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMFolderTree( KMMainWidget *mainWidget, TQWidget *parent=0,
diff --git a/kmail/kmheaders.h b/kmail/kmheaders.h
index 3dce0a66..28b75142 100644
--- a/kmail/kmheaders.h
+++ b/kmail/kmheaders.h
@@ -48,7 +48,7 @@ enum NestingPolicy { AlwaysOpen = 0, DefaultOpen, DefaultClosed, OpenUnread };
 class KMHeaders : public KListView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   friend class ::KMail::HeaderItem; // For easy access to the pixmaps
 
diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
index bfcd053a..c334291e 100644
--- a/kmail/kmkernel.h
+++ b/kmail/kmkernel.h
@@ -83,7 +83,7 @@ class ConfigureDialog;
 class KDE_EXPORT KMKernel : public TQObject, virtual public KMailIface
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMKernel (TQObject *parent=0, const char *name=0);
diff --git a/kmail/kmlineeditspell.h b/kmail/kmlineeditspell.h
index c5681573..536d3158 100644
--- a/kmail/kmlineeditspell.h
+++ b/kmail/kmlineeditspell.h
@@ -12,7 +12,7 @@ class TQPopupMenu;
 class KMLineEdit : public KPIM::AddresseeLineEdit
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KMLineEdit(bool useCompletion, TQWidget *parent = 0,
                const char *name = 0);
@@ -41,7 +41,7 @@ private:
 class KMLineEditSpell : public KMLineEdit
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KMLineEditSpell(bool useCompletion, TQWidget *parent = 0,
                const char *name = 0);
diff --git a/kmail/kmmainwidget.h b/kmail/kmmainwidget.h
index e67f4fbd..fbfd9eeb 100644
--- a/kmail/kmmainwidget.h
+++ b/kmail/kmmainwidget.h
@@ -82,7 +82,7 @@ typedef TQMap<int,KMFolder*> KMMenuToFolder;
 class KDE_EXPORT KMMainWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMMainWidget(TQWidget *parent, const char *name,
diff --git a/kmail/kmmainwin.h b/kmail/kmmainwin.h
index e4c9fa04..aa545244 100644
--- a/kmail/kmmainwin.h
+++ b/kmail/kmmainwin.h
@@ -35,7 +35,7 @@ using KPIM::ProgressDialog;
 class KMMainWin : public KMainWindow
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   // the main window needs to have a name since else restoring the window
diff --git a/kmail/kmmimeparttree.h b/kmail/kmmimeparttree.h
index c8d3c598..e6985d2c 100644
--- a/kmail/kmmimeparttree.h
+++ b/kmail/kmmimeparttree.h
@@ -47,7 +47,7 @@ class KMMimePartTreeItem;
 class KMMimePartTree : public KListView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class ::KMReaderWin;
 
 public:
diff --git a/kmail/kmmsgpartdlg.h b/kmail/kmmsgpartdlg.h
index 723ebda7..1a7a83d3 100644
--- a/kmail/kmmsgpartdlg.h
+++ b/kmail/kmmsgpartdlg.h
@@ -39,7 +39,7 @@ class TQLineEdit;
 class KMMsgPartDialog: public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMMsgPartDialog( const TQString & caption=TQString(),
@@ -140,7 +140,7 @@ protected:
 */
 class KMMsgPartDialogCompat : public KMMsgPartDialog {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KMMsgPartDialogCompat( TQWidget * parent=0, const char * caption=0, bool=FALSE );
   virtual ~KMMsgPartDialogCompat();
diff --git a/kmail/kmpopfiltercnfrmdlg.h b/kmail/kmpopfiltercnfrmdlg.h
index 8055faea..98a277e5 100644
--- a/kmail/kmpopfiltercnfrmdlg.h
+++ b/kmail/kmpopfiltercnfrmdlg.h
@@ -36,7 +36,7 @@ class KMPopFilterCnfrmDlg;
 class KMPopHeadersView : public KListView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMPopHeadersView(TQWidget *aParent=0, KMPopFilterCnfrmDlg *aDialog=0);
@@ -79,7 +79,7 @@ class KMPopFilterCnfrmDlg : public KDialogBase
 {
 	friend class ::KMPopHeadersView;
   Q_OBJECT
-  TQ_OBJECT
+  
 protected:
   KMPopFilterCnfrmDlg() { };
   TQMap<TQListViewItem*, KMPopHeaders*> mItemMap;
diff --git a/kmail/kmreadermainwin.h b/kmail/kmreadermainwin.h
index 83d87267..ca4f29e7 100644
--- a/kmail/kmreadermainwin.h
+++ b/kmail/kmreadermainwin.h
@@ -25,7 +25,7 @@ class MessageActions;
 class KMReaderMainWin : public KMail::SecondaryWindow
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMReaderMainWin( bool htmlOverride, bool htmlLoadExtOverride, char *name = 0 );
diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h
index baa63731..f8c4e74e 100644
--- a/kmail/kmreaderwin.h
+++ b/kmail/kmreaderwin.h
@@ -75,7 +75,7 @@ namespace KParts {
 
 class KMReaderWin: public TQWidget, public KMail::Interface::Observer {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   friend void KMMimePartTree::itemClicked( TQListViewItem* item );
   friend void KMMimePartTree::itemRightClicked( TQListViewItem* item, const TQPoint & );
diff --git a/kmail/kmsearchpatternedit.h b/kmail/kmsearchpatternedit.h
index 625d8f86..77089df4 100644
--- a/kmail/kmsearchpatternedit.h
+++ b/kmail/kmsearchpatternedit.h
@@ -40,7 +40,7 @@ class KMSearchPatternEdit;
 class KMSearchRuleWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /** Constructor. You can give a KMSearchRule as parameter, which will
       be used to initialize the widget. */
@@ -106,7 +106,7 @@ private:
 class KMSearchRuleWidgetLister : public KWidgetLister
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   friend class ::KMSearchPatternEdit;
 
@@ -167,7 +167,7 @@ private:
 
 class KMSearchPatternEdit : public TQGroupBox  {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /** Constructor. The parent and name parameters are passed to the underlying
       TQGroupBox, as usual. */
diff --git a/kmail/kmsender.h b/kmail/kmsender.h
index 36153a2a..e01cba08 100644
--- a/kmail/kmsender.h
+++ b/kmail/kmsender.h
@@ -53,7 +53,7 @@ namespace KPIM {
 class KMSender: public TQObject, public KMail::MessageSender
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class ::KMSendProc;
   friend class ::KMSendSendmail;
   friend class ::KMSendSMTP;
diff --git a/kmail/kmsender_p.h b/kmail/kmsender_p.h
index ddfb56f9..74520389 100644
--- a/kmail/kmsender_p.h
+++ b/kmail/kmsender_p.h
@@ -23,7 +23,7 @@ namespace KIO {
 class KMSendProc: public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMSendProc(KMSender*);
@@ -87,7 +87,7 @@ protected:
 class KMSendSendmail: public KMSendProc
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KMSendSendmail(KMSender*);
   ~KMSendSendmail();
@@ -118,7 +118,7 @@ private:
 class KMSendSMTP : public KMSendProc
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KMSendSMTP(KMSender *sender);
   ~KMSendSMTP();
diff --git a/kmail/kmservertest.h b/kmail/kmservertest.h
index ca2392a7..74fa8833 100644
--- a/kmail/kmservertest.h
+++ b/kmail/kmservertest.h
@@ -47,7 +47,7 @@ namespace KIO {
 class KMServerTest : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMServerTest( const TQString & protocol, const TQString & host, int port );
diff --git a/kmail/kmsystemtray.h b/kmail/kmsystemtray.h
index 5e02b15b..208dd0c7 100644
--- a/kmail/kmsystemtray.h
+++ b/kmail/kmsystemtray.h
@@ -41,7 +41,7 @@ class TQPoint;
 class KMSystemTray : public KSystemTray
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /** construtor */
   KMSystemTray(TQWidget* parent=0, const char *name=0);
diff --git a/kmail/kmtransport.h b/kmail/kmtransport.h
index ba43ebc0..e4dd6f1e 100644
--- a/kmail/kmtransport.h
+++ b/kmail/kmtransport.h
@@ -64,7 +64,7 @@ public:
 class KMTransportSelDlg : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMTransportSelDlg( TQWidget *parent=0, const char *name=0, bool modal=TRUE );
@@ -80,7 +80,7 @@ private:
 class KMTransportDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMTransportDialog( const TQString & caption, KMTransportInfo *transportInfo,
diff --git a/kmail/listjob.h b/kmail/listjob.h
index 8f4ac73d..fc289569 100644
--- a/kmail/listjob.h
+++ b/kmail/listjob.h
@@ -54,7 +54,7 @@ namespace KMail {
 class ListJob : public FolderJob
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /**
    * Create a new job
diff --git a/kmail/localsubscriptiondialog.h b/kmail/localsubscriptiondialog.h
index d7f3dd0b..601a8463 100644
--- a/kmail/localsubscriptiondialog.h
+++ b/kmail/localsubscriptiondialog.h
@@ -40,7 +40,7 @@ namespace KMail {
   class LocalSubscriptionDialog: public SubscriptionDialog
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
       LocalSubscriptionDialog( TQWidget *parent, const TQString &caption,
diff --git a/kmail/maildirjob.h b/kmail/maildirjob.h
index d31635cc..1d5a9710 100644
--- a/kmail/maildirjob.h
+++ b/kmail/maildirjob.h
@@ -41,7 +41,7 @@ namespace KMail {
 class MaildirJob : public FolderJob
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   MaildirJob( KMMessage *msg, JobType jt = tGetMessage, KMFolder *folder = 0 );
   MaildirJob( TQPtrList<KMMessage>& msgList, const TQString& sets,
diff --git a/kmail/mailinglistpropertiesdialog.h b/kmail/mailinglistpropertiesdialog.h
index ed7073a6..e527a5ae 100644
--- a/kmail/mailinglistpropertiesdialog.h
+++ b/kmail/mailinglistpropertiesdialog.h
@@ -45,7 +45,7 @@ namespace KMail
 class MailingListFolderPropertiesDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   MailingListFolderPropertiesDialog( TQWidget *parent, KMFolder *folder );
   ~MailingListFolderPropertiesDialog() {};
diff --git a/kmail/managesievescriptsdialog.h b/kmail/managesievescriptsdialog.h
index 048fbcdd..25a53dad 100644
--- a/kmail/managesievescriptsdialog.h
+++ b/kmail/managesievescriptsdialog.h
@@ -15,7 +15,7 @@ class SieveEditor;
 
 class ManageSieveScriptsDialog : public KDialogBase {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ManageSieveScriptsDialog( TQWidget * parent=0, const char * name=0 );
   ~ManageSieveScriptsDialog();
diff --git a/kmail/managesievescriptsdialog_p.h b/kmail/managesievescriptsdialog_p.h
index f860ffb5..584d011b 100644
--- a/kmail/managesievescriptsdialog_p.h
+++ b/kmail/managesievescriptsdialog_p.h
@@ -9,7 +9,7 @@ namespace KMail {
 
 class SieveEditor : public KDialogBase {
   Q_OBJECT
-  TQ_OBJECT
+  
   TQ_PROPERTY( TQString script READ script WRITE setScript )
 public:
   SieveEditor( TQWidget * parent=0, const char * name=0 );
diff --git a/kmail/mboxjob.h b/kmail/mboxjob.h
index 656a3928..9b1d2dea 100644
--- a/kmail/mboxjob.h
+++ b/kmail/mboxjob.h
@@ -41,7 +41,7 @@ namespace KMail {
 class MboxJob : public FolderJob
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class ::KMFolderMbox;
 public:
   MboxJob( KMMessage *msg, JobType jt = tGetMessage, KMFolder *folder = 0 );
diff --git a/kmail/messageactions.h b/kmail/messageactions.h
index f0b47372..e2256123 100644
--- a/kmail/messageactions.h
+++ b/kmail/messageactions.h
@@ -39,7 +39,7 @@ namespace KMail {
 class MessageActions : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     MessageActions( KActionCollection* ac, TQWidget *parent );
     void setMessageView( KMReaderWin *msgView );
diff --git a/kmail/messagecomposer.h b/kmail/messagecomposer.h
index f6392b83..11290cc2 100644
--- a/kmail/messagecomposer.h
+++ b/kmail/messagecomposer.h
@@ -64,7 +64,7 @@ namespace KPIM {
 
 class MessageComposer : public TQObject {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class ::MessageComposerJob;
   friend class ::EncryptMessageJob;
   friend class ::SetLastMessageAsUnencryptedVersionOfLastButOne;
diff --git a/kmail/messagecopyhelper.h b/kmail/messagecopyhelper.h
index 05627e17..6d38d7b5 100644
--- a/kmail/messagecopyhelper.h
+++ b/kmail/messagecopyhelper.h
@@ -39,7 +39,7 @@ namespace KMail {
 class MessageCopyHelper : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     /**
diff --git a/kmail/messageproperty.h b/kmail/messageproperty.h
index bd040ef5..fdd3f35d 100644
--- a/kmail/messageproperty.h
+++ b/kmail/messageproperty.h
@@ -57,7 +57,7 @@ class ActionScheduler;
 class MessageProperty : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   /** If the message is being filtered  */
diff --git a/kmail/networkaccount.h b/kmail/networkaccount.h
index 433e30af..112cc71d 100644
--- a/kmail/networkaccount.h
+++ b/kmail/networkaccount.h
@@ -45,7 +45,7 @@ namespace KMail {
 
   class NetworkAccount : public KMAccount {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     NetworkAccount( AccountManager * parent, const TQString & name, uint id );
   public:
diff --git a/kmail/newfolderdialog.h b/kmail/newfolderdialog.h
index 485bf910..96cfc277 100644
--- a/kmail/newfolderdialog.h
+++ b/kmail/newfolderdialog.h
@@ -47,7 +47,7 @@ namespace KMail {
 class NewFolderDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     NewFolderDialog( TQWidget* parent = 0, KMFolder *folder = 0 );
diff --git a/kmail/objecttreeparser_p.h b/kmail/objecttreeparser_p.h
index 5bac65f6..44a1e9af 100644
--- a/kmail/objecttreeparser_p.h
+++ b/kmail/objecttreeparser_p.h
@@ -61,7 +61,7 @@ namespace KMail {
       public KMail::ISubject
   {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     CryptoBodyPartMemento();
     ~CryptoBodyPartMemento();
@@ -88,7 +88,7 @@ namespace KMail {
     : public CryptoBodyPartMemento
   {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     DecryptVerifyBodyPartMemento( Kleo::DecryptVerifyJob * job, const TQByteArray & cipherText );
     ~DecryptVerifyBodyPartMemento();
@@ -124,7 +124,7 @@ namespace KMail {
     : public CryptoBodyPartMemento
   {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     VerifyDetachedBodyPartMemento( Kleo::VerifyDetachedJob * job,
                                    Kleo::KeyListJob * klj,
@@ -164,7 +164,7 @@ namespace KMail {
     : public CryptoBodyPartMemento
   {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     VerifyOpaqueBodyPartMemento( Kleo::VerifyOpaqueJob * job,
                                  Kleo::KeyListJob * klj,
diff --git a/kmail/popaccount.h b/kmail/popaccount.h
index 4c8dfdd5..51cb8452 100644
--- a/kmail/popaccount.h
+++ b/kmail/popaccount.h
@@ -27,7 +27,7 @@ namespace KMail {
  */
 class PopAccount: public NetworkAccount {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   virtual ~PopAccount();
diff --git a/kmail/quotajobs.h b/kmail/quotajobs.h
index 0188a1eb..1db1b3d2 100644
--- a/kmail/quotajobs.h
+++ b/kmail/quotajobs.h
@@ -137,7 +137,7 @@ GetStorageQuotaJob* getStorageQuota( KIO::Slave* slave, const KURL& url );
 class GetQuotarootJob : public KIO::SimpleJob
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   GetQuotarootJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo );
 
@@ -164,7 +164,7 @@ protected slots:
 class GetStorageQuotaJob : public KIO::Job
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   GetStorageQuotaJob( KIO::Slave* slave, const KURL& url );
 
diff --git a/kmail/recipientseditor.h b/kmail/recipientseditor.h
index db63c8fe..aadf25bc 100644
--- a/kmail/recipientseditor.h
+++ b/kmail/recipientseditor.h
@@ -72,7 +72,7 @@ class Recipient
 class RecipientComboBox : public TQComboBox
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     RecipientComboBox( TQWidget *parent );
 
@@ -86,7 +86,7 @@ class RecipientComboBox : public TQComboBox
 class RecipientLineEdit : public KMLineEdit
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     RecipientLineEdit( TQWidget * parent ) :
       KMLineEdit( true, parent ) {}
@@ -103,7 +103,7 @@ class RecipientLineEdit : public KMLineEdit
 class RecipientLine : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     RecipientLine( TQWidget *parent );
 
@@ -173,7 +173,7 @@ class RecipientLine : public TQWidget
 class RecipientsView : public TQScrollView
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     RecipientsView( TQWidget *parent );
 
@@ -267,7 +267,7 @@ class RecipientsToolTip : public TQToolTip
 class SideWidget : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     SideWidget( RecipientsView *view, TQWidget *parent );
     ~SideWidget();
@@ -299,7 +299,7 @@ class SideWidget : public TQWidget
 class RecipientsEditor : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     RecipientsEditor( TQWidget *parent );
     ~RecipientsEditor();
diff --git a/kmail/recipientseditortest.h b/kmail/recipientseditortest.h
index 77387218..12d0c2fc 100644
--- a/kmail/recipientseditortest.h
+++ b/kmail/recipientseditortest.h
@@ -31,7 +31,7 @@ class RecipientsEditor;
 class Composer : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     Composer( TQWidget *parent );
 
diff --git a/kmail/recipientspicker.h b/kmail/recipientspicker.h
index fb6e657f..85f7432a 100644
--- a/kmail/recipientspicker.h
+++ b/kmail/recipientspicker.h
@@ -163,7 +163,7 @@ class RecipientsCollection
 class SearchLine : public KListViewSearchLine
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     SearchLine( TQWidget *parent, KListView *listView );
 
@@ -179,7 +179,7 @@ using namespace KABC;
 class RecipientsPicker : public TQDialog
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     RecipientsPicker( TQWidget *parent );
     ~RecipientsPicker();
diff --git a/kmail/redirectdialog.h b/kmail/redirectdialog.h
index c3480313..aa46404f 100644
--- a/kmail/redirectdialog.h
+++ b/kmail/redirectdialog.h
@@ -50,7 +50,7 @@ namespace KMail {
   class RedirectDialog : public KDialogBase
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
       /** Constructor
diff --git a/kmail/regexplineedit.h b/kmail/regexplineedit.h
index 2cfeaa4a..4db2e922 100644
--- a/kmail/regexplineedit.h
+++ b/kmail/regexplineedit.h
@@ -47,7 +47,7 @@ namespace KMail {
   class RegExpLineEdit : public TQWidget
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     RegExpLineEdit( const TQString &str, TQWidget *parent = 0,
diff --git a/kmail/renamejob.h b/kmail/renamejob.h
index 9389fc0c..58a8f6d3 100644
--- a/kmail/renamejob.h
+++ b/kmail/renamejob.h
@@ -51,7 +51,7 @@ class CopyFolderJob;
 class RenameJob : public FolderJob
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /**
    * Create a new job
diff --git a/kmail/searchjob.h b/kmail/searchjob.h
index 7e59fb7f..d90f7fa1 100644
--- a/kmail/searchjob.h
+++ b/kmail/searchjob.h
@@ -53,7 +53,7 @@ class ImapAccountBase;
 class SearchJob : public FolderJob
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /**
    * Creates a new job
diff --git a/kmail/searchwindow.h b/kmail/searchwindow.h
index 19183e66..0cd5303a 100644
--- a/kmail/searchwindow.h
+++ b/kmail/searchwindow.h
@@ -68,7 +68,7 @@ namespace KMail {
 class SearchWindow: public KDialogBase, virtual public KXMLGUIClient
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   /**
diff --git a/kmail/secondarywindow.h b/kmail/secondarywindow.h
index c17d604e..11d6cbae 100644
--- a/kmail/secondarywindow.h
+++ b/kmail/secondarywindow.h
@@ -44,7 +44,7 @@ namespace KMail {
   class SecondaryWindow : public KMainWindow
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     SecondaryWindow( const char * name = 0 );
diff --git a/kmail/sieveconfig.h b/kmail/sieveconfig.h
index 2765f6a5..5c6fb4ad 100644
--- a/kmail/sieveconfig.h
+++ b/kmail/sieveconfig.h
@@ -87,7 +87,7 @@ namespace KMail {
 
   class SieveConfigEditor : public TQWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     SieveConfigEditor( TQWidget * parent=0, const char * name=0 );
 
diff --git a/kmail/sievedebugdialog.h b/kmail/sievedebugdialog.h
index 669a13d5..7eacab62 100644
--- a/kmail/sievedebugdialog.h
+++ b/kmail/sievedebugdialog.h
@@ -50,7 +50,7 @@ class SieveJob;
 class SieveDebugDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     SieveDebugDialog( TQWidget *parent = 0, const char *name = 0 );
diff --git a/kmail/sievejob.h b/kmail/sievejob.h
index ddf3e6a9..a350740f 100644
--- a/kmail/sievejob.h
+++ b/kmail/sievejob.h
@@ -33,7 +33,7 @@ namespace KMail {
 
   class SieveJob : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     enum Command { Get, Put, Activate, Deactivate, SearchActive, List, Delete };
     SieveJob( const KURL & url, const TQString & script,
diff --git a/kmail/signatureconfigurator.h b/kmail/signatureconfigurator.h
index 2d46ac5d..48e6c5d6 100644
--- a/kmail/signatureconfigurator.h
+++ b/kmail/signatureconfigurator.h
@@ -33,7 +33,7 @@ namespace KMail {
 
   class SignatureConfigurator : public TQWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     SignatureConfigurator( TQWidget * parent=0, const char * name=0 );
     virtual ~SignatureConfigurator();
diff --git a/kmail/simplestringlisteditor.h b/kmail/simplestringlisteditor.h
index 49169f7a..cb28d57b 100644
--- a/kmail/simplestringlisteditor.h
+++ b/kmail/simplestringlisteditor.h
@@ -47,7 +47,7 @@ class TQPushButton;
 
 class SimpleStringListEditor : public TQWidget {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   enum ButtonCode {
     None = 0x00, Add = 0x01,
diff --git a/kmail/snippetdlg.h b/kmail/snippetdlg.h
index bc845a90..4aa89c1d 100644
--- a/kmail/snippetdlg.h
+++ b/kmail/snippetdlg.h
@@ -19,7 +19,7 @@ class KShortcut;
 class SnippetDlg : public SnippetDlgBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     SnippetDlg( KActionCollection* ac, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
diff --git a/kmail/snippetitem.h b/kmail/snippetitem.h
index 4274fde8..3222449a 100644
--- a/kmail/snippetitem.h
+++ b/kmail/snippetitem.h
@@ -33,7 +33,7 @@ class SnippetItem : public TQObject, public TQListViewItem {
 friend class SnippetGroup;
 
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     SnippetItem(TQListViewItem * parent, TQString name, TQString text);
 
diff --git a/kmail/snippetsettings.h b/kmail/snippetsettings.h
index 6d908a9f..706de5af 100644
--- a/kmail/snippetsettings.h
+++ b/kmail/snippetsettings.h
@@ -29,7 +29,7 @@ same named .ui file
 class SnippetSettings : public SnippetSettingsBase
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
     SnippetSettings(TQWidget *parent = 0, const char *name = 0);
     SnippetSettings(SnippetWidget * w, TQWidget *parent = 0, const char *name = 0);
diff --git a/kmail/snippetwidget.h b/kmail/snippetwidget.h
index 45d684ec..120f64ad 100644
--- a/kmail/snippetwidget.h
+++ b/kmail/snippetwidget.h
@@ -45,7 +45,7 @@ tooltips which contains the text of the snippet
 class SnippetWidget : public KListView, public TQToolTip
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     SnippetWidget(KMEdit* editor, KActionCollection* actionCollection, TQWidget* parent = 0);
diff --git a/kmail/subscriptiondialog.h b/kmail/subscriptiondialog.h
index 9d16c9e2..30a06d9f 100644
--- a/kmail/subscriptiondialog.h
+++ b/kmail/subscriptiondialog.h
@@ -47,7 +47,7 @@ namespace KMail {
   class SubscriptionDialogBase : public KSubscription
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
       SubscriptionDialogBase( TQWidget *parent,
@@ -128,7 +128,7 @@ namespace KMail {
   class SubscriptionDialog : public SubscriptionDialogBase
   {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
 
       SubscriptionDialog( TQWidget *parent,
diff --git a/kmail/templateparser.h b/kmail/templateparser.h
index bf011851..da6a5234 100644
--- a/kmail/templateparser.h
+++ b/kmail/templateparser.h
@@ -54,7 +54,7 @@ class KProcess;
 class TemplateParser : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     enum Mode {
diff --git a/kmail/templatesconfiguration.h b/kmail/templatesconfiguration.h
index 47dbdea5..a0196c8e 100644
--- a/kmail/templatesconfiguration.h
+++ b/kmail/templatesconfiguration.h
@@ -29,7 +29,7 @@
 class TemplatesConfiguration : public TemplatesConfigurationBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
 
diff --git a/kmail/templatesinsertcommand.h b/kmail/templatesinsertcommand.h
index 2251340d..26ba889d 100644
--- a/kmail/templatesinsertcommand.h
+++ b/kmail/templatesinsertcommand.h
@@ -30,7 +30,7 @@ class KActionMenu;
 class TemplatesInsertCommand : public TQPushButton
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     TemplatesInsertCommand( TQWidget *parent, const char *name = 0 );
diff --git a/kmail/tests/messagedicttests.h b/kmail/tests/messagedicttests.h
index 52a09cc6..abff55da 100644
--- a/kmail/tests/messagedicttests.h
+++ b/kmail/tests/messagedicttests.h
@@ -14,7 +14,7 @@ class KMDict;
 class MessageDictTester : public KUnitTest::SlotTester
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public slots:
     void setUp();
diff --git a/kmail/tests/mimelibtests.h b/kmail/tests/mimelibtests.h
index ef9a4b96..0f503324 100644
--- a/kmail/tests/mimelibtests.h
+++ b/kmail/tests/mimelibtests.h
@@ -26,7 +26,7 @@ class DwString;
 class MimeLibTester : public KUnitTest::SlotTester
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public slots:
   void setUp();
diff --git a/kmail/tests/utiltests.h b/kmail/tests/utiltests.h
index cb6c225a..b2cb8c69 100644
--- a/kmail/tests/utiltests.h
+++ b/kmail/tests/utiltests.h
@@ -12,7 +12,7 @@
 class UtilTester : public KUnitTest::SlotTester
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public slots:
   void setUp();
diff --git a/kmail/treebase.h b/kmail/treebase.h
index b89461e2..94f0756c 100644
--- a/kmail/treebase.h
+++ b/kmail/treebase.h
@@ -33,7 +33,7 @@ class TreeItemBase;
 class TreeBase : public KListView
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
     TreeBase( TQWidget * parent, KMFolderTree *folderTree,
         const TQString &preSelection, bool mustBeReadWrite );
diff --git a/kmail/twindowpositioner.h b/kmail/twindowpositioner.h
index efb65390..88fab3f8 100644
--- a/kmail/twindowpositioner.h
+++ b/kmail/twindowpositioner.h
@@ -28,7 +28,7 @@ class TQWindow;
 class KWindowPositioner : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     enum Mode { Right, Bottom };
 
diff --git a/kmail/undostack.h b/kmail/undostack.h
index d1e9408a..1debbf10 100644
--- a/kmail/undostack.h
+++ b/kmail/undostack.h
@@ -44,7 +44,7 @@ public:
 class UndoStack : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   UndoStack(int size);
diff --git a/kmail/vacation.h b/kmail/vacation.h
index c7a9980a..eac3bd9d 100644
--- a/kmail/vacation.h
+++ b/kmail/vacation.h
@@ -37,7 +37,7 @@ namespace KMail {
 
   class Vacation : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     Vacation( TQObject * parent=0, bool checkOnly = false, const char * name=0 );
     virtual ~Vacation();
diff --git a/kmail/vacationdialog.h b/kmail/vacationdialog.h
index bbb2a2c1..d38c75d0 100644
--- a/kmail/vacationdialog.h
+++ b/kmail/vacationdialog.h
@@ -36,7 +36,7 @@ namespace KMail {
 
   class VacationDialog : public KDialogBase {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     VacationDialog( const TQString & caption, TQWidget * parent=0,
 		    const char * name=0, bool modal=true );
diff --git a/kmail/vcardviewer.h b/kmail/vcardviewer.h
index 87a6611a..3ed8b213 100644
--- a/kmail/vcardviewer.h
+++ b/kmail/vcardviewer.h
@@ -37,7 +37,7 @@ namespace KMail {
 class VCardViewer : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 #if defined(KABC_VCARD_ENCODING_FIX)
     VCardViewer( TQWidget *parent, const TQByteArray &vCard, const char *name );
diff --git a/kmail/xfaceconfigurator.h b/kmail/xfaceconfigurator.h
index e8fa1b0e..e6530714 100644
--- a/kmail/xfaceconfigurator.h
+++ b/kmail/xfaceconfigurator.h
@@ -31,7 +31,7 @@ namespace KMail {
 
   class XFaceConfigurator : public TQWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     XFaceConfigurator( TQWidget * parent=0, const char * name=0 );
     virtual ~XFaceConfigurator();
diff --git a/kmailcvt/kimportpage.h b/kmailcvt/kimportpage.h
index 76a9844f..9541b5d4 100644
--- a/kmailcvt/kimportpage.h
+++ b/kmailcvt/kimportpage.h
@@ -22,7 +22,7 @@
 
 class KImportPage : public KImportPageDlg  {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	KImportPage(TQWidget *parent=0, const char *name=0);
 	~KImportPage();
diff --git a/kmailcvt/kmailcvt.h b/kmailcvt/kmailcvt.h
index 63b2506b..87617a99 100644
--- a/kmailcvt/kmailcvt.h
+++ b/kmailcvt/kmailcvt.h
@@ -27,7 +27,7 @@
 /** KMailCVT is the base class of the project */
 class KMailCVT : public KWizard {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	KMailCVT(TQWidget* parent=0, const char *name=0);
 	~KMailCVT();
diff --git a/kmailcvt/kselfilterpage.h b/kmailcvt/kselfilterpage.h
index a2a83145..127dc816 100644
--- a/kmailcvt/kselfilterpage.h
+++ b/kmailcvt/kselfilterpage.h
@@ -25,7 +25,7 @@ template <class T> class TQPtrList;
 
 class KSelFilterPage : public KSelFilterPageDlg  {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	KSelFilterPage(TQWidget *parent=0, const char *name=0);
 	~KSelFilterPage();
diff --git a/kmobile/devices/gnokii/gnokii_mobile.h b/kmobile/devices/gnokii/gnokii_mobile.h
index e3fe7bde..782c2b92 100644
--- a/kmobile/devices/gnokii/gnokii_mobile.h
+++ b/kmobile/devices/gnokii/gnokii_mobile.h
@@ -30,7 +30,7 @@
 class KMobileGnokii : public KMobileDevice
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KMobileGnokii( TQObject *obj=0, const char *name=0, const TQStringList &args=TQStringList() );
     ~KMobileGnokii();
diff --git a/kmobile/devices/gnokii/gnokiiconfig.h b/kmobile/devices/gnokii/gnokiiconfig.h
index 9422fced..530bb4e4 100644
--- a/kmobile/devices/gnokii/gnokiiconfig.h
+++ b/kmobile/devices/gnokii/gnokiiconfig.h
@@ -26,7 +26,7 @@
 class GnokiiConfig : public GnokiiConfigUI
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
     GnokiiConfig( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~GnokiiConfig();
diff --git a/kmobile/devices/skeleton/skeleton.h b/kmobile/devices/skeleton/skeleton.h
index ab3ce770..922565b7 100644
--- a/kmobile/devices/skeleton/skeleton.h
+++ b/kmobile/devices/skeleton/skeleton.h
@@ -29,7 +29,7 @@
 class KMobileSkeleton : public KMobileDevice
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KMobileSkeleton( TQObject *obj=0, const char *name=0, const TQStringList &args=TQStringList() );
     ~KMobileSkeleton();
diff --git a/kmobile/kmobile.h b/kmobile/kmobile.h
index b576352f..f9bfefb3 100644
--- a/kmobile/kmobile.h
+++ b/kmobile/kmobile.h
@@ -23,7 +23,7 @@ class SystemTray;
 class KMobile : public KMainWindow
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      * Default Constructor
diff --git a/kmobile/kmobileclient.h b/kmobile/kmobileclient.h
index 8456776c..72bf6605 100644
--- a/kmobile/kmobileclient.h
+++ b/kmobile/kmobileclient.h
@@ -11,7 +11,7 @@
 class KDE_EXPORT KMobileClient : public DCOPClient
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KMobileClient();
     virtual ~KMobileClient();
diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h
index b0b1a654..b7961dd4 100644
--- a/kmobile/kmobiledevice.h
+++ b/kmobile/kmobiledevice.h
@@ -65,7 +65,7 @@ class KConfig;
 class KDE_EXPORT KMobileDevice : public KLibFactory
 {
     Q_OBJECT
-    TQ_OBJECT
+    
     friend class KMobileView;
 
 public:
diff --git a/kmobile/kmobileitem.h b/kmobile/kmobileitem.h
index ba204265..81878c8d 100644
--- a/kmobile/kmobileitem.h
+++ b/kmobile/kmobileitem.h
@@ -13,7 +13,7 @@
 class KMobileItem : public TQObject, public TQIconViewItem 
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     friend class KMobileView;
 public:
     KMobileItem(TQIconView *parent, KConfig *config, KService::Ptr service);
diff --git a/kmobile/kmobileview.h b/kmobile/kmobileview.h
index ee8b1e53..ccb207ed 100644
--- a/kmobile/kmobileview.h
+++ b/kmobile/kmobileview.h
@@ -23,7 +23,7 @@ class KMobileItem;
 class KDE_EXPORT KMobileView : public TQIconView, public kmobileIface
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KMobileView(TQWidget *parent, KConfig *_config);
     virtual ~KMobileView();
diff --git a/kmobile/pref.h b/kmobile/pref.h
index ad28b1de..81430335 100644
--- a/kmobile/pref.h
+++ b/kmobile/pref.h
@@ -14,7 +14,7 @@ class KMobilePrefPageTwo;
 class KMobilePreferences : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KMobilePreferences();
 
@@ -26,7 +26,7 @@ private:
 class KMobilePrefPageOne : public TQFrame
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KMobilePrefPageOne(TQWidget *parent = 0);
 };
@@ -34,7 +34,7 @@ public:
 class KMobilePrefPageTwo : public TQFrame
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KMobilePrefPageTwo(TQWidget *parent = 0);
 };
diff --git a/kmobile/systemtray.h b/kmobile/systemtray.h
index 87843c30..29e723c1 100644
--- a/kmobile/systemtray.h
+++ b/kmobile/systemtray.h
@@ -28,7 +28,7 @@ class KAction;
 class SystemTray : public KSystemTray
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     SystemTray(KMainWindow *parent = 0, const char *name = 0);
diff --git a/knode/articlewidget.h b/knode/articlewidget.h
index 2b951ee7..da2968e8 100644
--- a/knode/articlewidget.h
+++ b/knode/articlewidget.h
@@ -53,7 +53,7 @@ class CSSHelper;
 class ArticleWidget : public TQWidget, public KNJobConsumer {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     /// Construct a new article widget
diff --git a/knode/headerview.h b/knode/headerview.h
index 134f1edd..78e6f2a6 100644
--- a/knode/headerview.h
+++ b/knode/headerview.h
@@ -27,7 +27,7 @@ class KNHdrViewItem;
 class KNHeaderView : public KListView  {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   friend class KNHdrViewItem;
 
diff --git a/knode/knaccountmanager.h b/knode/knaccountmanager.h
index 4b1227fc..8ee01497 100644
--- a/knode/knaccountmanager.h
+++ b/knode/knaccountmanager.h
@@ -30,7 +30,7 @@ class KNServerInfo;
 class KNAccountManager : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNAccountManager(KNGroupManager *gm, TQObject * parent=0, const char * name=0);
diff --git a/knode/knapplication.h b/knode/knapplication.h
index 66751f9a..4536c119 100644
--- a/knode/knapplication.h
+++ b/knode/knapplication.h
@@ -22,7 +22,7 @@
 class KNApplication : public KUniqueApplication
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KNApplication(): KUniqueApplication() { };
 
diff --git a/knode/knarticlefactory.h b/knode/knarticlefactory.h
index 030ac9f3..1e13ddc1 100644
--- a/knode/knarticlefactory.h
+++ b/knode/knarticlefactory.h
@@ -39,7 +39,7 @@ namespace KNConfig {
 class KNArticleFactory : public TQObject , public KNJobConsumer {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     enum replyType { RTgroup, RTmail, RTboth };
@@ -97,7 +97,7 @@ class KNArticleFactory : public TQObject , public KNJobConsumer {
 class KNSendErrorDialog : public KDialogBase  {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNSendErrorDialog();
diff --git a/knode/knarticlemanager.h b/knode/knarticlemanager.h
index 7b052561..ee62c8d0 100644
--- a/knode/knarticlemanager.h
+++ b/knode/knarticlemanager.h
@@ -39,7 +39,7 @@ class KNJobData;
 class KNArticleManager : public TQObject, public KNJobConsumer {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNArticleManager();
diff --git a/knode/knarticlewindow.h b/knode/knarticlewindow.h
index 297790eb..2fa10286 100644
--- a/knode/knarticlewindow.h
+++ b/knode/knarticlewindow.h
@@ -27,7 +27,7 @@ namespace KNode {
 class KNArticleWindow : public KMainWindow  {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNArticleWindow(KNArticle *art);
diff --git a/knode/kncollectionview.h b/knode/kncollectionview.h
index c48b7f44..44d6ab3a 100644
--- a/knode/kncollectionview.h
+++ b/knode/kncollectionview.h
@@ -27,7 +27,7 @@ class KNCollectionViewItem;
 class KNCollectionView : public KFolderTree {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNCollectionView(TQWidget *parent, const char *name = 0);
diff --git a/knode/kncomposer.h b/knode/kncomposer.h
index f72f4398..22b0b793 100644
--- a/knode/kncomposer.h
+++ b/knode/kncomposer.h
@@ -44,7 +44,7 @@ class SpellingFilter;
 class KNComposer : public KMainWindow , virtual public KNodeComposerIface {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     enum composerResult { CRsendNow, CRsendLater, CRdelAsk,
@@ -252,7 +252,7 @@ class KNComposer::ComposerView  : public TQSplitter {
 class KNComposer::Editor : public KEdit {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     Editor(KNComposer::ComposerView *_composerView, KNComposer *_composer, TQWidget *parent=0, char *name=0);
@@ -305,7 +305,7 @@ private:
 class KNComposer::AttachmentView : public KListView {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AttachmentView(TQWidget *parent, char *name=0);
@@ -333,7 +333,7 @@ class KNComposer::AttachmentViewItem : public KListViewItem {
 class KNComposer::AttachmentPropertiesDlg : public KDialogBase {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AttachmentPropertiesDlg( KNAttachment *a, TQWidget *p=0, const char *n=0);
@@ -358,7 +358,7 @@ class KNComposer::AttachmentPropertiesDlg : public KDialogBase {
 class KNLineEdit : public KABC::AddressLineEdit
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     typedef KABC::AddressLineEdit KNLineEditInherited;
 public:
 
@@ -378,7 +378,7 @@ private:
 class KNLineEditSpell : public KNLineEdit
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KNLineEditSpell(KNComposer::ComposerView *_composerView, bool useCompletion,TQWidget * parent, const char * name = 0);
     void highLightWord( unsigned int length, unsigned int pos );
diff --git a/knode/knconfig.h b/knode/knconfig.h
index 0f0f868c..b859f626 100644
--- a/knode/knconfig.h
+++ b/knode/knconfig.h
@@ -66,7 +66,7 @@ class Base {
 class KDE_EXPORT Identity : public TQObject, public Base {
 
 Q_OBJECT
-  TQ_OBJECT
+  
 
   friend class IdentityWidget;
 
diff --git a/knode/knconfigmanager.h b/knode/knconfigmanager.h
index 4ec08c41..c0c6a49e 100644
--- a/knode/knconfigmanager.h
+++ b/knode/knconfigmanager.h
@@ -27,7 +27,7 @@ class KNConfigDialog;
 class KNConfigManager : TQObject {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNConfigManager(TQObject *p=0, const char *n=0);
@@ -72,7 +72,7 @@ class KNConfigManager : TQObject {
 class KNConfigDialog : public KCMultiDialog {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNConfigDialog(TQWidget *p=0, const char *n=0);
diff --git a/knode/knconfigpages.h b/knode/knconfigpages.h
index 5479d3c8..41054a97 100644
--- a/knode/knconfigpages.h
+++ b/knode/knconfigpages.h
@@ -31,7 +31,7 @@ namespace KNConfig {
  */
 class KDE_EXPORT BasePageWithTabs : public KCModule {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     BasePageWithTabs( TQWidget * parent=0, const char * name=0 );
     ~BasePageWithTabs() {};
@@ -52,7 +52,7 @@ class KDE_EXPORT BasePageWithTabs : public KCModule {
 // accounts page
 class AccountsPage : public BasePageWithTabs {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AccountsPage(TQWidget *parent = 0, const char *name = 0);
@@ -62,7 +62,7 @@ class AccountsPage : public BasePageWithTabs {
 // read news page
 class KDE_EXPORT ReadNewsPage : public BasePageWithTabs {
   Q_OBJECT
-  TQ_OBJECT
+  
  
   public:
     ReadNewsPage(TQWidget *parent = 0, const char *name = 0);
@@ -71,7 +71,7 @@ class KDE_EXPORT ReadNewsPage : public BasePageWithTabs {
 // post news page
 class KDE_EXPORT PostNewsPage : public BasePageWithTabs {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PostNewsPage(TQWidget *parent = 0, const char *name = 0);
diff --git a/knode/knconfigwidgets.h b/knode/knconfigwidgets.h
index adaec613..fcf678a2 100644
--- a/knode/knconfigwidgets.h
+++ b/knode/knconfigwidgets.h
@@ -66,7 +66,7 @@ namespace KNConfig {
 class KDE_EXPORT IdentityWidget : public KCModule {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     IdentityWidget(Identity *d, TQWidget *p=0, const char *n=0);
@@ -108,7 +108,7 @@ class KDE_EXPORT IdentityWidget : public KCModule {
 class KDE_EXPORT NntpAccountListWidget : public KCModule {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     NntpAccountListWidget(TQWidget *p=0, const char *n=0);
@@ -156,7 +156,7 @@ class KDE_EXPORT NntpAccountListWidget : public KCModule {
 class KDE_EXPORT NntpAccountConfDialog : public KDialogBase  {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     NntpAccountConfDialog(KNNntpAccount* acc, TQWidget *p=0, const char *n=0);
@@ -198,7 +198,7 @@ class KDE_EXPORT NntpAccountConfDialog : public KDialogBase  {
 class KDE_EXPORT SmtpAccountWidget : public SmtpAccountWidgetBase {
 
 Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     SmtpAccountWidget(TQWidget *p=0, const char *n=0);
@@ -220,7 +220,7 @@ Q_OBJECT
 class KDE_EXPORT AppearanceWidget : public KCModule {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AppearanceWidget(TQWidget *p=0, const char *n=0);
@@ -349,7 +349,7 @@ class KDE_EXPORT ReadNewsNavigationWidget : public KCModule {
 class KDE_EXPORT ReadNewsViewerWidget : public KCModule {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ReadNewsViewerWidget(ReadNewsViewer *d, TQWidget *p=0, const char *n=0);
@@ -376,7 +376,7 @@ class KDE_EXPORT ReadNewsViewerWidget : public KCModule {
 class KDE_EXPORT DisplayedHeadersWidget : public KCModule {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     DisplayedHeadersWidget(DisplayedHeaders *d, TQWidget *p=0, const char *n=0);
@@ -423,7 +423,7 @@ class KDE_EXPORT DisplayedHeadersWidget : public KCModule {
 class KDE_EXPORT DisplayedHeaderConfDialog : public KDialogBase {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     DisplayedHeaderConfDialog(KNDisplayedHeader *h, TQWidget *p=0, char *n=0);
@@ -448,7 +448,7 @@ class KDE_EXPORT DisplayedHeaderConfDialog : public KDialogBase {
 class KDE_EXPORT ScoringWidget : public KCModule {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ScoringWidget(Scoring *d, TQWidget *p=0, const char *n=0);
@@ -469,7 +469,7 @@ class KDE_EXPORT ScoringWidget : public KCModule {
 class KDE_EXPORT FilterListWidget : public KCModule {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     FilterListWidget(TQWidget *p=0, const char *n=0);
@@ -535,7 +535,7 @@ class KDE_EXPORT FilterListWidget : public KCModule {
 class KDE_EXPORT PostNewsTechnicalWidget : public KCModule {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PostNewsTechnicalWidget(PostNewsTechnical *d, TQWidget *p=0, const char *n=0);
@@ -589,7 +589,7 @@ class KDE_EXPORT XHeaderConfDialog : public KDialogBase {
 class KDE_EXPORT PostNewsComposerWidget : public KCModule {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PostNewsComposerWidget(PostNewsComposer *d, TQWidget *p=0, const char *n=0);
@@ -635,7 +635,7 @@ class KDE_EXPORT PostNewsSpellingWidget : public KCModule {
 class KDE_EXPORT PrivacyWidget : public KCModule {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PrivacyWidget(TQWidget *p=0, const char *n=0);
@@ -655,7 +655,7 @@ class KDE_EXPORT PrivacyWidget : public KCModule {
 class KDE_EXPORT GroupCleanupWidget : public TQWidget {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     GroupCleanupWidget( Cleanup *data, TQWidget *parent = 0, const char *name = 0 );
@@ -684,7 +684,7 @@ class KDE_EXPORT GroupCleanupWidget : public TQWidget {
 class KDE_EXPORT CleanupWidget : public KCModule {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CleanupWidget(TQWidget *p=0, const char *n=0);
@@ -717,7 +717,7 @@ class KDE_EXPORT CleanupWidget : public KCModule {
 
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CacheWidget(Cache *d, TQWidget *p=0, const char *n=0);
diff --git a/knode/knconvert.h b/knode/knconvert.h
index af0e91dc..49f8e701 100644
--- a/knode/knconvert.h
+++ b/knode/knconvert.h
@@ -35,7 +35,7 @@ class KProcess;
 class KDE_EXPORT KNConvert : public TQDialog {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     static bool needToConvert(const TQString &oldVersion);
diff --git a/knode/knfilterconfigwidget.h b/knode/knfilterconfigwidget.h
index b0903a0c..680231b5 100644
--- a/knode/knfilterconfigwidget.h
+++ b/knode/knfilterconfigwidget.h
@@ -27,7 +27,7 @@ class KNRangeFilterWidget;
 class KNFilterConfigWidget : public TQTabWidget  {
 
   Q_OBJECT
-  TQ_OBJECT
+  
   
   friend class KNFilterDialog;
   friend class KNSearchDialog;
diff --git a/knode/knfilterdialog.h b/knode/knfilterdialog.h
index 875217c9..b17eaed6 100644
--- a/knode/knfilterdialog.h
+++ b/knode/knfilterdialog.h
@@ -29,7 +29,7 @@ class TQCheckBox;
 class KNFilterDialog : public KDialogBase {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   friend class KNFilterManager;
 
diff --git a/knode/knfiltermanager.h b/knode/knfiltermanager.h
index b037514c..5bf97454 100644
--- a/knode/knfiltermanager.h
+++ b/knode/knfiltermanager.h
@@ -31,7 +31,7 @@ class KNFilterDialog;
 class KNFilterSelectAction : public KActionMenu
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNFilterSelectAction( const TQString& text, const TQString& pix,
@@ -54,7 +54,7 @@ class KNFilterSelectAction : public KActionMenu
 class KNFilterManager : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNFilterManager(TQObject * parent = 0, const char * name = 0);
diff --git a/knode/knfoldermanager.h b/knode/knfoldermanager.h
index 0920a675..9e817c23 100644
--- a/knode/knfoldermanager.h
+++ b/knode/knfoldermanager.h
@@ -26,7 +26,7 @@ class KNCleanUp;
 class KNFolderManager : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNFolderManager(KNArticleManager *a);
diff --git a/knode/kngroupbrowser.h b/knode/kngroupbrowser.h
index 65bbb293..a3df9a76 100644
--- a/knode/kngroupbrowser.h
+++ b/knode/kngroupbrowser.h
@@ -35,7 +35,7 @@ class KNNntpAccount;
 class KNGroupBrowser : public KDialogBase {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     class CheckItem : public TQCheckListItem {
diff --git a/knode/kngroupdialog.h b/knode/kngroupdialog.h
index 625f2c07..f9b5a523 100644
--- a/knode/kngroupdialog.h
+++ b/knode/kngroupdialog.h
@@ -23,7 +23,7 @@
 class KNGroupDialog : public KNGroupBrowser {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNGroupDialog(TQWidget *parent, KNNntpAccount *a);
diff --git a/knode/kngroupmanager.h b/knode/kngroupmanager.h
index c6ccc92f..e3573830 100644
--- a/knode/kngroupmanager.h
+++ b/knode/kngroupmanager.h
@@ -78,7 +78,7 @@ class KNGroupListData : public KNJobItem {
 class KNGroupManager : public TQObject , public KNJobConsumer {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
 
diff --git a/knode/kngroupselectdialog.h b/knode/kngroupselectdialog.h
index a2d9e016..177765bf 100644
--- a/knode/kngroupselectdialog.h
+++ b/knode/kngroupselectdialog.h
@@ -23,7 +23,7 @@
 class KNGroupSelectDialog : public KNGroupBrowser {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNGroupSelectDialog(TQWidget *parent, KNNntpAccount *a, const TQString &act);
diff --git a/knode/knjobdata.h b/knode/knjobdata.h
index 5d9352ad..09050f59 100644
--- a/knode/knjobdata.h
+++ b/knode/knjobdata.h
@@ -71,7 +71,7 @@ class KNJobItem {
 class KNJobData : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
 
diff --git a/knode/knmainwidget.h b/knode/knmainwidget.h
index fffd22b4..8670966a 100644
--- a/knode/knmainwidget.h
+++ b/knode/knmainwidget.h
@@ -63,7 +63,7 @@ class KActionCollection;
 class KDE_EXPORT KNMainWidget : public KDockArea, virtual public KNodeIface
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KNMainWidget( KXMLGUIClient *client, bool detachable, TQWidget* parent, const char* name );
   ~KNMainWidget();
@@ -414,7 +414,7 @@ private:
 class  FetchArticleIdDlg : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     FetchArticleIdDlg(TQWidget *parent, const char */*name*/ );
     TQString messageId() const;
diff --git a/knode/knnetaccess.h b/knode/knnetaccess.h
index 23e34e0c..b8f48f92 100644
--- a/knode/knnetaccess.h
+++ b/knode/knnetaccess.h
@@ -37,7 +37,7 @@ class KNNntpClient;
 class KNNetAccess : public TQObject  {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
 
diff --git a/knode/knnntpaccount.h b/knode/knnntpaccount.h
index 3625906f..23567077 100644
--- a/knode/knnntpaccount.h
+++ b/knode/knnntpaccount.h
@@ -35,7 +35,7 @@ namespace KNConfig {
 class KNNntpAccountIntervalChecking : public TQObject  {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNNntpAccountIntervalChecking(KNNntpAccount *account);
diff --git a/knode/knode.h b/knode/knode.h
index f0dbca58..d22c9608 100644
--- a/knode/knode.h
+++ b/knode/knode.h
@@ -44,7 +44,7 @@ class KNHeaderView;
 class KNMainWindow : public KMainWindow
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KNMainWindow( TQWidget* parentWidget=0 );
diff --git a/knode/knode_part.h b/knode/knode_part.h
index 4b0043f3..1f9d9b3b 100644
--- a/knode/knode_part.h
+++ b/knode/knode_part.h
@@ -42,7 +42,7 @@ class KNMainWidget;
 class KNodePart: public KParts::ReadOnlyPart
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KNodePart(TQWidget *parentWidget, const char *widgetName,
               TQObject *parent, const char *name, const TQStringList &);
diff --git a/knode/knrangefilter.h b/knode/knrangefilter.h
index 8bf7d950..1a1f4ebc 100644
--- a/knode/knrangefilter.h
+++ b/knode/knrangefilter.h
@@ -63,7 +63,7 @@ class KNRangeFilter {
 class KNRangeFilterWidget : public TQGroupBox {
       
   Q_OBJECT
-  TQ_OBJECT
+  
     
   public:
     KNRangeFilterWidget(const TQString& value, int min, int max, TQWidget* parent, const TQString &unit=TQString());
diff --git a/knode/knscoring.h b/knode/knscoring.h
index 00db3ee0..1e0c8c37 100644
--- a/knode/knscoring.h
+++ b/knode/knscoring.h
@@ -61,7 +61,7 @@ public:
 class KNScoringManager : public KScoringManager
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KNScoringManager();
diff --git a/knode/knsearchdialog.h b/knode/knsearchdialog.h
index f3c0647d..37b12eb3 100644
--- a/knode/knsearchdialog.h
+++ b/knode/knsearchdialog.h
@@ -28,7 +28,7 @@ class KNArticleFilter;
 class KNSearchDialog : public TQDialog {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     enum searchType { STfolderSearch, STgroupSearch };
diff --git a/knode/knsourceviewwindow.h b/knode/knsourceviewwindow.h
index 6f720ea6..595a1a99 100644
--- a/knode/knsourceviewwindow.h
+++ b/knode/knsourceviewwindow.h
@@ -21,7 +21,7 @@
 class KNSourceViewWindow : public KTextBrowser {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNSourceViewWindow( const TQString &text );
diff --git a/knode/knstatusfilter.h b/knode/knstatusfilter.h
index 109e0455..cb949fb7 100644
--- a/knode/knstatusfilter.h
+++ b/knode/knstatusfilter.h
@@ -54,7 +54,7 @@ class KNStatusFilter {
 class KNStatusFilterWidget : public TQButtonGroup  {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNStatusFilterWidget(TQWidget *parent);
diff --git a/knode/knstringfilter.h b/knode/knstringfilter.h
index 2c93a70d..8552d087 100644
--- a/knode/knstringfilter.h
+++ b/knode/knstringfilter.h
@@ -58,7 +58,7 @@ class KNStringFilter {
 class KNStringFilterWidget : public TQGroupBox  {
   
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNStringFilterWidget(const TQString& title, TQWidget *parent);
diff --git a/knode/knwidgets.h b/knode/knwidgets.h
index e9e782e2..dcdfe35b 100644
--- a/knode/knwidgets.h
+++ b/knode/knwidgets.h
@@ -69,7 +69,7 @@ class KNDialogListBox : public TQListBox
 class KNDockWidgetHeaderDrag : public KDockWidgetHeaderDrag
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNDockWidgetHeaderDrag(TQWidget *focusWidget, KDockWidgetAbstractHeader* parent, KDockWidget* dock,
diff --git a/knotes/knote.h b/knotes/knote.h
index cf8dbca5..880a85a4 100644
--- a/knotes/knote.h
+++ b/knotes/knote.h
@@ -51,7 +51,7 @@ namespace KCal {
 class KNote : public TQFrame, virtual public KXMLGUIClient
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KNote( TQDomDocument buildDoc, KCal::Journal *journal, TQWidget *parent = 0,
            const char *name = 0 );
diff --git a/knotes/knotealarmdlg.h b/knotes/knotealarmdlg.h
index 888da8a6..b018418a 100644
--- a/knotes/knotealarmdlg.h
+++ b/knotes/knotealarmdlg.h
@@ -46,7 +46,7 @@ namespace KCal {
 class KNoteAlarmDlg : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KNoteAlarmDlg( const TQString& caption, TQWidget *parent=0, const char *name=0 );
 
diff --git a/knotes/knotebutton.h b/knotes/knotebutton.h
index 2f369926..5d1739ae 100644
--- a/knotes/knotebutton.h
+++ b/knotes/knotebutton.h
@@ -31,7 +31,7 @@ class TQResizeEvent;
 class KNoteButton: public TQPushButton
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KNoteButton( const TQString& icon, TQWidget *parent=0, const char *name=0 );
     ~KNoteButton();
diff --git a/knotes/knoteconfigdlg.h b/knotes/knoteconfigdlg.h
index a74ed2a0..18300d98 100644
--- a/knotes/knoteconfigdlg.h
+++ b/knotes/knoteconfigdlg.h
@@ -30,7 +30,7 @@ class KNoteConfig;
 class KNoteConfigDlg : public KConfigDialog
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KNoteConfigDlg( KNoteConfig *config, const TQString &title,
                     TQWidget *parent=0, const char *name=0 );
diff --git a/knotes/knoteedit.h b/knotes/knoteedit.h
index da45b000..65de3e45 100644
--- a/knotes/knoteedit.h
+++ b/knotes/knoteedit.h
@@ -38,7 +38,7 @@ class KFontSizeAction;
 class KNoteEdit : public KTextEdit
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KNoteEdit( KActionCollection *actions, TQWidget *parent=0, const char *name=0 );
     ~KNoteEdit();
diff --git a/knotes/knotehostdlg.h b/knotes/knotehostdlg.h
index 279e67f6..03a83dcb 100644
--- a/knotes/knotehostdlg.h
+++ b/knotes/knotehostdlg.h
@@ -44,7 +44,7 @@ class KHistoryCombo;
 class KNoteHostDlg : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KNoteHostDlg( const TQString& caption, TQWidget *parent=0, const char *name=0 );
     ~KNoteHostDlg();
diff --git a/knotes/knotesalarm.h b/knotes/knotesalarm.h
index dc8ff278..84bfff50 100644
--- a/knotes/knotesalarm.h
+++ b/knotes/knotesalarm.h
@@ -45,7 +45,7 @@ namespace KCal {
 class KNotesAlarm : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KNotesAlarm( KNotesResourceManager *manager, TQObject *parent = 0, const char *name = 0 );
 
diff --git a/knotes/knotesapp.h b/knotes/knotesapp.h
index 6a65027f..9ec90442 100644
--- a/knotes/knotesapp.h
+++ b/knotes/knotesapp.h
@@ -56,7 +56,7 @@ class KNotesApp : public TQLabel, public KSessionManaged, virtual public KXMLGUI
     virtual public KNotesAppIface
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KNotesApp();
     ~KNotesApp();
diff --git a/knotes/knotesnetrecv.h b/knotes/knotesnetrecv.h
index 9f1cfdbb..e8fab803 100644
--- a/knotes/knotesnetrecv.h
+++ b/knotes/knotesnetrecv.h
@@ -44,7 +44,7 @@ namespace KNetwork {
 class KNotesNetworkReceiver : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KNotesNetworkReceiver( KNetwork::KBufferedSocket * );
     ~KNotesNetworkReceiver();
diff --git a/knotes/knotesnetsend.h b/knotes/knotesnetsend.h
index 128013e7..c8611e1c 100644
--- a/knotes/knotesnetsend.h
+++ b/knotes/knotesnetsend.h
@@ -43,7 +43,7 @@ using namespace KNetwork;
 class KNotesNetworkSender : public KNetwork::KBufferedSocket
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KNotesNetworkSender( const TQString& host, int port );
 
diff --git a/knotes/resourcelocalconfig.h b/knotes/resourcelocalconfig.h
index ee4a987b..bdfeea30 100644
--- a/knotes/resourcelocalconfig.h
+++ b/knotes/resourcelocalconfig.h
@@ -28,7 +28,7 @@ class KURLRequester;
 class ResourceLocalConfig : public KRES::ConfigWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
         ResourceLocalConfig( TQWidget *parent = 0, const char *name = 0 );
         virtual ~ResourceLocalConfig();
diff --git a/knotes/resourcemanager.h b/knotes/resourcemanager.h
index e4476ced..350d7c7d 100644
--- a/knotes/resourcemanager.h
+++ b/knotes/resourcemanager.h
@@ -50,7 +50,7 @@ namespace KCal {
 class KNotesResourceManager : public TQObject, public KRES::ManagerObserver<ResourceNotes>
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KNotesResourceManager();
     virtual ~KNotesResourceManager();
diff --git a/kode/kwsdl/compiler.h b/kode/kwsdl/compiler.h
index be773610..f7ab693d 100644
--- a/kode/kwsdl/compiler.h
+++ b/kode/kwsdl/compiler.h
@@ -32,7 +32,7 @@ namespace KWSDL {
 class Compiler : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     Compiler();
diff --git a/kode/kwsdl/kung/binaryinputfield.h b/kode/kwsdl/kung/binaryinputfield.h
index 636b6a24..3695654c 100644
--- a/kode/kwsdl/kung/binaryinputfield.h
+++ b/kode/kwsdl/kung/binaryinputfield.h
@@ -33,7 +33,7 @@ class TQPushButton;
 class BinaryInputField : public SimpleInputField
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     BinaryInputField( const TQString &name, const TQString &typeName, const Schema::SimpleType *type );
@@ -59,7 +59,7 @@ class BinaryInputField : public SimpleInputField
 class BinaryWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     BinaryWidget( TQWidget *parent );
diff --git a/kode/kwsdl/kung/boolinputfield.h b/kode/kwsdl/kung/boolinputfield.h
index c2cda0c8..e99a3d50 100644
--- a/kode/kwsdl/kung/boolinputfield.h
+++ b/kode/kwsdl/kung/boolinputfield.h
@@ -31,7 +31,7 @@ class TQCheckBox;
 class BoolInputField : public SimpleInputField
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     BoolInputField( const TQString &name, const Schema::SimpleType *type );
diff --git a/kode/kwsdl/kung/dateinputfield.h b/kode/kwsdl/kung/dateinputfield.h
index 082bb562..6a5d29ae 100644
--- a/kode/kwsdl/kung/dateinputfield.h
+++ b/kode/kwsdl/kung/dateinputfield.h
@@ -32,7 +32,7 @@ class KDatePicker;
 class DateInputField : public SimpleInputField
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     DateInputField( const TQString &name, const Schema::SimpleType *type );
diff --git a/kode/kwsdl/kung/dispatcher.h b/kode/kwsdl/kung/dispatcher.h
index 5b57f2c9..c5e0744d 100644
--- a/kode/kwsdl/kung/dispatcher.h
+++ b/kode/kwsdl/kung/dispatcher.h
@@ -32,7 +32,7 @@ class Transport;
 class Dispatcher : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     Dispatcher();
diff --git a/kode/kwsdl/kung/doubleinputfield.h b/kode/kwsdl/kung/doubleinputfield.h
index 93f3a012..1368a6cd 100644
--- a/kode/kwsdl/kung/doubleinputfield.h
+++ b/kode/kwsdl/kung/doubleinputfield.h
@@ -31,7 +31,7 @@ class KDoubleSpinBox;
 class DoubleInputField : public SimpleInputField
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     DoubleInputField( const TQString &name, const TQString &typeName, const Schema::SimpleType *type );
diff --git a/kode/kwsdl/kung/enuminputfield.h b/kode/kwsdl/kung/enuminputfield.h
index 36bb101f..13615b1e 100644
--- a/kode/kwsdl/kung/enuminputfield.h
+++ b/kode/kwsdl/kung/enuminputfield.h
@@ -31,7 +31,7 @@ class KComboBox;
 class EnumInputField : public SimpleInputField
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     EnumInputField( const TQString &name, const Schema::SimpleType *type );
diff --git a/kode/kwsdl/kung/inputfield.h b/kode/kwsdl/kung/inputfield.h
index 4b05044b..4a68e161 100644
--- a/kode/kwsdl/kung/inputfield.h
+++ b/kode/kwsdl/kung/inputfield.h
@@ -40,7 +40,7 @@ class ComplexType;
 class InputField : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     typedef TQValueList<InputField*> List;
diff --git a/kode/kwsdl/kung/integerinputfield.h b/kode/kwsdl/kung/integerinputfield.h
index 2ffeb1ec..91294308 100644
--- a/kode/kwsdl/kung/integerinputfield.h
+++ b/kode/kwsdl/kung/integerinputfield.h
@@ -31,7 +31,7 @@ class KIntSpinBox;
 class IntegerInputField : public SimpleInputField
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     IntegerInputField( const TQString &name, const TQString &typeName, const Schema::SimpleType *type );
diff --git a/kode/kwsdl/kung/listinputfield.h b/kode/kwsdl/kung/listinputfield.h
index 1d48cc6a..c7105bbb 100644
--- a/kode/kwsdl/kung/listinputfield.h
+++ b/kode/kwsdl/kung/listinputfield.h
@@ -33,7 +33,7 @@ class TQPushButton;
 class ListInputField : public SimpleInputField
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ListInputField( const TQString &name, const TQString &typeName, const Schema::SimpleType *type );
@@ -54,7 +54,7 @@ class ListInputField : public SimpleInputField
 class ListWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ListWidget( InputField *parentField, const TQString &name, const TQString &type, TQWidget *parent );
diff --git a/kode/kwsdl/kung/loader.h b/kode/kwsdl/kung/loader.h
index d48d935c..2839780c 100644
--- a/kode/kwsdl/kung/loader.h
+++ b/kode/kwsdl/kung/loader.h
@@ -29,7 +29,7 @@ class Dispatcher;
 class Loader : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     Loader();
diff --git a/kode/kwsdl/kung/pageinputfield.h b/kode/kwsdl/kung/pageinputfield.h
index 22d5fdc0..f70ba98e 100644
--- a/kode/kwsdl/kung/pageinputfield.h
+++ b/kode/kwsdl/kung/pageinputfield.h
@@ -31,7 +31,7 @@
 class PageInputField : public InputField
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PageInputField( const TQString &name, const KWSDL::Message &message );
diff --git a/kode/kwsdl/kung/stringinputfield.h b/kode/kwsdl/kung/stringinputfield.h
index 7bfc4124..b6c8f172 100644
--- a/kode/kwsdl/kung/stringinputfield.h
+++ b/kode/kwsdl/kung/stringinputfield.h
@@ -31,7 +31,7 @@ class TQLineEdit;
 class StringInputField : public SimpleInputField
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     StringInputField( const TQString &name, const TQString &typeName, const Schema::SimpleType *type );
diff --git a/kode/kwsdl/kung/timeinputfield.h b/kode/kwsdl/kung/timeinputfield.h
index 30d219ae..2b351652 100644
--- a/kode/kwsdl/kung/timeinputfield.h
+++ b/kode/kwsdl/kung/timeinputfield.h
@@ -32,7 +32,7 @@ class KTimeWidget;
 class TimeInputField : public SimpleInputField
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     TimeInputField( const TQString &name, const Schema::SimpleType *type );
diff --git a/kode/kwsdl/kung/transport.h b/kode/kwsdl/kung/transport.h
index 6e6bec1c..3047b881 100644
--- a/kode/kwsdl/kung/transport.h
+++ b/kode/kwsdl/kung/transport.h
@@ -26,7 +26,7 @@
 class Transport : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     Transport( const TQString &url );
diff --git a/kode/kwsdl/schema/fileprovider.h b/kode/kwsdl/schema/fileprovider.h
index 1c2ef738..679cd0a2 100644
--- a/kode/kwsdl/schema/fileprovider.h
+++ b/kode/kwsdl/schema/fileprovider.h
@@ -33,7 +33,7 @@ namespace Schema {
 class FileProvider : TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     FileProvider();
diff --git a/kode/kwsdl/tests/google/googlesearchservice.h b/kode/kwsdl/tests/google/googlesearchservice.h
index 7e79fdba..e61cd446 100644
--- a/kode/kwsdl/tests/google/googlesearchservice.h
+++ b/kode/kwsdl/tests/google/googlesearchservice.h
@@ -33,7 +33,7 @@
 class GoogleSearchService : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     void doGetCachedPage( TQString* key, TQString* url );
diff --git a/kode/kwsdl/tests/google/transport.h b/kode/kwsdl/tests/google/transport.h
index 54dbf694..d07d246c 100644
--- a/kode/kwsdl/tests/google/transport.h
+++ b/kode/kwsdl/tests/google/transport.h
@@ -30,7 +30,7 @@
 class Transport : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     Transport( const TQString &url );
diff --git a/kode/printer.cpp b/kode/printer.cpp
index f36b1c38..4dc2e2e0 100644
--- a/kode/printer.cpp
+++ b/kode/printer.cpp
@@ -202,7 +202,7 @@ TQString Printer::classHeader( const Class &c )
   if ( c.isTQObject() ) {
     code += "Q_OBJECT";
     code.newLine();
-    code += "TQ_OBJECT";
+    code += "";
     code.newLine();
   }
 
diff --git a/kontact/interfaces/core.h b/kontact/interfaces/core.h
index 343132d0..2c8a5a4d 100644
--- a/kontact/interfaces/core.h
+++ b/kontact/interfaces/core.h
@@ -41,7 +41,7 @@ class Plugin;
 class KDE_EXPORT Core : public KParts::MainWindow
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     virtual ~Core();
 
diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h
index aaa40078..09bc25c7 100644
--- a/kontact/interfaces/plugin.h
+++ b/kontact/interfaces/plugin.h
@@ -58,7 +58,7 @@ class Summary;
 class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     /**
diff --git a/kontact/interfaces/summary.h b/kontact/interfaces/summary.h
index f490f517..961c4b07 100644
--- a/kontact/interfaces/summary.h
+++ b/kontact/interfaces/summary.h
@@ -36,7 +36,7 @@ namespace Kontact
 class KDE_EXPORT Summary : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     Summary( TQWidget *parent, const char *name = 0 );
diff --git a/kontact/interfaces/uniqueapphandler.h b/kontact/interfaces/uniqueapphandler.h
index 875906f0..3af1a877 100644
--- a/kontact/interfaces/uniqueapphandler.h
+++ b/kontact/interfaces/uniqueapphandler.h
@@ -92,7 +92,7 @@ template <class T> class UniqueAppHandlerFactory : public UniqueAppHandlerFactor
 class KDE_EXPORT UniqueAppWatcher : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     /**
diff --git a/kontact/plugins/akregator/akregator_plugin.h b/kontact/plugins/akregator/akregator_plugin.h
index 207fa894..27b6b417 100644
--- a/kontact/plugins/akregator/akregator_plugin.h
+++ b/kontact/plugins/akregator/akregator_plugin.h
@@ -51,7 +51,7 @@ class UniqueAppHandler : public Kontact::UniqueAppHandler
 class Plugin : public Kontact::Plugin
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     Plugin( Kontact::Core *core, const char *name,
diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.h b/kontact/plugins/kaddressbook/kaddressbook_plugin.h
index 8302dee7..44f3441f 100644
--- a/kontact/plugins/kaddressbook/kaddressbook_plugin.h
+++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.h
@@ -45,7 +45,7 @@ public:
 class KAddressbookPlugin : public Kontact::Plugin
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KAddressbookPlugin( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/karm/karm_plugin.h b/kontact/plugins/karm/karm_plugin.h
index 0996f399..7b3d1077 100644
--- a/kontact/plugins/karm/karm_plugin.h
+++ b/kontact/plugins/karm/karm_plugin.h
@@ -37,7 +37,7 @@ class KAboutData;
 class KarmPlugin : public Kontact::Plugin
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KarmPlugin( Kontact::Core *core, const char *name,
diff --git a/kontact/plugins/kitchensync/kitchensync_plugin.h b/kontact/plugins/kitchensync/kitchensync_plugin.h
index efb218c1..a391436a 100644
--- a/kontact/plugins/kitchensync/kitchensync_plugin.h
+++ b/kontact/plugins/kitchensync/kitchensync_plugin.h
@@ -35,7 +35,7 @@ class KAboutData;
 class KitchenSyncPlugin : public Kontact::Plugin
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KitchenSyncPlugin( Kontact::Core *core, const char *name,
diff --git a/kontact/plugins/kmail/kcmkmailsummary.h b/kontact/plugins/kmail/kcmkmailsummary.h
index 025a3f7d..ae879280 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.h
+++ b/kontact/plugins/kmail/kcmkmailsummary.h
@@ -36,7 +36,7 @@ class TQCheckListItem;
 class KCMKMailSummary : public KCModule
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KCMKMailSummary( TQWidget *parent = 0, const char *name = 0 );
diff --git a/kontact/plugins/kmail/kmail_plugin.h b/kontact/plugins/kmail/kmail_plugin.h
index 9ab74ac2..59b66add 100644
--- a/kontact/plugins/kmail/kmail_plugin.h
+++ b/kontact/plugins/kmail/kmail_plugin.h
@@ -46,7 +46,7 @@ public:
 class KMailPlugin : public Kontact::Plugin
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KMailPlugin( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/kmail/summarywidget.h b/kontact/plugins/kmail/summarywidget.h
index 73e27551..28bb63ab 100644
--- a/kontact/plugins/kmail/summarywidget.h
+++ b/kontact/plugins/kmail/summarywidget.h
@@ -41,7 +41,7 @@ class TQString;
 class SummaryWidget : public Kontact::Summary, public DCOPObject
 {
   Q_OBJECT
-//  TQ_OBJECT
+//  
   K_DCOP
 
   public:
diff --git a/kontact/plugins/knode/knode_plugin.h b/kontact/plugins/knode/knode_plugin.h
index c8d1d637..c6ed79b4 100644
--- a/kontact/plugins/knode/knode_plugin.h
+++ b/kontact/plugins/knode/knode_plugin.h
@@ -43,7 +43,7 @@ public:
 class KNodePlugin : public Kontact::Plugin
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNodePlugin( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/knotes/knotes_part.h b/kontact/plugins/knotes/knotes_part.h
index 4ab1be70..a3c7c790 100644
--- a/kontact/plugins/knotes/knotes_part.h
+++ b/kontact/plugins/knotes/knotes_part.h
@@ -47,7 +47,7 @@ class Journal;
 class KNotesPart : public KParts::ReadOnlyPart, virtual public KNotesIface
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNotesPart( TQObject *parent = 0, const char *name = 0 );
diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h
index 3794638e..b8a66b96 100644
--- a/kontact/plugins/knotes/knotes_part_p.h
+++ b/kontact/plugins/knotes/knotes_part_p.h
@@ -115,7 +115,7 @@ class KNotesIconView : public KIconView
 class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNoteEditDlg( TQWidget *parent = 0, const char *name = 0 )
diff --git a/kontact/plugins/knotes/knotes_plugin.h b/kontact/plugins/knotes/knotes_plugin.h
index de48b2ff..12d48540 100644
--- a/kontact/plugins/knotes/knotes_plugin.h
+++ b/kontact/plugins/knotes/knotes_plugin.h
@@ -32,7 +32,7 @@ class SummaryWidget;
 class KNotesPlugin : public Kontact::Plugin
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNotesPlugin( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/knotes/summarywidget.h b/kontact/plugins/knotes/summarywidget.h
index 088bdea3..305873d7 100644
--- a/kontact/plugins/knotes/summarywidget.h
+++ b/kontact/plugins/knotes/summarywidget.h
@@ -43,7 +43,7 @@ namespace Kontact {
 class KNotesSummaryWidget : public Kontact::Summary
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNotesSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const char *name = 0 );
diff --git a/kontact/plugins/korganizer/journalplugin.h b/kontact/plugins/korganizer/journalplugin.h
index af76b782..8387df65 100644
--- a/kontact/plugins/korganizer/journalplugin.h
+++ b/kontact/plugins/korganizer/journalplugin.h
@@ -34,7 +34,7 @@
 class JournalPlugin : public Kontact::Plugin
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     JournalPlugin( Kontact::Core *core, const char *name, const TQStringList& );
     ~JournalPlugin();
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.h b/kontact/plugins/korganizer/kcmkorgsummary.h
index ea698f91..21655785 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.h
+++ b/kontact/plugins/korganizer/kcmkorgsummary.h
@@ -32,7 +32,7 @@ class TQButtonGroup;
 class KCMKOrgSummary : public KCModule
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KCMKOrgSummary( TQWidget *parent = 0, const char *name = 0 );
diff --git a/kontact/plugins/korganizer/korganizerplugin.h b/kontact/plugins/korganizer/korganizerplugin.h
index 83abfa91..e5a32295 100644
--- a/kontact/plugins/korganizer/korganizerplugin.h
+++ b/kontact/plugins/korganizer/korganizerplugin.h
@@ -36,7 +36,7 @@
 class KOrganizerPlugin : public Kontact::Plugin
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KOrganizerPlugin( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/korganizer/summarywidget.h b/kontact/plugins/korganizer/summarywidget.h
index 1f7df4f1..02fc11c4 100644
--- a/kontact/plugins/korganizer/summarywidget.h
+++ b/kontact/plugins/korganizer/summarywidget.h
@@ -39,7 +39,7 @@ class KOrganizerPlugin;
 class SummaryWidget : public Kontact::Summary
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     SummaryWidget( KOrganizerPlugin *plugin, TQWidget *parent,
diff --git a/kontact/plugins/korganizer/todoplugin.h b/kontact/plugins/korganizer/todoplugin.h
index 4d2896cd..4775fbeb 100644
--- a/kontact/plugins/korganizer/todoplugin.h
+++ b/kontact/plugins/korganizer/todoplugin.h
@@ -34,7 +34,7 @@
 class TodoPlugin : public Kontact::Plugin
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     TodoPlugin( Kontact::Core *core, const char *name, const TQStringList& );
     ~TodoPlugin();
diff --git a/kontact/plugins/korganizer/todosummarywidget.h b/kontact/plugins/korganizer/todosummarywidget.h
index e8374edc..292444cd 100644
--- a/kontact/plugins/korganizer/todosummarywidget.h
+++ b/kontact/plugins/korganizer/todosummarywidget.h
@@ -39,7 +39,7 @@ class TodoPlugin;
 class TodoSummaryWidget : public Kontact::Summary
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     TodoSummaryWidget( TodoPlugin *plugin, TQWidget *parent,
diff --git a/kontact/plugins/kpilot/summarywidget.h b/kontact/plugins/kpilot/summarywidget.h
index 3e04ed88..209934fd 100644
--- a/kontact/plugins/kpilot/summarywidget.h
+++ b/kontact/plugins/kpilot/summarywidget.h
@@ -45,7 +45,7 @@ class KURLLabel;
 class SummaryWidget : public Kontact::Summary, public DCOPObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   K_DCOP
 
   public:
diff --git a/kontact/plugins/newsticker/kcmkontactknt.h b/kontact/plugins/newsticker/kcmkontactknt.h
index 7bb00c7e..b3a56d0a 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.h
+++ b/kontact/plugins/newsticker/kcmkontactknt.h
@@ -38,7 +38,7 @@ class NewsItem;
 class KCMKontactKNT : public KCModule
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KCMKontactKNT( TQWidget *parent = 0, const char *name = 0 );
@@ -86,7 +86,7 @@ class KCMKontactKNT : public KCModule
 class NewsEditDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     NewsEditDialog( const TQString&, const TQString&, TQWidget *parent );
diff --git a/kontact/plugins/newsticker/summarywidget.h b/kontact/plugins/newsticker/summarywidget.h
index 4a7c5c45..c5122fb8 100644
--- a/kontact/plugins/newsticker/summarywidget.h
+++ b/kontact/plugins/newsticker/summarywidget.h
@@ -56,7 +56,7 @@ typedef TQValueList<Feed> FeedList;
 class SummaryWidget : public Kontact::Summary, public DCOPObject
 {
   Q_OBJECT
-//  TQ_OBJECT
+//  
   K_DCOP
 
   public:
diff --git a/kontact/plugins/specialdates/kcmsdsummary.h b/kontact/plugins/specialdates/kcmsdsummary.h
index 7e18f219..bdff28b7 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.h
+++ b/kontact/plugins/specialdates/kcmsdsummary.h
@@ -36,7 +36,7 @@ class KAboutData;
 class KCMSDSummary : public KCModule
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KCMSDSummary( TQWidget *parent = 0, const char *name = 0 );
diff --git a/kontact/plugins/specialdates/sdsummarywidget.h b/kontact/plugins/specialdates/sdsummarywidget.h
index 00f45a5d..ff9fb70a 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.h
+++ b/kontact/plugins/specialdates/sdsummarywidget.h
@@ -43,7 +43,7 @@ class TQLabel;
 class SDSummaryWidget : public Kontact::Summary
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent,
diff --git a/kontact/plugins/summary/dropwidget.h b/kontact/plugins/summary/dropwidget.h
index c4fe2c8b..d406f441 100644
--- a/kontact/plugins/summary/dropwidget.h
+++ b/kontact/plugins/summary/dropwidget.h
@@ -27,7 +27,7 @@
 class DropWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     DropWidget( TQWidget *parent, const char *name = 0 );
diff --git a/kontact/plugins/summary/kcmkontactsummary.h b/kontact/plugins/summary/kcmkontactsummary.h
index 33c9b8f0..fa162045 100644
--- a/kontact/plugins/summary/kcmkontactsummary.h
+++ b/kontact/plugins/summary/kcmkontactsummary.h
@@ -33,7 +33,7 @@ class KPluginInfo;
 class PluginView : public KListView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PluginView( TQWidget *parent, const char *name = 0 );
@@ -43,7 +43,7 @@ class PluginView : public KListView
 class KCMKontactSummary : public KCModule
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KCMKontactSummary( TQWidget *parent = 0, const char *name = 0 );
diff --git a/kontact/plugins/summary/summaryview_part.h b/kontact/plugins/summary/summaryview_part.h
index 28a591dd..9a7b605c 100644
--- a/kontact/plugins/summary/summaryview_part.h
+++ b/kontact/plugins/summary/summaryview_part.h
@@ -52,7 +52,7 @@ class KCMultiDialog;
 class SummaryViewPart : public KParts::ReadOnlyPart
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     SummaryViewPart( Kontact::Core *core, const char *widgetName,
diff --git a/kontact/plugins/summary/summaryview_plugin.h b/kontact/plugins/summary/summaryview_plugin.h
index 44d7c6d8..1be750fe 100644
--- a/kontact/plugins/summary/summaryview_plugin.h
+++ b/kontact/plugins/summary/summaryview_plugin.h
@@ -35,7 +35,7 @@ class SummaryViewPart;
 class SummaryView : public Kontact::Plugin
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     SummaryView( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/test/test_part.h b/kontact/plugins/test/test_part.h
index 1be87dde..c70b9895 100644
--- a/kontact/plugins/test/test_part.h
+++ b/kontact/plugins/test/test_part.h
@@ -34,7 +34,7 @@ class KAddressBookIface_stub;
 class TestPart : public KParts::ReadOnlyPart
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 
diff --git a/kontact/plugins/test/test_plugin.h b/kontact/plugins/test/test_plugin.h
index 8a22b33a..256fb520 100644
--- a/kontact/plugins/test/test_plugin.h
+++ b/kontact/plugins/test/test_plugin.h
@@ -34,7 +34,7 @@ class TestPart;
 class TestPlugin : public Kontact::Plugin
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 
diff --git a/kontact/plugins/weather/summarywidget.h b/kontact/plugins/weather/summarywidget.h
index b4735151..8bb36ce8 100644
--- a/kontact/plugins/weather/summarywidget.h
+++ b/kontact/plugins/weather/summarywidget.h
@@ -87,7 +87,7 @@ class WeatherData
 class SummaryWidget : public Kontact::Summary, public DCOPObject
 {
     Q_OBJECT
-//    TQ_OBJECT
+//    
     K_DCOP
   public:
     SummaryWidget( TQWidget *parent, const char *name = 0 );
diff --git a/kontact/src/aboutdialog.h b/kontact/src/aboutdialog.h
index c5faa503..c2d29a5a 100644
--- a/kontact/src/aboutdialog.h
+++ b/kontact/src/aboutdialog.h
@@ -34,7 +34,7 @@ class Plugin;
 class AboutDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AboutDialog( Kontact::Core *core, const char *name = 0 );
diff --git a/kontact/src/iconsidepane.h b/kontact/src/iconsidepane.h
index 13533228..35859bda 100644
--- a/kontact/src/iconsidepane.h
+++ b/kontact/src/iconsidepane.h
@@ -118,7 +118,7 @@ class EntryItemToolTip : public TQToolTip
 class Navigator : public KListBox
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     Navigator( IconSidePane *parent = 0, const char *name = 0 );
 
@@ -174,7 +174,7 @@ class Navigator : public KListBox
 class IconSidePane : public SidePaneBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     IconSidePane( Core *core, TQWidget *parent, const char *name = 0 );
     ~IconSidePane();
diff --git a/kontact/src/kcmkontact.h b/kontact/src/kcmkontact.h
index 0bb8cb47..0affd92d 100644
--- a/kontact/src/kcmkontact.h
+++ b/kontact/src/kcmkontact.h
@@ -39,7 +39,7 @@ class KListView;
 class KcmKontact : public KPrefsModule
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KcmKontact( TQWidget *parent = 0, const char *name = 0 );
@@ -50,7 +50,7 @@ class KcmKontact : public KPrefsModule
 class PluginSelection : public KPrefsWid
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PluginSelection( KConfigSkeleton::ItemString *item, TQWidget *parent );
diff --git a/kontact/src/mainwindow.h b/kontact/src/mainwindow.h
index 6732ed27..90e9045b 100644
--- a/kontact/src/mainwindow.h
+++ b/kontact/src/mainwindow.h
@@ -67,7 +67,7 @@ typedef TQPtrList<KAction> ActionPluginList;
 class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public KontactIface
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     MainWindow();
diff --git a/kontact/src/profiledialog.h b/kontact/src/profiledialog.h
index dc0aee03..640fec99 100644
--- a/kontact/src/profiledialog.h
+++ b/kontact/src/profiledialog.h
@@ -40,7 +40,7 @@ namespace Kontact {
 class ProfileDialog : public KDialogBase
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     explicit ProfileDialog( TQWidget* parent = 0, WFlags f = 0 );
diff --git a/kontact/src/profilemanager.h b/kontact/src/profilemanager.h
index 2224b29f..12ed5747 100644
--- a/kontact/src/profilemanager.h
+++ b/kontact/src/profilemanager.h
@@ -89,7 +89,7 @@ private:
 class ProfileManager : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
     enum ImportError {
         SuccessfulImport=0,
diff --git a/kontact/src/sidepanebase.h b/kontact/src/sidepanebase.h
index 6942ac8b..47ed0932 100644
--- a/kontact/src/sidepanebase.h
+++ b/kontact/src/sidepanebase.h
@@ -34,7 +34,7 @@ class Plugin;
 class SidePaneBase : public TQVBox
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     SidePaneBase( Core *core, TQWidget *parent, const char *name = 0 );
     virtual ~SidePaneBase();
diff --git a/korganizer/actionmanager.h b/korganizer/actionmanager.h
index 66f66bca..47e4c4d8 100644
--- a/korganizer/actionmanager.h
+++ b/korganizer/actionmanager.h
@@ -73,7 +73,7 @@ using namespace KCal;
 class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ActionManager( KXMLGUIClient *client, CalendarView *widget,
                    TQObject *parent, KOrg::MainWindow *mainWindow,
diff --git a/korganizer/agendaview.h b/korganizer/agendaview.h
index 1ed1937a..32b58d3c 100644
--- a/korganizer/agendaview.h
+++ b/korganizer/agendaview.h
@@ -27,7 +27,7 @@ namespace KOrg {
 class AgendaView : public KOEventView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     AgendaView( Calendar *cal,TQWidget *parent=0,const char *name=0 );
 
diff --git a/korganizer/archivedialog.h b/korganizer/archivedialog.h
index 897123b0..4d43f5da 100644
--- a/korganizer/archivedialog.h
+++ b/korganizer/archivedialog.h
@@ -41,7 +41,7 @@ using namespace KCal;
 class ArchiveDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ArchiveDialog(Calendar *calendar,TQWidget *parent=0, const char *name=0);
     virtual ~ArchiveDialog();
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 131cd878..1baaf16e 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -81,7 +81,7 @@ class CalendarViewExtension : public TQWidget
 class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar::Observer
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     /**
       Constructs a new calendar view widget.
diff --git a/korganizer/datechecker.h b/korganizer/datechecker.h
index 67ada073..a2d191a3 100644
--- a/korganizer/datechecker.h
+++ b/korganizer/datechecker.h
@@ -37,7 +37,7 @@ class NavigatorBar;
 class DateChecker: public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     DateChecker( TQObject *parent = 0, const char *name = 0 );
     ~DateChecker();
diff --git a/korganizer/datenavigator.h b/korganizer/datenavigator.h
index 2f827a27..4418745d 100644
--- a/korganizer/datenavigator.h
+++ b/korganizer/datenavigator.h
@@ -36,7 +36,7 @@
 class DateNavigator : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     DateNavigator( TQObject *parent = 0, const char *name = 0 );
     ~DateNavigator();
diff --git a/korganizer/datenavigatorcontainer.h b/korganizer/datenavigatorcontainer.h
index cd0b98e9..17c983e7 100644
--- a/korganizer/datenavigatorcontainer.h
+++ b/korganizer/datenavigatorcontainer.h
@@ -32,7 +32,7 @@ class KDateNavigator;
 class DateNavigatorContainer: public TQFrame
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     DateNavigatorContainer( TQWidget *parent = 0, const char *name = 0 );
     ~DateNavigatorContainer();
diff --git a/korganizer/eventarchiver.h b/korganizer/eventarchiver.h
index f5b61e6d..8fb99ab9 100644
--- a/korganizer/eventarchiver.h
+++ b/korganizer/eventarchiver.h
@@ -47,7 +47,7 @@ using namespace KCal;
 class EventArchiver : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     EventArchiver( TQObject* parent = 0, const char* name = 0 );
diff --git a/korganizer/exportwebdialog.h b/korganizer/exportwebdialog.h
index 2fe90196..d3f77ff8 100644
--- a/korganizer/exportwebdialog.h
+++ b/korganizer/exportwebdialog.h
@@ -38,7 +38,7 @@ using namespace KCal;
 class ExportWebDialog : public KDialogBase, public KPrefsWidManager
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ExportWebDialog( HTMLExportSettings *settings, TQWidget *parent = 0,
                      const char *name = 0 );
diff --git a/korganizer/filtereditdialog.h b/korganizer/filtereditdialog.h
index e278bded..73a0df8e 100644
--- a/korganizer/filtereditdialog.h
+++ b/korganizer/filtereditdialog.h
@@ -45,7 +45,7 @@ using namespace KCal;
 class FilterEditDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     FilterEditDialog(TQPtrList<CalFilter> *,TQWidget *parent=0, const char *name=0);
     virtual ~FilterEditDialog();
@@ -70,7 +70,7 @@ class FilterEditDialog : public KDialogBase
 class FilterEdit : public FilterEdit_base
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     FilterEdit(TQPtrList<CalFilter> *filters, TQWidget *parent);
     ~FilterEdit();
diff --git a/korganizer/freebusymanager.h b/korganizer/freebusymanager.h
index d8fcc952..b6b93d04 100644
--- a/korganizer/freebusymanager.h
+++ b/korganizer/freebusymanager.h
@@ -55,7 +55,7 @@ class FreeBusyManager;
 class FreeBusyDownloadJob : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     FreeBusyDownloadJob( const TQString &email, const KURL &url,
                    FreeBusyManager *manager, const char *name = 0 );
@@ -80,7 +80,7 @@ class FreeBusyDownloadJob : public TQObject
 class FreeBusyManager : public TQObject, public KCal::FreeBusyCache
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     FreeBusyManager( TQObject *parent, const char *name );
 
diff --git a/korganizer/freebusyurldialog.h b/korganizer/freebusyurldialog.h
index e18728cd..9447a7f1 100644
--- a/korganizer/freebusyurldialog.h
+++ b/korganizer/freebusyurldialog.h
@@ -36,7 +36,7 @@ class Attendee;
 class FreeBusyUrlDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     FreeBusyUrlDialog( KCal::Attendee *, TQWidget *parent = 0,
                        const char *name = 0 );
@@ -51,7 +51,7 @@ class FreeBusyUrlDialog : public KDialogBase
 class FreeBusyUrlWidget : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     FreeBusyUrlWidget( KCal::Attendee *, TQWidget *parent = 0,
                        const char *name = 0 );
diff --git a/korganizer/history.h b/korganizer/history.h
index 4b87db8c..d0b7e575 100644
--- a/korganizer/history.h
+++ b/korganizer/history.h
@@ -39,7 +39,7 @@ namespace KOrg {
 class History : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     History( KCal::Calendar * );
 
diff --git a/korganizer/importdialog.h b/korganizer/importdialog.h
index 92726cd2..f6161ea5 100644
--- a/korganizer/importdialog.h
+++ b/korganizer/importdialog.h
@@ -35,7 +35,7 @@ class TQRadioButton;
 class ImportDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ImportDialog( const KURL &url, TQWidget *parent, bool isPart );
     ~ImportDialog();
diff --git a/korganizer/incidencechanger.h b/korganizer/incidencechanger.h
index bfbac851..ee684e7c 100644
--- a/korganizer/incidencechanger.h
+++ b/korganizer/incidencechanger.h
@@ -33,7 +33,7 @@ namespace KCal {
 class IncidenceChanger : public KOrg::IncidenceChangerBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     IncidenceChanger( Calendar *cal, TQObject *parent )
       : IncidenceChangerBase( cal, parent ) {}
diff --git a/korganizer/interfaces/korganizer/baseview.h b/korganizer/interfaces/korganizer/baseview.h
index 2a7fc375..fe0bd96c 100644
--- a/korganizer/interfaces/korganizer/baseview.h
+++ b/korganizer/interfaces/korganizer/baseview.h
@@ -59,7 +59,7 @@ namespace KOrg {
 class KDE_EXPORT BaseView : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     /**
       Constructs a view.
diff --git a/korganizer/interfaces/korganizer/incidencechangerbase.h b/korganizer/interfaces/korganizer/incidencechangerbase.h
index 169ea1b2..ba26ce02 100644
--- a/korganizer/interfaces/korganizer/incidencechangerbase.h
+++ b/korganizer/interfaces/korganizer/incidencechangerbase.h
@@ -39,7 +39,7 @@ namespace KOrg {
 class IncidenceChangerBase : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
   IncidenceChangerBase( Calendar*cal, TQObject *parent = 0 ) :
         TQObject( parent ), mCalendar( cal ) {}
diff --git a/korganizer/journalentry.h b/korganizer/journalentry.h
index 496cb395..f74ab848 100644
--- a/korganizer/journalentry.h
+++ b/korganizer/journalentry.h
@@ -49,7 +49,7 @@ using namespace KCal;
 
 class JournalEntry : public TQWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     typedef ListBase<JournalEntry> List;
 
@@ -114,7 +114,7 @@ class JournalEntry : public TQWidget {
 
 class JournalDateEntry : public TQVBox {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     typedef ListBase<JournalDateEntry> List;
 
diff --git a/korganizer/kdatenavigator.h b/korganizer/kdatenavigator.h
index b36de304..11395138 100644
--- a/korganizer/kdatenavigator.h
+++ b/korganizer/kdatenavigator.h
@@ -45,7 +45,7 @@ class KODayMatrix;
 class KDateNavigator: public TQFrame
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KDateNavigator( TQWidget *parent = 0, const char *name = 0 );
     ~KDateNavigator();
diff --git a/korganizer/koagenda.h b/korganizer/koagenda.h
index 9bc7b00d..06550bfe 100644
--- a/korganizer/koagenda.h
+++ b/korganizer/koagenda.h
@@ -53,7 +53,7 @@ using namespace KCal;
 class MarcusBains : public TQFrame
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     MarcusBains( KOAgenda *agenda = 0, const char *name = 0 );
     void updateLocationRecalc( bool recalculate = false );
@@ -74,7 +74,7 @@ class MarcusBains : public TQFrame
 class KOAgenda : public TQScrollView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOAgenda ( int columns, int rows, int columnSize, CalendarView *calendarView,
                TQWidget *parent=0, const char *name = 0, WFlags f = 0 );
diff --git a/korganizer/koagendaitem.h b/korganizer/koagendaitem.h
index c95a9f4f..9ab341ed 100644
--- a/korganizer/koagendaitem.h
+++ b/korganizer/koagendaitem.h
@@ -75,7 +75,7 @@ struct MultiItemInfo
 class KOAgendaItem : public TQWidget, public KOrg::CellItem
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOAgendaItem( Calendar *calendar, Incidence *incidence, const TQDate &qd,
                   TQWidget *parent,
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h
index 1a90bad0..00e8b699 100644
--- a/korganizer/koagendaview.h
+++ b/korganizer/koagendaview.h
@@ -51,7 +51,7 @@ namespace KOrg {
 class EventIndicator : public TQFrame
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     enum Location { Top, Bottom };
     EventIndicator( Location loc = Top, TQWidget *parent = 0,
@@ -75,7 +75,7 @@ class EventIndicator : public TQFrame
 class KOAlternateLabel : public TQLabel
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOAlternateLabel( const TQString &shortlabel, const TQString &longlabel,
                       const TQString &extensivelabel = TQString(),
@@ -108,7 +108,7 @@ class KOAlternateLabel : public TQLabel
 class KOAgendaView : public KOrg::AgendaView, public KCal::Calendar::Observer
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOAgendaView( Calendar *cal,
                   CalendarView *calendarView,
diff --git a/korganizer/koapp.h b/korganizer/koapp.h
index 80b3d2d6..782e6994 100644
--- a/korganizer/koapp.h
+++ b/korganizer/koapp.h
@@ -30,7 +30,7 @@
 class KOrganizerApp : public KUniqueApplication
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOrganizerApp();
     ~KOrganizerApp();
diff --git a/korganizer/koattendeeeditor.h b/korganizer/koattendeeeditor.h
index 0719744b..77630426 100644
--- a/korganizer/koattendeeeditor.h
+++ b/korganizer/koattendeeeditor.h
@@ -47,7 +47,7 @@ namespace KCal {
 class KOAttendeeEditor : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOAttendeeEditor( TQWidget *parent, const char *name = 0 );
 
diff --git a/korganizer/kocounterdialog.h b/korganizer/kocounterdialog.h
index 14a45433..1af7c47c 100644
--- a/korganizer/kocounterdialog.h
+++ b/korganizer/kocounterdialog.h
@@ -39,7 +39,7 @@ class KOEventViewer;
 class KOCounterDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOCounterDialog(Calendar *calendar, TQWidget *parent = 0, const char *name = 0 );
     virtual ~KOCounterDialog();
diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h
index d2426425..79231b46 100644
--- a/korganizer/kodaymatrix.h
+++ b/korganizer/kodaymatrix.h
@@ -105,7 +105,7 @@ class DynamicTip : public TQToolTip
 class KODayMatrix: public TQFrame, public KCal::Calendar::Observer
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     /** constructor to create a day matrix widget.
      *
diff --git a/korganizer/kodialogmanager.h b/korganizer/kodialogmanager.h
index 1434e8da..7cabd6ad 100644
--- a/korganizer/kodialogmanager.h
+++ b/korganizer/kodialogmanager.h
@@ -51,7 +51,7 @@ using namespace KCal;
 class KODialogManager : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KODialogManager( CalendarView * );
     virtual ~KODialogManager();
diff --git a/korganizer/koeditoralarms.h b/korganizer/koeditoralarms.h
index 4454a587..f713fcf9 100644
--- a/korganizer/koeditoralarms.h
+++ b/korganizer/koeditoralarms.h
@@ -34,7 +34,7 @@ class AlarmListViewItem;
 class KOEditorAlarms : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOEditorAlarms( const TQCString &type,
                     KCal::Alarm::List *alarms, TQWidget *parent = 0,
diff --git a/korganizer/koeditorattachments.h b/korganizer/koeditorattachments.h
index a95c4999..479ce36a 100644
--- a/korganizer/koeditorattachments.h
+++ b/korganizer/koeditorattachments.h
@@ -57,7 +57,7 @@ class KTempDir;
 class AttachmentEditDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     AttachmentEditDialog( AttachmentListItem *item, TQWidget *parent=0 );
 
@@ -81,7 +81,7 @@ class AttachmentEditDialog : public KDialogBase
 class KOEditorAttachments : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOEditorAttachments( int spacing = 8, TQWidget *parent = 0,
                          const char *name = 0 );
@@ -152,7 +152,7 @@ class KOEditorAttachments : public TQWidget
 class AttachmentIconView : public KIconView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   friend class KOEditorAttachments;
   public:
diff --git a/korganizer/koeditordetails.h b/korganizer/koeditordetails.h
index b03d0a1b..10d61e21 100644
--- a/korganizer/koeditordetails.h
+++ b/korganizer/koeditordetails.h
@@ -60,7 +60,7 @@ typedef CustomListViewItem<KCal::Attendee *> AttendeeListItem;
 class KOAttendeeListView : public KListView
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KOAttendeeListView (TQWidget *parent=0, const char *name=0);
   virtual ~KOAttendeeListView();
@@ -79,7 +79,7 @@ signals:
 class KOEditorDetails : public KOAttendeeEditor
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOEditorDetails (int spacing = 8,TQWidget* parent = 0, const char* name = 0);
     virtual ~KOEditorDetails();
diff --git a/korganizer/koeditorfreebusy.h b/korganizer/koeditorfreebusy.h
index 98e789c6..c5201fc2 100644
--- a/korganizer/koeditorfreebusy.h
+++ b/korganizer/koeditorfreebusy.h
@@ -45,7 +45,7 @@ namespace KCal {
 class KOEditorFreeBusy : public KOAttendeeEditor
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOEditorFreeBusy( int spacing = 8, TQWidget *parent = 0,
                       const char *name = 0 );
diff --git a/korganizer/koeditorgeneral.h b/korganizer/koeditorgeneral.h
index 69d986e1..c387792a 100644
--- a/korganizer/koeditorgeneral.h
+++ b/korganizer/koeditorgeneral.h
@@ -49,7 +49,7 @@ using namespace KCal;
 class FocusLineEdit : public TQLineEdit
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     FocusLineEdit( TQWidget *parent );
 
@@ -66,7 +66,7 @@ class FocusLineEdit : public TQLineEdit
 class KOEditorGeneral : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOEditorGeneral (TQObject* parent=0,const char* name=0);
     virtual ~KOEditorGeneral();
diff --git a/korganizer/koeditorgeneralevent.h b/korganizer/koeditorgeneralevent.h
index 037b2323..c6ace2b1 100644
--- a/korganizer/koeditorgeneralevent.h
+++ b/korganizer/koeditorgeneralevent.h
@@ -42,7 +42,7 @@ using namespace KCal;
 class KOEditorGeneralEvent : public KOEditorGeneral
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOEditorGeneralEvent (TQObject* parent=0,const char* name=0);
     virtual ~KOEditorGeneralEvent();
diff --git a/korganizer/koeditorgeneraljournal.h b/korganizer/koeditorgeneraljournal.h
index 88288c30..0a2eef18 100644
--- a/korganizer/koeditorgeneraljournal.h
+++ b/korganizer/koeditorgeneraljournal.h
@@ -48,7 +48,7 @@ using namespace KCal;
 class KOEditorGeneralJournal : public KOEditorGeneral
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOEditorGeneralJournal ( TQWidget *parent=0, const char* name=0 );
     virtual ~KOEditorGeneralJournal();
diff --git a/korganizer/koeditorgeneraltodo.h b/korganizer/koeditorgeneraltodo.h
index bf7fb979..3ccf9c81 100644
--- a/korganizer/koeditorgeneraltodo.h
+++ b/korganizer/koeditorgeneraltodo.h
@@ -42,7 +42,7 @@ using namespace KCal;
 class KOEditorGeneralTodo : public KOEditorGeneral
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOEditorGeneralTodo (TQObject* parent=0,const char* name=0);
     virtual ~KOEditorGeneralTodo();
diff --git a/korganizer/koeditorrecurrence.h b/korganizer/koeditorrecurrence.h
index f3aeeb41..00224b0c 100644
--- a/korganizer/koeditorrecurrence.h
+++ b/korganizer/koeditorrecurrence.h
@@ -149,7 +149,7 @@ class RecurYearly : public RecurBase
 class RecurrenceChooser : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     RecurrenceChooser( TQWidget *parent = 0, const char *name = 0 );
 
@@ -183,7 +183,7 @@ class ExceptionsBase
 class ExceptionsWidget : public TQWidget, public ExceptionsBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ExceptionsWidget( TQWidget *parent = 0, const char *name = 0 );
 
@@ -231,7 +231,7 @@ class RecurrenceRangeBase
 class RecurrenceRangeWidget : public TQWidget, public RecurrenceRangeBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     RecurrenceRangeWidget( TQWidget *parent = 0, const char *name = 0 );
 
@@ -282,7 +282,7 @@ class RecurrenceRangeDialog : public KDialogBase, public RecurrenceRangeBase
 class KOEditorRecurrence : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOEditorRecurrence ( TQWidget *parent = 0, const char *name = 0 );
     virtual ~KOEditorRecurrence();
@@ -349,7 +349,7 @@ class KOEditorRecurrence : public TQWidget
 class KOEditorRecurrenceDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOEditorRecurrenceDialog( TQWidget *parent );
     KOEditorRecurrence* editor() const { return mRecurrence; }
diff --git a/korganizer/koeventeditor.h b/korganizer/koeventeditor.h
index 87032930..bb2405eb 100644
--- a/korganizer/koeventeditor.h
+++ b/korganizer/koeventeditor.h
@@ -48,7 +48,7 @@ using namespace KCal;
 class KOEventEditor : public KOIncidenceEditor
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     /**
       Construct new event editor.
diff --git a/korganizer/koeventpopupmenu.h b/korganizer/koeventpopupmenu.h
index 8232da4e..cc846885 100644
--- a/korganizer/koeventpopupmenu.h
+++ b/korganizer/koeventpopupmenu.h
@@ -38,7 +38,7 @@ using namespace KCal;
 
 class KOEventPopupMenu : public TQPopupMenu {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOEventPopupMenu();
 
diff --git a/korganizer/koeventview.h b/korganizer/koeventview.h
index 303486c4..a5441a83 100644
--- a/korganizer/koeventview.h
+++ b/korganizer/koeventview.h
@@ -55,7 +55,7 @@ class TQPopupMenu;
 class KOEventView : public KOrg::BaseView
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     /**
diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h
index bebbb4ed..fa787f4e 100644
--- a/korganizer/koeventviewer.h
+++ b/korganizer/koeventviewer.h
@@ -40,7 +40,7 @@ using namespace KCal;
 class KDE_EXPORT KOEventViewer : public TQTextBrowser
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     explicit KOEventViewer( Calendar *calendar, TQWidget *parent = 0, const char *name = 0 );
     virtual ~KOEventViewer();
diff --git a/korganizer/koeventviewerdialog.h b/korganizer/koeventviewerdialog.h
index 346471df..f66ecafd 100644
--- a/korganizer/koeventviewerdialog.h
+++ b/korganizer/koeventviewerdialog.h
@@ -41,7 +41,7 @@ class KOEventViewer;
 class KDE_EXPORT KOEventViewerDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     explicit KOEventViewerDialog( Calendar *calendar, TQWidget *parent = 0,
                                   const char *name = 0, bool compact = false );
diff --git a/korganizer/kogroupware.h b/korganizer/kogroupware.h
index 5fd80187..a9372b04 100644
--- a/korganizer/kogroupware.h
+++ b/korganizer/kogroupware.h
@@ -65,7 +65,7 @@ using namespace KOrg;
 class KOGroupware : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     static KOGroupware* create( CalendarView*, KCal::CalendarResources* );
     static KOGroupware* instance();
diff --git a/korganizer/koincidenceeditor.h b/korganizer/koincidenceeditor.h
index 7bd18584..8c397d7c 100644
--- a/korganizer/koincidenceeditor.h
+++ b/korganizer/koincidenceeditor.h
@@ -57,7 +57,7 @@ using namespace KOrg;
 class KOIncidenceEditor : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     /**
       Construct new IncidenceEditor.
diff --git a/korganizer/kojournaleditor.h b/korganizer/kojournaleditor.h
index f537cae3..14433c21 100644
--- a/korganizer/kojournaleditor.h
+++ b/korganizer/kojournaleditor.h
@@ -46,7 +46,7 @@ class KOEditorGeneralJournal;
 class KOJournalEditor : public KOIncidenceEditor
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     /**
       Constructs a new Journal editor.
diff --git a/korganizer/kojournalview.h b/korganizer/kojournalview.h
index 347453cc..e229a99f 100644
--- a/korganizer/kojournalview.h
+++ b/korganizer/kojournalview.h
@@ -41,7 +41,7 @@ class TQVBox;
 class KOJournalView : public KOrg::BaseView
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOJournalView( Calendar *calendar, TQWidget *parent = 0,
                    const char *name = 0);
diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h
index a4533ea8..d234c98f 100644
--- a/korganizer/kolistview.h
+++ b/korganizer/kolistview.h
@@ -68,7 +68,7 @@ class KOListViewToolTip : public TQToolTip
 class KOListView : public KOEventView
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
    explicit KOListView( Calendar *calendar,
                         TQWidget *parent = 0,
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index 24f05f30..d9b63bd9 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -51,7 +51,7 @@ class KOMonthCellToolTip : public TQToolTip
 class KNoScrollListBox: public TQListBox
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KNoScrollListBox(TQWidget *parent=0, const char *name=0);
     ~KNoScrollListBox() {}
@@ -135,7 +135,7 @@ class KOMonthView;
 class MonthViewCell : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     class CreateItemVisitor;
     MonthViewCell( KOMonthView * );
@@ -245,7 +245,7 @@ class MonthViewCell : public TQWidget
 class KOMonthView: public KOEventView
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOMonthView(Calendar *cal, TQWidget *parent = 0, const char *name = 0 );
     ~KOMonthView();
diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h
index c86ff452..28fc3ba7 100644
--- a/korganizer/koprefsdialog.h
+++ b/korganizer/koprefsdialog.h
@@ -41,7 +41,7 @@ class TQListView;
 class KDE_EXPORT KOPrefsDialogMain : public KPrefsModule
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOPrefsDialogMain( TQWidget *parent, const char *name );
 
@@ -54,7 +54,7 @@ class KDE_EXPORT KOPrefsDialogMain : public KPrefsModule
 class KDE_EXPORT KOPrefsDialogColors : public KPrefsModule
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOPrefsDialogColors( TQWidget *parent, const char *name );
 
@@ -85,7 +85,7 @@ class KDE_EXPORT KOPrefsDialogColors : public KPrefsModule
 class KDE_EXPORT KOPrefsDialogGroupScheduling : public KPrefsModule
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOPrefsDialogGroupScheduling( TQWidget *parent, const char *name );
 
@@ -109,7 +109,7 @@ class KOGroupwarePrefsPage;
 class KDE_EXPORT KOPrefsDialogGroupwareScheduling : public KPrefsModule
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOPrefsDialogGroupwareScheduling( TQWidget *parent, const char *name );
 
@@ -124,7 +124,7 @@ class KDE_EXPORT KOPrefsDialogGroupwareScheduling : public KPrefsModule
 class KDE_EXPORT KOPrefsDialogPlugins : public KPrefsModule
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOPrefsDialogPlugins( TQWidget *parent, const char *name );
 
diff --git a/korganizer/korgac/alarmdialog.h b/korganizer/korgac/alarmdialog.h
index b47f64d1..d3e3af41 100644
--- a/korganizer/korgac/alarmdialog.h
+++ b/korganizer/korgac/alarmdialog.h
@@ -44,7 +44,7 @@ class TQSplitter;
 
 class AlarmDialog : public KDialogBase {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     explicit AlarmDialog( CalendarResources *calendar, TQWidget *parent = 0, const char *name = 0 );
 
diff --git a/korganizer/korgac/alarmdockwindow.h b/korganizer/korgac/alarmdockwindow.h
index f73c667b..6f317fda 100644
--- a/korganizer/korgac/alarmdockwindow.h
+++ b/korganizer/korgac/alarmdockwindow.h
@@ -31,7 +31,7 @@
 class AlarmDockWindow : public KSystemTray
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     AlarmDockWindow( const char *name = 0 );
     virtual ~AlarmDockWindow();
diff --git a/korganizer/korgac/koalarmclient.h b/korganizer/korgac/koalarmclient.h
index 93e1f31c..6ba8a5fb 100644
--- a/korganizer/korgac/koalarmclient.h
+++ b/korganizer/korgac/koalarmclient.h
@@ -44,7 +44,7 @@ class Incidence;
 class KOAlarmClient : public TQObject, virtual public AlarmClientIface, public KSessionManaged
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOAlarmClient( TQObject *parent = 0, const char *name = 0 );
     ~KOAlarmClient();
diff --git a/korganizer/korganizer.h b/korganizer/korganizer.h
index 9148a07f..34f58cdc 100644
--- a/korganizer/korganizer.h
+++ b/korganizer/korganizer.h
@@ -65,7 +65,7 @@ typedef KParts::MainWindow KPartsMainWindow;
 class KOrganizer : public KPartsMainWindow, public KOrgMainWindow
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     /**
       Constructs a new main window.
diff --git a/korganizer/korganizer_part.h b/korganizer/korganizer_part.h
index c7f1964a..ef307c55 100644
--- a/korganizer/korganizer_part.h
+++ b/korganizer/korganizer_part.h
@@ -57,7 +57,7 @@ class KOrganizerPart: public KParts::ReadOnlyPart,
                       public KOrg::MainWindow
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOrganizerPart( TQWidget *parentWidget, const char *widgetName,
                     TQObject *parent, const char *name, const TQStringList & );
diff --git a/korganizer/kotimelineview.h b/korganizer/kotimelineview.h
index 683d0c4d..2d0e7c0d 100644
--- a/korganizer/kotimelineview.h
+++ b/korganizer/kotimelineview.h
@@ -44,7 +44,7 @@ namespace KOrg {
 class KOTimelineView : public KOEventView
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOTimelineView(Calendar *calendar, TQWidget *parent = 0,
                     const char *name = 0);
diff --git a/korganizer/kotodoeditor.h b/korganizer/kotodoeditor.h
index bf31f369..a571d88b 100644
--- a/korganizer/kotodoeditor.h
+++ b/korganizer/kotodoeditor.h
@@ -37,7 +37,7 @@ class KOEditorRecurrence;
 class KOTodoEditor : public KOIncidenceEditor
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     /**
       Constructs a new todo editor.
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index f9ce4070..48777e58 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -72,7 +72,7 @@ class KOTodoListViewToolTip : public TQToolTip
 class KOTodoListView : public KListView
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOTodoListView( TQWidget *parent = 0, const char *name = 0 );
     ~KOTodoListView();
@@ -113,7 +113,7 @@ class KOTodoListView : public KListView
 class KOTodoView : public KOrg::BaseView
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOTodoView( Calendar *cal, TQWidget *parent = 0, const char *name = 0 );
     ~KOTodoView();
diff --git a/korganizer/koviewmanager.h b/korganizer/koviewmanager.h
index c8900d01..d33e9b32 100644
--- a/korganizer/koviewmanager.h
+++ b/korganizer/koviewmanager.h
@@ -52,7 +52,7 @@ using namespace KCal;
 class KOViewManager : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
 
     enum AgendaMode {
diff --git a/korganizer/kowhatsnextview.h b/korganizer/kowhatsnextview.h
index c65a85df..22c55f5d 100644
--- a/korganizer/kowhatsnextview.h
+++ b/korganizer/kowhatsnextview.h
@@ -34,7 +34,7 @@ class KOEventViewerDialog;
 
 class WhatsNextTextBrowser : public TQTextBrowser {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     WhatsNextTextBrowser(TQWidget *parent) : TQTextBrowser(parent) {}
 
@@ -51,7 +51,7 @@ class WhatsNextTextBrowser : public TQTextBrowser {
 class KOWhatsNextView : public KOrg::BaseView
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOWhatsNextView(Calendar *calendar, TQWidget *parent = 0,
                     const char *name = 0);
diff --git a/korganizer/kowindowlist.h b/korganizer/kowindowlist.h
index f6e58319..69523160 100644
--- a/korganizer/kowindowlist.h
+++ b/korganizer/kowindowlist.h
@@ -43,7 +43,7 @@ class KURL;
 class KOWindowList : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     /**
       Constructs a new list of KOrganizer windows. There should only be one
diff --git a/korganizer/multiagendaview.h b/korganizer/multiagendaview.h
index a702b9c0..f3e22754 100644
--- a/korganizer/multiagendaview.h
+++ b/korganizer/multiagendaview.h
@@ -41,7 +41,7 @@ namespace KOrg {
 class MultiAgendaView : public AgendaView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     explicit MultiAgendaView( Calendar* cal, CalendarView *calendarView,
                               TQWidget *parent = 0, const char *name = 0 );
diff --git a/korganizer/navigatorbar.h b/korganizer/navigatorbar.h
index d3642b0a..13d39716 100644
--- a/korganizer/navigatorbar.h
+++ b/korganizer/navigatorbar.h
@@ -34,7 +34,7 @@ class TQFrame;
 class ActiveLabel : public TQLabel
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ActiveLabel( TQWidget *parent, const char *name = 0 );
 
@@ -49,7 +49,7 @@ class ActiveLabel : public TQLabel
 class NavigatorBar: public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     NavigatorBar( TQWidget *parent = 0, const char *name = 0 );
     ~NavigatorBar();
diff --git a/korganizer/plugins/datenums/configdialog.h b/korganizer/plugins/datenums/configdialog.h
index df2b7594..d5e6a52c 100644
--- a/korganizer/plugins/datenums/configdialog.h
+++ b/korganizer/plugins/datenums/configdialog.h
@@ -26,7 +26,7 @@ class TQButtonGroup;
 class ConfigDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ConfigDialog(TQWidget *parent=0);
     virtual ~ConfigDialog();
diff --git a/korganizer/plugins/exchange/exchange.h b/korganizer/plugins/exchange/exchange.h
index 8f021004..8de777fe 100644
--- a/korganizer/plugins/exchange/exchange.h
+++ b/korganizer/plugins/exchange/exchange.h
@@ -35,7 +35,7 @@ using namespace KCal;
 
 class Exchange : public KOrg::Part {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     Exchange( KOrg::MainWindow *, const char *name );
     ~Exchange();
diff --git a/korganizer/plugins/exchange/exchangeconfig.h b/korganizer/plugins/exchange/exchangeconfig.h
index 54692f84..a7aa3285 100644
--- a/korganizer/plugins/exchange/exchangeconfig.h
+++ b/korganizer/plugins/exchange/exchangeconfig.h
@@ -30,7 +30,7 @@
 class ExchangeConfig : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ExchangeConfig(KPIM::ExchangeAccount* account, TQWidget *parent=0);
     virtual ~ExchangeConfig();
diff --git a/korganizer/plugins/exchange/exchangedialog.h b/korganizer/plugins/exchange/exchangedialog.h
index 80fe46f7..8c525f2b 100644
--- a/korganizer/plugins/exchange/exchangedialog.h
+++ b/korganizer/plugins/exchange/exchangedialog.h
@@ -27,7 +27,7 @@ class TQComboBox;
 class ExchangeDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ExchangeDialog( const TQDate &start, const TQDate &end, TQWidget *parent=0);
     virtual ~ExchangeDialog();
diff --git a/korganizer/plugins/hebrew/configdialog.h b/korganizer/plugins/hebrew/configdialog.h
index cfd19e7f..805ba970 100644
--- a/korganizer/plugins/hebrew/configdialog.h
+++ b/korganizer/plugins/hebrew/configdialog.h
@@ -28,7 +28,7 @@
 class ConfigDialog:public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 
diff --git a/korganizer/plugins/projectview/koprojectview.h b/korganizer/plugins/projectview/koprojectview.h
index 6065f9c3..be0e1ee9 100644
--- a/korganizer/plugins/projectview/koprojectview.h
+++ b/korganizer/plugins/projectview/koprojectview.h
@@ -66,7 +66,7 @@ class KOProjectViewItem : public KGanttItem {
 class KOProjectView : public KOrg::BaseView
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOProjectView(Calendar *, TQWidget* parent=0, const char* name=0 );
     ~KOProjectView() {}
diff --git a/korganizer/plugins/projectview/projectview.h b/korganizer/plugins/projectview/projectview.h
index c6059650..1c78ad84 100644
--- a/korganizer/plugins/projectview/projectview.h
+++ b/korganizer/plugins/projectview/projectview.h
@@ -25,7 +25,7 @@
 
 class ProjectView : public KOrg::Part {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ProjectView(KOrg::MainWindow *, const char *);
     ~ProjectView();
diff --git a/korganizer/plugins/timespanview/kotimespanview.h b/korganizer/plugins/timespanview/kotimespanview.h
index 7018ce46..ae407443 100644
--- a/korganizer/plugins/timespanview/kotimespanview.h
+++ b/korganizer/plugins/timespanview/kotimespanview.h
@@ -32,7 +32,7 @@ class TimeSpanWidget;
 class KOTimeSpanView : public KOEventView
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KOTimeSpanView( Calendar *calendar, TQWidget *parent = 0,
                     const char *name = 0 );
diff --git a/korganizer/plugins/timespanview/lineview.h b/korganizer/plugins/timespanview/lineview.h
index e0b5c906..5db02c09 100644
--- a/korganizer/plugins/timespanview/lineview.h
+++ b/korganizer/plugins/timespanview/lineview.h
@@ -30,7 +30,7 @@
 class LineView : public TQScrollView
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     LineView( TQWidget *parent = 0, const char *name = 0 );
     virtual ~LineView();
diff --git a/korganizer/plugins/timespanview/timeline.h b/korganizer/plugins/timespanview/timeline.h
index 74d0a3cf..0cb9ad5b 100644
--- a/korganizer/plugins/timespanview/timeline.h
+++ b/korganizer/plugins/timespanview/timeline.h
@@ -30,7 +30,7 @@
 class TimeLine : public TQScrollView
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     TimeLine( TQWidget *parent = 0, const char *name = 0 );
     virtual ~TimeLine();
diff --git a/korganizer/plugins/timespanview/timespanview.h b/korganizer/plugins/timespanview/timespanview.h
index 5338e8ff..ee20bb13 100644
--- a/korganizer/plugins/timespanview/timespanview.h
+++ b/korganizer/plugins/timespanview/timespanview.h
@@ -25,7 +25,7 @@
 
 class TimespanView : public KOrg::Part {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     TimespanView(KOrg::MainWindow *, const char *);
     ~TimespanView();
diff --git a/korganizer/plugins/timespanview/timespanwidget.h b/korganizer/plugins/timespanview/timespanwidget.h
index 92a2f116..cf2991df 100644
--- a/korganizer/plugins/timespanview/timespanwidget.h
+++ b/korganizer/plugins/timespanview/timespanwidget.h
@@ -38,7 +38,7 @@ class TimeLine;
 class TimeSpanWidget : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     TimeSpanWidget( TQWidget *parent=0, const char *name=0 );
     virtual ~TimeSpanWidget();
diff --git a/korganizer/previewdialog.h b/korganizer/previewdialog.h
index c495e9bb..243be11d 100644
--- a/korganizer/previewdialog.h
+++ b/korganizer/previewdialog.h
@@ -41,7 +41,7 @@ namespace KCal {
 class PreviewDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     PreviewDialog( const KURL &url, TQWidget *parent );
     ~PreviewDialog();
diff --git a/korganizer/printing/calprinter.h b/korganizer/printing/calprinter.h
index edb83bd3..a6d3d3cb 100644
--- a/korganizer/printing/calprinter.h
+++ b/korganizer/printing/calprinter.h
@@ -53,7 +53,7 @@ class TQLabel;
 class KDE_EXPORT CalPrinter : public TQObject, public KOrg::CalPrinterBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     enum ePrintOrientation {
@@ -107,7 +107,7 @@ class KDE_EXPORT CalPrinter : public TQObject, public KOrg::CalPrinterBase
 class CalPrintDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     CalPrintDialog( KOrg::PrintPlugin::List plugins,
                     TQWidget *parent = 0, const char *name = 0 );
diff --git a/korganizer/publishdialog.h b/korganizer/publishdialog.h
index 5ef4b9a9..dd1b5372 100644
--- a/korganizer/publishdialog.h
+++ b/korganizer/publishdialog.h
@@ -34,7 +34,7 @@ class PublishDialog_base;
 class PublishDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     PublishDialog(TQWidget* parent=0,const char* name=0,
                    bool modal=true );
diff --git a/korganizer/resourceview.h b/korganizer/resourceview.h
index 6734c4bc..b4d6a70b 100644
--- a/korganizer/resourceview.h
+++ b/korganizer/resourceview.h
@@ -95,7 +95,7 @@ class ResourceItem : public TQCheckListItem
 class ResourceView : public CalendarViewExtension
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ResourceView( CalendarResources *calendar, CalendarView *view,
                   TQWidget *parent = 0, const char *name = 0 );
diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h
index f2a1f40f..c1beef80 100644
--- a/korganizer/searchdialog.h
+++ b/korganizer/searchdialog.h
@@ -46,7 +46,7 @@ using namespace KCal;
 class SearchDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     SearchDialog(Calendar *calendar,TQWidget *parent=0);
     virtual ~SearchDialog();
diff --git a/korganizer/statusdialog.h b/korganizer/statusdialog.h
index 5906b44d..4aa00d3e 100644
--- a/korganizer/statusdialog.h
+++ b/korganizer/statusdialog.h
@@ -29,7 +29,7 @@ class TQComboBox;
 class StatusDialog : public KDialog
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     StatusDialog(TQWidget* parent=0,const char* name=0);
     ~StatusDialog();
diff --git a/korganizer/templatemanagementdialog.h b/korganizer/templatemanagementdialog.h
index d3f2afd2..d3e5995c 100644
--- a/korganizer/templatemanagementdialog.h
+++ b/korganizer/templatemanagementdialog.h
@@ -46,7 +46,7 @@
 
 class TemplateManagementDialog: public KDialogBase {
 Q_OBJECT
-  TQ_OBJECT
+  
   public:
     TemplateManagementDialog( TQWidget *parent, const TQStringList& templates );
 
diff --git a/korganizer/timelabels.h b/korganizer/timelabels.h
index 60353e37..3b44dbfe 100644
--- a/korganizer/timelabels.h
+++ b/korganizer/timelabels.h
@@ -39,7 +39,7 @@ class KConfig;
 class TimeLabels : public TQScrollView
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     TimeLabels( int rows, TQWidget *parent = 0, const char *name = 0,
                 WFlags f = 0 );
diff --git a/korn/accountmanager.h b/korn/accountmanager.h
index 3c0c652d..5e7a0347 100644
--- a/korn/accountmanager.h
+++ b/korn/accountmanager.h
@@ -40,7 +40,7 @@ template< class T, class W > class TQMap;
  */
 class AccountManager : public TQObject
 { Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	/**
 	 * Constructor, parameters are directed to TQObject.
diff --git a/korn/boxcontainer.h b/korn/boxcontainer.h
index 3f5a54e0..765d28b1 100644
--- a/korn/boxcontainer.h
+++ b/korn/boxcontainer.h
@@ -33,7 +33,7 @@ class KConfig;
  */
 class BoxContainer : public TQObject
 { Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	/**
 	 * Constructor: everything is passed to TQObject.
diff --git a/korn/boxcontaineritem.h b/korn/boxcontaineritem.h
index bd03801a..e12c400f 100644
--- a/korn/boxcontaineritem.h
+++ b/korn/boxcontaineritem.h
@@ -43,7 +43,7 @@ class TQString;
 class BoxContainerItem : public AccountManager, public DCOPObject
 {
   Q_OBJECT
-//  TQ_OBJECT
+//  
   K_DCOP
 public:
 	/**
diff --git a/korn/dcopdrop.h b/korn/dcopdrop.h
index c6558d98..ed695372 100644
--- a/korn/dcopdrop.h
+++ b/korn/dcopdrop.h
@@ -39,7 +39,7 @@ class TQString;
  */
 class DCOPDrop : public KMailDrop
 { Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	/**
 	 * Constructor: no parameters
diff --git a/korn/dockedcontainer.h b/korn/dockedcontainer.h
index 06a833f2..11ea6ccf 100644
--- a/korn/dockedcontainer.h
+++ b/korn/dockedcontainer.h
@@ -29,7 +29,7 @@ class BoxContainerItem;
  */
 class DockedContainer : public BoxContainer
 { Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	DockedContainer( TQObject * parent = 0, const char * name = 0 );
 	~DockedContainer();
diff --git a/korn/dockeditem.h b/korn/dockeditem.h
index e5737608..ddb6b0d7 100644
--- a/korn/dockeditem.h
+++ b/korn/dockeditem.h
@@ -36,7 +36,7 @@ class TQPixmap;
  */
 class DockedItem : public BoxContainerItem
 { Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	/**
 	 * This contructor gives all it parameters to its parents.
diff --git a/korn/hvcontainer.h b/korn/hvcontainer.h
index 049d32d6..1485209f 100644
--- a/korn/hvcontainer.h
+++ b/korn/hvcontainer.h
@@ -31,7 +31,7 @@ class TQHBox;
 
 class HVContainer : public BoxContainer
 { Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	/**
 	 * Constructor: all elements are passed to BoxContainer, except orientation.
diff --git a/korn/hvitem.h b/korn/hvitem.h
index 98e42025..550d19ba 100644
--- a/korn/hvitem.h
+++ b/korn/hvitem.h
@@ -31,7 +31,7 @@ class Label;
  */
 class HVItem : public BoxContainerItem
 { Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	HVItem( TQWidget *parent = 0, const char *name = 0 );
 	~HVItem();
diff --git a/korn/keditlistboxman.h b/korn/keditlistboxman.h
index 0432e76e..3c213c3c 100644
--- a/korn/keditlistboxman.h
+++ b/korn/keditlistboxman.h
@@ -33,7 +33,7 @@ class TQWidget;
  */
 class KEditListBoxManager : public KEditListBox
 { Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	/**
 	 * Constructor: @see KEditListBoxManager::KEditListBoxManager( const TQString&, TQWidget, const char * name, bool, int )
diff --git a/korn/kio.h b/korn/kio.h
index eceb8653..21ac533e 100644
--- a/korn/kio.h
+++ b/korn/kio.h
@@ -50,7 +50,7 @@ namespace KIO { class Job; class MetaData; class Slave; class TransferJob; }
 class KKioDrop : public KPollableDrop
 {
  Q_OBJECT
-  TQ_OBJECT
+  
 private:
 	KURL *_kurl;
 	KIO::MetaData *_metadata;
diff --git a/korn/kio_count.h b/korn/kio_count.h
index 3b555739..25616e60 100644
--- a/korn/kio_count.h
+++ b/korn/kio_count.h
@@ -43,7 +43,7 @@ class TQString;
 
 class KIO_Count : public TQObject
 { Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	KIO_Count( TQObject * parent = 0, const char * name = 0 );
 	~KIO_Count();
diff --git a/korn/kio_delete.h b/korn/kio_delete.h
index 3358d8b3..d900d508 100644
--- a/korn/kio_delete.h
+++ b/korn/kio_delete.h
@@ -36,7 +36,7 @@ template<class T> class TQPtrList;
 
 class KIO_Delete : public TQObject
 { Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	//constructors
 	KIO_Delete( TQObject * parent = 0, const char * name = 0 );
diff --git a/korn/kio_read.h b/korn/kio_read.h
index c890b2ec..41f212da 100644
--- a/korn/kio_read.h
+++ b/korn/kio_read.h
@@ -34,7 +34,7 @@ class TQString;
 
 class KIO_Read : public TQObject
 { Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	KIO_Read( TQObject * parent = 0, const char * name = 0 );
 	~KIO_Read();
diff --git a/korn/kio_single_subject.h b/korn/kio_single_subject.h
index 472148e9..cba3a639 100644
--- a/korn/kio_single_subject.h
+++ b/korn/kio_single_subject.h
@@ -34,7 +34,7 @@ class TQString;
 
 class KIO_Single_Subject : public TQObject
 { Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	KIO_Single_Subject( TQObject * parent, const char * name, KURL &, KIO::MetaData &, const KIO_Protocol *,
 	                    KIO::Slave *&, const TQString &, const long );
diff --git a/korn/kio_subjects.h b/korn/kio_subjects.h
index 87105476..124c83c4 100644
--- a/korn/kio_subjects.h
+++ b/korn/kio_subjects.h
@@ -36,7 +36,7 @@ template<class T> class TQValueList;
 
 class KIO_Subjects : public TQObject
 { Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	KIO_Subjects( TQObject * parent, const char * name );
 	~KIO_Subjects( );
diff --git a/korn/kornaccountcfgimpl.h b/korn/kornaccountcfgimpl.h
index c17885d6..8e2f833e 100644
--- a/korn/kornaccountcfgimpl.h
+++ b/korn/kornaccountcfgimpl.h
@@ -37,7 +37,7 @@ template< class T > class TQPtrVector;
 
 class KornAccountCfgImpl : public KornAccountCfg
 { Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	KornAccountCfgImpl( TQWidget * parent = 0, const char * name = 0 );
 	~KornAccountCfgImpl();
diff --git a/korn/kornapp.h b/korn/kornapp.h
index 513695b2..41348cc2 100644
--- a/korn/kornapp.h
+++ b/korn/kornapp.h
@@ -17,7 +17,7 @@ class KornShell;
 class KornApp : public KUniqueApplication
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	/**
diff --git a/korn/kornboxcfgimpl.h b/korn/kornboxcfgimpl.h
index ffcd9747..73cf7bb5 100644
--- a/korn/kornboxcfgimpl.h
+++ b/korn/kornboxcfgimpl.h
@@ -31,7 +31,7 @@ class TQWidget;
 
 class KornBoxCfgImpl : public KornBoxCfg
 { Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	KornBoxCfgImpl( TQWidget *parent, const char * name );
 	~KornBoxCfgImpl();
diff --git a/korn/korncfgimpl.h b/korn/korncfgimpl.h
index aef4be1f..eee7c610 100644
--- a/korn/korncfgimpl.h
+++ b/korn/korncfgimpl.h
@@ -29,7 +29,7 @@ class TQString;
 
 class KornCfgImpl : public KornCfgWidget
 { Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	KornCfgImpl( TQWidget * parent = 0, const char * name = 0 );
 	~KornCfgImpl();
diff --git a/korn/kornshell.h b/korn/kornshell.h
index 56859863..e3e50667 100644
--- a/korn/kornshell.h
+++ b/korn/kornshell.h
@@ -31,7 +31,7 @@ class KConfig;
  */
 class KornShell : public TQWidget
 { Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	KornShell( TQWidget * parent = 0, const char * name = 0 );
 	~KornShell();
diff --git a/korn/label.h b/korn/label.h
index c8d9b485..d6cd31b0 100644
--- a/korn/label.h
+++ b/korn/label.h
@@ -27,7 +27,7 @@
  */
 class Label : public TQLabel
 { Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	Label( TQWidget * parent = 0, const char * name = 0 ) : TQLabel( parent, name ) {}
 	virtual ~Label() {}
diff --git a/korn/maildlg.h b/korn/maildlg.h
index 81917bb4..7d76d488 100644
--- a/korn/maildlg.h
+++ b/korn/maildlg.h
@@ -17,7 +17,7 @@ class TQString;
 class KornMailDlg : public KDialogBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 	/**
 	 * Edit control showing the mail (read only)
diff --git a/korn/maildrop.h b/korn/maildrop.h
index 160a59cd..460f0aff 100644
--- a/korn/maildrop.h
+++ b/korn/maildrop.h
@@ -30,7 +30,7 @@ template< class T, class R > class TQMap;
 class KMailDrop : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
 
diff --git a/korn/polldrop.h b/korn/polldrop.h
index 751bebc0..44a90d1c 100644
--- a/korn/polldrop.h
+++ b/korn/polldrop.h
@@ -21,7 +21,7 @@ class TQTimerEvent;
 class KPollableDrop : public KMailDrop
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	static const char *PollConfigKey;
 	static const int DefaultPoll;
diff --git a/korn/subjectsdlg.h b/korn/subjectsdlg.h
index e7c8a985..224d6e78 100644
--- a/korn/subjectsdlg.h
+++ b/korn/subjectsdlg.h
@@ -24,7 +24,7 @@ template< class T > class TQPtrList;
 class KornSubjectsDlg: public KDialogBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 	/**
 	* SubjectListViewItem is a helper class representing one line in the list view.
diff --git a/korn/systemtray.h b/korn/systemtray.h
index 3cf3fe2c..01a4f683 100644
--- a/korn/systemtray.h
+++ b/korn/systemtray.h
@@ -31,7 +31,7 @@ class TQWidget;
  */
 class SystemTray : public KSystemTray
 { Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	/**
 	 * This contructor gives all it parameters to its parents.
diff --git a/kresources/birthdays/resourcekabc.h b/kresources/birthdays/resourcekabc.h
index 30c0814d..be77c186 100644
--- a/kresources/birthdays/resourcekabc.h
+++ b/kresources/birthdays/resourcekabc.h
@@ -48,7 +48,7 @@ namespace KCal {
 class KDE_EXPORT ResourceKABC : public ResourceCalendar
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     friend class ResourceKABCConfig;
 
diff --git a/kresources/birthdays/resourcekabcconfig.h b/kresources/birthdays/resourcekabcconfig.h
index b2e1fb7e..b8ae916e 100644
--- a/kresources/birthdays/resourcekabcconfig.h
+++ b/kresources/birthdays/resourcekabcconfig.h
@@ -41,7 +41,7 @@ namespace KCal {
 class ResourceKABCConfig : public KRES::ConfigWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ResourceKABCConfig( TQWidget* parent = 0, const char* name = 0 );
 
diff --git a/kresources/blogging/API_Blog.h b/kresources/blogging/API_Blog.h
index b8229cf8..f690fc42 100644
--- a/kresources/blogging/API_Blog.h
+++ b/kresources/blogging/API_Blog.h
@@ -84,7 +84,7 @@ protected:
 class APIBlog : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     APIBlog( const KURL &server, TQObject *parent = 0L, const char *name = 0L );
     virtual ~APIBlog();
diff --git a/kresources/blogging/bloggingcalendaradaptor.h b/kresources/blogging/bloggingcalendaradaptor.h
index f193f879..e47e6b13 100644
--- a/kresources/blogging/bloggingcalendaradaptor.h
+++ b/kresources/blogging/bloggingcalendaradaptor.h
@@ -51,7 +51,7 @@ class BloggingUploadItem : public KPIM::GroupwareUploadItem
 class BloggingCalendarAdaptor : public CalendarAdaptor
 {
 Q_OBJECT
-  TQ_OBJECT
+  
   public:
     BloggingCalendarAdaptor();
     TQValueList<KPIM::FolderLister::ContentType> supportedTypes()
diff --git a/kresources/blogging/kcal_resourceblogging.h b/kresources/blogging/kcal_resourceblogging.h
index 36942d52..8eff5062 100644
--- a/kresources/blogging/kcal_resourceblogging.h
+++ b/kresources/blogging/kcal_resourceblogging.h
@@ -36,7 +36,7 @@ namespace KCal {
 class KDE_EXPORT ResourceBlogging : public ResourceGroupwareBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ResourceBlogging();
     ResourceBlogging( const KConfig * );
diff --git a/kresources/blogging/kcal_resourcebloggingconfig.h b/kresources/blogging/kcal_resourcebloggingconfig.h
index b9509e9b..b7584167 100644
--- a/kresources/blogging/kcal_resourcebloggingconfig.h
+++ b/kresources/blogging/kcal_resourcebloggingconfig.h
@@ -28,7 +28,7 @@ namespace KCal {
 class KDE_EXPORT ResourceBloggingConfig : public ResourceGroupwareBaseConfig
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ResourceBloggingConfig( TQWidget *parent = 0, const char *name = 0 );
 
diff --git a/kresources/blogging/xmlrpcjob.h b/kresources/blogging/xmlrpcjob.h
index 349d7617..bc830ad2 100644
--- a/kresources/blogging/xmlrpcjob.h
+++ b/kresources/blogging/xmlrpcjob.h
@@ -46,7 +46,7 @@ namespace KIO {
  */
 class XmlrpcJob : public TransferJob {
 Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     /** Indicates the response type of the call
diff --git a/kresources/caldav/config.h b/kresources/caldav/config.h
index cfa612d3..3e6abe9b 100644
--- a/kresources/caldav/config.h
+++ b/kresources/caldav/config.h
@@ -40,7 +40,7 @@ class CalDavSaveConfig;
 class KDE_EXPORT ResourceCalDavConfig : public KRES::ConfigWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 
diff --git a/kresources/caldav/configwidgets.h b/kresources/caldav/configwidgets.h
index 6ceb0c71..1e524844 100644
--- a/kresources/caldav/configwidgets.h
+++ b/kresources/caldav/configwidgets.h
@@ -50,7 +50,7 @@ class ResourceCached;
 class KDE_EXPORT CalDavReloadConfig : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     explicit CalDavReloadConfig( TQWidget *parent = 0 );
     ~CalDavReloadConfig();
@@ -77,7 +77,7 @@ class KDE_EXPORT CalDavReloadConfig : public TQWidget
 class KDE_EXPORT CalDavSaveConfig : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     explicit CalDavSaveConfig( TQWidget *parent = 0 );
     ~CalDavSaveConfig();
diff --git a/kresources/caldav/resource.h b/kresources/caldav/resource.h
index fd028f7a..67eaa6c0 100644
--- a/kresources/caldav/resource.h
+++ b/kresources/caldav/resource.h
@@ -44,7 +44,7 @@ class CalDavWriter;
 class KDE_EXPORT ResourceCalDav : public ResourceCached
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 
diff --git a/kresources/carddav/config.h b/kresources/carddav/config.h
index 8e0a7100..c26b2b16 100644
--- a/kresources/carddav/config.h
+++ b/kresources/carddav/config.h
@@ -39,7 +39,7 @@ class CardDavSaveConfig;
 class KDE_EXPORT ResourceCardDavConfig : public KRES::ConfigWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 
diff --git a/kresources/carddav/configwidgets.h b/kresources/carddav/configwidgets.h
index 9fb84942..9f45579d 100644
--- a/kresources/carddav/configwidgets.h
+++ b/kresources/carddav/configwidgets.h
@@ -49,7 +49,7 @@ class ResourceCached;
 class KDE_EXPORT CardDavReloadConfig : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     explicit CardDavReloadConfig( TQWidget *parent = 0 );
     ~CardDavReloadConfig();
@@ -76,7 +76,7 @@ class KDE_EXPORT CardDavReloadConfig : public TQWidget
 class KDE_EXPORT CardDavSaveConfig : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     explicit CardDavSaveConfig( TQWidget *parent = 0 );
     ~CardDavSaveConfig();
diff --git a/kresources/carddav/resource.h b/kresources/carddav/resource.h
index cfe0f4da..ff4c4967 100644
--- a/kresources/carddav/resource.h
+++ b/kresources/carddav/resource.h
@@ -43,7 +43,7 @@ class CardDavWriter;
 class KDE_EXPORT ResourceCardDav : public ResourceCached
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 
diff --git a/kresources/egroupware/debugdialog.h b/kresources/egroupware/debugdialog.h
index dc3124a7..bde17988 100644
--- a/kresources/egroupware/debugdialog.h
+++ b/kresources/egroupware/debugdialog.h
@@ -32,7 +32,7 @@ class KTextBrowser;
 class DebugDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     /**
diff --git a/kresources/egroupware/kabc_resourcexmlrpc.h b/kresources/egroupware/kabc_resourcexmlrpc.h
index 73b083d1..93ba6650 100644
--- a/kresources/egroupware/kabc_resourcexmlrpc.h
+++ b/kresources/egroupware/kabc_resourcexmlrpc.h
@@ -40,7 +40,7 @@ class EGroupwarePrefs;
 class KDE_EXPORT ResourceXMLRPC : public ResourceCached
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ResourceXMLRPC( const KConfig* );
diff --git a/kresources/egroupware/kabc_resourcexmlrpcconfig.h b/kresources/egroupware/kabc_resourcexmlrpcconfig.h
index 7ed608aa..fb0c9b47 100644
--- a/kresources/egroupware/kabc_resourcexmlrpcconfig.h
+++ b/kresources/egroupware/kabc_resourcexmlrpcconfig.h
@@ -32,7 +32,7 @@ namespace KABC {
 class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget
 { 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ResourceXMLRPCConfig( TQWidget* parent = 0, const char* name = 0 );
diff --git a/kresources/egroupware/kcal_resourcexmlrpc.h b/kresources/egroupware/kcal_resourcexmlrpc.h
index b95f1344..de603307 100644
--- a/kresources/egroupware/kcal_resourcexmlrpc.h
+++ b/kresources/egroupware/kcal_resourcexmlrpc.h
@@ -53,7 +53,7 @@ class EGroupwarePrefs;
 class KDE_EXPORT ResourceXMLRPC : public ResourceCached
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ResourceXMLRPC( const KConfig* );
diff --git a/kresources/egroupware/kcal_resourcexmlrpcconfig.h b/kresources/egroupware/kcal_resourcexmlrpcconfig.h
index 7b38bbad..1ff75ea8 100644
--- a/kresources/egroupware/kcal_resourcexmlrpcconfig.h
+++ b/kresources/egroupware/kcal_resourcexmlrpcconfig.h
@@ -33,7 +33,7 @@ namespace KCal {
 class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget
 { 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ResourceXMLRPCConfig( TQWidget* parent = 0, const char* name = 0 );
diff --git a/kresources/egroupware/knotes_resourcexmlrpc.h b/kresources/egroupware/knotes_resourcexmlrpc.h
index c44700c3..c7bee901 100644
--- a/kresources/egroupware/knotes_resourcexmlrpc.h
+++ b/kresources/egroupware/knotes_resourcexmlrpc.h
@@ -49,7 +49,7 @@ class EGroupwarePrefs;
 class KDE_EXPORT ResourceXMLRPC : public ResourceNotes
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ResourceXMLRPC( const KConfig* );
diff --git a/kresources/egroupware/knotes_resourcexmlrpcconfig.h b/kresources/egroupware/knotes_resourcexmlrpcconfig.h
index f55a6602..afc5371f 100644
--- a/kresources/egroupware/knotes_resourcexmlrpcconfig.h
+++ b/kresources/egroupware/knotes_resourcexmlrpcconfig.h
@@ -33,7 +33,7 @@ namespace KNotes {
 class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget
 { 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ResourceXMLRPCConfig( TQWidget* parent = 0, const char* name = 0 );
diff --git a/kresources/egroupware/xmlrpciface.h b/kresources/egroupware/xmlrpciface.h
index 4e05dc67..395cf237 100644
--- a/kresources/egroupware/xmlrpciface.h
+++ b/kresources/egroupware/xmlrpciface.h
@@ -33,7 +33,7 @@ namespace KXMLRPC
   class Query : public TQObject
   {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
 
 
@@ -78,7 +78,7 @@ namespace KXMLRPC
   class Server : public TQObject
   {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
       Server( const KURL &url = KURL(),
               TQObject *parent = 0, const char *name = 0 );
diff --git a/kresources/exchange/resourceexchange.h b/kresources/exchange/resourceexchange.h
index d6a092f2..b59b6656 100644
--- a/kresources/exchange/resourceexchange.h
+++ b/kresources/exchange/resourceexchange.h
@@ -48,7 +48,7 @@ class CalFormat;
 class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ResourceExchange( const KConfig * );
diff --git a/kresources/exchange/resourceexchangeconfig.h b/kresources/exchange/resourceexchangeconfig.h
index 3fb49231..42c4ce7e 100644
--- a/kresources/exchange/resourceexchangeconfig.h
+++ b/kresources/exchange/resourceexchangeconfig.h
@@ -37,7 +37,7 @@ namespace KCal {
 class ResourceExchangeConfig : public KRES::ConfigWidget
 { 
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   ResourceExchangeConfig( TQWidget* parent = 0, const char* name = 0 );
diff --git a/kresources/featureplan/kcal_resourcefeatureplan.h b/kresources/featureplan/kcal_resourcefeatureplan.h
index 41eb54af..0e666704 100644
--- a/kresources/featureplan/kcal_resourcefeatureplan.h
+++ b/kresources/featureplan/kcal_resourcefeatureplan.h
@@ -40,7 +40,7 @@ namespace KCal {
 class KDE_EXPORT ResourceFeaturePlan : public ResourceCached
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ResourceFeaturePlan( const KConfig * );
     virtual ~ResourceFeaturePlan();
diff --git a/kresources/featureplan/kcal_resourcefeatureplanconfig.h b/kresources/featureplan/kcal_resourcefeatureplanconfig.h
index 94e31313..5ee83c54 100644
--- a/kresources/featureplan/kcal_resourcefeatureplanconfig.h
+++ b/kresources/featureplan/kcal_resourcefeatureplanconfig.h
@@ -34,7 +34,7 @@ namespace KCal {
 class KDE_EXPORT ResourceFeaturePlanConfig : public KRES::ConfigWidget
 { 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ResourceFeaturePlanConfig( TQWidget *parent = 0, const char *name = 0 );
diff --git a/kresources/groupdav/kabc_resourcegroupdav.h b/kresources/groupdav/kabc_resourcegroupdav.h
index 082eb2a5..662af282 100644
--- a/kresources/groupdav/kabc_resourcegroupdav.h
+++ b/kresources/groupdav/kabc_resourcegroupdav.h
@@ -30,7 +30,7 @@ namespace KABC {
 class KDE_EXPORT ResourceGroupDav : public ResourceGroupwareBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ResourceGroupDav( const KConfig * );
diff --git a/kresources/groupdav/kcal_resourcegroupdav.h b/kresources/groupdav/kcal_resourcegroupdav.h
index 35d76c60..102a5021 100644
--- a/kresources/groupdav/kcal_resourcegroupdav.h
+++ b/kresources/groupdav/kcal_resourcegroupdav.h
@@ -34,7 +34,7 @@ namespace KCal {
 class KDE_EXPORT ResourceGroupDav : public ResourceGroupwareBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ResourceGroupDav();
     ResourceGroupDav( const KConfig * );
diff --git a/kresources/groupware/kabc_resourcegroupware.h b/kresources/groupware/kabc_resourcegroupware.h
index 70875f1d..995301fc 100644
--- a/kresources/groupware/kabc_resourcegroupware.h
+++ b/kresources/groupware/kabc_resourcegroupware.h
@@ -35,7 +35,7 @@ class GroupwarePrefs;
 class ResourceGroupware : public ResourceCached
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ResourceGroupware( const KConfig * );
diff --git a/kresources/groupware/kabc_resourcegroupwareconfig.h b/kresources/groupware/kabc_resourcegroupwareconfig.h
index 04900ca7..00c5c360 100644
--- a/kresources/groupware/kabc_resourcegroupwareconfig.h
+++ b/kresources/groupware/kabc_resourcegroupwareconfig.h
@@ -36,7 +36,7 @@ class ResourceGroupware;
 class ResourceGroupwareConfig : public KRES::ConfigWidget
 { 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ResourceGroupwareConfig( TQWidget* parent = 0, const char* name = 0 );
diff --git a/kresources/groupware/kcal_resourcegroupware.h b/kresources/groupware/kcal_resourcegroupware.h
index 072487a3..9674b0bf 100644
--- a/kresources/groupware/kcal_resourcegroupware.h
+++ b/kresources/groupware/kcal_resourcegroupware.h
@@ -42,7 +42,7 @@ namespace KCal {
 class ResourceGroupware : public ResourceCached
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ResourceGroupware();
   
diff --git a/kresources/groupware/kcal_resourcegroupwareconfig.h b/kresources/groupware/kcal_resourcegroupwareconfig.h
index b43d1bc1..08c75e77 100644
--- a/kresources/groupware/kcal_resourcegroupwareconfig.h
+++ b/kresources/groupware/kcal_resourcegroupwareconfig.h
@@ -41,7 +41,7 @@ class ResourceCachedSaveConfig;
 class ResourceGroupwareConfig : public KRES::ConfigWidget
 { 
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ResourceGroupwareConfig( TQWidget *parent = 0, const char *name = 0 );
 
diff --git a/kresources/groupwise/groupwisesettingswidget.h b/kresources/groupwise/groupwisesettingswidget.h
index 03b68873..9fff6aa7 100644
--- a/kresources/groupwise/groupwisesettingswidget.h
+++ b/kresources/groupwise/groupwisesettingswidget.h
@@ -31,7 +31,7 @@ class TQListViewItem;
 class GroupWiseSettingsWidget : public GroupWiseSettingsWidgetBase
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
   GroupWiseSettingsWidget( TQWidget * parent );
   TQMap<TQString, TQString> dirtySettings();
diff --git a/kresources/groupwise/kabc_resourcegroupwise.h b/kresources/groupwise/kabc_resourcegroupwise.h
index d5c6734b..23912916 100644
--- a/kresources/groupwise/kabc_resourcegroupwise.h
+++ b/kresources/groupwise/kabc_resourcegroupwise.h
@@ -42,7 +42,7 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached
   friend class ResourceGroupwiseConfig;
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ResourceGroupwise( const KConfig * );
diff --git a/kresources/groupwise/kabc_resourcegroupwiseconfig.h b/kresources/groupwise/kabc_resourcegroupwiseconfig.h
index 4db0a705..5b7eb1cf 100644
--- a/kresources/groupwise/kabc_resourcegroupwiseconfig.h
+++ b/kresources/groupwise/kabc_resourcegroupwiseconfig.h
@@ -39,7 +39,7 @@ class ResourceGroupwise;
 class KDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget
 { 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ResourceGroupwiseConfig( TQWidget* parent = 0, const char* name = 0 );
diff --git a/kresources/groupwise/kcal_resourcegroupwise.h b/kresources/groupwise/kcal_resourcegroupwise.h
index 7baf0729..09e0b6d4 100644
--- a/kresources/groupwise/kcal_resourcegroupwise.h
+++ b/kresources/groupwise/kcal_resourcegroupwise.h
@@ -44,7 +44,7 @@ class GroupwisePrefsBase;
 class KDE_EXPORT ResourceGroupwise : public ResourceCached
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ResourceGroupwise();
diff --git a/kresources/groupwise/kcal_resourcegroupwiseconfig.h b/kresources/groupwise/kcal_resourcegroupwiseconfig.h
index 2bf07c83..db47a3f4 100644
--- a/kresources/groupwise/kcal_resourcegroupwiseconfig.h
+++ b/kresources/groupwise/kcal_resourcegroupwiseconfig.h
@@ -42,7 +42,7 @@ class ResourceCachedSaveConfig;
 class KDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget
 { 
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ResourceGroupwiseConfig( TQWidget *parent = 0, const char *name = 0 );
 
diff --git a/kresources/groupwise/kioslave/groupwise.h b/kresources/groupwise/kioslave/groupwise.h
index 72b57971..3d110af8 100644
--- a/kresources/groupwise/kioslave/groupwise.h
+++ b/kresources/groupwise/kioslave/groupwise.h
@@ -27,7 +27,7 @@
 class Groupwise : public TQObject, public KIO::SlaveBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     void get( const KURL &url );
     Groupwise( const TQCString &protocol, const TQCString &pool,
diff --git a/kresources/groupwise/soap/groupwiseserver.h b/kresources/groupwise/soap/groupwiseserver.h
index c37cc148..95218be0 100644
--- a/kresources/groupwise/soap/groupwiseserver.h
+++ b/kresources/groupwise/soap/groupwiseserver.h
@@ -94,7 +94,7 @@ class DeltaInfo
 class GroupwiseServer : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     bool checkResponse( int result, ngwt__Status *status );
diff --git a/kresources/groupwise/soap/ksslsocket.h b/kresources/groupwise/soap/ksslsocket.h
index 5158d001..a8367236 100644
--- a/kresources/groupwise/soap/ksslsocket.h
+++ b/kresources/groupwise/soap/ksslsocket.h
@@ -28,7 +28,7 @@ class KSSLSocketPrivate;
 class KSSLSocket : public KExtendedSocket
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 	public:
 		KSSLSocket();
diff --git a/kresources/kolab/kabc/resourcekolab.h b/kresources/kolab/kabc/resourcekolab.h
index 95fdf3ab..d27a97c9 100644
--- a/kresources/kolab/kabc/resourcekolab.h
+++ b/kresources/kolab/kabc/resourcekolab.h
@@ -53,7 +53,7 @@ class KDE_EXPORT ResourceKolab : public KPIM::ResourceABC,
                      public Kolab::ResourceKolabBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   /**
diff --git a/kresources/kolab/kcal/resourcekolab.h b/kresources/kolab/kcal/resourcekolab.h
index 8d5672f9..e639d260 100644
--- a/kresources/kolab/kcal/resourcekolab.h
+++ b/kresources/kolab/kcal/resourcekolab.h
@@ -52,7 +52,7 @@ class KDE_EXPORT ResourceKolab : public KCal::ResourceCalendar,
                       public Kolab::ResourceKolabBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
     friend struct TemporarySilencer;
 
 public:
diff --git a/kresources/kolab/knotes/resourcekolab.h b/kresources/kolab/knotes/resourcekolab.h
index cc77d25d..f596d8f7 100644
--- a/kresources/kolab/knotes/resourcekolab.h
+++ b/kresources/kolab/knotes/resourcekolab.h
@@ -54,7 +54,7 @@ class KDE_EXPORT ResourceKolab : public ResourceNotes,
                       public ResourceKolabBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   ResourceKolab( const KConfig* );
diff --git a/kresources/kolab/shared/kmailconnection.h b/kresources/kolab/shared/kmailconnection.h
index ec49bfd1..62003b5f 100644
--- a/kresources/kolab/shared/kmailconnection.h
+++ b/kresources/kolab/shared/kmailconnection.h
@@ -50,7 +50,7 @@ class ResourceKolabBase;
 */
 class KMailConnection : public TQObject, public DCOPObject {
   Q_OBJECT
-//  TQ_OBJECT
+//  
   K_DCOP
 
   // These are the methods called by KMail when the resource changes
diff --git a/kresources/lib/calendaradaptor.h b/kresources/lib/calendaradaptor.h
index 12e7d3ae..354a2795 100644
--- a/kresources/lib/calendaradaptor.h
+++ b/kresources/lib/calendaradaptor.h
@@ -52,7 +52,7 @@ class CalendarUploadItem : public KPIM::GroupwareUploadItem
 class KDE_EXPORT CalendarAdaptor : public KPIM::GroupwareDataAdaptor
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     CalendarAdaptor();
 
diff --git a/kresources/lib/folderconfig.h b/kresources/lib/folderconfig.h
index 0c6fb795..36a8d31a 100644
--- a/kresources/lib/folderconfig.h
+++ b/kresources/lib/folderconfig.h
@@ -38,7 +38,7 @@ class FolderLister;
 class KDE_EXPORT FolderConfig : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     FolderConfig( TQWidget *parent );
     ~FolderConfig();
diff --git a/kresources/lib/folderlister.h b/kresources/lib/folderlister.h
index 81121ff6..746c99a2 100644
--- a/kresources/lib/folderlister.h
+++ b/kresources/lib/folderlister.h
@@ -48,7 +48,7 @@ class GroupwarePrefsBase;
 class KDE_EXPORT FolderLister : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     enum Type { AddressBook, Calendar };
     enum ContentType {
diff --git a/kresources/lib/folderlistview.h b/kresources/lib/folderlistview.h
index 1992f8bf..32f01199 100644
--- a/kresources/lib/folderlistview.h
+++ b/kresources/lib/folderlistview.h
@@ -38,7 +38,7 @@ class FolderListCaption;
 class FolderListView : public KListView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   friend class FolderListItem;
 
diff --git a/kresources/lib/groupwaredataadaptor.h b/kresources/lib/groupwaredataadaptor.h
index 09fef659..5cd72419 100644
--- a/kresources/lib/groupwaredataadaptor.h
+++ b/kresources/lib/groupwaredataadaptor.h
@@ -91,7 +91,7 @@ class KDE_EXPORT GroupwareUploadItem
 class KDE_EXPORT GroupwareDataAdaptor : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
   public:
     GroupwareDataAdaptor();
     virtual ~GroupwareDataAdaptor();
diff --git a/kresources/lib/groupwaredownloadjob.h b/kresources/lib/groupwaredownloadjob.h
index e611d286..b2788295 100644
--- a/kresources/lib/groupwaredownloadjob.h
+++ b/kresources/lib/groupwaredownloadjob.h
@@ -42,7 +42,7 @@ class ProgressItem;
 class GroupwareDownloadJob : public GroupwareJob
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     GroupwareDownloadJob( GroupwareDataAdaptor *adaptor );
 
diff --git a/kresources/lib/groupwareresourcejob.h b/kresources/lib/groupwareresourcejob.h
index 6b9cd970..f2818f2c 100644
--- a/kresources/lib/groupwareresourcejob.h
+++ b/kresources/lib/groupwareresourcejob.h
@@ -38,7 +38,7 @@ class GroupwareDataAdaptor;
 class GroupwareJob : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     GroupwareJob( GroupwareDataAdaptor *adaptor );
 
diff --git a/kresources/lib/groupwareuploadjob.h b/kresources/lib/groupwareuploadjob.h
index 273ab77c..7d3c973c 100644
--- a/kresources/lib/groupwareuploadjob.h
+++ b/kresources/lib/groupwareuploadjob.h
@@ -47,7 +47,7 @@ class ProgressItem;
 class GroupwareUploadJob : public GroupwareJob
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     GroupwareUploadJob( GroupwareDataAdaptor *adaptor );
 
diff --git a/kresources/lib/kabc_resourcegroupwarebase.h b/kresources/lib/kabc_resourcegroupwarebase.h
index 872a52e8..0785709c 100644
--- a/kresources/lib/kabc_resourcegroupwarebase.h
+++ b/kresources/lib/kabc_resourcegroupwarebase.h
@@ -43,7 +43,7 @@ class AddressBookAdaptor;
 class KDE_EXPORT ResourceGroupwareBase : public ResourceCached
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ResourceGroupwareBase( const KConfig * );
diff --git a/kresources/lib/kabc_resourcegroupwarebaseconfig.h b/kresources/lib/kabc_resourcegroupwarebaseconfig.h
index 88b9f6db..47a801ae 100644
--- a/kresources/lib/kabc_resourcegroupwarebaseconfig.h
+++ b/kresources/lib/kabc_resourcegroupwarebaseconfig.h
@@ -39,7 +39,7 @@ class ResourceGroupwareBase;
 class KDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget
 { 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ResourceGroupwareBaseConfig( TQWidget* parent = 0, const char* name = 0 );
diff --git a/kresources/lib/kcal_cachesettingsdlg.h b/kresources/lib/kcal_cachesettingsdlg.h
index 920bde0c..1a6b369a 100644
--- a/kresources/lib/kcal_cachesettingsdlg.h
+++ b/kresources/lib/kcal_cachesettingsdlg.h
@@ -42,7 +42,7 @@ class ResourceCachedSaveConfig;
 class KDE_EXPORT CacheSettingsDialog : public KDialogBase
 { 
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     CacheSettingsDialog( TQWidget *parent = 0, const char *name = 0 );
 
diff --git a/kresources/lib/kcal_resourcegroupwarebase.h b/kresources/lib/kcal_resourcegroupwarebase.h
index 800469c1..5691c19d 100644
--- a/kresources/lib/kcal_resourcegroupwarebase.h
+++ b/kresources/lib/kcal_resourcegroupwarebase.h
@@ -52,7 +52,7 @@ class CalendarAdaptor;
 class KDE_EXPORT ResourceGroupwareBase : public ResourceCached
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ResourceGroupwareBase();
   
diff --git a/kresources/lib/kcal_resourcegroupwarebaseconfig.h b/kresources/lib/kcal_resourcegroupwarebaseconfig.h
index d5109281..e326d0d8 100644
--- a/kresources/lib/kcal_resourcegroupwarebaseconfig.h
+++ b/kresources/lib/kcal_resourcegroupwarebaseconfig.h
@@ -47,7 +47,7 @@ class CacheSettingsDialog;
 class KDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ResourceGroupwareBaseConfig( TQWidget *parent = 0, const char *name = 0 );
 
diff --git a/kresources/newexchange/kabc_resourceexchange.h b/kresources/newexchange/kabc_resourceexchange.h
index 9f967c55..2afad9da 100644
--- a/kresources/newexchange/kabc_resourceexchange.h
+++ b/kresources/newexchange/kabc_resourceexchange.h
@@ -28,7 +28,7 @@ namespace KABC {
 class KDE_EXPORT ResourceExchange : public ResourceGroupwareBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ResourceExchange( const KConfig * );
diff --git a/kresources/newexchange/kcal_resourceexchange.h b/kresources/newexchange/kcal_resourceexchange.h
index 7c7c3a70..ded903a2 100644
--- a/kresources/newexchange/kcal_resourceexchange.h
+++ b/kresources/newexchange/kcal_resourceexchange.h
@@ -32,7 +32,7 @@ namespace KCal {
 class KDE_EXPORT ResourceExchange : public ResourceGroupwareBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ResourceExchange();
     ResourceExchange( const KConfig * );
diff --git a/kresources/remote/resourceremote.h b/kresources/remote/resourceremote.h
index 0a7ccef6..656fa9e3 100644
--- a/kresources/remote/resourceremote.h
+++ b/kresources/remote/resourceremote.h
@@ -51,7 +51,7 @@ namespace KCal {
 class KDE_EXPORT ResourceRemote : public ResourceCached
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     friend class ResourceRemoteConfig;
 
diff --git a/kresources/remote/resourceremoteconfig.h b/kresources/remote/resourceremoteconfig.h
index e741510d..595a5d73 100644
--- a/kresources/remote/resourceremoteconfig.h
+++ b/kresources/remote/resourceremoteconfig.h
@@ -45,7 +45,7 @@ class ResourceCachedSaveConfig;
 class KDE_EXPORT ResourceRemoteConfig : public KRES::ConfigWidget
 { 
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ResourceRemoteConfig( TQWidget *parent = 0, const char *name = 0 );
 
diff --git a/kresources/scalix/kabc/resourcescalix.h b/kresources/scalix/kabc/resourcescalix.h
index 613c186a..82c23819 100644
--- a/kresources/scalix/kabc/resourcescalix.h
+++ b/kresources/scalix/kabc/resourcescalix.h
@@ -54,7 +54,7 @@ class KDE_EXPORT ResourceScalix : public KPIM::ResourceABC,
                      public Scalix::ResourceScalixBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   /**
diff --git a/kresources/scalix/kcal/resourcescalix.h b/kresources/scalix/kcal/resourcescalix.h
index 1f409069..cfcf7140 100644
--- a/kresources/scalix/kcal/resourcescalix.h
+++ b/kresources/scalix/kcal/resourcescalix.h
@@ -51,7 +51,7 @@ class KDE_EXPORT ResourceScalix : public KCal::ResourceCalendar,
                       public Scalix::ResourceScalixBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
     friend struct TemporarySilencer;
 
 public:
diff --git a/kresources/scalix/kioslave/scalix.h b/kresources/scalix/kioslave/scalix.h
index 16f60be7..62c2428b 100644
--- a/kresources/scalix/kioslave/scalix.h
+++ b/kresources/scalix/kioslave/scalix.h
@@ -29,7 +29,7 @@
 class Scalix : public TQObject, public KIO::SlaveBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     Scalix( const TQCString &protocol, const TQCString &pool, const TQCString &app );
diff --git a/kresources/scalix/knotes/resourcescalix.h b/kresources/scalix/knotes/resourcescalix.h
index 96b11b39..000b2e91 100644
--- a/kresources/scalix/knotes/resourcescalix.h
+++ b/kresources/scalix/knotes/resourcescalix.h
@@ -53,7 +53,7 @@ class KDE_EXPORT ResourceScalix : public ResourceNotes,
                       public ResourceScalixBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   ResourceScalix( const KConfig* );
diff --git a/kresources/scalix/scalixadmin/delegatedialog.h b/kresources/scalix/scalixadmin/delegatedialog.h
index 6b3d7851..2f258113 100644
--- a/kresources/scalix/scalixadmin/delegatedialog.h
+++ b/kresources/scalix/scalixadmin/delegatedialog.h
@@ -35,7 +35,7 @@ class Delegate;
 class DelegateDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     DelegateDialog( TQWidget *parent = 0 );
diff --git a/kresources/scalix/scalixadmin/delegatemanager.h b/kresources/scalix/scalixadmin/delegatemanager.h
index 2edff628..05b0262d 100644
--- a/kresources/scalix/scalixadmin/delegatemanager.h
+++ b/kresources/scalix/scalixadmin/delegatemanager.h
@@ -29,7 +29,7 @@
 class DelegateManager : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     DelegateManager();
diff --git a/kresources/scalix/scalixadmin/delegatepage.h b/kresources/scalix/scalixadmin/delegatepage.h
index 26afbad8..0f1b9c79 100644
--- a/kresources/scalix/scalixadmin/delegatepage.h
+++ b/kresources/scalix/scalixadmin/delegatepage.h
@@ -31,7 +31,7 @@ class DelegateView;
 class DelegatePage : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     DelegatePage( TQWidget *parent = 0 );
diff --git a/kresources/scalix/scalixadmin/delegateview.h b/kresources/scalix/scalixadmin/delegateview.h
index ec8f1fe2..5dfa379f 100644
--- a/kresources/scalix/scalixadmin/delegateview.h
+++ b/kresources/scalix/scalixadmin/delegateview.h
@@ -32,7 +32,7 @@ class DelegateManager;
 class DelegateView : public KListView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     DelegateView( DelegateManager *manager, TQWidget *parent = 0 );
diff --git a/kresources/scalix/scalixadmin/jobs.h b/kresources/scalix/scalixadmin/jobs.h
index 84574456..27efbb72 100644
--- a/kresources/scalix/scalixadmin/jobs.h
+++ b/kresources/scalix/scalixadmin/jobs.h
@@ -133,7 +133,7 @@ namespace Scalix {
   class GetDelegatesJob : public KIO::SimpleJob
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
       GetDelegatesJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo );
@@ -162,7 +162,7 @@ namespace Scalix {
   class GetOtherUsersJob : public KIO::SimpleJob
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
       GetOtherUsersJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo );
@@ -185,7 +185,7 @@ namespace Scalix {
   class GetOutOfOfficeJob : public KIO::SimpleJob
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
       GetOutOfOfficeJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo );
diff --git a/kresources/scalix/scalixadmin/ldapview.h b/kresources/scalix/scalixadmin/ldapview.h
index d666726a..6af41aa7 100644
--- a/kresources/scalix/scalixadmin/ldapview.h
+++ b/kresources/scalix/scalixadmin/ldapview.h
@@ -30,7 +30,7 @@ class LdapObject;
 class LdapView : public KListView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     LdapView( TQWidget *parent = 0 );
diff --git a/kresources/scalix/scalixadmin/otherusermanager.h b/kresources/scalix/scalixadmin/otherusermanager.h
index 386280ad..26f33ee4 100644
--- a/kresources/scalix/scalixadmin/otherusermanager.h
+++ b/kresources/scalix/scalixadmin/otherusermanager.h
@@ -27,7 +27,7 @@
 class OtherUserManager : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     OtherUserManager();
diff --git a/kresources/scalix/scalixadmin/otheruserpage.h b/kresources/scalix/scalixadmin/otheruserpage.h
index b3333197..67ec4fe9 100644
--- a/kresources/scalix/scalixadmin/otheruserpage.h
+++ b/kresources/scalix/scalixadmin/otheruserpage.h
@@ -31,7 +31,7 @@ class OtherUserView;
 class OtherUserPage : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     OtherUserPage( TQWidget *parent = 0 );
diff --git a/kresources/scalix/scalixadmin/otheruserview.h b/kresources/scalix/scalixadmin/otheruserview.h
index 4f0170eb..b5d3ff00 100644
--- a/kresources/scalix/scalixadmin/otheruserview.h
+++ b/kresources/scalix/scalixadmin/otheruserview.h
@@ -28,7 +28,7 @@ class OtherUserManager;
 class OtherUserView : public KListView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     OtherUserView( OtherUserManager *manager, TQWidget *parent = 0 );
diff --git a/kresources/scalix/scalixadmin/outofofficepage.h b/kresources/scalix/scalixadmin/outofofficepage.h
index ee8ba176..dbd845ba 100644
--- a/kresources/scalix/scalixadmin/outofofficepage.h
+++ b/kresources/scalix/scalixadmin/outofofficepage.h
@@ -31,7 +31,7 @@ class TQTextEdit;
 class OutOfOfficePage : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     OutOfOfficePage( TQWidget *parent = 0 );
diff --git a/kresources/scalix/scalixadmin/passwordpage.h b/kresources/scalix/scalixadmin/passwordpage.h
index 5961ffe2..450bde67 100644
--- a/kresources/scalix/scalixadmin/passwordpage.h
+++ b/kresources/scalix/scalixadmin/passwordpage.h
@@ -33,7 +33,7 @@ class Job;
 class PasswordPage : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PasswordPage( TQWidget *parent = 0 );
diff --git a/kresources/scalix/shared/kmailconnection.h b/kresources/scalix/shared/kmailconnection.h
index 6eab8ff1..7fec6274 100644
--- a/kresources/scalix/shared/kmailconnection.h
+++ b/kresources/scalix/shared/kmailconnection.h
@@ -49,7 +49,7 @@ class ResourceScalixBase;
 */
 class KMailConnection : public TQObject, public DCOPObject {
   Q_OBJECT
-//  TQ_OBJECT
+//  
   K_DCOP
 
   // These are the methods called by KMail when the resource changes
diff --git a/kresources/slox/kabcresourceslox.h b/kresources/slox/kabcresourceslox.h
index cede1717..51bec97c 100644
--- a/kresources/slox/kabcresourceslox.h
+++ b/kresources/slox/kabcresourceslox.h
@@ -48,7 +48,7 @@ class SloxPrefs;
 class KDE_EXPORT ResourceSlox : public ResourceCached, public SloxBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ResourceSlox( const KConfig * );
     ResourceSlox( const KURL &url,
diff --git a/kresources/slox/kabcresourcesloxconfig.h b/kresources/slox/kabcresourcesloxconfig.h
index 20398562..b845321a 100644
--- a/kresources/slox/kabcresourcesloxconfig.h
+++ b/kresources/slox/kabcresourcesloxconfig.h
@@ -35,7 +35,7 @@ namespace KABC {
 class KDE_EXPORT ResourceSloxConfig : public KRES::ConfigWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ResourceSloxConfig( TQWidget* parent = 0, const char* name = 0 );
diff --git a/kresources/slox/kcalresourceslox.h b/kresources/slox/kcalresourceslox.h
index 93d05370..ce1fd86c 100644
--- a/kresources/slox/kcalresourceslox.h
+++ b/kresources/slox/kcalresourceslox.h
@@ -61,7 +61,7 @@ class SloxAccounts;
 class KDE_EXPORT KCalResourceSlox : public KCal::ResourceCached, public SloxBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     friend class KCalResourceSloxConfig;
 
diff --git a/kresources/slox/kcalresourcesloxconfig.h b/kresources/slox/kcalresourcesloxconfig.h
index cbba2a45..619854a8 100644
--- a/kresources/slox/kcalresourcesloxconfig.h
+++ b/kresources/slox/kcalresourcesloxconfig.h
@@ -45,7 +45,7 @@ class SloxBase;
 class KDE_EXPORT KCalResourceSloxConfig : public KRES::ConfigWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KCalResourceSloxConfig( TQWidget *parent = 0, const char *name = 0 );
 
diff --git a/kresources/slox/sloxaccounts.h b/kresources/slox/sloxaccounts.h
index 4860bfd6..85b7625c 100644
--- a/kresources/slox/sloxaccounts.h
+++ b/kresources/slox/sloxaccounts.h
@@ -33,7 +33,7 @@ class SloxBase;
 class KDE_EXPORT SloxAccounts : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     SloxAccounts( SloxBase *res, const KURL &baseUrl );
     ~SloxAccounts();
diff --git a/kresources/slox/sloxfolderdialog.h b/kresources/slox/sloxfolderdialog.h
index c29ebda5..69b8126b 100644
--- a/kresources/slox/sloxfolderdialog.h
+++ b/kresources/slox/sloxfolderdialog.h
@@ -31,7 +31,7 @@ class SloxFolderManager;
 class SloxFolderDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     SloxFolderDialog( SloxFolderManager *manager, FolderType type, TQWidget* parent = 0, const char *name = 0 );
     ~SloxFolderDialog();
diff --git a/kresources/slox/sloxfoldermanager.h b/kresources/slox/sloxfoldermanager.h
index 1ccecc38..54008d55 100644
--- a/kresources/slox/sloxfoldermanager.h
+++ b/kresources/slox/sloxfoldermanager.h
@@ -38,7 +38,7 @@ class SloxFolder;
 class KDE_EXPORT SloxFolderManager : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     SloxFolderManager( SloxBase *res, const KURL &baseUrl );
     ~SloxFolderManager();
diff --git a/kresources/tvanytime/kcal_resourcetvanytime.h b/kresources/tvanytime/kcal_resourcetvanytime.h
index 23922e70..526d1f18 100644
--- a/kresources/tvanytime/kcal_resourcetvanytime.h
+++ b/kresources/tvanytime/kcal_resourcetvanytime.h
@@ -51,7 +51,7 @@ class TVAnytimePrefsBase;
 class KDE_EXPORT ResourceTVAnytime : public ResourceCached
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ResourceTVAnytime();
diff --git a/kresources/tvanytime/kcal_resourcetvanytimeconfig.h b/kresources/tvanytime/kcal_resourcetvanytimeconfig.h
index 6e23ee85..404738ae 100644
--- a/kresources/tvanytime/kcal_resourcetvanytimeconfig.h
+++ b/kresources/tvanytime/kcal_resourcetvanytimeconfig.h
@@ -41,7 +41,7 @@ class ResourceCachedSaveConfig;
 class KDE_EXPORT ResourceTVAnytimeConfig : public KRES::ConfigWidget
 {
 Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ResourceTVAnytimeConfig( TQWidget *parent = 0, const char *name = 0 );
 
diff --git a/ktnef/gui/ktnefmain.h b/ktnef/gui/ktnefmain.h
index 7fe89b32..8e751928 100644
--- a/ktnef/gui/ktnefmain.h
+++ b/ktnef/gui/ktnefmain.h
@@ -29,7 +29,7 @@ class KTNEFAttach;
 class KTNEFMain : public KMainWindow
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	KTNEFMain(TQWidget *parent = 0, const char *name = 0);
diff --git a/ktnef/gui/ktnefview.h b/ktnef/gui/ktnefview.h
index e150595d..2db54d1f 100644
--- a/ktnef/gui/ktnefview.h
+++ b/ktnef/gui/ktnefview.h
@@ -27,7 +27,7 @@ class KTNEFAttach;
 class KDE_EXPORT KTNEFView : public KListView
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	KTNEFView(TQWidget *parent = 0, const char *name = 0);
diff --git a/ktnef/gui/messagepropertydialog.h b/ktnef/gui/messagepropertydialog.h
index d48f3a26..1c46fbb2 100644
--- a/ktnef/gui/messagepropertydialog.h
+++ b/ktnef/gui/messagepropertydialog.h
@@ -26,7 +26,7 @@ class KTNEFMessage;
 class MessagePropertyDialog : public KDialogBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	MessagePropertyDialog( TQWidget *parent, KTNEFMessage *msg );
 
diff --git a/libkcal/calendar.h b/libkcal/calendar.h
index 01d65038..08255938 100644
--- a/libkcal/calendar.h
+++ b/libkcal/calendar.h
@@ -170,7 +170,7 @@ class LIBKCAL_EXPORT Calendar : public TQObject, public CustomProperties,
                                 public IncidenceBase::Observer
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
 
diff --git a/libkcal/calendarresources.h b/libkcal/calendarresources.h
index a2ba6738..3f6f1774 100644
--- a/libkcal/calendarresources.h
+++ b/libkcal/calendarresources.h
@@ -66,7 +66,7 @@ class LIBKCAL_EXPORT CalendarResources :
       public KRES::ManagerObserver<ResourceCalendar>
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     /**
        @class DestinationPolicy
diff --git a/libkcal/resourcecached.h b/libkcal/resourcecached.h
index be6fc2ae..a26c3c53 100644
--- a/libkcal/resourcecached.h
+++ b/libkcal/resourcecached.h
@@ -46,7 +46,7 @@ class KDE_EXPORT ResourceCached : public ResourceCalendar,
                        public KCal::Calendar::Observer
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     /**
       Reload policy.
diff --git a/libkcal/resourcecachedconfig.h b/libkcal/resourcecachedconfig.h
index 4fac644f..0ee57793 100644
--- a/libkcal/resourcecachedconfig.h
+++ b/libkcal/resourcecachedconfig.h
@@ -39,7 +39,7 @@ class ResourceCached;
 class KDE_EXPORT ResourceCachedReloadConfig : public TQWidget
 { 
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ResourceCachedReloadConfig( TQWidget *parent = 0, const char *name = 0 );
 
@@ -66,7 +66,7 @@ class KDE_EXPORT ResourceCachedReloadConfig : public TQWidget
 class KDE_EXPORT ResourceCachedSaveConfig : public TQWidget
 { 
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ResourceCachedSaveConfig( TQWidget *parent = 0, const char *name = 0 );
 
diff --git a/libkcal/resourcecalendar.h b/libkcal/resourcecalendar.h
index 8ec25ff7..c1c1e492 100644
--- a/libkcal/resourcecalendar.h
+++ b/libkcal/resourcecalendar.h
@@ -57,7 +57,7 @@ class CalFormat;
 class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ResourceCalendar( const KConfig * );
     virtual ~ResourceCalendar();
diff --git a/libkcal/resourcelocal.h b/libkcal/resourcelocal.h
index d03f824c..d5a28eaa 100644
--- a/libkcal/resourcelocal.h
+++ b/libkcal/resourcelocal.h
@@ -45,7 +45,7 @@ class CalFormat;
 class LIBKCAL_EXPORT ResourceLocal : public ResourceCached
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     friend class ResourceLocalConfig;
 
diff --git a/libkcal/resourcelocalconfig.h b/libkcal/resourcelocalconfig.h
index 46e26711..3fd42a6f 100644
--- a/libkcal/resourcelocalconfig.h
+++ b/libkcal/resourcelocalconfig.h
@@ -42,7 +42,7 @@ namespace KCal {
 class LIBKCAL_EXPORT ResourceLocalConfig : public KRES::ConfigWidget
 { 
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ResourceLocalConfig( TQWidget* parent = 0, const char* name = 0 );
 
diff --git a/libkcal/resourcelocaldir.h b/libkcal/resourcelocaldir.h
index ea59546f..e5fe7f81 100644
--- a/libkcal/resourcelocaldir.h
+++ b/libkcal/resourcelocaldir.h
@@ -45,7 +45,7 @@ class Incidence;
 class LIBKCAL_EXPORT ResourceLocalDir : public ResourceCached
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     friend class ResourceLocalDirConfig;
 
diff --git a/libkcal/resourcelocaldirconfig.h b/libkcal/resourcelocaldirconfig.h
index 3866e9cc..7e223320 100644
--- a/libkcal/resourcelocaldirconfig.h
+++ b/libkcal/resourcelocaldirconfig.h
@@ -44,7 +44,7 @@ namespace KCal {
 class LIBKCAL_EXPORT ResourceLocalDirConfig : public KRES::ConfigWidget
 { 
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ResourceLocalDirConfig( TQWidget *parent = 0, const char *name = 0 );
 
diff --git a/libkcal/tests/testresource.h b/libkcal/tests/testresource.h
index 848d7988..f6d7fc12 100644
--- a/libkcal/tests/testresource.h
+++ b/libkcal/tests/testresource.h
@@ -29,7 +29,7 @@ namespace KCal {
 class TestResource : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     TestResource( const TQString& type, KConfig *config );
diff --git a/libkpgp/kpgpui.h b/libkpgp/kpgpui.h
index 219ed148..2f15f0c0 100644
--- a/libkpgp/kpgpui.h
+++ b/libkpgp/kpgpui.h
@@ -55,7 +55,7 @@ class KeyIDList;            // needed by KeySelectionDialog
 class KDE_EXPORT PassphraseDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PassphraseDialog( TQWidget *parent=0, const TQString &caption=TQString(),
@@ -76,7 +76,7 @@ class KDE_EXPORT PassphraseDialog : public KDialogBase
 class KDE_EXPORT Config : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     Config(TQWidget *parent = 0, const char *name = 0, bool encrypt =true);
@@ -104,7 +104,7 @@ class KDE_EXPORT Config : public TQWidget
 class KDE_EXPORT KeySelectionDialog: public KeySelectionDialogSuper
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   enum TrustCheckMode { NoExpensiveTrustCheck,
                         AllowExpensiveTrustCheck,
@@ -204,7 +204,7 @@ class KDE_EXPORT KeySelectionDialog: public KeySelectionDialogSuper
 class KDE_EXPORT KeyRequester: public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KeyRequester( TQWidget * parent=0, bool multipleKeys=false,
@@ -256,7 +256,7 @@ protected:
 
 class KDE_EXPORT PublicKeyRequester : public KeyRequester {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   PublicKeyRequester( TQWidget * parent=0, bool multipleKeys=false,
 		      unsigned int allowedKeys=PublicKeys, const char * name=0 );
@@ -276,7 +276,7 @@ protected:
 
 class KDE_EXPORT SecretKeyRequester : public KeyRequester {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   SecretKeyRequester( TQWidget * parent=0, bool multipleKeys=false,
 		      unsigned int allowedKeys=SecretKeys, const char * name=0 );
@@ -298,7 +298,7 @@ protected:
 class KDE_EXPORT KeyApprovalDialog: public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KeyApprovalDialog( const TQStringList&,
@@ -334,7 +334,7 @@ class KDE_EXPORT KeyApprovalDialog: public KDialogBase
 class KDE_EXPORT CipherTextDialog: public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CipherTextDialog( const TQCString & text, const TQCString & charset=0,
diff --git a/libkpimexchange/core/exchangeaccount.h b/libkpimexchange/core/exchangeaccount.h
index c05f41be..71b6b889 100644
--- a/libkpimexchange/core/exchangeaccount.h
+++ b/libkpimexchange/core/exchangeaccount.h
@@ -35,7 +35,7 @@ namespace KPIM {
 class KDE_EXPORT ExchangeAccount : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ExchangeAccount( const TQString &host, const TQString &port,
                      const TQString &account, const TQString &password,
diff --git a/libkpimexchange/core/exchangeclient.h b/libkpimexchange/core/exchangeclient.h
index 57dced4f..b9b0acd5 100644
--- a/libkpimexchange/core/exchangeclient.h
+++ b/libkpimexchange/core/exchangeclient.h
@@ -47,7 +47,7 @@ class ExchangeDelete;
 
 class KDE_EXPORT ExchangeClient : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ExchangeClient( ExchangeAccount* account, const TQString& mTimeZoneId=TQString() );
     ~ExchangeClient();
diff --git a/libkpimexchange/core/exchangedelete.h b/libkpimexchange/core/exchangedelete.h
index 3af93343..0c2c60e4 100644
--- a/libkpimexchange/core/exchangedelete.h
+++ b/libkpimexchange/core/exchangedelete.h
@@ -35,7 +35,7 @@ class ExchangeAccount;
 
 class KDE_EXPORT ExchangeDelete : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ExchangeDelete( KCal::Event* event, ExchangeAccount* account, TQWidget* window=0 );
     ~ExchangeDelete();
diff --git a/libkpimexchange/core/exchangedownload.h b/libkpimexchange/core/exchangedownload.h
index 591f5d25..a28cc710 100644
--- a/libkpimexchange/core/exchangedownload.h
+++ b/libkpimexchange/core/exchangedownload.h
@@ -37,7 +37,7 @@ class ExchangeAccount;
 
 class ExchangeDownload : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ExchangeDownload( ExchangeAccount* account, TQWidget* window=0 );
    ~ExchangeDownload();
diff --git a/libkpimexchange/core/exchangemonitor.h b/libkpimexchange/core/exchangemonitor.h
index b43ba688..6f31700d 100644
--- a/libkpimexchange/core/exchangemonitor.h
+++ b/libkpimexchange/core/exchangemonitor.h
@@ -41,7 +41,7 @@ class ExchangeAccount;
 
 class ExchangeMonitor : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     typedef long ID;
     typedef TQValueList<ID> IDList;
diff --git a/libkpimexchange/core/exchangeprogress.h b/libkpimexchange/core/exchangeprogress.h
index f3db0be9..4d29c24c 100644
--- a/libkpimexchange/core/exchangeprogress.h
+++ b/libkpimexchange/core/exchangeprogress.h
@@ -29,7 +29,7 @@ namespace KPIM {
 class ExchangeProgress : public KProgressDialog
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   
   public:
     ExchangeProgress(TQWidget *parent=0);
diff --git a/libkpimexchange/core/exchangeupload.h b/libkpimexchange/core/exchangeupload.h
index 5a663597..fd279faa 100644
--- a/libkpimexchange/core/exchangeupload.h
+++ b/libkpimexchange/core/exchangeupload.h
@@ -35,7 +35,7 @@ class ExchangeAccount;
 
 class KDE_EXPORT ExchangeUpload : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ExchangeUpload( KCal::Event* event, ExchangeAccount* account, const TQString& timeZoneId, TQWidget* window=0 );
     ~ExchangeUpload();
diff --git a/libkpimidentities/identitycombo.h b/libkpimidentities/identitycombo.h
index 7d040866..1644f9c2 100644
--- a/libkpimidentities/identitycombo.h
+++ b/libkpimidentities/identitycombo.h
@@ -50,7 +50,7 @@ class Identity;
 
 class KDE_EXPORT IdentityCombo : public TQComboBox {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   IdentityCombo( IdentityManager* manager, TQWidget * parent=0, const char * name=0 );
 
diff --git a/libkpimidentities/identitymanager.h b/libkpimidentities/identitymanager.h
index 3285091c..2f0d5bde 100644
--- a/libkpimidentities/identitymanager.h
+++ b/libkpimidentities/identitymanager.h
@@ -55,7 +55,7 @@ class IdentityManager : public ConfigManager, public DCOPObject
 #undef IdentityManager
 {
   Q_OBJECT
-//  TQ_OBJECT
+//  
   K_DCOP
 
 public:
diff --git a/libtdenetwork/qgpgme/eventloopinteractor.h b/libtdenetwork/qgpgme/eventloopinteractor.h
index c1e5859a..b89b1841 100644
--- a/libtdenetwork/qgpgme/eventloopinteractor.h
+++ b/libtdenetwork/qgpgme/eventloopinteractor.h
@@ -37,7 +37,7 @@ namespace QGpgME {
 
   class KDE_EXPORT EventLoopInteractor : public TQObject, public GpgME::EventLoopInteractor {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     EventLoopInteractor( TQObject * parent, const char * name=0 );
   public:
diff --git a/libtdepim/addresseelineedit.h b/libtdepim/addresseelineedit.h
index 209151b6..3c98fe13 100644
--- a/libtdepim/addresseelineedit.h
+++ b/libtdepim/addresseelineedit.h
@@ -54,7 +54,7 @@ class KDE_EXPORT AddresseeLineEdit : public ClickLineEdit, public DCOPObject
 {
   K_DCOP
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AddresseeLineEdit( TQWidget* parent, bool useCompletion = true,
diff --git a/libtdepim/addresseeselector.h b/libtdepim/addresseeselector.h
index 7ce70fb8..c5e6b493 100644
--- a/libtdepim/addresseeselector.h
+++ b/libtdepim/addresseeselector.h
@@ -166,7 +166,7 @@ class SelectionItem
 class KDE_EXPORT AddresseeSelector : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AddresseeSelector( Selection *selection,
@@ -216,7 +216,7 @@ class KDE_EXPORT AddresseeSelector : public TQWidget
 class KDE_EXPORT AddresseeSelectorDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AddresseeSelectorDialog( Selection *selection,
diff --git a/libtdepim/addresseeview.h b/libtdepim/addresseeview.h
index 0b7c13b0..98a77983 100644
--- a/libtdepim/addresseeview.h
+++ b/libtdepim/addresseeview.h
@@ -43,7 +43,7 @@ namespace KPIM {
 class KDE_EXPORT AddresseeView : public KTextBrowser
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     /**
       Constructor.
diff --git a/libtdepim/addressesdialog.h b/libtdepim/addressesdialog.h
index c553c642..7f751452 100644
--- a/libtdepim/addressesdialog.h
+++ b/libtdepim/addressesdialog.h
@@ -38,7 +38,7 @@ namespace KPIM {
   class AddresseeViewItem : public TQObject, public KListViewItem
   {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     enum Category {
@@ -79,7 +79,7 @@ namespace KPIM {
   class KDE_EXPORT AddressesDialog : public KDialogBase
   {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     AddressesDialog( TQWidget *widget=0, const char *name=0 );
     ~AddressesDialog();
diff --git a/libtdepim/broadcaststatus.h b/libtdepim/broadcaststatus.h
index 934d1cfa..fc9eb607 100644
--- a/libtdepim/broadcaststatus.h
+++ b/libtdepim/broadcaststatus.h
@@ -33,7 +33,7 @@ class KDE_EXPORT BroadcastStatus : public TQObject
 {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   virtual ~BroadcastStatus();
diff --git a/libtdepim/categoryeditdialog.h b/libtdepim/categoryeditdialog.h
index 064f8b68..86cd8e32 100644
--- a/libtdepim/categoryeditdialog.h
+++ b/libtdepim/categoryeditdialog.h
@@ -32,7 +32,7 @@ namespace KPIM {
 class KDE_EXPORT CategoryEditDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     CategoryEditDialog( KPimPrefs *prefs, TQWidget* parent = 0,
                         const char* name = 0,
diff --git a/libtdepim/categoryselectdialog.h b/libtdepim/categoryselectdialog.h
index 3cff0313..ca501ddc 100644
--- a/libtdepim/categoryselectdialog.h
+++ b/libtdepim/categoryselectdialog.h
@@ -33,7 +33,7 @@ namespace KPIM {
 class KDE_EXPORT CategorySelectDialog : public KDialogBase
 { 
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     CategorySelectDialog( KPimPrefs *prefs, TQWidget *parent = 0,
                           const char *name = 0, bool modal = false );
diff --git a/libtdepim/clicklineedit.h b/libtdepim/clicklineedit.h
index 28b771ff..ca832b5e 100644
--- a/libtdepim/clicklineedit.h
+++ b/libtdepim/clicklineedit.h
@@ -36,7 +36,7 @@ namespace KPIM {
 class KDE_EXPORT ClickLineEdit : public KLineEdit
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   TQ_PROPERTY( TQString clickMessage READ clickMessage WRITE setClickMessage )
   public:
     ClickLineEdit( TQWidget *parent, const TQString &msg = TQString(), const char* name = 0 );
diff --git a/libtdepim/collectingprocess.h b/libtdepim/collectingprocess.h
index ae737826..69550ddd 100644
--- a/libtdepim/collectingprocess.h
+++ b/libtdepim/collectingprocess.h
@@ -48,7 +48,7 @@ namespace KPIM {
  */
 class KDE_EXPORT CollectingProcess : public KProcess {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   CollectingProcess( TQObject * parent = 0, const char * name = 0 );
   ~CollectingProcess();
diff --git a/libtdepim/completionordereditor.h b/libtdepim/completionordereditor.h
index 50cc3b3c..6a87b307 100644
--- a/libtdepim/completionordereditor.h
+++ b/libtdepim/completionordereditor.h
@@ -63,7 +63,7 @@ public:
 
 class CompletionOrderEditor : public KDialogBase {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   CompletionOrderEditor( KPIM::LdapSearch* ldapSearch, TQWidget* parent, const char* name = 0 );
diff --git a/libtdepim/configmanager.h b/libtdepim/configmanager.h
index 832a0f70..37147843 100644
--- a/libtdepim/configmanager.h
+++ b/libtdepim/configmanager.h
@@ -31,7 +31,7 @@ namespace KPIM {
  **/
 class KDE_EXPORT ConfigManager : public TQObject {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /** Commit changes to disk and emit changed() if necessary. */
   virtual void commit() = 0;
diff --git a/libtdepim/designerfields.h b/libtdepim/designerfields.h
index c7c2d22c..8e870bd4 100644
--- a/libtdepim/designerfields.h
+++ b/libtdepim/designerfields.h
@@ -35,7 +35,7 @@ namespace KPIM {
 class KDE_EXPORT DesignerFields : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     DesignerFields( const TQString &uiFile, TQWidget *parent,
       const char *name = 0 );
diff --git a/libtdepim/embeddedurlpage.h b/libtdepim/embeddedurlpage.h
index c306466c..0a24b206 100644
--- a/libtdepim/embeddedurlpage.h
+++ b/libtdepim/embeddedurlpage.h
@@ -32,7 +32,7 @@ namespace KPIM {
 class KDE_EXPORT EmbeddedURLPage : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     EmbeddedURLPage( const TQString &url, const TQString &mimetype,
                      TQWidget *parent, const char *name = 0 );
diff --git a/libtdepim/infoextension.h b/libtdepim/infoextension.h
index b857dc4a..f1d43a52 100644
--- a/libtdepim/infoextension.h
+++ b/libtdepim/infoextension.h
@@ -38,7 +38,7 @@ namespace KParts
 	class KDE_EXPORT InfoExtension : public TQObject
 	{
 		Q_OBJECT
-  TQ_OBJECT
+  
 
 	public:
       /**
diff --git a/libtdepim/kabcresourcecached.h b/libtdepim/kabcresourcecached.h
index 2cf0352e..0b2d4287 100644
--- a/libtdepim/kabcresourcecached.h
+++ b/libtdepim/kabcresourcecached.h
@@ -34,7 +34,7 @@ namespace KABC {
 class KDE_EXPORT ResourceCached : public Resource
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     /**
diff --git a/libtdepim/kcmdesignerfields.h b/libtdepim/kcmdesignerfields.h
index 820506f9..9e9c890f 100644
--- a/libtdepim/kcmdesignerfields.h
+++ b/libtdepim/kcmdesignerfields.h
@@ -36,7 +36,7 @@ namespace KPIM {
 class KDE_EXPORT KCMDesignerFields : public KCModule
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KCMDesignerFields( TQWidget *parent = 0, const char *name = 0 );
diff --git a/libtdepim/kconfigwizard.h b/libtdepim/kconfigwizard.h
index 71455277..b933e2a2 100644
--- a/libtdepim/kconfigwizard.h
+++ b/libtdepim/kconfigwizard.h
@@ -33,7 +33,7 @@ class TQListView;
 class KDE_EXPORT KConfigWizard : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     /**
       Create wizard. You have to set a propgator with setPropagator() later.
diff --git a/libtdepim/kdateedit.h b/libtdepim/kdateedit.h
index 02a7701c..ee5bf8d6 100644
--- a/libtdepim/kdateedit.h
+++ b/libtdepim/kdateedit.h
@@ -54,7 +54,7 @@ class TQEvent;
 class KDE_EXPORT KDateEdit : public TQComboBox
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KDateEdit( TQWidget *parent = 0, const char *name = 0 );
diff --git a/libtdepim/kdatepickerpopup.h b/libtdepim/kdatepickerpopup.h
index 7bcfea3e..38b947ad 100644
--- a/libtdepim/kdatepickerpopup.h
+++ b/libtdepim/kdatepickerpopup.h
@@ -45,7 +45,7 @@
 class KDE_EXPORT KDatePickerPopup: public TQPopupMenu
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     enum { NoDate = 1, DatePicker = 2, Words = 4 };
 
diff --git a/libtdepim/kfoldertree.h b/libtdepim/kfoldertree.h
index 89c0e677..c9f9425d 100644
--- a/libtdepim/kfoldertree.h
+++ b/libtdepim/kfoldertree.h
@@ -242,7 +242,7 @@ class KDE_EXPORT KFolderTreeItem : public KListViewItem
 class KDE_EXPORT KFolderTree : public KListView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KFolderTree( TQWidget *parent, const char *name=0 );
diff --git a/libtdepim/kimportdialog.h b/libtdepim/kimportdialog.h
index abcbb318..b21cbc83 100644
--- a/libtdepim/kimportdialog.h
+++ b/libtdepim/kimportdialog.h
@@ -76,7 +76,7 @@ class KImportColumn
 class KImportDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KImportDialog(TQWidget* parent);
 
diff --git a/libtdepim/kincidencechooser.h b/libtdepim/kincidencechooser.h
index 0d8107f0..51deb7a1 100644
--- a/libtdepim/kincidencechooser.h
+++ b/libtdepim/kincidencechooser.h
@@ -42,7 +42,7 @@ class TQButtonGroup;
 class KDE_EXPORT KIncidenceChooser : public KDialog
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     enum mode {
       local, remote, newest, ask, both
diff --git a/libtdepim/kmailcompletion.h b/libtdepim/kmailcompletion.h
index 9251c279..d07eb6a3 100644
--- a/libtdepim/kmailcompletion.h
+++ b/libtdepim/kmailcompletion.h
@@ -36,7 +36,7 @@ namespace KPIM {
 class KMailCompletion : public KCompletion
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KMailCompletion();
diff --git a/libtdepim/komposer/core/core.h b/libtdepim/komposer/core/core.h
index 91487572..98fee42a 100644
--- a/libtdepim/komposer/core/core.h
+++ b/libtdepim/komposer/core/core.h
@@ -45,7 +45,7 @@ namespace Komposer
   class Core : public KMainWindow, virtual public KomposerIface
   {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     Core( TQWidget *parentWidget = 0, const char *name = 0 );
     virtual ~Core();
diff --git a/libtdepim/komposer/core/corewidget.h b/libtdepim/komposer/core/corewidget.h
index 7d2acc6d..dbe1d674 100644
--- a/libtdepim/komposer/core/corewidget.h
+++ b/libtdepim/komposer/core/corewidget.h
@@ -32,7 +32,7 @@ namespace Komposer
   class CoreWidget : public TQWidget
   {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     CoreWidget( TQWidget *parent, const char *name=0 );
 
diff --git a/libtdepim/komposer/core/editor.h b/libtdepim/komposer/core/editor.h
index cdc05710..a1845f6f 100644
--- a/libtdepim/komposer/core/editor.h
+++ b/libtdepim/komposer/core/editor.h
@@ -38,7 +38,7 @@ namespace Komposer {
   class Editor : public Plugin
   {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     enum TextType {
       Plain    = 1 << 0,
diff --git a/libtdepim/komposer/core/plugin.h b/libtdepim/komposer/core/plugin.h
index 7acd7f70..c14bcc6b 100644
--- a/libtdepim/komposer/core/plugin.h
+++ b/libtdepim/komposer/core/plugin.h
@@ -33,7 +33,7 @@ namespace Komposer
                  virtual public KXMLGUIClient
   {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     virtual ~Plugin();
 
diff --git a/libtdepim/komposer/core/pluginmanager.h b/libtdepim/komposer/core/pluginmanager.h
index 34cc6b9c..38895f7b 100644
--- a/libtdepim/komposer/core/pluginmanager.h
+++ b/libtdepim/komposer/core/pluginmanager.h
@@ -40,7 +40,7 @@ namespace Komposer
   class PluginManager : public TQObject
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PluginManager( TQObject * );
diff --git a/libtdepim/komposer/core/prefsmodule.h b/libtdepim/komposer/core/prefsmodule.h
index aba969f1..9e60098e 100644
--- a/libtdepim/komposer/core/prefsmodule.h
+++ b/libtdepim/komposer/core/prefsmodule.h
@@ -35,7 +35,7 @@ namespace Komposer {
   class PrefsModule : public KPrefsModule
   {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     PrefsModule( TQWidget *parent=0, const char *name=0 );
     virtual const KAboutData *aboutData() const;
@@ -44,7 +44,7 @@ namespace Komposer {
   class EditorSelection : public KPrefsWid
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     EditorSelection( const TQString &text, TQString &reference, TQWidget *parent );
diff --git a/libtdepim/komposer/core/tests/managertest.h b/libtdepim/komposer/core/tests/managertest.h
index f02510e6..d131f830 100644
--- a/libtdepim/komposer/core/tests/managertest.h
+++ b/libtdepim/komposer/core/tests/managertest.h
@@ -32,7 +32,7 @@ class ManagerTest : public TQObject,
                     public Tester
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     ManagerTest( TQObject* parent = 0 );
 
diff --git a/libtdepim/komposer/core/tests/testmanager.h b/libtdepim/komposer/core/tests/testmanager.h
index 5dfaa15d..67c04414 100644
--- a/libtdepim/komposer/core/tests/testmanager.h
+++ b/libtdepim/komposer/core/tests/testmanager.h
@@ -12,7 +12,7 @@ using Komposer::Plugin;
 class TestManager : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   TestManager( TQObject *parent );
 
diff --git a/libtdepim/komposer/plugins/default/defaulteditor.h b/libtdepim/komposer/plugins/default/defaulteditor.h
index 84cedcbc..d73953a6 100644
--- a/libtdepim/komposer/plugins/default/defaulteditor.h
+++ b/libtdepim/komposer/plugins/default/defaulteditor.h
@@ -34,7 +34,7 @@ class KActionCollection;
 class DefaultEditor : public Komposer::Editor
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   DefaultEditor( TQObject *parent, const char *name, const TQStringList &args );
   ~DefaultEditor();
diff --git a/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.h b/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.h
index fc49f251..91c96d2f 100644
--- a/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.h
+++ b/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.h
@@ -31,7 +31,7 @@ namespace KParts { class ReadOnlyPart; }
  */
 class KPartsGenericPart : public TQWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
     TQ_PROPERTY( TQString url READ url WRITE setURL )
     TQ_PROPERTY( TQString mimetype READ mimetype WRITE setMimetype )
 public:
diff --git a/libtdepim/kpixmapregionselectorwidget.h b/libtdepim/kpixmapregionselectorwidget.h
index ac399dd0..caad8fc3 100644
--- a/libtdepim/kpixmapregionselectorwidget.h
+++ b/libtdepim/kpixmapregionselectorwidget.h
@@ -47,7 +47,7 @@ namespace KPIM {
 class KPixmapRegionSelectorWidget : public TQWidget
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
    /**
diff --git a/libtdepim/kprefsdialog.h b/libtdepim/kprefsdialog.h
index 907989f8..4ef604ee 100644
--- a/libtdepim/kprefsdialog.h
+++ b/libtdepim/kprefsdialog.h
@@ -58,7 +58,7 @@ class KURLRequester;
 class KDE_EXPORT KPrefsWid : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     /**
       This function is called to read value of the setting from the
@@ -279,7 +279,7 @@ class KDE_EXPORT KPrefsWidDate : public KPrefsWid
 class KDE_EXPORT KPrefsWidColor : public KPrefsWid
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     /**
       Create a color value control element consisting of a test field and a
@@ -322,7 +322,7 @@ class KDE_EXPORT KPrefsWidColor : public KPrefsWid
 class KDE_EXPORT KPrefsWidFont : public KPrefsWid
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     /**
       Create a font value control element consisting of a test field and a
@@ -721,7 +721,7 @@ class KDE_EXPORT KPrefsWidManager
 class KDE_EXPORT KPrefsDialog : public KDialogBase, public KPrefsWidManager
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     /**
       Create a KPrefsDialog for a KPrefs object.
@@ -775,7 +775,7 @@ class KDE_EXPORT KPrefsDialog : public KDialogBase, public KPrefsWidManager
 class KDE_EXPORT KPrefsModule : public KCModule, public KPrefsWidManager
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KPrefsModule( KConfigSkeleton *, TQWidget *parent = 0, const char *name = 0 );
 
diff --git a/libtdepim/krsqueezedtextlabel.h b/libtdepim/krsqueezedtextlabel.h
index 97451d58..cfa924f3 100644
--- a/libtdepim/krsqueezedtextlabel.h
+++ b/libtdepim/krsqueezedtextlabel.h
@@ -40,7 +40,7 @@
  */
 class KDE_EXPORT KRSqueezedTextLabel : public TQLabel {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   /**
diff --git a/libtdepim/kscoring.h b/libtdepim/kscoring.h
index 1b6e2d3c..a345ba14 100644
--- a/libtdepim/kscoring.h
+++ b/libtdepim/kscoring.h
@@ -303,7 +303,7 @@ private:
 class KDE_EXPORT KScoringManager : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
  public:
   //* this is the container for all rules
@@ -410,7 +410,7 @@ class KDE_EXPORT KScoringManager : public TQObject
 class KDE_EXPORT NotifyDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   static void display(ScorableArticle&,const TQString&);
 protected slots:
diff --git a/libtdepim/kscoringeditor.h b/libtdepim/kscoringeditor.h
index ba0ee190..4d445984 100644
--- a/libtdepim/kscoringeditor.h
+++ b/libtdepim/kscoringeditor.h
@@ -52,7 +52,7 @@ class KColorCombo;
 class KDE_EXPORT SingleConditionWidget : public TQFrame
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class ConditionEditWidget;
 public:
   SingleConditionWidget(KScoringManager *,TQWidget *p =0, const char *n =0);
@@ -85,7 +85,7 @@ private:
 class ConditionEditWidget: public KWidgetLister
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ConditionEditWidget(KScoringManager *,TQWidget *p =0, const char *n =0);
   ~ConditionEditWidget();
@@ -104,7 +104,7 @@ private:
 class SingleActionWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class ActionEditWidget;
 public:
   SingleActionWidget(KScoringManager *m,TQWidget *p =0, const char *n =0);
@@ -134,7 +134,7 @@ private:
 class KDE_EXPORT ActionEditWidget : public KWidgetLister
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ActionEditWidget(KScoringManager *m,TQWidget *p =0, const char *n =0);
   ~ActionEditWidget();
@@ -152,7 +152,7 @@ private:
 class RuleEditWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   RuleEditWidget(KScoringManager *m,TQWidget *p =0, const char *n =0);
   ~RuleEditWidget();
@@ -203,7 +203,7 @@ private:
 class KDE_EXPORT RuleListWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   RuleListWidget(KScoringManager *m, bool =false, TQWidget *p =0, const char *n =0);
   ~RuleListWidget();
@@ -254,7 +254,7 @@ private:
 class KDE_EXPORT KScoringEditor : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ~KScoringEditor();
   void setRule(KScoringRule*);
@@ -285,7 +285,7 @@ private:
 class KScoringEditorWidgetDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KScoringEditorWidgetDialog(KScoringManager *m, const TQString& rName, TQWidget *parent=0, const char *name=0);
 protected slots:
@@ -302,7 +302,7 @@ private:
 class KDE_EXPORT KScoringEditorWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KScoringEditorWidget(KScoringManager *m,TQWidget *p =0, const char *n =0);
   ~KScoringEditorWidget();
diff --git a/libtdepim/ksubscription.h b/libtdepim/ksubscription.h
index af8fd37f..0fb5209c 100644
--- a/libtdepim/ksubscription.h
+++ b/libtdepim/ksubscription.h
@@ -188,7 +188,7 @@ class KDE_EXPORT GroupItem : public TQCheckListItem
 class KDE_EXPORT KSubscription : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     /**
diff --git a/libtdepim/ktimeedit.h b/libtdepim/ktimeedit.h
index 11190842..1b93b8fa 100644
--- a/libtdepim/ktimeedit.h
+++ b/libtdepim/ktimeedit.h
@@ -44,7 +44,7 @@
 class KDE_EXPORT KTimeEdit : public TQComboBox
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     /** constructs a new time edit. */
     KTimeEdit(TQWidget *parent=0, TQTime qt=TQTime(12,0), const char *name=0);
diff --git a/libtdepim/kvcarddrag.h b/libtdepim/kvcarddrag.h
index 31885f6a..e2d3c1e2 100644
--- a/libtdepim/kvcarddrag.h
+++ b/libtdepim/kvcarddrag.h
@@ -40,7 +40,7 @@ class KVCardDragPrivate;
 class KDE_EXPORT KVCardDrag : public TQStoredDrag
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     /**
diff --git a/libtdepim/kwidgetlister.h b/libtdepim/kwidgetlister.h
index ebe9c141..4eb189c2 100644
--- a/libtdepim/kwidgetlister.h
+++ b/libtdepim/kwidgetlister.h
@@ -65,7 +65,7 @@ class TQHBox;
 class KDE_EXPORT KWidgetLister : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KWidgetLister( int minWidgets=1, int maxWidgets=8, TQWidget* parent=0, const char* name=0 );
   virtual ~KWidgetLister();
diff --git a/libtdepim/kxface.h b/libtdepim/kxface.h
index 77023230..85d3d9fa 100644
--- a/libtdepim/kxface.h
+++ b/libtdepim/kxface.h
@@ -522,7 +522,7 @@ namespace KPIM {
   class KDE_EXPORT KXFace : public TQObject
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
       KXFace();
diff --git a/libtdepim/ldapclient.h b/libtdepim/ldapclient.h
index a2a85f1e..7eaa3fd0 100644
--- a/libtdepim/ldapclient.h
+++ b/libtdepim/ldapclient.h
@@ -142,7 +142,7 @@ class LdapObject
 class KDE_EXPORT LdapClient : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     LdapClient( int clientNumber, TQObject* parent = 0, const char* name = 0 );
@@ -246,7 +246,7 @@ typedef TQValueList<LdapResult> LdapResultList;
 class KDE_EXPORT LdapSearch : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     LdapSearch();
diff --git a/libtdepim/ldapsearchdialog.h b/libtdepim/ldapsearchdialog.h
index 45e174ef..6dce88ab 100644
--- a/libtdepim/ldapsearchdialog.h
+++ b/libtdepim/ldapsearchdialog.h
@@ -38,7 +38,7 @@ namespace KPIM {
 class LDAPSearchDialog : public KDialogBase
 { 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     LDAPSearchDialog( TQWidget* parent, const char* name = 0 );
diff --git a/libtdepim/overlaywidget.h b/libtdepim/overlaywidget.h
index bb4a89de..c25f00d7 100644
--- a/libtdepim/overlaywidget.h
+++ b/libtdepim/overlaywidget.h
@@ -44,7 +44,7 @@ namespace KPIM {
 class OverlayWidget : public TQHBox
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   OverlayWidget( TQWidget* alignWidget, TQWidget* parent, const char* name = 0 );
diff --git a/libtdepim/progressdialog.h b/libtdepim/progressdialog.h
index 91d92be5..fca815ae 100644
--- a/libtdepim/progressdialog.h
+++ b/libtdepim/progressdialog.h
@@ -52,7 +52,7 @@ class SSLLabel;
 
 class TransactionItemView : public TQScrollView {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   TransactionItemView( TQWidget * parent = 0,
                        const char * name = 0,
@@ -78,7 +78,7 @@ private:
 class TransactionItem : public TQVBox {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   TransactionItem( TQWidget * parent,
@@ -118,7 +118,7 @@ protected:
 class KDE_EXPORT ProgressDialog : public OverlayWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const char* name = 0 );
diff --git a/libtdepim/progressmanager.h b/libtdepim/progressmanager.h
index 2458d5ca..48c21181 100644
--- a/libtdepim/progressmanager.h
+++ b/libtdepim/progressmanager.h
@@ -39,7 +39,7 @@ typedef TQMap<ProgressItem*, bool> ProgressItemMap;
 class KDE_EXPORT ProgressItem : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class ProgressManager;
   friend class TQDict< ProgressItem >; // so it can be deleted from dicts
 
@@ -267,7 +267,7 @@ class KDE_EXPORT ProgressManager : public TQObject
 {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     virtual ~ProgressManager();
diff --git a/libtdepim/resourceabc.h b/libtdepim/resourceabc.h
index 6ac17721..c7e019fb 100644
--- a/libtdepim/resourceabc.h
+++ b/libtdepim/resourceabc.h
@@ -44,7 +44,7 @@ namespace KPIM {
 class KDE_EXPORT ResourceABC : public KABC::Resource
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   ResourceABC( const KConfig* );
diff --git a/libtdepim/sendsmsdialog.h b/libtdepim/sendsmsdialog.h
index af7a97e9..5dec286b 100644
--- a/libtdepim/sendsmsdialog.h
+++ b/libtdepim/sendsmsdialog.h
@@ -30,7 +30,7 @@ class TQTextEdit;
 class SendSMSDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     SendSMSDialog( const TQString &recipientName, TQWidget *parent, const char *name = 0 );
diff --git a/libtdepim/sidebarextension.h b/libtdepim/sidebarextension.h
index fc39ef6c..a8cf13df 100644
--- a/libtdepim/sidebarextension.h
+++ b/libtdepim/sidebarextension.h
@@ -38,7 +38,7 @@ namespace KParts
   class KDE_EXPORT SideBarExtension : public TQObject
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
       /**
diff --git a/libtdepim/statusbarprogresswidget.h b/libtdepim/statusbarprogresswidget.h
index 8b08d2cf..5cd04974 100644
--- a/libtdepim/statusbarprogresswidget.h
+++ b/libtdepim/statusbarprogresswidget.h
@@ -54,7 +54,7 @@ class ProgressDialog;
 class KDE_EXPORT StatusbarProgressWidget : public TQFrame {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 
diff --git a/libtdepim/tests/testdateedit.h b/libtdepim/tests/testdateedit.h
index 8693ffa0..73c9ec91 100644
--- a/libtdepim/tests/testdateedit.h
+++ b/libtdepim/tests/testdateedit.h
@@ -27,7 +27,7 @@
 class DateEdit : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     DateEdit( TQWidget *parent = 0, const char *name = 0 );
diff --git a/libtdepim/tests/testdistrlist.h b/libtdepim/tests/testdistrlist.h
index 3f64527e..1e602a33 100644
--- a/libtdepim/tests/testdistrlist.h
+++ b/libtdepim/tests/testdistrlist.h
@@ -24,7 +24,7 @@
 class TestDistrList : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     TestDistrList() {}
diff --git a/libtdepim/weaver.h b/libtdepim/weaver.h
index 8e82b581..d914d980 100644
--- a/libtdepim/weaver.h
+++ b/libtdepim/weaver.h
@@ -164,7 +164,7 @@ namespace ThreadWeaver {
     class KDE_EXPORT Job : public TQObject
     {
         Q_OBJECT
-  TQ_OBJECT
+  
     public:
         /** Construct a Job object. */
         Job(TQObject* parent=0, const char* name=0);
@@ -297,7 +297,7 @@ namespace ThreadWeaver {
     class KDE_EXPORT Weaver : public TQObject
     {
         Q_OBJECT
-  TQ_OBJECT
+  
     public:
         Weaver (TQObject* parent=0, const char* name=0,
                 int inventoryMin = 4, // minimal number of provided threads
diff --git a/libtdepim/weaverextensions.h b/libtdepim/weaverextensions.h
index 26bccade..7c2cf170 100644
--- a/libtdepim/weaverextensions.h
+++ b/libtdepim/weaverextensions.h
@@ -33,7 +33,7 @@ namespace ThreadWeaver {
     class WeaverExtension : public TQObject
         {
             Q_OBJECT
-  TQ_OBJECT
+  
         public:
             WeaverExtension ( TQObject *parent = 0, const char *name = 0);
             /** Attach() is a convenience method that will connect all our
diff --git a/libtdepim/weaverlogger.h b/libtdepim/weaverlogger.h
index d4d35ff4..962968a1 100644
--- a/libtdepim/weaverlogger.h
+++ b/libtdepim/weaverlogger.h
@@ -26,7 +26,7 @@ namespace ThreadWeaver {
     class WeaverThreadLogger : public WeaverExtension
     {
         Q_OBJECT
-  TQ_OBJECT
+  
     public:
         WeaverThreadLogger( TQObject *parent = 0, const char *name = 0);
         ~WeaverThreadLogger();
diff --git a/plugins/kmail/bodypartformatter/attendeeselector.h b/plugins/kmail/bodypartformatter/attendeeselector.h
index f30ce3d1..f111ac53 100644
--- a/plugins/kmail/bodypartformatter/attendeeselector.h
+++ b/plugins/kmail/bodypartformatter/attendeeselector.h
@@ -30,7 +30,7 @@ class AttendeeSelectorWidget;
 class AttendeeSelector : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     AttendeeSelector( TQWidget *parent = 0 );
 
diff --git a/plugins/kmail/bodypartformatter/delegateselector.h b/plugins/kmail/bodypartformatter/delegateselector.h
index 982f9355..9f34e3c5 100644
--- a/plugins/kmail/bodypartformatter/delegateselector.h
+++ b/plugins/kmail/bodypartformatter/delegateselector.h
@@ -34,7 +34,7 @@ class TQCheckBox;
 class DelegateSelector : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     DelegateSelector( TQWidget *parent = 0 );
diff --git a/wizards/groupwarewizard.h b/wizards/groupwarewizard.h
index f6339718..5f0deee8 100644
--- a/wizards/groupwarewizard.h
+++ b/wizards/groupwarewizard.h
@@ -29,7 +29,7 @@ class OverViewPage;
 class GroupwareWizard : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     GroupwareWizard( TQWidget *parent, const char *name = 0 );
diff --git a/wizards/groupwisewizard.h b/wizards/groupwisewizard.h
index 8abf53b8..f3a7b4ff 100644
--- a/wizards/groupwisewizard.h
+++ b/wizards/groupwisewizard.h
@@ -31,7 +31,7 @@ class TQGroupBox;
 class KDE_EXPORT GroupwiseWizard : public KConfigWizard
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     GroupwiseWizard();
     ~GroupwiseWizard();
diff --git a/wizards/overviewpage.h b/wizards/overviewpage.h
index 723a8a25..6120d739 100644
--- a/wizards/overviewpage.h
+++ b/wizards/overviewpage.h
@@ -27,7 +27,7 @@
 class OverViewPage : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     OverViewPage( TQWidget *parent, const char *name = 0 );
diff --git a/wizards/servertypemanager.h b/wizards/servertypemanager.h
index 5e1e11b5..4f4591a1 100644
--- a/wizards/servertypemanager.h
+++ b/wizards/servertypemanager.h
@@ -29,7 +29,7 @@
 class ServerTypeManager : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     static ServerTypeManager* self();