diff --git a/dcop/dcopclient.h b/dcop/dcopclient.h
index f673899e2..7595cfc2b 100644
--- a/dcop/dcopclient.h
+++ b/dcop/dcopclient.h
@@ -68,7 +68,7 @@ typedef TQValueList<TQCString> QCStringList;
 class DCOP_EXPORT DCOPClient : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
  public:
   /**
diff --git a/interfaces/ktexteditor/document.h b/interfaces/ktexteditor/document.h
index da6a6dd77..90095b64b 100644
--- a/interfaces/ktexteditor/document.h
+++ b/interfaces/ktexteditor/document.h
@@ -33,7 +33,7 @@ class KTEXTEDITOR_EXPORT Document : public KTextEditor::Editor
   friend class PrivateDocument;
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     Document ( TQObject *parent = 0, const char *name = 0 );
diff --git a/interfaces/ktexteditor/editor.h b/interfaces/ktexteditor/editor.h
index 0a4f4c769..a9f542043 100644
--- a/interfaces/ktexteditor/editor.h
+++ b/interfaces/ktexteditor/editor.h
@@ -41,7 +41,7 @@ class KTEXTEDITOR_EXPORT Editor : public KParts::ReadWritePart
   friend class PrivateEditor;
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     /**
diff --git a/kabc/ldapconfigwidget.h b/kabc/ldapconfigwidget.h
index 800066d83..c4144b027 100644
--- a/kabc/ldapconfigwidget.h
+++ b/kabc/ldapconfigwidget.h
@@ -50,7 +50,7 @@ namespace KABC {
   class KABC_EXPORT LdapConfigWidget : public TQWidget
   {
     Q_OBJECT
-    TQ_OBJECT
+    
     TQ_PROPERTY( LCW_Flags flags READ flagsProp WRITE setFlagsProp )
     TQ_PROPERTY( TQString user READ user WRITE setUser )
     TQ_PROPERTY( TQString password READ password WRITE setPassword )
diff --git a/kfile-plugins/elf/kfile_elf.h b/kfile-plugins/elf/kfile_elf.h
index def7e50d9..1e6247a46 100644
--- a/kfile-plugins/elf/kfile_elf.h
+++ b/kfile-plugins/elf/kfile_elf.h
@@ -39,7 +39,7 @@ class TQStringList;
 class KElfPlugin: public KFilePlugin
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     
 public:
     KElfPlugin( TQObject *parent, const char *name, const TQStringList& args );
diff --git a/kio/bookmarks/kbookmarkbar.h b/kio/bookmarks/kbookmarkbar.h
index 4eefbb9a1..310c1933d 100644
--- a/kio/bookmarks/kbookmarkbar.h
+++ b/kio/bookmarks/kbookmarkbar.h
@@ -42,7 +42,7 @@ class TQPopupMenu;
 class KIO_EXPORT KBookmarkBar : public TQObject
 {
     Q_OBJECT
-    TQ_OBJECT
+    
     friend class RMB;
 public:
     /**
diff --git a/kio/kfile/kacleditwidget.h b/kio/kfile/kacleditwidget.h
index e436f16e6..d0f30f60a 100644
--- a/kio/kfile/kacleditwidget.h
+++ b/kio/kfile/kacleditwidget.h
@@ -41,7 +41,7 @@ class TQPushButton;
 class KACLEditWidget : TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KACLEditWidget( TQWidget *parent = 0, const char *name = 0 );
   KACL getACL() const;
diff --git a/kio/kfile/kacleditwidget_p.h b/kio/kfile/kacleditwidget_p.h
index 1a0c85064..166725638 100644
--- a/kio/kfile/kacleditwidget_p.h
+++ b/kio/kfile/kacleditwidget_p.h
@@ -50,7 +50,7 @@ class TQCheckBox;
 class KACLListView : public KListView
 {
     Q_OBJECT
-    TQ_OBJECT
+    
     friend class KACLListViewItem;
 public:
     enum Types
@@ -134,7 +134,7 @@ private:
 class EditACLEntryDialog : public KDialogBase
 {
     Q_OBJECT
-    TQ_OBJECT
+    
 public:
     EditACLEntryDialog( KACLListView *listView, KACLListViewItem *item,
                         const TQStringList &users,
diff --git a/kio/kio/kdatatool.h b/kio/kio/kdatatool.h
index ec76ca5b2..573bf809e 100644
--- a/kio/kio/kdatatool.h
+++ b/kio/kio/kdatatool.h
@@ -194,7 +194,7 @@ private:
 class KIO_EXPORT KDataToolAction : public KAction
 {
     Q_OBJECT
-    TQ_OBJECT
+    
 public:
     /**
      * Constructs a new KDataToolAction.
@@ -254,7 +254,7 @@ private:
 class KIO_EXPORT KDataTool : public TQObject
 {
     Q_OBJECT
-    TQ_OBJECT
+    
 public:
     /**
      * Constructor
diff --git a/kio/kio/kurifilter.h b/kio/kio/kurifilter.h
index 0887d8e4b..cff151cb7 100644
--- a/kio/kio/kurifilter.h
+++ b/kio/kio/kurifilter.h
@@ -363,7 +363,7 @@ private:
 class KIO_EXPORT KURIFilterPlugin : public TQObject
 {
     Q_OBJECT
-    TQ_OBJECT
+    
 
 public:
 
diff --git a/kio/kio/slave.h b/kio/kio/slave.h
index 7c838f784..e5cdc332c 100644
--- a/kio/kio/slave.h
+++ b/kio/kio/slave.h
@@ -44,7 +44,7 @@ namespace KIO {
     class KIO_EXPORT Slave : public KIO::SlaveInterface
     {
 	Q_OBJECT
-	TQ_OBJECT
+	
 
     protected:
 	/**
diff --git a/krsync/krsync.h b/krsync/krsync.h
index 9fa46ad6e..6bca00827 100644
--- a/krsync/krsync.h
+++ b/krsync/krsync.h
@@ -85,7 +85,7 @@ namespace KParts
 class KRsync : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 
diff --git a/krsync/rsyncconfigdialog.h b/krsync/rsyncconfigdialog.h
index f7aae1aff..3da9e6f79 100644
--- a/krsync/rsyncconfigdialog.h
+++ b/krsync/rsyncconfigdialog.h
@@ -38,7 +38,7 @@
 class RsyncConfigDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         RsyncConfigDialog(TQWidget* parent = 0, const char* name = 0,
diff --git a/kstyles/asteroid/asteroid.h b/kstyles/asteroid/asteroid.h
index 7b513896b..cbffa7112 100644
--- a/kstyles/asteroid/asteroid.h
+++ b/kstyles/asteroid/asteroid.h
@@ -12,7 +12,7 @@
 class AsteroidStyle : public KStyle
 {
 	Q_OBJECT
-	TQ_OBJECT
+	
 public:
 	AsteroidStyle();
 	virtual ~AsteroidStyle();
diff --git a/kutils/kcmoduleproxy.h b/kutils/kcmoduleproxy.h
index 1848d9038..11ae06dbb 100644
--- a/kutils/kcmoduleproxy.h
+++ b/kutils/kcmoduleproxy.h
@@ -68,7 +68,7 @@ class KProcess;
 class KUTILS_EXPORT KCModuleProxy : public TQWidget
 {
 Q_OBJECT
-TQ_OBJECT
+
 
 	friend class KCModuleProxyRootCommunicatorImpl;
 
diff --git a/kutils/kfind.h b/kutils/kfind.h
index e37b26fa7..ab088ef33 100644
--- a/kutils/kfind.h
+++ b/kutils/kfind.h
@@ -104,7 +104,7 @@ class KUTILS_EXPORT KFind :
     public TQObject
 {
     Q_OBJECT
-    TQ_OBJECT
+    
 
 public:
 
diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp
index 3ca23c49f..d2ab865cc 100644
--- a/tdecore/kapplication.cpp
+++ b/tdecore/kapplication.cpp
@@ -195,6 +195,7 @@ static int x11_error(Display *dpy, XErrorEvent *ev) {
 		x11_composite_error_generated = true;
 		return 0;
 	}
+	return 1;
 }
 #endif
 
diff --git a/tdecore/kasyncio.h b/tdecore/kasyncio.h
index dbe7cd603..88b904a55 100644
--- a/tdecore/kasyncio.h
+++ b/tdecore/kasyncio.h
@@ -47,7 +47,7 @@ public TQObject,
 public TQIODevice
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 protected:
   KAsyncIO()			// cannot be accessed externally
   { }
diff --git a/tdecore/kbufferedio.h b/tdecore/kbufferedio.h
index 8c53d0676..78bccc9ef 100644
--- a/tdecore/kbufferedio.h
+++ b/tdecore/kbufferedio.h
@@ -56,7 +56,7 @@ class KBufferedIOPrivate;
 class TDECORE_EXPORT KBufferedIO: public KAsyncIO
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 protected:
   // no default public constructor
diff --git a/tdecore/kconfigbase.h b/tdecore/kconfigbase.h
index 2f41195aa..7c0706e46 100644
--- a/tdecore/kconfigbase.h
+++ b/tdecore/kconfigbase.h
@@ -70,7 +70,7 @@ class KConfigGroup;
 class TDECORE_EXPORT KConfigBase : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   friend class KConfigBackEnd;
   friend class KConfigINIBackEnd;
diff --git a/tdecore/kextsock.h b/tdecore/kextsock.h
index 57f3dc8e2..080898443 100644
--- a/tdecore/kextsock.h
+++ b/tdecore/kextsock.h
@@ -95,7 +95,7 @@ class KExtendedSocketPrivate;
 class TDECORE_EXPORT KExtendedSocket: public KBufferedIO // public TQObject, public QIODevice
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   /**
diff --git a/tdecore/kstartupinfo.h b/tdecore/kstartupinfo.h
index d384ceeed..70b1f6e09 100644
--- a/tdecore/kstartupinfo.h
+++ b/tdecore/kstartupinfo.h
@@ -68,7 +68,7 @@ class TDECORE_EXPORT KStartupInfo
     : public TQObject
     {
     Q_OBJECT
-    TQ_OBJECT
+    
     public:
         /**
          * By default, the startup notification is ended for the application
diff --git a/tdecore/network/kbufferedsocket.h b/tdecore/network/kbufferedsocket.h
index 2035098df..93bee08f3 100644
--- a/tdecore/network/kbufferedsocket.h
+++ b/tdecore/network/kbufferedsocket.h
@@ -58,7 +58,7 @@ class KBufferedSocketPrivate;
 class TDECORE_EXPORT KBufferedSocket: public KStreamSocket
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /**
    * Default constructor.
diff --git a/tdecore/network/kclientsocketbase.h b/tdecore/network/kclientsocketbase.h
index ceb5cf118..59da43511 100644
--- a/tdecore/network/kclientsocketbase.h
+++ b/tdecore/network/kclientsocketbase.h
@@ -58,7 +58,7 @@ public TQObject,
 public KActiveSocketBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   /**
diff --git a/tdecore/network/kdatagramsocket.h b/tdecore/network/kdatagramsocket.h
index e68119276..c51fea1ef 100644
--- a/tdecore/network/kdatagramsocket.h
+++ b/tdecore/network/kdatagramsocket.h
@@ -180,7 +180,7 @@ class KDatagramSocketPrivate;
 class TDECORE_EXPORT KDatagramSocket: public KClientSocketBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   /**
diff --git a/tdecore/network/kresolver.h b/tdecore/network/kresolver.h
index 6ae6a26c4..5e20e174a 100644
--- a/tdecore/network/kresolver.h
+++ b/tdecore/network/kresolver.h
@@ -295,7 +295,7 @@ class KResolverPrivate;
 class TDECORE_EXPORT KResolver: public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 
diff --git a/tdecore/network/kreverseresolver.h b/tdecore/network/kreverseresolver.h
index 5c9e95779..21a17b0a5 100644
--- a/tdecore/network/kreverseresolver.h
+++ b/tdecore/network/kreverseresolver.h
@@ -50,7 +50,7 @@ class KReverseResolverPrivate;
 class TDECORE_EXPORT KReverseResolver: public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   /**
diff --git a/tdecore/network/kserversocket.h b/tdecore/network/kserversocket.h
index 448fed270..4f1af33b9 100644
--- a/tdecore/network/kserversocket.h
+++ b/tdecore/network/kserversocket.h
@@ -107,7 +107,7 @@ class KServerSocketPrivate;
 class TDECORE_EXPORT KServerSocket: public TQObject, public KPassiveSocketBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /**
    * Default constructor.
diff --git a/tdecore/network/ksrvresolverworker_p.h b/tdecore/network/ksrvresolverworker_p.h
index 293308544..a9aba3d35 100644
--- a/tdecore/network/ksrvresolverworker_p.h
+++ b/tdecore/network/ksrvresolverworker_p.h
@@ -42,7 +42,7 @@ namespace KNetwork
 			      public KNetwork::KResolverWorkerBase
     {
       Q_OBJECT
-      TQ_OBJECT
+      
 
     public:
       struct Entry
diff --git a/tdecore/network/kstreamsocket.h b/tdecore/network/kstreamsocket.h
index 0308eb9ab..ab90e923a 100644
--- a/tdecore/network/kstreamsocket.h
+++ b/tdecore/network/kstreamsocket.h
@@ -97,7 +97,7 @@ class KStreamSocketPrivate;
 class TDECORE_EXPORT KStreamSocket: public KClientSocketBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   /**
diff --git a/tdefx/kstyle.h b/tdefx/kstyle.h
index ed641d5c6..75cdc32ff 100644
--- a/tdefx/kstyle.h
+++ b/tdefx/kstyle.h
@@ -57,7 +57,7 @@ struct KStylePrivate;
 class TDEFX_EXPORT KStyle: public TQCommonStyle
 {
 	Q_OBJECT
-	TQ_OBJECT
+	
 
 	public:
 
diff --git a/tdeui/kactionclasses.h b/tdeui/kactionclasses.h
index 235a39058..a51701287 100644
--- a/tdeui/kactionclasses.h
+++ b/tdeui/kactionclasses.h
@@ -68,7 +68,7 @@ class KMainWindow;
 class TDEUI_EXPORT KToggleAction : public KAction
 {
     Q_OBJECT
-    TQ_OBJECT
+    
     Q_PROPERTY( bool checked READ isChecked WRITE setChecked )
     Q_PROPERTY( TQString exclusiveGroup READ exclusiveGroup WRITE setExclusiveGroup )
 public:
@@ -231,7 +231,7 @@ private:
 class TDEUI_EXPORT KRadioAction : public KToggleAction
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      * Constructs a radio action with text and potential keyboard
@@ -331,7 +331,7 @@ private:
 class TDEUI_EXPORT KSelectAction : public KAction
 {
     Q_OBJECT
-    TQ_OBJECT
+    
     Q_PROPERTY( int currentItem READ currentItem WRITE setCurrentItem )
     Q_PROPERTY( TQStringList items READ items WRITE setItems )
     Q_PROPERTY( bool editable READ isEditable WRITE setEditable )
@@ -584,7 +584,7 @@ private:
 class TDEUI_EXPORT_DEPRECATED KListAction : public KSelectAction
 {
     Q_OBJECT
-    TQ_OBJECT
+    
 public:
     /**
      * Constructs a list action with text and potential keyboard
@@ -700,7 +700,7 @@ private:
 class TDEUI_EXPORT KRecentFilesAction : public KListAction  // TODO public KSelectAction
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   Q_PROPERTY( uint maxItems READ maxItems WRITE setMaxItems )
 public:
   /**
@@ -910,7 +910,7 @@ private:
 class TDEUI_EXPORT KFontAction : public KSelectAction
 {
     Q_OBJECT
-    TQ_OBJECT
+    
     Q_PROPERTY( TQString font READ font WRITE setFont )
 public:
     KFontAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* parent = 0,
@@ -961,7 +961,7 @@ private:
 class TDEUI_EXPORT KFontSizeAction : public KSelectAction
 {
     Q_OBJECT
-    TQ_OBJECT
+    
     Q_PROPERTY( int fontSize READ fontSize WRITE setFontSize )
 public:
     KFontSizeAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* parent = 0,
@@ -1020,7 +1020,7 @@ private:
 class TDEUI_EXPORT KActionMenu : public KAction
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   Q_PROPERTY( bool delayed READ delayed WRITE setDelayed )
   Q_PROPERTY( bool stickyMenu READ stickyMenu WRITE setStickyMenu )
 
@@ -1094,7 +1094,7 @@ private:
 class TDEUI_EXPORT KToolBarPopupAction : public KAction
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   Q_PROPERTY( bool delayed READ delayed WRITE setDelayed )
   Q_PROPERTY( bool stickyMenu READ stickyMenu WRITE setStickyMenu )
 
@@ -1217,7 +1217,7 @@ private:
 class TDEUI_EXPORT KToggleToolBarAction : public KToggleAction
 {
     Q_OBJECT
-    TQ_OBJECT
+    
 public:
     /**
      * Create a KToggleToolbarAction that manages the toolbar
@@ -1264,7 +1264,7 @@ private:
 class TDEUI_EXPORT KToggleFullScreenAction : public KToggleAction
 {
     Q_OBJECT
-    TQ_OBJECT
+    
 public:
     /**
      * Create a KToggleFullScreenAction
@@ -1309,7 +1309,7 @@ private:
 class TDEUI_EXPORT KWidgetAction : public KAction
 {
     Q_OBJECT
-    TQ_OBJECT
+    
 public:
     /**
      * Create an action that will embed widget into a toolbar
@@ -1354,7 +1354,7 @@ private:
 class TDEUI_EXPORT KActionSeparator : public KAction
 {
     Q_OBJECT
-    TQ_OBJECT
+    
 public:
     KActionSeparator( TQObject* parent = 0, const char* name = 0 );
     virtual ~KActionSeparator();
@@ -1381,7 +1381,7 @@ private:
 class TDEUI_EXPORT KPasteTextAction: public KAction
 {
     Q_OBJECT
-    TQ_OBJECT
+    
 public:
     /**
      * Create a KPasteTextAction, with a text, an icon, an accelerator,
diff --git a/tdeui/kdockwidget.h b/tdeui/kdockwidget.h
index b2b740ca6..4f54e5f13 100644
--- a/tdeui/kdockwidget.h
+++ b/tdeui/kdockwidget.h
@@ -103,7 +103,7 @@ namespace KMDI
 class TDEUI_EXPORT KDockWidgetAbstractHeader : public TQFrame
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
   /**
@@ -153,7 +153,7 @@ private:
 class TDEUI_EXPORT KDockWidgetAbstractHeaderDrag : public TQFrame
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
   /**
@@ -199,7 +199,7 @@ private:
 class TDEUI_EXPORT KDockWidgetHeaderDrag : public KDockWidgetAbstractHeaderDrag
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
   /**
@@ -241,7 +241,7 @@ private:
 class TDEUI_EXPORT KDockWidgetHeader : public KDockWidgetAbstractHeader
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
   /**
@@ -367,7 +367,7 @@ private:
 class TDEUI_EXPORT KDockTabGroup : public TQTabWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /**
    * Constructs this. It just calls the method of the base class.
@@ -428,7 +428,7 @@ private:
 class TDEUI_EXPORT KDockWidget: public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 friend class KDockManager;
 friend class KDockSplitter;
 friend class KDockMainWindow;
@@ -915,7 +915,7 @@ private:
 class TDEUI_EXPORT KDockManager: public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 friend class KDockWidget;
 friend class KDockMainWindow;
 
@@ -1314,7 +1314,7 @@ private:
 class TDEUI_EXPORT KDockMainWindow : public KMainWindow
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 friend class KDockManager;
 
@@ -1485,7 +1485,7 @@ private:
 class TDEUI_EXPORT KDockArea : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 friend class KDockManager;
 
diff --git a/tdeui/keditlistbox.h b/tdeui/keditlistbox.h
index b7b988a7b..2bb8de6b8 100644
--- a/tdeui/keditlistbox.h
+++ b/tdeui/keditlistbox.h
@@ -44,7 +44,7 @@ class KEditListBoxPrivate;
 class TDEUI_EXPORT KEditListBox : public TQGroupBox
 {
    Q_OBJECT
-   TQ_OBJECT
+   
 
    TQ_SETS( Button )
    TQ_PROPERTY( Button buttons READ buttonsProp WRITE setButtonsProp )
diff --git a/tdeui/klistview.h b/tdeui/klistview.h
index c8bb837cd..4b888ffc3 100644
--- a/tdeui/klistview.h
+++ b/tdeui/klistview.h
@@ -55,7 +55,7 @@ class TDEUI_EXPORT KListView : public TQListView
   friend class KListViewItem;
 
   Q_OBJECT
-  TQ_OBJECT
+  
   Q_ENUMS( SelectionModeExt )
   Q_PROPERTY( bool fullWidth READ fullWidth WRITE setFullWidth )
   Q_PROPERTY( bool itemsMovable READ itemsMovable WRITE setItemsMovable )
diff --git a/tdeui/knuminput.h b/tdeui/knuminput.h
index 5f0127cda..1cff20520 100644
--- a/tdeui/knuminput.h
+++ b/tdeui/knuminput.h
@@ -49,7 +49,7 @@ class KIntSpinBox;
 class TDEUI_EXPORT KNumInput : public TQWidget
 {
     Q_OBJECT
-    TQ_OBJECT
+    
     Q_PROPERTY( TQString label READ label WRITE setLabel )
 public:
     /**
@@ -188,7 +188,7 @@ private:
 class TDEUI_EXPORT KIntNumInput : public KNumInput
 {
     Q_OBJECT
-    TQ_OBJECT
+    
     Q_PROPERTY( int value READ value WRITE setValue )
     Q_PROPERTY( int minValue READ minValue WRITE setMinValue )
     Q_PROPERTY( int maxValue READ maxValue WRITE setMaxValue )
@@ -434,7 +434,7 @@ class KDoubleLine;
 class TDEUI_EXPORT KDoubleNumInput : public KNumInput
 {
     Q_OBJECT
-    TQ_OBJECT
+    
     Q_PROPERTY( double value READ value WRITE setValue )
     Q_PROPERTY( double minValue READ minValue WRITE setMinValue )
     Q_PROPERTY( double maxValue READ maxValue WRITE setMaxValue )
@@ -707,7 +707,7 @@ private:
 class TDEUI_EXPORT KIntSpinBox : public TQSpinBox
 {
     Q_OBJECT
-    TQ_OBJECT
+    
     Q_PROPERTY( int base READ base WRITE setBase )
 
 public:
@@ -837,7 +837,7 @@ private:
 
 class TDEUI_EXPORT KDoubleSpinBox : public TQSpinBox {
   Q_OBJECT
-  TQ_OBJECT
+  
   Q_PROPERTY( bool acceptLocalizedNumbers READ acceptLocalizedNumbers WRITE setAcceptLocalizedNumbers )
   Q_OVERRIDE( double maxValue READ maxValue WRITE setMaxValue )
   Q_OVERRIDE( double minValue READ minValue WRITE setMinValue )
diff --git a/tdeui/kpopupmenu.h b/tdeui/kpopupmenu.h
index dfee4537b..5c29fd2f9 100644
--- a/tdeui/kpopupmenu.h
+++ b/tdeui/kpopupmenu.h
@@ -122,7 +122,7 @@ private:
  */
 class TDEUI_EXPORT KPopupMenu : public TQPopupMenu {
     Q_OBJECT
-    TQ_OBJECT
+    
 public:
     /**
      * Constructs a KPopupMenu.
diff --git a/tdeui/ksharedpixmap.h b/tdeui/ksharedpixmap.h
index 07431678a..3295b38d1 100644
--- a/tdeui/ksharedpixmap.h
+++ b/tdeui/ksharedpixmap.h
@@ -58,7 +58,7 @@ class TDEUI_EXPORT KSharedPixmap:
     public KPixmap
 {
     Q_OBJECT
-    TQ_OBJECT
+    
 
 public:
 
diff --git a/tdeui/ktoolbar.h b/tdeui/ktoolbar.h
index 947fd3bab..1ef30a3cc 100644
--- a/tdeui/ktoolbar.h
+++ b/tdeui/ktoolbar.h
@@ -58,7 +58,7 @@ class KToolBarPrivate;
 class TDEUI_EXPORT KToolBarSeparator : public TQFrame
 {
     Q_OBJECT
-    TQ_OBJECT
+    
 public:
     KToolBarSeparator( Orientation, bool l, TQToolBar *parent, const char* name=0 );
 
@@ -104,7 +104,7 @@ private:
 class TDEUI_EXPORT KToolBar : public TQToolBar
 {
     Q_OBJECT
-    TQ_OBJECT
+    
     Q_ENUMS( IconText BarPosition )
     Q_PROPERTY( IconText iconText READ iconText WRITE setIconText )
     Q_PROPERTY( BarPosition barPos READ barPos WRITE setBarPos )
diff --git a/tdeui/ktoolbarbutton.h b/tdeui/ktoolbarbutton.h
index e1da25ae8..340761bd0 100644
--- a/tdeui/ktoolbarbutton.h
+++ b/tdeui/ktoolbarbutton.h
@@ -44,7 +44,7 @@ class TQPainter;
 class TDEUI_EXPORT KToolBarButton : public TQToolButton
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   /**
diff --git a/tdeui/qxembed.h b/tdeui/qxembed.h
index c780e829c..423a69a80 100644
--- a/tdeui/qxembed.h
+++ b/tdeui/qxembed.h
@@ -62,7 +62,7 @@ class QXEmbedData;
 class TDEUI_EXPORT QXEmbed : public TQWidget
 {
     Q_OBJECT
-    TQ_OBJECT
+    
 
 public: