diff --git a/ark/ace.h b/ark/ace.h
index 2492961..0598682 100644
--- a/ark/ace.h
+++ b/ark/ace.h
@@ -32,7 +32,7 @@ class KProcess; // TODO: Remove me!
 class AceArch : public Arch
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		AceArch( ArkWidget *, const TQString & );
 		virtual ~AceArch();
diff --git a/ark/ar.h b/ark/ar.h
index ccc7172..281702d 100644
--- a/ark/ar.h
+++ b/ark/ar.h
@@ -40,7 +40,7 @@ class ArkWidget;
 class ArArch : public Arch 
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ArArch( ArkWidget *_gui,
 	   const TQString & _fileName );
diff --git a/ark/arch.h b/ark/arch.h
index 9b28319..7aa18ac 100644
--- a/ark/arch.h
+++ b/ark/arch.h
@@ -76,7 +76,7 @@ typedef TQValueList< TQPair< TQString, TQt::AlignmentFlags > > ColumnList;
 class Arch : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   protected:
     /**
diff --git a/ark/archiveformatdlg.h b/ark/archiveformatdlg.h
index d87da74..136236f 100644
--- a/ark/archiveformatdlg.h
+++ b/ark/archiveformatdlg.h
@@ -28,7 +28,7 @@
 class ArchiveFormatDlg: public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     ArchiveFormatDlg( TQWidget * parent, const TQString & defaultType );
     TQString mimeType();
diff --git a/ark/ark_part.h b/ark/ark_part.h
index ac5a8bd..fb136b6 100644
--- a/ark/ark_part.h
+++ b/ark/ark_part.h
@@ -46,7 +46,7 @@ namespace KIO
 class ArkBrowserExtension: public KParts::BrowserExtension
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     ArkBrowserExtension( KParts::ReadOnlyPart * parent, const char * name = 0L );
 public slots:
@@ -56,7 +56,7 @@ public slots:
 class ArkStatusBarExtension: public KParts::StatusBarExtension
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     ArkStatusBarExtension( KParts::ReadWritePart * parent );
     ~ArkStatusBarExtension();
@@ -88,7 +88,7 @@ private:
 class ArkPart: public KParts::ReadWritePart
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     ArkPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent,
              const char *name, const TQStringList &, bool readWrite );
diff --git a/ark/arkapp.h b/ark/arkapp.h
index dc376e9..787513d 100644
--- a/ark/arkapp.h
+++ b/ark/arkapp.h
@@ -52,7 +52,7 @@ class EqualKey
 class ArkApplication : public KUniqueApplication
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		virtual int newInstance();
 		virtual ~ArkApplication() {}
diff --git a/ark/arkviewer.h b/ark/arkviewer.h
index 70a09d5..5fc3849 100644
--- a/ark/arkviewer.h
+++ b/ark/arkviewer.h
@@ -28,7 +28,7 @@
 class ArkViewer : public KDialogBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 	public:
 		ArkViewer( TQWidget* parent = 0, const char * name = 0 );
diff --git a/ark/arkwidget.h b/ark/arkwidget.h
index f174f9c..67c2f78 100644
--- a/ark/arkwidget.h
+++ b/ark/arkwidget.h
@@ -59,7 +59,7 @@ class SearchBar;
 class ArkWidget : public TQVBox
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     ArkWidget( TQWidget *parent=0, const char *name=0 );
     virtual ~ArkWidget();
diff --git a/ark/compressedfile.h b/ark/compressedfile.h
index 3c5ede8..896b0fa 100644
--- a/ark/compressedfile.h
+++ b/ark/compressedfile.h
@@ -44,7 +44,7 @@ class ArkWidget;
 class CompressedFile : public Arch
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   CompressedFile( ArkWidget *_gui, const TQString & _fileName, const TQString &_openAsMimeType );
   virtual ~CompressedFile();
diff --git a/ark/extractiondialog.h b/ark/extractiondialog.h
index 0fc3100..aae9e99 100644
--- a/ark/extractiondialog.h
+++ b/ark/extractiondialog.h
@@ -41,7 +41,7 @@ class KURLRequester;
 class ExtractionDialog : public KDialogBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/**
 		 * Constructor.
diff --git a/ark/filelistview.h b/ark/filelistview.h
index b670feb..88a9546 100644
--- a/ark/filelistview.h
+++ b/ark/filelistview.h
@@ -74,7 +74,7 @@ typedef TQValueList< TQPair< TQString, TQt::AlignmentFlags > > ColumnList;
 class FileListView: public KListView
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		FileListView( TQWidget *parent = 0, const char* name = 0 );
 
diff --git a/ark/lha.h b/ark/lha.h
index 075f7a3..8babd1d 100644
--- a/ark/lha.h
+++ b/ark/lha.h
@@ -38,7 +38,7 @@ class ArkWidget;
 class LhaArch : public Arch
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     LhaArch( ArkWidget *, const TQString & );
     virtual ~LhaArch() { }
diff --git a/ark/mainwindow.h b/ark/mainwindow.h
index e620b40..ca3abb2 100644
--- a/ark/mainwindow.h
+++ b/ark/mainwindow.h
@@ -41,7 +41,7 @@ class
 MainWindow: public KParts::MainWindow
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     MainWindow( TQWidget *parent=0, const char *name=0 );
     virtual ~MainWindow();
diff --git a/ark/rar.h b/ark/rar.h
index 9176fe6..5b0e183 100644
--- a/ark/rar.h
+++ b/ark/rar.h
@@ -35,7 +35,7 @@ class ArkWidget;
 class RarArch : public Arch
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     RarArch( ArkWidget *_gui, const TQString & _fileName );
     virtual ~RarArch() {}
diff --git a/ark/searchbar.h b/ark/searchbar.h
index 7a024bf..1b9aa03 100644
--- a/ark/searchbar.h
+++ b/ark/searchbar.h
@@ -32,7 +32,7 @@ class KActionCollection;
 class SearchBar: public KListViewSearchLine
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		SearchBar( TQWidget* parent, KActionCollection* aC, const char * name = 0 );
 		~SearchBar();
diff --git a/ark/sevenzip.h b/ark/sevenzip.h
index 535ea53..c37708b 100644
--- a/ark/sevenzip.h
+++ b/ark/sevenzip.h
@@ -29,7 +29,7 @@
 class SevenZipArch : public Arch
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     SevenZipArch( ArkWidget *, const TQString & );
     virtual ~SevenZipArch();
diff --git a/ark/tar.h b/ark/tar.h
index 74f37c2..df0d012 100644
--- a/ark/tar.h
+++ b/ark/tar.h
@@ -56,7 +56,7 @@ class TarListingThread;
 class TarArch : public Arch
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		TarArch( ArkWidget *_gui, const TQString & _filename,
 		         const TQString & _openAsMimeType );
diff --git a/ark/zip.h b/ark/zip.h
index c6f0fe3..28f61bd 100644
--- a/ark/zip.h
+++ b/ark/zip.h
@@ -38,7 +38,7 @@ class ArkWidget;
 class ZipArch : public Arch
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ZipArch( ArkWidget *_gui, const TQString & _fileName );
     virtual ~ZipArch() { }
diff --git a/ark/zoo.h b/ark/zoo.h
index 6b9538e..4ee2f24 100644
--- a/ark/zoo.h
+++ b/ark/zoo.h
@@ -36,7 +36,7 @@ class ArkWidget;
 class ZooArch : public Arch
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ZooArch( ArkWidget *, const TQString & );
     virtual ~ZooArch() { }
diff --git a/charselectapplet/charselectapplet.h b/charselectapplet/charselectapplet.h
index 0aad05a..4343660 100644
--- a/charselectapplet/charselectapplet.h
+++ b/charselectapplet/charselectapplet.h
@@ -36,7 +36,7 @@ class KAboutData;
 class ConfigDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     ConfigDialog(TQWidget* parent = 0, const char* name = 0);
@@ -58,7 +58,7 @@ private:
 class CharTable : public TQFrame
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     CharTable(TQWidget* parent = 0, const char* name = 0);
@@ -97,7 +97,7 @@ private:
 class CharSelectApplet : public KPanelApplet
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     CharSelectApplet(const TQString& configFile, Type t = Stretch, int actions = 0,
diff --git a/kcalc/dlabel.h b/kcalc/dlabel.h
index f4ce5d4..9656dc5 100644
--- a/kcalc/dlabel.h
+++ b/kcalc/dlabel.h
@@ -38,7 +38,7 @@ class KActionCollection;
 class DispLogic : public KCalcDisplay
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	DispLogic(TQWidget *parent, const char *name,
diff --git a/kcalc/kcalc.h b/kcalc/kcalc.h
index 4abceb7..ab0acec 100644
--- a/kcalc/kcalc.h
+++ b/kcalc/kcalc.h
@@ -61,7 +61,7 @@ class Constants;
 class KCalculator : public KMainWindow
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	KCalculator(TQWidget *parent = 0, const char *name = 0);
diff --git a/kcalc/kcalc_button.h b/kcalc/kcalc_button.h
index ba70769..a5b26be 100644
--- a/kcalc/kcalc_button.h
+++ b/kcalc/kcalc_button.h
@@ -61,7 +61,7 @@ public:
 class KCalcButton : public KPushButton
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
  KCalcButton(TQWidget *parent, const char * name = 0); 
@@ -90,7 +90,7 @@ protected:
 class KSquareButton : public KCalcButton
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KSquareButton(TQWidget *parent, const char * name = 0)
diff --git a/kcalc/kcalc_const_button.h b/kcalc/kcalc_const_button.h
index 182ab97..f557c61 100644
--- a/kcalc/kcalc_const_button.h
+++ b/kcalc/kcalc_const_button.h
@@ -31,7 +31,7 @@
 class KCalcConstButton : public KCalcButton
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
 
diff --git a/kcalc/kcalc_const_menu.h b/kcalc/kcalc_const_menu.h
index be01f42..2718ed9 100644
--- a/kcalc/kcalc_const_menu.h
+++ b/kcalc/kcalc_const_menu.h
@@ -39,7 +39,7 @@ struct science_constant{
 class KCalcConstMenu : public TQPopupMenu
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
  public:
   KCalcConstMenu(TQWidget * parent = 0, const char * name = 0);
diff --git a/kcalc/kcalcdisplay.h b/kcalc/kcalcdisplay.h
index 338e721..92dc83a 100644
--- a/kcalc/kcalcdisplay.h
+++ b/kcalc/kcalcdisplay.h
@@ -79,7 +79,7 @@ enum NumBase {
 class KCalcDisplay : public TQLabel
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	KCalcDisplay(TQWidget *parent=0, const char *name=0);
diff --git a/kcharselect/kcharselectdia.h b/kcharselect/kcharselectdia.h
index 083d0a0..a6a298b 100644
--- a/kcharselect/kcharselectdia.h
+++ b/kcharselect/kcharselectdia.h
@@ -25,7 +25,7 @@ static const char *version = "v1.1";
 class KCharSelectDia : public KMainWindow
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KCharSelectDia(TQWidget *parent,const char *name,const TQChar &_chr,const TQString &_font,int _tableNum, bool direction);
diff --git a/kdelirc/irkick/irkick.h b/kdelirc/irkick/irkick.h
index f3b7687..e99a1c0 100644
--- a/kdelirc/irkick/irkick.h
+++ b/kdelirc/irkick/irkick.h
@@ -42,7 +42,7 @@ public:
 class IRKick: public TQObject, public DCOPObject
 {
 	Q_OBJECT
-//	TQ_OBJECT
+//	
 	K_DCOP
 
 	TQString npApp, npModule, npMethod;
diff --git a/kdelirc/irkick/klircclient.h b/kdelirc/irkick/klircclient.h
index bae36ec..3af4637 100644
--- a/kdelirc/irkick/klircclient.h
+++ b/kdelirc/irkick/klircclient.h
@@ -29,7 +29,7 @@ class TQSocketNotifier;
 class KLircClient: public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 private:
 	struct lirc_config *theConfig;
diff --git a/kdelirc/kcmlirc/addaction.h b/kdelirc/kcmlirc/addaction.h
index e1c812b..3a3f22f 100644
--- a/kdelirc/kcmlirc/addaction.h
+++ b/kdelirc/kcmlirc/addaction.h
@@ -27,7 +27,7 @@ class TQListViewItem;
 class AddAction : public AddActionBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 	int curPage;
 	Mode theMode;
diff --git a/kdelirc/kcmlirc/editaction.h b/kdelirc/kcmlirc/editaction.h
index bc01d24..8b19b6a 100644
--- a/kdelirc/kcmlirc/editaction.h
+++ b/kdelirc/kcmlirc/editaction.h
@@ -26,7 +26,7 @@
 class EditAction : public EditActionBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	IRAIt theAction;
 	TQMap<TQString, TQString> applicationMap, functionMap;
 	TQMap<TQString, TQString> nameProgramMap;
diff --git a/kdelirc/kcmlirc/editmode.h b/kdelirc/kcmlirc/editmode.h
index 8ceff01..5de0836 100644
--- a/kdelirc/kcmlirc/editmode.h
+++ b/kdelirc/kcmlirc/editmode.h
@@ -21,7 +21,7 @@
 class EditMode : public EditModeBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	void slotCheckText(const TQString &newText);
diff --git a/kdelirc/kcmlirc/kcmlirc.h b/kdelirc/kcmlirc/kcmlirc.h
index 6d65fe8..7c0abd2 100644
--- a/kdelirc/kcmlirc/kcmlirc.h
+++ b/kdelirc/kcmlirc/kcmlirc.h
@@ -31,7 +31,7 @@ class Remote;
 class KCMLirc: public KCModule, virtual public DCOPObject
 {
 	Q_OBJECT
-//	TQ_OBJECT
+//	
 	K_DCOP
 
 private:
diff --git a/kdelirc/kcmlirc/modeslist.h b/kdelirc/kcmlirc/modeslist.h
index c0e9aa8..742b0c5 100644
--- a/kdelirc/kcmlirc/modeslist.h
+++ b/kdelirc/kcmlirc/modeslist.h
@@ -25,7 +25,7 @@
 class ModesList : public KListView
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	virtual bool acceptDrag(TQDropEvent *) const;
 	ModesList(TQWidget *parent = 0, const char *name = 0);
diff --git a/kdessh/sshdlg.h b/kdessh/sshdlg.h
index cb77b36..45175d7 100644
--- a/kdessh/sshdlg.h
+++ b/kdessh/sshdlg.h
@@ -15,7 +15,7 @@ class KDEsshDialog
     : public KPasswordDialog
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     KDEsshDialog(TQCString host, TQCString user, TQCString stub, 
diff --git a/kdf/disklist.h b/kdf/disklist.h
index fbce6c2..122e59c 100644
--- a/kdf/disklist.h
+++ b/kdf/disklist.h
@@ -95,7 +95,7 @@ private:
 /***************************************************************************/
 class DiskList : public TQObject
 {  Q_OBJECT
-  TQ_OBJECT
+  
 public:
    DiskList( TQObject *parent=0, const char *name=0 );
  ~DiskList();
diff --git a/kdf/disks.h b/kdf/disks.h
index 2993323..06b768f 100644
--- a/kdf/disks.h
+++ b/kdf/disks.h
@@ -40,7 +40,7 @@
 class DiskEntry : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   DiskEntry(TQObject *parent=0, const char *name=0);
   DiskEntry(const TQString & deviceName, TQObject *parent=0, const char *name=0);
diff --git a/kdf/kcmdf.h b/kdf/kcmdf.h
index 7f5adef..f1a9a97 100644
--- a/kdf/kcmdf.h
+++ b/kdf/kcmdf.h
@@ -33,7 +33,7 @@
 class KDiskFreeWidget : public KCModule
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   
   public:
     KDiskFreeWidget( TQWidget *parent=0, const char *name=0 );
diff --git a/kdf/kdf.h b/kdf/kdf.h
index d2fceed..25aa2e6 100644
--- a/kdf/kdf.h
+++ b/kdf/kdf.h
@@ -31,7 +31,7 @@
 class KDFTopLevel : public KMainWindow
 {
  Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KDFTopLevel(TQWidget *parent=0, const char *name=0);
diff --git a/kdf/kdfconfig.h b/kdf/kdfconfig.h
index 7c6aea3..d5c2993 100644
--- a/kdf/kdfconfig.h
+++ b/kdf/kdfconfig.h
@@ -42,7 +42,7 @@ class CListView;
 class KDFConfigWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   class CTabName
   {
diff --git a/kdf/kdfwidget.h b/kdf/kdfwidget.h
index 79b8715..3afd033 100644
--- a/kdf/kdfwidget.h
+++ b/kdf/kdfwidget.h
@@ -92,7 +92,7 @@ class CListViewItem : public TQListViewItem
 class KDFWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     enum ColId
diff --git a/kdf/kwikdisk.h b/kdf/kwikdisk.h
index 7ac9576..5ce0d23 100644
--- a/kdf/kwikdisk.h
+++ b/kdf/kwikdisk.h
@@ -42,7 +42,7 @@
 class KwikDisk : public KSystemTray
 {
    Q_OBJECT
-  TQ_OBJECT
+  
    public:
       KwikDisk();
 
diff --git a/kdf/listview.h b/kdf/listview.h
index 873a327..fa85dde 100644
--- a/kdf/listview.h
+++ b/kdf/listview.h
@@ -28,7 +28,7 @@
 class CListView : public KListView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CListView( TQWidget *parent=0, const char *name=0, int visibleItem=10 );
diff --git a/kdf/mntconfig.h b/kdf/mntconfig.h
index 682c229..b524089 100644
--- a/kdf/mntconfig.h
+++ b/kdf/mntconfig.h
@@ -46,7 +46,7 @@ class TQListViewItem;
 class MntConfigWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     enum ColType
diff --git a/kdf/optiondialog.h b/kdf/optiondialog.h
index 848a126..c56f8a2 100644
--- a/kdf/optiondialog.h
+++ b/kdf/optiondialog.h
@@ -28,7 +28,7 @@ class MntConfigWidget;
 class COptionDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     COptionDialog( TQWidget *parent=0, const char *name=0, bool modal=true );
diff --git a/kedit/kedit.h b/kedit/kedit.h
index 9faba86..c353d87 100644
--- a/kedit/kedit.h
+++ b/kedit/kedit.h
@@ -48,7 +48,7 @@ namespace KIO { class Job; }
 class TopLevel : public KMainWindow
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     enum { KEDIT_OK 		= 0,
@@ -206,7 +206,7 @@ private slots:
 
 class SettingsDialog: public KConfigDialog {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   SettingsDialog(TQWidget *parent, const char *name,KConfigSkeleton *config, KSpellConfig *_spellConfig);
diff --git a/kedit/ktextfiledlg.h b/kedit/ktextfiledlg.h
index d4bd76e..bf673d6 100644
--- a/kedit/ktextfiledlg.h
+++ b/kedit/ktextfiledlg.h
@@ -38,7 +38,7 @@ class KURL;
 class KTextFileDialog : public KFileDialog
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
  public:
     KTextFileDialog(const TQString& startDir, const TQString& filter,
diff --git a/kfloppy/floppy.h b/kfloppy/floppy.h
index ead6b71..7a8e311 100644
--- a/kfloppy/floppy.h
+++ b/kfloppy/floppy.h
@@ -44,7 +44,7 @@ class KFActionQueue;
 class FloppyData : public KDialog
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     FloppyData(TQWidget* parent = 0, const char * name = 0);
diff --git a/kfloppy/format.h b/kfloppy/format.h
index e861a0d..a33ff53 100644
--- a/kfloppy/format.h
+++ b/kfloppy/format.h
@@ -66,7 +66,7 @@
 class KFAction : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	KFAction(TQObject *parent = 0L);
@@ -116,7 +116,7 @@ signals:
 class KFActionQueue : public KFAction
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	KFActionQueue(TQObject *parent = 0L);
@@ -176,7 +176,7 @@ class KProcess;
 class FloppyAction : public KFAction
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	FloppyAction(TQObject *parent = 0L);
diff --git a/kfloppy/zip.h b/kfloppy/zip.h
index b422c92..525eb3f 100644
--- a/kfloppy/zip.h
+++ b/kfloppy/zip.h
@@ -47,7 +47,7 @@ class KConfig;
 class ZipFormat : public DiskFormat
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	ZipFormat(TQWidget *w, const char *n);
diff --git a/kgpg/keygener.h b/kgpg/keygener.h
index d5f0120..59c73b8 100644
--- a/kgpg/keygener.h
+++ b/kgpg/keygener.h
@@ -25,7 +25,7 @@ class KLineEdit;
 class keyGenerate : public KDialogBase
 {
         Q_OBJECT
-  TQ_OBJECT
+  
 public:
         keyGenerate(TQWidget *parent=0, const char *name=0);
 
diff --git a/kgpg/keyinfowidget.h b/kgpg/keyinfowidget.h
index faa3b16..2560e96 100644
--- a/kgpg/keyinfowidget.h
+++ b/kgpg/keyinfowidget.h
@@ -33,7 +33,7 @@ class KProcIO;
 class KgpgKeyInfo : public KDialogBase
 {
         Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 
diff --git a/kgpg/keyservers.h b/kgpg/keyservers.h
index 9a5301f..de33f35 100644
--- a/kgpg/keyservers.h
+++ b/kgpg/keyservers.h
@@ -31,7 +31,7 @@ class searchRes;
 class keyServer : public KDialogBase
 {
         Q_OBJECT
-  TQ_OBJECT
+  
 public:
         keyServer(TQWidget *parent=0, const char *name=0,bool modal=false,bool autoClose=false);
         ~keyServer();
diff --git a/kgpg/kgpg.h b/kgpg/kgpg.h
index 5fa6089..83395a2 100644
--- a/kgpg/kgpg.h
+++ b/kgpg/kgpg.h
@@ -44,7 +44,7 @@ class MyView : public TQLabel
 {
 
         Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
         MyView( TQWidget *parent = 0, const char *name = 0);
@@ -122,7 +122,7 @@ signals:
 class kgpgapplet : public KSystemTray//KUniqueApplication
 {
         Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
         kgpgapplet( TQWidget *parent = 0, const char *name = 0);
@@ -146,7 +146,7 @@ class KCmdLineArgs;
 class KgpgAppletApp : public KUniqueApplication
 {
         Q_OBJECT
-  TQ_OBJECT
+  
         friend class kgpgapplet;
 public:
         KgpgAppletApp();
diff --git a/kgpg/kgpgeditor.h b/kgpg/kgpgeditor.h
index 63ec59c..6123847 100644
--- a/kgpg/kgpgeditor.h
+++ b/kgpg/kgpgeditor.h
@@ -36,7 +36,7 @@ class KgpgView;
 class KgpgApp : public KMainWindow
 {
         Q_OBJECT
-  TQ_OBJECT
+  
 
         friend class KgpgView;
 
diff --git a/kgpg/kgpginterface.h b/kgpg/kgpginterface.h
index 718c0bf..da0d0f1 100644
--- a/kgpg/kgpginterface.h
+++ b/kgpg/kgpginterface.h
@@ -37,7 +37,7 @@ class KgpgInterface : public TQObject
 {
 
         Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
         /**
@@ -390,7 +390,7 @@ private:
 class  Md5Widget :public KDialogBase
 {
         Q_OBJECT
-  TQ_OBJECT
+  
 public:
         Md5Widget(TQWidget *parent=0, const char *name=0,KURL url=KURL());
         ~Md5Widget();
diff --git a/kgpg/kgpglibrary.h b/kgpg/kgpglibrary.h
index e388b13..c887653 100644
--- a/kgpg/kgpglibrary.h
+++ b/kgpg/kgpglibrary.h
@@ -31,7 +31,7 @@ class KgpgLibrary : public TQObject
 {
 
         Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
         /**
diff --git a/kgpg/kgpgoptions.h b/kgpg/kgpgoptions.h
index 5493735..d58e9ba 100644
--- a/kgpg/kgpgoptions.h
+++ b/kgpg/kgpgoptions.h
@@ -39,7 +39,7 @@ class KSimpleConfig;
 class kgpgOptions : public KConfigDialog
 {
         Q_OBJECT
-  TQ_OBJECT
+  
 public:
         kgpgOptions(TQWidget *parent=0, const char *name=0);
         ~kgpgOptions();
diff --git a/kgpg/kgpgview.h b/kgpg/kgpgview.h
index ac1e639..bca013e 100644
--- a/kgpg/kgpgview.h
+++ b/kgpg/kgpgview.h
@@ -41,7 +41,7 @@ class TQDragEnterEvent;
 class MyEditor : public KTextEdit
 {
         Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
         MyEditor( TQWidget *parent = 0, const char *name = 0);
@@ -69,7 +69,7 @@ signals:
 class KgpgView : public TQWidget
 {
         Q_OBJECT
-  TQ_OBJECT
+  
         friend class MyEditor;
 public:
         /** Constructor for the main view */
diff --git a/kgpg/listkeys.h b/kgpg/listkeys.h
index abb2689..13f0bf1 100644
--- a/kgpg/listkeys.h
+++ b/kgpg/listkeys.h
@@ -68,7 +68,7 @@ struct gpgKey
 class KgpgSelKey : public KDialogBase
 {
         Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
         KgpgSelKey( TQWidget *parent = 0, const char *name = 0,bool allowMultipleSelection=false, TQString preselected=TQString());
@@ -92,7 +92,7 @@ public slots:
 class KeyView : public KListView
 {
         Q_OBJECT
-  TQ_OBJECT
+  
         friend class listKeys;
 public:
         KeyView( TQWidget *parent = 0, const char *name = 0);
@@ -144,7 +144,7 @@ protected:
 class mySearchLine: public KListViewSearchLine
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     mySearchLine(TQWidget *parent = 0, KeyView *listView = 0, const char *name = 0);
     virtual ~mySearchLine();
@@ -162,7 +162,7 @@ class listKeys : public KMainWindow, virtual public KeyInterface
 {
         friend class KeyView;
         Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
         listKeys(TQWidget *parent=0, const char *name=0);
diff --git a/kgpg/popuppublic.h b/kgpg/popuppublic.h
index 06d7b01..e20c509 100644
--- a/kgpg/popuppublic.h
+++ b/kgpg/popuppublic.h
@@ -32,7 +32,7 @@ class KProcIO;
 class popupPublic : public KDialogBase //TQDialog
 {
         Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
         popupPublic(TQWidget *parent=0, const char *name=0,TQString sfile="",bool filemode=false,KShortcut goDefaultKey=TQKeySequence(CTRL+TQt::Key_Home));
diff --git a/khexedit/bitswapwidget.h b/khexedit/bitswapwidget.h
index d2ec6de..d07c009 100644
--- a/khexedit/bitswapwidget.h
+++ b/khexedit/bitswapwidget.h
@@ -29,7 +29,7 @@
 class CDigitLabel : public TQLabel
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CDigitLabel( TQWidget *parent, uint digit = 0, const char *name=0 );
@@ -71,7 +71,7 @@ inline uint CDigitLabel::value( void )
 class CByteWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CByteWidget( TQWidget *parent, const char *name=0 );
diff --git a/khexedit/chartabledialog.h b/khexedit/chartabledialog.h
index 6b7610b..c5a204c 100644
--- a/khexedit/chartabledialog.h
+++ b/khexedit/chartabledialog.h
@@ -35,7 +35,7 @@ class TQSpinBox;
 class CCharTableDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   
   public:
     CCharTableDialog( TQWidget *parent=0, const char *name=0,bool modal=false );
diff --git a/khexedit/converterdialog.h b/khexedit/converterdialog.h
index 544517b..8cfd51d 100644
--- a/khexedit/converterdialog.h
+++ b/khexedit/converterdialog.h
@@ -30,7 +30,7 @@ class CHexValidator;
 class CValidateLineEdit : public TQLineEdit 
 {
   Q_OBJECT
-  TQ_OBJECT
+  
    
   public:
     CValidateLineEdit( TQWidget *parent, int validateType, const char *name=0 );
@@ -54,7 +54,7 @@ class CValidateLineEdit : public TQLineEdit
 class CConverterDialog : public KDialogBase 
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   
   public:
     CConverterDialog( TQWidget *parent, const char *name=0, bool modal=true );
diff --git a/khexedit/dialog.h b/khexedit/dialog.h
index 61b4633..ad6c09c 100644
--- a/khexedit/dialog.h
+++ b/khexedit/dialog.h
@@ -64,7 +64,7 @@ const uint Find_Next       = 7;
 class CGotoDialog : public KDialogBase 
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   
   public:
     CGotoDialog( TQWidget *parent, const char *name = 0, bool modal = false );
@@ -91,7 +91,7 @@ class CGotoDialog : public KDialogBase
 class CFindDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     enum EOperation
@@ -139,7 +139,7 @@ class CFindDialog : public KDialogBase
 class CFindNavigatorDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   
   public:
     CFindNavigatorDialog( TQWidget *parent=0, const char *name=0, 
@@ -169,7 +169,7 @@ class CFindNavigatorDialog : public KDialogBase
 class CReplaceDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   
   public:
     CReplaceDialog( TQWidget *parent=0, const char *name=0, bool modal=false );
@@ -213,7 +213,7 @@ class CReplaceDialog : public KDialogBase
 class CReplacePromptDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   
   public:
     CReplacePromptDialog( TQWidget *parent=0, const char *name=0, 
@@ -243,7 +243,7 @@ class CReplacePromptDialog : public KDialogBase
 class CFilterDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     enum EStackMode
@@ -303,7 +303,7 @@ class CFilterDialog : public KDialogBase
 class CInsertDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   
   public:
     CInsertDialog( TQWidget *parent=0, const char *name=0, bool modal=false );
diff --git a/khexedit/draglabel.h b/khexedit/draglabel.h
index 44f355b..999d502 100644
--- a/khexedit/draglabel.h
+++ b/khexedit/draglabel.h
@@ -32,7 +32,7 @@ class KURLDrag;
 class CDragLabel: public TQLabel
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CDragLabel( TQWidget *parent );
diff --git a/khexedit/exportdialog.h b/khexedit/exportdialog.h
index ee89134..392e74c 100644
--- a/khexedit/exportdialog.h
+++ b/khexedit/exportdialog.h
@@ -39,7 +39,7 @@ class KSimpleConfig;
 class CExportDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     enum EPage
diff --git a/khexedit/fileinfodialog.h b/khexedit/fileinfodialog.h
index 816c972..cd1bd4a 100644
--- a/khexedit/fileinfodialog.h
+++ b/khexedit/fileinfodialog.h
@@ -36,7 +36,7 @@ class CListView;
 class CFileInfoDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   
   public:
     CFileInfoDialog( TQWidget *parent=0, const char *name=0,bool modal=false );
diff --git a/khexedit/hexdrag.h b/khexedit/hexdrag.h
index 7d4fd26..0f267f4 100644
--- a/khexedit/hexdrag.h
+++ b/khexedit/hexdrag.h
@@ -28,7 +28,7 @@
 class CHexDrag : public TQDragObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CHexDrag( const TQByteArray &data, TQWidget *dragSource = 0, 
diff --git a/khexedit/hexeditorwidget.h b/khexedit/hexeditorwidget.h
index 669d789..a417343 100644
--- a/khexedit/hexeditorwidget.h
+++ b/khexedit/hexeditorwidget.h
@@ -54,7 +54,7 @@ namespace KIO { class Job; }
 class CHexEditorWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     enum EProgressMode
diff --git a/khexedit/hexmanagerwidget.h b/khexedit/hexmanagerwidget.h
index b04fbc8..a3956f1 100644
--- a/khexedit/hexmanagerwidget.h
+++ b/khexedit/hexmanagerwidget.h
@@ -75,7 +75,7 @@ class CFileKey
 class CTabBar : public TQTabBar
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CTabBar( TQWidget *parent=0, char *name=0 );
@@ -101,7 +101,7 @@ class CTabBar : public TQTabBar
 class CHexManagerWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     enum EConversionPosition
diff --git a/khexedit/hextoolwidget.h b/khexedit/hextoolwidget.h
index cdaaad6..94eb10c 100644
--- a/khexedit/hextoolwidget.h
+++ b/khexedit/hextoolwidget.h
@@ -34,7 +34,7 @@ class TQCheckBox;
 class CHexToolWidget : public TQFrame
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CHexToolWidget( TQWidget *parent = 0, const char *name = 0 );
diff --git a/khexedit/hexvalidator.h b/khexedit/hexvalidator.h
index 387fcbe..c15cb5c 100644
--- a/khexedit/hexvalidator.h
+++ b/khexedit/hexvalidator.h
@@ -26,7 +26,7 @@
 class CHexValidator: public TQValidator
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   
   public:
     enum EState
diff --git a/khexedit/hexviewwidget.h b/khexedit/hexviewwidget.h
index a958309..bccf654 100644
--- a/khexedit/hexviewwidget.h
+++ b/khexedit/hexviewwidget.h
@@ -40,7 +40,7 @@
 class CScrollBar : public TQScrollBar
 {
   Q_OBJECT
-  TQ_OBJECT
+  
  
   public:
     CScrollBar( Qt::Orientation o, TQWidget *parent, const char *name = 0 )
@@ -62,7 +62,7 @@ class CScrollBar : public TQScrollBar
 class CDragManager : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
     
   public:
     enum EDragActivateMode
@@ -100,7 +100,7 @@ class CDragManager : public TQWidget
 class CHexViewWidget : public TQFrame
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CHexViewWidget( TQWidget *parent, const char *name, CHexBuffer *hexBuffer );
diff --git a/khexedit/lib/kbufferdrag.h b/khexedit/lib/kbufferdrag.h
index 3af0ebd..79a87d9 100644
--- a/khexedit/lib/kbufferdrag.h
+++ b/khexedit/lib/kbufferdrag.h
@@ -40,7 +40,7 @@ typedef KColTextExport* KColTextExportPtr;
 class KBufferDrag : public TQDragObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     // TODO: make this call somewhat more generic
diff --git a/khexedit/lib/kbytesedit.h b/khexedit/lib/kbytesedit.h
index eedf025..a94fff6 100644
--- a/khexedit/lib/kbytesedit.h
+++ b/khexedit/lib/kbytesedit.h
@@ -57,7 +57,7 @@ class KBytesEditPrivate;
 class KHEXEDIT_EXPORT KBytesEdit : public KHexEdit
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   //_PROPERTY( char * Data READ data )
   TQ_PROPERTY( int DataSize READ dataSize )
   TQ_PROPERTY( int MaxDataSize READ maxDataSize WRITE setMaxDataSize )
diff --git a/khexedit/lib/kcolumnsview.h b/khexedit/lib/kcolumnsview.h
index 3323df9..d51e54c 100644
--- a/khexedit/lib/kcolumnsview.h
+++ b/khexedit/lib/kcolumnsview.h
@@ -42,7 +42,7 @@ class KColumnsViewPrivate;
 class KColumnsView : public TQScrollView
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 
    friend class KColumn;
 
diff --git a/khexedit/lib/khexedit.h b/khexedit/lib/khexedit.h
index 7122f80..052914e 100644
--- a/khexedit/lib/khexedit.h
+++ b/khexedit/lib/khexedit.h
@@ -81,7 +81,7 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView
   friend class KCharEditor;
 
   Q_OBJECT
-  TQ_OBJECT
+  
   Q_ENUMS( KResizeStyle KCoding )
   TQ_PROPERTY( bool OverwriteMode READ isOverwriteMode WRITE setOverwriteMode )
   TQ_PROPERTY( bool OverwriteOnly READ isOverwriteOnly WRITE setOverwriteOnly )
diff --git a/khexedit/listview.h b/khexedit/listview.h
index b9182bf..7f687cb 100644
--- a/khexedit/listview.h
+++ b/khexedit/listview.h
@@ -26,7 +26,7 @@
 class CListView : public KListView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CListView( TQWidget *parent=0, const char *name=0, int visibleItem=10 );
diff --git a/khexedit/optiondialog.h b/khexedit/optiondialog.h
index f44aade..b9c649e 100644
--- a/khexedit/optiondialog.h
+++ b/khexedit/optiondialog.h
@@ -43,7 +43,7 @@ class KFontChooser;
 class CColorListBox : public KListBox
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CColorListBox( TQWidget *parent=0, const char * name=0, WFlags f=0 );
@@ -93,7 +93,7 @@ class CColorListItem : public TQListBoxItem
 class COptionDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     enum EPage
diff --git a/khexedit/parts/kbytesedit/kbyteseditwidget.h b/khexedit/parts/kbytesedit/kbyteseditwidget.h
index 42ae126..99bc684 100644
--- a/khexedit/parts/kbytesedit/kbyteseditwidget.h
+++ b/khexedit/parts/kbytesedit/kbyteseditwidget.h
@@ -43,7 +43,7 @@ class KBytesEditWidget : public TQWidget, public KHE::BytesEditInterface,
                          public KHE::ZoomInterface, public KHE::ClipboardInterface
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     /** constructor API as demanded by KGenericFactory */
diff --git a/khexedit/parts/kpart/khebrowserextension.h b/khexedit/parts/kpart/khebrowserextension.h
index f962b0b..3115b8e 100644
--- a/khexedit/parts/kpart/khebrowserextension.h
+++ b/khexedit/parts/kpart/khebrowserextension.h
@@ -34,7 +34,7 @@ class KHexEditPart;
 class KHexEditBrowserExtension : public KParts::BrowserExtension
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KHexEditBrowserExtension( KHexEditPart *P );
diff --git a/khexedit/parts/kpart/khepart.h b/khexedit/parts/kpart/khepart.h
index 4c3fcd9..0ce0391 100644
--- a/khexedit/parts/kpart/khepart.h
+++ b/khexedit/parts/kpart/khepart.h
@@ -45,7 +45,7 @@ class KHexEdit;
 class KHexEditPart : public KParts::ReadOnlyPart
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     friend class KHexEditBrowserExtension;
 
diff --git a/khexedit/parts/kpart/khepartfactory.h b/khexedit/parts/kpart/khepartfactory.h
index 15f821c..0883caa 100644
--- a/khexedit/parts/kpart/khepartfactory.h
+++ b/khexedit/parts/kpart/khepartfactory.h
@@ -27,7 +27,7 @@ class KAboutData;
 class KHexEditPartFactory : public KParts::Factory
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KHexEditPartFactory();
diff --git a/khexedit/printdialogpage.h b/khexedit/printdialogpage.h
index 73c3714..2b88b2e 100644
--- a/khexedit/printdialogpage.h
+++ b/khexedit/printdialogpage.h
@@ -33,7 +33,7 @@ class TQSpinBox;
 class LayoutDialogPage : public KPrintDialogPage
 {
  Q_OBJECT
-  TQ_OBJECT
+  
 
  public:
     LayoutDialogPage( TQWidget *parent = 0, const char *name = 0 );
diff --git a/khexedit/searchbar.h b/khexedit/searchbar.h
index 25b9011..b0aed20 100644
--- a/khexedit/searchbar.h
+++ b/khexedit/searchbar.h
@@ -33,7 +33,7 @@ class CHexValidator;
 class CSearchBar : public TQFrame
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   
   public:
     CSearchBar( TQWidget *parent=0, const char *name=0, WFlags f=0 );
diff --git a/khexedit/statusbarprogress.h b/khexedit/statusbarprogress.h
index 531c9aa..5601316 100644
--- a/khexedit/statusbarprogress.h
+++ b/khexedit/statusbarprogress.h
@@ -28,7 +28,7 @@
 class CStatusBarProgress : public TQFrame, public TQRangeControl 
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
   /** 
diff --git a/khexedit/stringdialog.h b/khexedit/stringdialog.h
index b854971..2726665 100644
--- a/khexedit/stringdialog.h
+++ b/khexedit/stringdialog.h
@@ -41,7 +41,7 @@ class CListView;
 class CStringDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   
   public:
     CStringDialog( TQWidget *parent=0, const char *name = 0, bool modal=false );
diff --git a/khexedit/toplevel.h b/khexedit/toplevel.h
index 6a8db9b..cb07e3c 100644
--- a/khexedit/toplevel.h
+++ b/khexedit/toplevel.h
@@ -48,7 +48,7 @@ class CDragLabel;
 class KHexEdit : public KMainWindow
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   enum StatusBarId
   {
diff --git a/kjots/KJotsMain.h b/kjots/KJotsMain.h
index 61c830b..132e10e 100644
--- a/kjots/KJotsMain.h
+++ b/kjots/KJotsMain.h
@@ -82,7 +82,7 @@ class KJotsEdit;
 class KJotsMain : public KMainWindow
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         KJotsMain( const char* name = 0 );
diff --git a/kjots/kjotsbookmarks.h b/kjots/kjotsbookmarks.h
index 1351af4..ebf08d4 100644
--- a/kjots/kjotsbookmarks.h
+++ b/kjots/kjotsbookmarks.h
@@ -30,7 +30,7 @@ class KJotsMain;
 class KJotsBookmarks : public TQObject, public KBookmarkOwner
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         KJotsBookmarks(KJotsMain* parent = 0, const char* name = 0);
diff --git a/kjots/kjotsedit.h b/kjots/kjotsedit.h
index 39ddc3a..d5edf2a 100644
--- a/kjots/kjotsedit.h
+++ b/kjots/kjotsedit.h
@@ -30,7 +30,7 @@ class KJotsPage;
 class KJotsEdit : public KEdit
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
         KJotsEdit (TQWidget* parent=0, const char* name=0);
         ~KJotsEdit ();
diff --git a/kjots/kjotsentry.h b/kjots/kjotsentry.h
index 9d7df78..96e5086 100644
--- a/kjots/kjotsentry.h
+++ b/kjots/kjotsentry.h
@@ -49,7 +49,7 @@ namespace KIO
 class KJotsEntryBase : public TQObject, public KListViewItem
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
         KJotsEntryBase(KListView*, TQListViewItem*);
         KJotsEntryBase(KListViewItem*, TQListViewItem*);
@@ -99,7 +99,7 @@ class KJotsEntryBase : public TQObject, public KListViewItem
 class KJotsBook : public KJotsEntryBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
         KJotsBook(KListView*, TQListViewItem* after = 0);
         KJotsBook(KListViewItem*, TQListViewItem* after = 0);
@@ -143,7 +143,7 @@ class KJotsBook : public KJotsEntryBase
 class KJotsPage : public KJotsEntryBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
         KJotsPage(KJotsBook* parent, TQListViewItem* after = 0);
         ~KJotsPage();
diff --git a/klaptopdaemon/acpi.h b/klaptopdaemon/acpi.h
index ffa2840..d077af6 100644
--- a/klaptopdaemon/acpi.h
+++ b/klaptopdaemon/acpi.h
@@ -40,7 +40,7 @@ class TQPushButton;
 class AcpiConfig : public KCModule
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   AcpiConfig( TQWidget *parent=0, const char* name=0);
   ~AcpiConfig( );     
diff --git a/klaptopdaemon/apm.h b/klaptopdaemon/apm.h
index e57d77a..5a212f5 100644
--- a/klaptopdaemon/apm.h
+++ b/klaptopdaemon/apm.h
@@ -40,7 +40,7 @@ class TQPushButton;
 class ApmConfig : public KCModule
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ApmConfig( TQWidget *parent=0, const char* name=0);
   ~ApmConfig( );     
diff --git a/klaptopdaemon/battery.h b/klaptopdaemon/battery.h
index e76fba6..ad6c851 100644
--- a/klaptopdaemon/battery.h
+++ b/klaptopdaemon/battery.h
@@ -45,7 +45,7 @@ class TQLabel;
 class BatteryConfig : public KCModule
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   BatteryConfig( TQWidget *parent=0, const char* name=0);
   ~BatteryConfig( );     
diff --git a/klaptopdaemon/buttons.h b/klaptopdaemon/buttons.h
index 76910c7..b18c041 100644
--- a/klaptopdaemon/buttons.h
+++ b/klaptopdaemon/buttons.h
@@ -40,7 +40,7 @@ class KComboBox;
 class ButtonsConfig : public KCModule
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ButtonsConfig( TQWidget *parent=0, const char* name=0);
     ~ButtonsConfig();
diff --git a/klaptopdaemon/daemondock.h b/klaptopdaemon/daemondock.h
index 6fab64d..70b878d 100644
--- a/klaptopdaemon/daemondock.h
+++ b/klaptopdaemon/daemondock.h
@@ -41,7 +41,7 @@ class KPopupMenu;
 class laptop_dock : public KSystemTray {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   laptop_dock(laptop_daemon* parent);
diff --git a/klaptopdaemon/kpcmcia.h b/klaptopdaemon/kpcmcia.h
index 489d3e8..1040268 100644
--- a/klaptopdaemon/kpcmcia.h
+++ b/klaptopdaemon/kpcmcia.h
@@ -178,7 +178,7 @@ private:
 
 class KPCMCIA : public TQObject {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
   KPCMCIA(int maxSlots = 8, const char *stabPath = "/var/run/stab");
diff --git a/klaptopdaemon/kpcmciainfo.h b/klaptopdaemon/kpcmciainfo.h
index 458219b..f6c1a67 100644
--- a/klaptopdaemon/kpcmciainfo.h
+++ b/klaptopdaemon/kpcmciainfo.h
@@ -39,7 +39,7 @@ class KPushButton;
 
 class KPCMCIAInfo : public KDialog {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
   KPCMCIAInfo(KPCMCIA *pcmcia, TQWidget *parent = NULL, const char *name = 0);
@@ -78,7 +78,7 @@ class TQLabel;
 
 class KPCMCIAInfoPage : public TQFrame {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KPCMCIAInfoPage(KPCMCIACard *card, TQWidget *parent = NULL, const char *name = 0);
   virtual ~KPCMCIAInfoPage();
diff --git a/klaptopdaemon/krichtextlabel.h b/klaptopdaemon/krichtextlabel.h
index 513e128..abd83c8 100644
--- a/klaptopdaemon/krichtextlabel.h
+++ b/klaptopdaemon/krichtextlabel.h
@@ -34,7 +34,7 @@
  */
 class TDEUI_EXPORT KRichTextLabel : public TQLabel {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   /**
diff --git a/klaptopdaemon/laptop_daemon.h b/klaptopdaemon/laptop_daemon.h
index f5ba767..19fb45e 100644
--- a/klaptopdaemon/laptop_daemon.h
+++ b/klaptopdaemon/laptop_daemon.h
@@ -74,7 +74,7 @@ class laptop_dock;
 class laptop_daemon: public KDEDModule
 {
 	Q_OBJECT
-//	TQ_OBJECT
+//	
 	K_DCOP
 public:
     	laptop_daemon(const TQCString& obj);
diff --git a/klaptopdaemon/main.h b/klaptopdaemon/main.h
index 973c2c8..448d3c6 100644
--- a/klaptopdaemon/main.h
+++ b/klaptopdaemon/main.h
@@ -44,7 +44,7 @@ class ButtonsConfig;
 class LaptopModule : public KCModule
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 
diff --git a/klaptopdaemon/pcmcia.h b/klaptopdaemon/pcmcia.h
index 60fc24f..9d4949c 100644
--- a/klaptopdaemon/pcmcia.h
+++ b/klaptopdaemon/pcmcia.h
@@ -41,7 +41,7 @@
 class PcmciaConfig : public KCModule
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   PcmciaConfig( TQWidget *parent=0, const char* name=0);
 
diff --git a/klaptopdaemon/power.h b/klaptopdaemon/power.h
index e27d901..aa140b4 100644
--- a/klaptopdaemon/power.h
+++ b/klaptopdaemon/power.h
@@ -41,7 +41,7 @@ class KDoubleSpinBox;
 class PowerConfig : public KCModule
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   PowerConfig( TQWidget *parent=0, const char* name=0);
     ~PowerConfig();
diff --git a/klaptopdaemon/profile.h b/klaptopdaemon/profile.h
index 1abadef..4eb0851 100644
--- a/klaptopdaemon/profile.h
+++ b/klaptopdaemon/profile.h
@@ -42,7 +42,7 @@ class KComboBox;
 class ProfileConfig : public KCModule
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ProfileConfig( TQWidget *parent=0, const char* name=0);
   ~ProfileConfig( );     
diff --git a/klaptopdaemon/sony.h b/klaptopdaemon/sony.h
index 1f80d3c..52de84d 100644
--- a/klaptopdaemon/sony.h
+++ b/klaptopdaemon/sony.h
@@ -41,7 +41,7 @@ class TQPushButton;
 class SonyConfig : public KCModule
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   SonyConfig( TQWidget *parent=0, const char* name=0);
   ~SonyConfig( );     
diff --git a/klaptopdaemon/warning.h b/klaptopdaemon/warning.h
index fa0383b..67244ca 100644
--- a/klaptopdaemon/warning.h
+++ b/klaptopdaemon/warning.h
@@ -41,7 +41,7 @@ class KComboBox;
 class WarningConfig : public KCModule
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   WarningConfig(int x, TQWidget *parent=0, const char* name=0);
   ~WarningConfig();
diff --git a/klaptopdaemon/xautolock.h b/klaptopdaemon/xautolock.h
index e248e5e..de43be0 100644
--- a/klaptopdaemon/xautolock.h
+++ b/klaptopdaemon/xautolock.h
@@ -20,7 +20,7 @@
 class XAutoLock : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     XAutoLock();
     ~XAutoLock();
diff --git a/kmilo/generic/generic_monitor.h b/kmilo/generic/generic_monitor.h
index c94606d..6f23316 100644
--- a/kmilo/generic/generic_monitor.h
+++ b/kmilo/generic/generic_monitor.h
@@ -48,7 +48,7 @@ struct ShortcutInfo
 class GenericMonitor : public Monitor
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	GenericMonitor(TQObject *parent, const char *name, const TQStringList&);
diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.h b/kmilo/kmilo_kvaio/kcmkvaio/main.h
index 20e0b64..11e2d31 100644
--- a/kmilo/kmilo_kvaio/kcmkvaio/main.h
+++ b/kmilo/kmilo_kvaio/kcmkvaio/main.h
@@ -31,7 +31,7 @@ class KCMKVaioGeneral;
 class KVaioModule : public KCModule
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     KVaioModule(TQWidget *parent, const char *name, const TQStringList &);
diff --git a/kmilo/kmilo_kvaio/kmilo_kvaio.h b/kmilo/kmilo_kvaio/kmilo_kvaio.h
index 28780af..6fb2ce5 100644
--- a/kmilo/kmilo_kvaio/kmilo_kvaio.h
+++ b/kmilo/kmilo_kvaio/kmilo_kvaio.h
@@ -35,7 +35,7 @@ class KVaio;
 
 class KMiloKVaio : public KMilo::Monitor {
 //	Q_OBJECT
-  TQ_OBJECT
+  
 
 	public:
 		KMiloKVaio(TQObject *parent, 
diff --git a/kmilo/kmilo_kvaio/kvaio.h b/kmilo/kmilo_kvaio/kvaio.h
index ba2bf98..bf5ad22 100644
--- a/kmilo/kmilo_kvaio/kvaio.h
+++ b/kmilo/kmilo_kvaio/kvaio.h
@@ -56,7 +56,7 @@ class KMiloKVaio;
 class KVaio : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 //    KVaio(TQObject *parent = 0, const char *name =0);
     KVaio(KMiloKVaio *parent = 0, const char *name =0);
diff --git a/kmilo/kmilo_kvaio/kvaiodriverinterface.h b/kmilo/kmilo_kvaio/kvaiodriverinterface.h
index 2d051c2..fed34d4 100644
--- a/kmilo/kmilo_kvaio/kvaiodriverinterface.h
+++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.h
@@ -34,7 +34,7 @@ class TQSocketNotifier;
 class KVaioDriverInterface : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KVaioDriverInterface(TQObject *parent=0);
     bool connectToDriver(bool listen = true);
diff --git a/kmilo/kmilod/defaultskin.h b/kmilo/kmilod/defaultskin.h
index 82a3184..69e2e3f 100644
--- a/kmilo/kmilod/defaultskin.h
+++ b/kmilo/kmilod/defaultskin.h
@@ -32,7 +32,7 @@ class DefaultWidget;
 
 class DefaultSkin : public TQObject, public KMilo::DisplaySkin {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		DefaultSkin();
 		virtual ~DefaultSkin();
diff --git a/kmilo/kmilod/kmilod.h b/kmilo/kmilod/kmilod.h
index 24f7fd8..d58ea01 100644
--- a/kmilo/kmilod/kmilod.h
+++ b/kmilo/kmilod/kmilod.h
@@ -36,7 +36,7 @@ class KMiloInterface;
 
 class KMiloD : public KDEDModule {
 	Q_OBJECT
-//	TQ_OBJECT
+//	
 	K_DCOP
 	public:
 		KMiloD(const TQCString &name);
diff --git a/kmilo/kmilod/kmilointerface.h b/kmilo/kmilod/kmilointerface.h
index 1b22ff0..4d21185 100644
--- a/kmilo/kmilod/kmilointerface.h
+++ b/kmilo/kmilod/kmilointerface.h
@@ -32,7 +32,7 @@ namespace KMilo {
 // FIXME: make put the methods into .cpp file when the header is installed.
 class KMiloInterface : public TQObject {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		KMiloInterface(KMiloD *p) : TQObject() { _p = p; }
 		virtual ~KMiloInterface() {}
diff --git a/kmilo/thinkpad/kcmthinkpad/main.h b/kmilo/thinkpad/kcmthinkpad/main.h
index cda78c5..01c7a52 100644
--- a/kmilo/thinkpad/kcmthinkpad/main.h
+++ b/kmilo/thinkpad/kcmthinkpad/main.h
@@ -31,7 +31,7 @@ class KCMThinkPadGeneral;
 
 class KCMThinkpadModule : public KCModule {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
  public:
 	KCMThinkpadModule(TQWidget* parent, const char* name, const TQStringList&);
diff --git a/kregexpeditor/KMultiFormListBox/indexWindow.h b/kregexpeditor/KMultiFormListBox/indexWindow.h
index 833c789..cf15393 100644
--- a/kregexpeditor/KMultiFormListBox/indexWindow.h
+++ b/kregexpeditor/KMultiFormListBox/indexWindow.h
@@ -41,7 +41,7 @@
 class indexWindow : public TQWidget{
 
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   indexWindow();
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.h b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.h
index 172bb6f..04a3f75 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.h
+++ b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.h
@@ -35,7 +35,7 @@
 class KMultiFormListBoxMultiVisible :public TQScrollView, KMultiFormListBoxShower {
 
 Q_OBJECT
-  TQ_OBJECT
+  
 
 friend class KMultiFormListBox;
 
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.h b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.h
index 764993e..f86f6a4 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.h
+++ b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.h
@@ -38,7 +38,7 @@ class WindowListboxItem;
 class KMultiFormListBoxWindowed  :public TQWidget, KMultiFormListBoxShower {
 
 Q_OBJECT
-  TQ_OBJECT
+  
 
 friend class KMultiFormListBox;
 
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.h b/kregexpeditor/KMultiFormListBox/kmultiformlistbox.h
index ba9b8a8..89a6d0a 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.h
+++ b/kregexpeditor/KMultiFormListBox/kmultiformlistbox.h
@@ -63,7 +63,7 @@ class KMultiFormListBoxMultiVisible;
 class KMultiFormListBox : public TQWidget {
 
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h b/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h
index 90d4e35..b3750bb 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h
+++ b/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h
@@ -48,7 +48,7 @@
 class KMultiFormListBoxEntry : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMultiFormListBoxEntry(TQWidget *parent, const char *name) : TQWidget(parent,name) {}
diff --git a/kregexpeditor/auxbuttons.h b/kregexpeditor/auxbuttons.h
index d16b7c7..d8775a5 100644
--- a/kregexpeditor/auxbuttons.h
+++ b/kregexpeditor/auxbuttons.h
@@ -26,7 +26,7 @@ class TQToolButton;
 class AuxButtons :public TQDockWindow
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     AuxButtons( TQWidget* parent, const char* name );
diff --git a/kregexpeditor/characterswidget.h b/kregexpeditor/characterswidget.h
index 576e6f1..8100f0a 100644
--- a/kregexpeditor/characterswidget.h
+++ b/kregexpeditor/characterswidget.h
@@ -123,7 +123,7 @@ public:
 class CharacterEdits : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     CharacterEdits(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/kregexpeditor/charselector.h b/kregexpeditor/charselector.h
index c34ffac..611ab19 100644
--- a/kregexpeditor/charselector.h
+++ b/kregexpeditor/charselector.h
@@ -27,7 +27,7 @@ class LimitedCharLineEdit;
 class CharSelector :public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     CharSelector( TQWidget* parent, const char* name = 0 );
diff --git a/kregexpeditor/compoundwidget.h b/kregexpeditor/compoundwidget.h
index ad16de8..746f33a 100644
--- a/kregexpeditor/compoundwidget.h
+++ b/kregexpeditor/compoundwidget.h
@@ -60,7 +60,7 @@ private:
 class CompoundWidget :public SingleContainerWidget
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   CompoundWidget( RegExpEditorWindow* editorWindow, TQWidget* parent,
diff --git a/kregexpeditor/dcbutton.h b/kregexpeditor/dcbutton.h
index 8f56505..451d1b3 100644
--- a/kregexpeditor/dcbutton.h
+++ b/kregexpeditor/dcbutton.h
@@ -28,7 +28,7 @@ class TQMouseEvent;
 class DoubleClickButton :public TQToolButton
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   DoubleClickButton( TQPixmap pix, TQWidget* parent, const char* name = 0);
diff --git a/kregexpeditor/editorwindow.h b/kregexpeditor/editorwindow.h
index 0d20597..f1ff424 100644
--- a/kregexpeditor/editorwindow.h
+++ b/kregexpeditor/editorwindow.h
@@ -46,7 +46,7 @@ class TQHBoxLayout;
 class RegExpEditorWindow :public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     RegExpEditorWindow(TQWidget *parent, const char *name = 0);
diff --git a/kregexpeditor/kregexpeditorgui.h b/kregexpeditor/kregexpeditorgui.h
index 58ecc65..17ff05c 100644
--- a/kregexpeditor/kregexpeditorgui.h
+++ b/kregexpeditor/kregexpeditorgui.h
@@ -37,7 +37,7 @@ class KRegExpEditorPrivate;
 class KDE_EXPORT KRegExpEditorGUI  :public TQWidget, public KRegExpEditorInterface
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   TQ_PROPERTY( TQString regexp READ regExp WRITE setRegExp )
 public:
   KRegExpEditorGUI( TQWidget *parent, const char *name = 0,
@@ -67,7 +67,7 @@ private:
 class KDE_EXPORT KRegExpEditorGUIDialog : public KDialogBase, public KRegExpEditorInterface
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     TQ_PROPERTY( TQString regexp READ regExp WRITE setRegExp )
 public:
     KRegExpEditorGUIDialog( TQWidget *parent, const char *name, const TQStringList &args );
diff --git a/kregexpeditor/kregexpeditorprivate.h b/kregexpeditor/kregexpeditorprivate.h
index ce7bc63..9cff2cf 100644
--- a/kregexpeditor/kregexpeditorprivate.h
+++ b/kregexpeditor/kregexpeditorprivate.h
@@ -46,7 +46,7 @@ class TQToolButton;
 class KRegExpEditorPrivate  :public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     KRegExpEditorPrivate( TQWidget *parent, const char *name = 0 );
diff --git a/kregexpeditor/lookaheadwidget.h b/kregexpeditor/lookaheadwidget.h
index 36c4e42..14efee0 100644
--- a/kregexpeditor/lookaheadwidget.h
+++ b/kregexpeditor/lookaheadwidget.h
@@ -24,7 +24,7 @@ class LookAheadRegExp;
 class LookAheadWidget :public SingleContainerWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     LookAheadWidget( RegExpEditorWindow* editorWindow, RegExpType tp, TQWidget* parent, const char* name = 0 );
     LookAheadWidget( LookAheadRegExp* regexp, RegExpEditorWindow* editorWindow, RegExpType tp,
diff --git a/kregexpeditor/qt-only/compat.h b/kregexpeditor/qt-only/compat.h
index cd3d10f..7812073 100644
--- a/kregexpeditor/qt-only/compat.h
+++ b/kregexpeditor/qt-only/compat.h
@@ -37,7 +37,7 @@ TQString i18n( const TQString& a, const TQString& b);
 class KDialogBase :public TQDialog
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     enum ButtonCode {Ok = 1, Cancel, Help};
@@ -73,7 +73,7 @@ private:
 class KMessageBox :public TQMessageBox
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     enum ButtonCode { Ok = 1, Cancel = 2, Yes = 3, No = 4, Continue = 5 };
     static int  warningYesNo (TQWidget *parent, const TQString &text,
diff --git a/kregexpeditor/regexpbuttons.h b/kregexpeditor/regexpbuttons.h
index 5cdbba0..a0306e2 100644
--- a/kregexpeditor/regexpbuttons.h
+++ b/kregexpeditor/regexpbuttons.h
@@ -29,7 +29,7 @@ class TQSignalMapper;
 class RegExpButtons :public TQDockWindow
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     RegExpButtons( TQWidget *parent, const char *name = 0 );
diff --git a/kregexpeditor/regexpwidget.h b/kregexpeditor/regexpwidget.h
index d9480e9..8a4ba41 100644
--- a/kregexpeditor/regexpwidget.h
+++ b/kregexpeditor/regexpwidget.h
@@ -32,7 +32,7 @@ class RegExpEditorWindow;
 class RegExpWidget :public TQWidget
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   RegExpWidget(RegExpEditorWindow* editorWindow, TQWidget *parent,
diff --git a/kregexpeditor/repeatwidget.h b/kregexpeditor/repeatwidget.h
index 98ea6ee..c740717 100644
--- a/kregexpeditor/repeatwidget.h
+++ b/kregexpeditor/repeatwidget.h
@@ -33,7 +33,7 @@ class RepeatRegExp;
 class RepeatRangeWindow :public TQVBox
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   enum REPEATTYPE {ANY, ATLEAST, ATMOST, EXACTLY, MINMAX};
@@ -72,7 +72,7 @@ private:
 class RepeatWidget :public SingleContainerWidget
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   RepeatWidget( RegExpEditorWindow* editorWindow, TQWidget *parent,
diff --git a/kregexpeditor/scrollededitorwindow.h b/kregexpeditor/scrollededitorwindow.h
index b404cee..8a40a3c 100644
--- a/kregexpeditor/scrollededitorwindow.h
+++ b/kregexpeditor/scrollededitorwindow.h
@@ -30,7 +30,7 @@ class RegExp;
 class RegExpScrolledEditorWindow :public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     RegExpScrolledEditorWindow( TQWidget *parent = 0, const char* name = 0);
     RegExp* regExp();
diff --git a/kregexpeditor/selectablelineedit.h b/kregexpeditor/selectablelineedit.h
index 79522b3..5cdb1a0 100644
--- a/kregexpeditor/selectablelineedit.h
+++ b/kregexpeditor/selectablelineedit.h
@@ -34,7 +34,7 @@ class RegExpWidget;
 class SelectableLineEdit :public TQLineEdit
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   SelectableLineEdit( RegExpWidget* owner, TQWidget* parent = 0, const char* name = 0);
diff --git a/kregexpeditor/singlecontainerwidget.h b/kregexpeditor/singlecontainerwidget.h
index 3e6768a..268e599 100644
--- a/kregexpeditor/singlecontainerwidget.h
+++ b/kregexpeditor/singlecontainerwidget.h
@@ -25,7 +25,7 @@
 class SingleContainerWidget :public RegExpWidget
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   SingleContainerWidget( RegExpEditorWindow* editorWindow, TQWidget* parent,
diff --git a/kregexpeditor/textwidget.h b/kregexpeditor/textwidget.h
index ac1c069..cd8d8f8 100644
--- a/kregexpeditor/textwidget.h
+++ b/kregexpeditor/textwidget.h
@@ -30,7 +30,7 @@ class TextRegExp;
 class TextWidget : public RegExpWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     TextWidget(RegExpEditorWindow* editorWindow, TQWidget *parent,
diff --git a/kregexpeditor/userdefinedregexps.h b/kregexpeditor/userdefinedregexps.h
index 0b01b81..1cbb989 100644
--- a/kregexpeditor/userdefinedregexps.h
+++ b/kregexpeditor/userdefinedregexps.h
@@ -28,7 +28,7 @@ class RegExp;
 class UserDefinedRegExps :public TQDockWindow
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   UserDefinedRegExps( TQWidget *parent, const char *name = 0 );
diff --git a/kregexpeditor/verifier.h b/kregexpeditor/verifier.h
index d1999d6..abc6adf 100644
--- a/kregexpeditor/verifier.h
+++ b/kregexpeditor/verifier.h
@@ -26,7 +26,7 @@ class SyntaxHighlighter;
 class Verifier :public TQTextEdit
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
     Verifier( TQWidget* parent, const char* name = 0 );
     void setHighlighter( RegexpHighlighter* );
diff --git a/kregexpeditor/verifybuttons.h b/kregexpeditor/verifybuttons.h
index 90629c0..f700643 100644
--- a/kregexpeditor/verifybuttons.h
+++ b/kregexpeditor/verifybuttons.h
@@ -28,7 +28,7 @@ class TQPopupMenu;
 class VerifyButtons :public TQDockWindow
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     VerifyButtons( TQWidget* parent, const char* name );
diff --git a/ksim/generalprefs.h b/ksim/generalprefs.h
index 776348a..997cbac 100644
--- a/ksim/generalprefs.h
+++ b/ksim/generalprefs.h
@@ -43,7 +43,7 @@ namespace KSim
   class GeneralPrefs : public TQWidget
   {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
       GeneralPrefs(TQWidget *parent, const char *name=0);
       ~GeneralPrefs();
@@ -66,7 +66,7 @@ namespace KSim
   class ClockPrefs : public TQWidget
   {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
       ClockPrefs(TQWidget *parent, const char *name=0);
       ~ClockPrefs();
@@ -84,7 +84,7 @@ namespace KSim
   class UptimePrefs : public TQWidget
   {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
       UptimePrefs(TQWidget *parent, const char *name=0);
       ~UptimePrefs();
@@ -119,7 +119,7 @@ namespace KSim
   class MemoryPrefs : public TQWidget
   {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
       MemoryPrefs(TQWidget *parent, const char *name=0);
       ~MemoryPrefs();
@@ -156,7 +156,7 @@ namespace KSim
   class SwapPrefs : public TQWidget
   {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
       SwapPrefs(TQWidget *parent, const char *name=0);
       ~SwapPrefs();
diff --git a/ksim/ksim.h b/ksim/ksim.h
index 5451b83..b50cd01 100644
--- a/ksim/ksim.h
+++ b/ksim/ksim.h
@@ -35,7 +35,7 @@ namespace KSim
   class PanelExtension : public KPanelExtension
   {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
       PanelExtension( const TQString & configFile, Type type,
          int actions, TQWidget * parent, const char * name);
diff --git a/ksim/ksimframe.h b/ksim/ksimframe.h
index d793a3a..87f5389 100644
--- a/ksim/ksimframe.h
+++ b/ksim/ksimframe.h
@@ -34,7 +34,7 @@ namespace KSim
   class Frame : public TQWidget, public KSim::Base
   {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
       Frame(int type, TQWidget *parent, const char *name = 0);
       ~Frame();
diff --git a/ksim/ksimpref.h b/ksim/ksimpref.h
index 2c98b5b..6eda8d9 100644
--- a/ksim/ksimpref.h
+++ b/ksim/ksimpref.h
@@ -73,7 +73,7 @@ namespace KSim
   class KDE_EXPORT ConfigDialog : public KDialogBase
   {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
       ConfigDialog(KSim::Config *config, TQWidget *parent, const char *name = 0);
       ~ConfigDialog();
diff --git a/ksim/ksimsysinfo.h b/ksim/ksimsysinfo.h
index c0d1511..89b8598 100644
--- a/ksim/ksimsysinfo.h
+++ b/ksim/ksimsysinfo.h
@@ -34,7 +34,7 @@ namespace KSim
   class Sysinfo : public TQWidget, virtual public DCOPObject
   {
     Q_OBJECT
-//    TQ_OBJECT
+//    
     K_DCOP
     public:
       Sysinfo(KSim::Config *config, TQWidget *parent=0,
diff --git a/ksim/ksimview.h b/ksim/ksimview.h
index 6bbb989..c0404b8 100644
--- a/ksim/ksimview.h
+++ b/ksim/ksimview.h
@@ -49,7 +49,7 @@ namespace KSim
   class KDE_EXPORT MainView : public TQWidget, virtual public DCOPObject
   {
     Q_OBJECT
-//    TQ_OBJECT
+//    
     K_DCOP
     public:
       MainView(KConfig *config, bool loadPlugins,
diff --git a/ksim/library/chart.h b/ksim/library/chart.h
index 6f8cfeb..e2e7494 100644
--- a/ksim/library/chart.h
+++ b/ksim/library/chart.h
@@ -36,7 +36,7 @@ namespace KSim
   class KDE_EXPORT Chart : public TQWidget, public KSim::Base
   {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
       enum DataType { DataIn = 0, DataOut };
       enum LabelType { Label = 0, Progress, Led };
diff --git a/ksim/library/label.h b/ksim/library/label.h
index 9e24c95..dce2adc 100644
--- a/ksim/library/label.h
+++ b/ksim/library/label.h
@@ -37,7 +37,7 @@ namespace KSim
   class KDE_EXPORT Label : public TQWidget, public KSim::Base
   {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
       /**
        * Constructs a KSim::Label.
diff --git a/ksim/library/led.h b/ksim/library/led.h
index 6dcecce..510f959 100644
--- a/ksim/library/led.h
+++ b/ksim/library/led.h
@@ -107,7 +107,7 @@ namespace KSim
   class KDE_EXPORT LedLabel : public KSim::Progress
   {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
       /**
        * Constructs a KSim::LedLabel.
diff --git a/ksim/library/pluginloader.h b/ksim/library/pluginloader.h
index 7110c72..912297c 100644
--- a/ksim/library/pluginloader.h
+++ b/ksim/library/pluginloader.h
@@ -64,7 +64,7 @@ namespace KSim
   class KDE_EXPORT PluginLoader : public TQObject
   {
     Q_OBJECT
-  TQ_OBJECT
+  
     friend class MainView;
     public:
       enum SearchType { Name = 0, DesktopFile, LibName };
diff --git a/ksim/library/pluginmodule.h b/ksim/library/pluginmodule.h
index 56d491c..78cc21b 100644
--- a/ksim/library/pluginmodule.h
+++ b/ksim/library/pluginmodule.h
@@ -114,7 +114,7 @@ namespace KSim
   class KDE_EXPORT PluginPage : public TQWidget
   {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
       /**
        * constructor for PluginPage
@@ -163,7 +163,7 @@ namespace KSim
   class KDE_EXPORT PluginView : public TQWidget
   {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
       /**
        * constructor for PluginView
diff --git a/ksim/library/progress.h b/ksim/library/progress.h
index 415c9fa..c857000 100644
--- a/ksim/library/progress.h
+++ b/ksim/library/progress.h
@@ -33,7 +33,7 @@ namespace KSim
   class KDE_EXPORT Progress : public KSim::Label
   {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
       enum ProgressType { Panel, Meter };
       /**
diff --git a/ksim/monitorprefs.h b/ksim/monitorprefs.h
index 2ecf4c9..07035da 100644
--- a/ksim/monitorprefs.h
+++ b/ksim/monitorprefs.h
@@ -30,7 +30,7 @@ namespace KSim
   class MonitorPrefs : public KListView
   {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
       MonitorPrefs(TQWidget *parent, const char *name=0);
       ~MonitorPrefs();
diff --git a/ksim/monitors/cpu/ksimcpu.h b/ksim/monitors/cpu/ksimcpu.h
index a520b7b..315f113 100644
--- a/ksim/monitors/cpu/ksimcpu.h
+++ b/ksim/monitors/cpu/ksimcpu.h
@@ -52,7 +52,7 @@ class CpuPlugin : public KSim::PluginObject
 class CpuView : public KSim::PluginView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     CpuView(KSim::PluginObject *parent, const char *name);
     ~CpuView();
@@ -201,7 +201,7 @@ class CpuView : public KSim::PluginView
 class CpuConfig : public KSim::PluginPage
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     CpuConfig(KSim::PluginObject *parent, const char *name);
     ~CpuConfig();
diff --git a/ksim/monitors/disk/ksimdisk.h b/ksim/monitors/disk/ksimdisk.h
index 1c97040..ea1b2d6 100644
--- a/ksim/monitors/disk/ksimdisk.h
+++ b/ksim/monitors/disk/ksimdisk.h
@@ -55,7 +55,7 @@ class DiskPlugin : public KSim::PluginObject
 class DiskView : public KSim::PluginView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     DiskView(KSim::PluginObject *parent, const char *name);
     ~DiskView();
@@ -132,7 +132,7 @@ class DiskView : public KSim::PluginView
 class DiskConfig : public KSim::PluginPage
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     DiskConfig(KSim::PluginObject *parent, const char *name);
     ~DiskConfig();
diff --git a/ksim/monitors/filesystem/filesystemwidget.h b/ksim/monitors/filesystem/filesystemwidget.h
index a79a34f..9cd3f61 100644
--- a/ksim/monitors/filesystem/filesystemwidget.h
+++ b/ksim/monitors/filesystem/filesystemwidget.h
@@ -30,7 +30,7 @@ class TQVBoxLayout;
 class FilesystemWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     FilesystemWidget(TQWidget *parent, const char *name);
     ~FilesystemWidget();
diff --git a/ksim/monitors/filesystem/fsystemconfig.h b/ksim/monitors/filesystem/fsystemconfig.h
index 82eafb7..0ec124c 100644
--- a/ksim/monitors/filesystem/fsystemconfig.h
+++ b/ksim/monitors/filesystem/fsystemconfig.h
@@ -33,7 +33,7 @@ class TQListBoxItem;
 class FsystemConfig : public KSim::PluginPage
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     FsystemConfig(KSim::PluginObject *parent, const char *name);
     ~FsystemConfig();
diff --git a/ksim/monitors/filesystem/ksimfsystem.h b/ksim/monitors/filesystem/ksimfsystem.h
index a9eefc6..17ab1f0 100644
--- a/ksim/monitors/filesystem/ksimfsystem.h
+++ b/ksim/monitors/filesystem/ksimfsystem.h
@@ -48,7 +48,7 @@ class PluginModule : public KSim::PluginObject
 class Fsystem : public KSim::PluginView, public FsystemIface
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     /**
      * construtor of Fsystem, calls all init functions to create the plugin.
diff --git a/ksim/monitors/i8k/ksimi8k.h b/ksim/monitors/i8k/ksimi8k.h
index 01383b5..09296ec 100644
--- a/ksim/monitors/i8k/ksimi8k.h
+++ b/ksim/monitors/i8k/ksimi8k.h
@@ -50,7 +50,7 @@ class I8KPlugin : public KSim::PluginObject
 class I8KView : public KSim::PluginView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     I8KView(KSim::PluginObject *parent, const char *name);
     ~I8KView();
@@ -82,7 +82,7 @@ class I8KView : public KSim::PluginView
 class I8KConfig : public KSim::PluginPage
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     I8KConfig(KSim::PluginObject *parent, const char *name);
     ~I8KConfig();
diff --git a/ksim/monitors/lm_sensors/ksimsensors.h b/ksim/monitors/lm_sensors/ksimsensors.h
index 97fa757..a0c9455 100644
--- a/ksim/monitors/lm_sensors/ksimsensors.h
+++ b/ksim/monitors/lm_sensors/ksimsensors.h
@@ -48,7 +48,7 @@ class PluginModule : public KSim::PluginObject
 class SensorsView : public KSim::PluginView, public KSimSensorsIface
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     SensorsView(KSim::PluginObject *parent, const char *name);
     ~SensorsView();
diff --git a/ksim/monitors/lm_sensors/sensorbase.h b/ksim/monitors/lm_sensors/sensorbase.h
index 7a39462..948a09b 100644
--- a/ksim/monitors/lm_sensors/sensorbase.h
+++ b/ksim/monitors/lm_sensors/sensorbase.h
@@ -91,7 +91,7 @@ class SensorList : public TQValueList<SensorInfo>
 class SensorBase : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     static SensorBase *self();
 
diff --git a/ksim/monitors/lm_sensors/sensorsconfig.h b/ksim/monitors/lm_sensors/sensorsconfig.h
index 6e27e3d..8aeb04c 100644
--- a/ksim/monitors/lm_sensors/sensorsconfig.h
+++ b/ksim/monitors/lm_sensors/sensorsconfig.h
@@ -36,7 +36,7 @@ class TQTimer;
 class SensorsConfig : public KSim::PluginPage
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     SensorsConfig(KSim::PluginObject *parent, const char *name);
     ~SensorsConfig();
diff --git a/ksim/monitors/mail/ksimmail.h b/ksim/monitors/mail/ksimmail.h
index 3ecb647..8f9dc9c 100644
--- a/ksim/monitors/mail/ksimmail.h
+++ b/ksim/monitors/mail/ksimmail.h
@@ -39,7 +39,7 @@ public:
 class MailView : public KSim::PluginView
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	MailView( KSim::PluginObject* parent, const char* name );
 	~MailView();
@@ -53,7 +53,7 @@ private slots:
 class MailLabel : public KSim::Label
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	MailLabel( TQWidget* parent );
 	virtual ~MailLabel();
@@ -79,7 +79,7 @@ private:
 class MailConfig : public KSim::PluginPage
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	MailConfig( KSim::PluginObject* parent, const char* name );
 	~MailConfig();
diff --git a/ksim/monitors/net/ksimnet.h b/ksim/monitors/net/ksimnet.h
index 87ad691..5da4165 100644
--- a/ksim/monitors/net/ksimnet.h
+++ b/ksim/monitors/net/ksimnet.h
@@ -43,7 +43,7 @@ class NetPlugin : public KSim::PluginObject
 class NetView : public KSim::PluginView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     NetView(KSim::PluginObject *parent, const char *name);
     ~NetView();
diff --git a/ksim/monitors/net/netconfig.h b/ksim/monitors/net/netconfig.h
index c2b5387..5bf2716 100644
--- a/ksim/monitors/net/netconfig.h
+++ b/ksim/monitors/net/netconfig.h
@@ -33,7 +33,7 @@ class TQListViewItem;
 class NetConfig : public KSim::PluginPage
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     NetConfig(KSim::PluginObject *parent, const char *name);
     virtual ~NetConfig();
diff --git a/ksim/monitors/net/netdialog.h b/ksim/monitors/net/netdialog.h
index 2b9f7b1..1c6cd85 100644
--- a/ksim/monitors/net/netdialog.h
+++ b/ksim/monitors/net/netdialog.h
@@ -35,7 +35,7 @@ class KURLRequester;
 class NetDialog : public TQTabDialog
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     NetDialog(TQWidget *parent, const char *name = 0);
     ~NetDialog();
diff --git a/ksim/monitors/snmp/browsedialog.h b/ksim/monitors/snmp/browsedialog.h
index 2e605b8..1bd641f 100644
--- a/ksim/monitors/snmp/browsedialog.h
+++ b/ksim/monitors/snmp/browsedialog.h
@@ -39,7 +39,7 @@ namespace Snmp
 class BrowseDialog : public BrowseDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     BrowseDialog( const HostConfig &hostConfig, const TQString &currentOid, TQWidget *parent, const char *name = 0 );
 
diff --git a/ksim/monitors/snmp/chartmonitor.h b/ksim/monitors/snmp/chartmonitor.h
index b147922..803f97e 100644
--- a/ksim/monitors/snmp/chartmonitor.h
+++ b/ksim/monitors/snmp/chartmonitor.h
@@ -31,7 +31,7 @@ namespace Snmp
 class ChartMonitor : public KSim::Chart
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     ChartMonitor( const MonitorConfig &config, TQWidget *parent, const char *name = 0 );
 
diff --git a/ksim/monitors/snmp/configpage.h b/ksim/monitors/snmp/configpage.h
index 6027862..d7508ae 100644
--- a/ksim/monitors/snmp/configpage.h
+++ b/ksim/monitors/snmp/configpage.h
@@ -79,7 +79,7 @@ class Plugin;
 class ConfigPage : public KSim::PluginPage
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     ConfigPage( Plugin *parent, const char *name );
     ~ConfigPage();
diff --git a/ksim/monitors/snmp/hostdialog.h b/ksim/monitors/snmp/hostdialog.h
index ba5e1c5..5a856e8 100644
--- a/ksim/monitors/snmp/hostdialog.h
+++ b/ksim/monitors/snmp/hostdialog.h
@@ -33,7 +33,7 @@ namespace Snmp
 class HostDialog : public HostDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     HostDialog( TQWidget *parent, const char *name = 0 );
     HostDialog( const HostConfig &src, TQWidget *parent, const char *name = 0 );
diff --git a/ksim/monitors/snmp/labelmonitor.h b/ksim/monitors/snmp/labelmonitor.h
index 90ffd90..ef7f91b 100644
--- a/ksim/monitors/snmp/labelmonitor.h
+++ b/ksim/monitors/snmp/labelmonitor.h
@@ -33,7 +33,7 @@ namespace Snmp
 class LabelMonitor : public KSim::Label
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     LabelMonitor( const MonitorConfig &config, TQWidget *parent, const char *name = 0 );
 
diff --git a/ksim/monitors/snmp/monitor.h b/ksim/monitors/snmp/monitor.h
index 0fddbef..f2eb1b9 100644
--- a/ksim/monitors/snmp/monitor.h
+++ b/ksim/monitors/snmp/monitor.h
@@ -34,7 +34,7 @@ namespace Snmp
 class Monitor : public TQObject, public TQThread
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     Monitor( const HostConfig &host, const Identifier &oid, int refresh, TQObject *parent = 0, const char *name = 0 );
     virtual ~Monitor();
diff --git a/ksim/monitors/snmp/monitordialog.h b/ksim/monitors/snmp/monitordialog.h
index eee6634..9f962e5 100644
--- a/ksim/monitors/snmp/monitordialog.h
+++ b/ksim/monitors/snmp/monitordialog.h
@@ -32,7 +32,7 @@ namespace Snmp
 class MonitorDialog : public MonitorDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     MonitorDialog( const HostConfigMap &hosts, TQWidget *parent, const char *name = 0 );
     MonitorDialog( const MonitorConfig &monitor, const HostConfigMap &hosts, TQWidget *parent, const char *name = 0 );
diff --git a/ksim/monitors/snmp/probedialog.h b/ksim/monitors/snmp/probedialog.h
index 98e705b..7f8d0ab 100644
--- a/ksim/monitors/snmp/probedialog.h
+++ b/ksim/monitors/snmp/probedialog.h
@@ -38,7 +38,7 @@ class Monitor;
 class ProbeDialog : public KProgressDialog
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     ProbeDialog( const HostConfig &hostConfig, TQWidget *parent, const char *name = 0 );
 
diff --git a/ksim/monitors/snmp/proberesultdialog.h b/ksim/monitors/snmp/proberesultdialog.h
index 66300bf..9d4884c 100644
--- a/ksim/monitors/snmp/proberesultdialog.h
+++ b/ksim/monitors/snmp/proberesultdialog.h
@@ -33,7 +33,7 @@ namespace Snmp
 class ProbeResultDialog : public ProbeResultDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     ProbeResultDialog( const HostConfig &hostConfig, const ProbeDialog::ProbeResultList &probeResults,
                        TQWidget *parent, const char *name = 0 );
diff --git a/ksim/monitors/snmp/view.h b/ksim/monitors/snmp/view.h
index a87af87..d40d44d 100644
--- a/ksim/monitors/snmp/view.h
+++ b/ksim/monitors/snmp/view.h
@@ -35,7 +35,7 @@ class Plugin;
 class View : public KSim::PluginView
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     View( Plugin *parent, const char *name );
     ~View();
diff --git a/ksim/monitors/snmp/walker.h b/ksim/monitors/snmp/walker.h
index 19b440b..cda0ad8 100644
--- a/ksim/monitors/snmp/walker.h
+++ b/ksim/monitors/snmp/walker.h
@@ -36,7 +36,7 @@ namespace Snmp
 class Walker : public TQObject, public TQThread
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     Walker( const HostConfig &host, const Identifier &startOid, TQObject *parent, const char *name = 0 );
     virtual ~Walker();
diff --git a/ksim/themeprefs.h b/ksim/themeprefs.h
index ec788b3..b03f878 100644
--- a/ksim/themeprefs.h
+++ b/ksim/themeprefs.h
@@ -76,7 +76,7 @@ namespace KSim
   class ThemePrefs : public TQWidget
   {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
       ThemePrefs(TQWidget *parent, const char *name=0);
       ~ThemePrefs();
diff --git a/ktimer/ktimer.h b/ktimer/ktimer.h
index 5f8cb4f..bdb1d00 100644
--- a/ktimer/ktimer.h
+++ b/ktimer/ktimer.h
@@ -29,7 +29,7 @@
 
 class KTimerJob : public TQObject {
  Q_OBJECT
-  TQ_OBJECT
+  
 
  public:
     KTimerJob( TQObject *parent=0, const char *name=0 );
@@ -91,7 +91,7 @@ class KTimerJob : public TQObject {
 class KTimerPref : public PrefWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
  public:
     KTimerPref( TQWidget *parent=0, const char *name = 0 );
     virtual ~KTimerPref();
diff --git a/kwallet/allyourbase.h b/kwallet/allyourbase.h
index d7bb391..c89276e 100644
--- a/kwallet/allyourbase.h
+++ b/kwallet/allyourbase.h
@@ -97,7 +97,7 @@ class KWalletFolderItem : public KListViewItem {
 
 class KWalletEntryList : public KListView {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		KWalletEntryList(TQWidget *parent, const char *name = 0L);
 		virtual ~KWalletEntryList();
@@ -134,7 +134,7 @@ class KWalletItem : public TQIconViewItem {
 
 class KWalletIconView : public KIconView {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		KWalletIconView(TQWidget *parent, const char *name = 0L);
 		virtual ~KWalletIconView();
diff --git a/kwallet/konfigurator/konfigurator.h b/kwallet/konfigurator/konfigurator.h
index 2c62842..28fef08 100644
--- a/kwallet/konfigurator/konfigurator.h
+++ b/kwallet/konfigurator/konfigurator.h
@@ -28,7 +28,7 @@ class TQListViewItem;
 
 class KWalletConfig : public KCModule {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		KWalletConfig(TQWidget *parent = 0L, const char *name = 0L, const TQStringList& = TQStringList());
 		virtual ~KWalletConfig();
diff --git a/kwallet/kwalleteditor.h b/kwallet/kwalleteditor.h
index d38f4a2..9f63961 100644
--- a/kwallet/kwalleteditor.h
+++ b/kwallet/kwalleteditor.h
@@ -36,7 +36,7 @@ class KWMapEditor;
 
 class KWalletEditor : public KMainWindow {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 	public:
 		KWalletEditor(const TQString& wallet, bool isPath, TQWidget *parent = 0, const char* name = 0);
diff --git a/kwallet/kwalletmanager.h b/kwallet/kwalletmanager.h
index acb8006..1cec995 100644
--- a/kwallet/kwalletmanager.h
+++ b/kwallet/kwalletmanager.h
@@ -32,7 +32,7 @@ class DCOPRef;
 
 class KWalletManager : public KMainWindow, public DCOPObject {
 	Q_OBJECT
-//	TQ_OBJECT
+//	
 	K_DCOP
 
 	public:
diff --git a/kwallet/kwalletpopup.h b/kwallet/kwalletpopup.h
index ce35669..8ef78b0 100644
--- a/kwallet/kwalletpopup.h
+++ b/kwallet/kwalletpopup.h
@@ -26,7 +26,7 @@
 
 class KWalletPopup : public KPopupMenu {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 	public:
 		KWalletPopup(const TQString& wallet, TQWidget *parent = 0, const char* name = 0);
diff --git a/kwallet/kwmapeditor.h b/kwallet/kwmapeditor.h
index fc34cbc..0fade7b 100644
--- a/kwallet/kwmapeditor.h
+++ b/kwallet/kwmapeditor.h
@@ -29,7 +29,7 @@ class KActionCollection;
 
 class KWMapEditor : public TQTable {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 	public:
 		KWMapEditor(TQMap<TQString,TQString>& map, TQWidget *parent = 0, const char *name = 0);
diff --git a/superkaramba/src/bar.h b/superkaramba/src/bar.h
index 78f9ff3..3c0562a 100644
--- a/superkaramba/src/bar.h
+++ b/superkaramba/src/bar.h
@@ -18,7 +18,7 @@
 class Bar : public Meter
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
     Bar(karamba* k,int ix,int iy,int iw,int ih );
     ~Bar();
diff --git a/superkaramba/src/clickarea.h b/superkaramba/src/clickarea.h
index 3df44b8..d062da1 100644
--- a/superkaramba/src/clickarea.h
+++ b/superkaramba/src/clickarea.h
@@ -40,7 +40,7 @@
 class ClickArea : public Meter
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     ClickArea(karamba* k, int x, int y, int w, int h );
 
diff --git a/superkaramba/src/clickmap.h b/superkaramba/src/clickmap.h
index fecb2a0..33fbf0e 100644
--- a/superkaramba/src/clickmap.h
+++ b/superkaramba/src/clickmap.h
@@ -23,7 +23,7 @@
 class ClickMap : public Meter
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
     ClickMap(karamba* k, int x, int y, int w, int h);
     ~ClickMap();
diff --git a/superkaramba/src/cpusensor.h b/superkaramba/src/cpusensor.h
index 70e06dd..e239edb 100644
--- a/superkaramba/src/cpusensor.h
+++ b/superkaramba/src/cpusensor.h
@@ -17,7 +17,7 @@
 class CPUSensor :  public Sensor
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     CPUSensor( TQString cpuNbr, int interval );
     ~CPUSensor();
diff --git a/superkaramba/src/datesensor.h b/superkaramba/src/datesensor.h
index 24d74d6..67c66db 100644
--- a/superkaramba/src/datesensor.h
+++ b/superkaramba/src/datesensor.h
@@ -27,7 +27,7 @@ private:
 class DateSensor :  public Sensor
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
   DateSensor( int interval );
   ~DateSensor();
diff --git a/superkaramba/src/disksensor.h b/superkaramba/src/disksensor.h
index 0fb2023..d28174f 100644
--- a/superkaramba/src/disksensor.h
+++ b/superkaramba/src/disksensor.h
@@ -19,7 +19,7 @@
 class DiskSensor :  public Sensor
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
   DiskSensor(int msec );
   ~DiskSensor();
diff --git a/superkaramba/src/graph.h b/superkaramba/src/graph.h
index 6e89c57..8c1b3a8 100644
--- a/superkaramba/src/graph.h
+++ b/superkaramba/src/graph.h
@@ -18,7 +18,7 @@
 class Graph : public Meter
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   Graph(karamba* k, int ix, int iy, int iw, int ih, int nbrPoints);
diff --git a/superkaramba/src/imagelabel.h b/superkaramba/src/imagelabel.h
index f27ed24..820c214 100644
--- a/superkaramba/src/imagelabel.h
+++ b/superkaramba/src/imagelabel.h
@@ -45,7 +45,7 @@ class Effect : public TQObject
 {
 
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   Effect(ImageLabel*, int millisec);
@@ -101,7 +101,7 @@ class ImageLabel : public Meter
 {
 
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   ImageLabel(karamba* k, int ix,int iy,int iw,int ih );
diff --git a/superkaramba/src/input.h b/superkaramba/src/input.h
index 509b66d..6e1601a 100644
--- a/superkaramba/src/input.h
+++ b/superkaramba/src/input.h
@@ -36,7 +36,7 @@
 class Input : public Meter
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
   Input(karamba* k, int ix, int iy, int iw, int ih);
   Input();
diff --git a/superkaramba/src/karamba.h b/superkaramba/src/karamba.h
index 9eac2fc..416bc5b 100644
--- a/superkaramba/src/karamba.h
+++ b/superkaramba/src/karamba.h
@@ -112,7 +112,7 @@ class LineParser;
 class karamba :  public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     karamba(TQString fn, TQString name, bool reloading = false,
@@ -327,7 +327,7 @@ private slots:
 class DesktopChangeSlot : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
   DesktopChangeSlot(TQObject *parent, int desktop_id);
@@ -348,7 +348,7 @@ class DesktopChangeSlot : public TQObject
 class SignalBridge : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     SignalBridge(TQObject* parent, TQString, KActionCollection*);
diff --git a/superkaramba/src/karambaapp.h b/superkaramba/src/karambaapp.h
index 2dff0a7..da63246 100644
--- a/superkaramba/src/karambaapp.h
+++ b/superkaramba/src/karambaapp.h
@@ -39,7 +39,7 @@ class KAboutData;
 class KarambaApplication : public KApplication
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     friend class KarambaIface;
 
diff --git a/superkaramba/src/kwidgetlistbox.h b/superkaramba/src/kwidgetlistbox.h
index b1e4b25..680df49 100644
--- a/superkaramba/src/kwidgetlistbox.h
+++ b/superkaramba/src/kwidgetlistbox.h
@@ -31,7 +31,7 @@ typedef bool (*show_callback) (int index, TQWidget* widget, void* data);
 class KWidgetListbox : public TQTable
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KWidgetListbox(TQWidget *parent = 0, const char *name = 0);
diff --git a/superkaramba/src/memsensor.h b/superkaramba/src/memsensor.h
index 4caa164..bf2af69 100644
--- a/superkaramba/src/memsensor.h
+++ b/superkaramba/src/memsensor.h
@@ -24,7 +24,7 @@
 class MemSensor :  public Sensor
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
   MemSensor( int interval );
diff --git a/superkaramba/src/meter.h b/superkaramba/src/meter.h
index 689bdd5..810a8aa 100644
--- a/superkaramba/src/meter.h
+++ b/superkaramba/src/meter.h
@@ -23,7 +23,7 @@ class karamba;
 class Meter : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
   Meter(karamba* k, int ix,int iy,int iw,int ih);
diff --git a/superkaramba/src/networksensor.h b/superkaramba/src/networksensor.h
index 77fdf08..5e93517 100644
--- a/superkaramba/src/networksensor.h
+++ b/superkaramba/src/networksensor.h
@@ -25,7 +25,7 @@
 class NetworkSensor :  public Sensor
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     NetworkSensor( TQString device, int interval );
     ~NetworkSensor();
diff --git a/superkaramba/src/programsensor.h b/superkaramba/src/programsensor.h
index 93e1c9e..d3f2b39 100644
--- a/superkaramba/src/programsensor.h
+++ b/superkaramba/src/programsensor.h
@@ -19,7 +19,7 @@
 class ProgramSensor :  public Sensor
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     ProgramSensor(const TQString &programName, int msec=1000, TQString encoding="" );
     ~ProgramSensor();
diff --git a/superkaramba/src/richtextlabel.h b/superkaramba/src/richtextlabel.h
index 5ea5a94..cae19c6 100644
--- a/superkaramba/src/richtextlabel.h
+++ b/superkaramba/src/richtextlabel.h
@@ -24,7 +24,7 @@
 class RichTextLabel : public Meter
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     RichTextLabel(karamba*);
     RichTextLabel(karamba* k, int x, int y, int w, int h);
diff --git a/superkaramba/src/rsssensor.h b/superkaramba/src/rsssensor.h
index 4e2322b..4361dca 100644
--- a/superkaramba/src/rsssensor.h
+++ b/superkaramba/src/rsssensor.h
@@ -22,7 +22,7 @@
 class RssSensor : public Sensor
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     RssSensor( const TQString &source, int interval, const TQString &format, const TQString &encoding=TQString() );
 
diff --git a/superkaramba/src/sensor.h b/superkaramba/src/sensor.h
index dd9b567..1fa34b1 100644
--- a/superkaramba/src/sensor.h
+++ b/superkaramba/src/sensor.h
@@ -21,7 +21,7 @@
 class Sensor : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     Sensor( int msec = 1000 );
diff --git a/superkaramba/src/sensorsensor.h b/superkaramba/src/sensorsensor.h
index 217cefb..f4ff004 100644
--- a/superkaramba/src/sensorsensor.h
+++ b/superkaramba/src/sensorsensor.h
@@ -20,7 +20,7 @@
 class SensorSensor : public Sensor
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     SensorSensor(int interval, char tempUnit);
 
diff --git a/superkaramba/src/showdesktop.h b/superkaramba/src/showdesktop.h
index bcf67d9..22d847f 100644
--- a/superkaramba/src/showdesktop.h
+++ b/superkaramba/src/showdesktop.h
@@ -30,7 +30,7 @@ class KWinModule;
 class ShowDesktop : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     static ShowDesktop* the();
diff --git a/superkaramba/src/systemtray.h b/superkaramba/src/systemtray.h
index ba8d1e8..dbbbed6 100644
--- a/superkaramba/src/systemtray.h
+++ b/superkaramba/src/systemtray.h
@@ -34,7 +34,7 @@ typedef long unsigned int Atom;
 class Systemtray : public TQWidget
 {
     Q_OBJECT
-    TQ_OBJECT
+    
 public:
     Systemtray(TQWidget* parent);
     ~Systemtray();
diff --git a/superkaramba/src/taskmanager.h b/superkaramba/src/taskmanager.h
index 7313ea5..f0d2c3c 100644
--- a/superkaramba/src/taskmanager.h
+++ b/superkaramba/src/taskmanager.h
@@ -49,7 +49,7 @@ class TaskManager;
 class Task: public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     TQ_PROPERTY( TQString name READ name )
     TQ_PROPERTY( TQString visibleName READ visibleName )
     TQ_PROPERTY( TQString visibleNameWithState READ visibleNameWithState )
@@ -376,7 +376,7 @@ private:
 class Startup: public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     TQ_PROPERTY( TQString text READ text )
     TQ_PROPERTY( TQString bin READ bin )
     TQ_PROPERTY( TQString icon READ icon )
@@ -432,7 +432,7 @@ typedef TQPtrList<Startup> StartupList;
 class TaskManager : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     TQ_PROPERTY( int currentDesktop READ currentDesktop )
     TQ_PROPERTY( int numberOfDesktops READ numberOfDesktops )
 
diff --git a/superkaramba/src/textfilesensor.h b/superkaramba/src/textfilesensor.h
index adf521e..930407a 100644
--- a/superkaramba/src/textfilesensor.h
+++ b/superkaramba/src/textfilesensor.h
@@ -37,7 +37,7 @@ class TextFileSensor : public Sensor
 {
 
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
     TextFileSensor( const TQString &fileName, bool rdf, int interval, const TQString &encoding=TQString() );
 
diff --git a/superkaramba/src/textlabel.h b/superkaramba/src/textlabel.h
index 72fcbc9..df730d1 100644
--- a/superkaramba/src/textlabel.h
+++ b/superkaramba/src/textlabel.h
@@ -23,7 +23,7 @@
 class TextLabel : public Meter
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
     enum ScrollType { ScrollNone, ScrollNormal,
                       ScrollBackAndForth, ScrollOnePass };
diff --git a/superkaramba/src/themesdlg.h b/superkaramba/src/themesdlg.h
index b75c820..22eb4c0 100644
--- a/superkaramba/src/themesdlg.h
+++ b/superkaramba/src/themesdlg.h
@@ -40,7 +40,7 @@ class KArchiveDirectory;
 class ThemesDlg : public ThemesLayout
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ThemesDlg(TQWidget *parent = 0, const char *name = 0);
diff --git a/superkaramba/src/themewidget.h b/superkaramba/src/themewidget.h
index 40cefe5..2481cb8 100644
--- a/superkaramba/src/themewidget.h
+++ b/superkaramba/src/themewidget.h
@@ -30,7 +30,7 @@
 class ThemeWidget : public ThemeWidgetLayout
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ThemeWidget(TQWidget *parent = 0, const char *name = 0);
     ThemeWidget(ThemeFile* tf);
diff --git a/superkaramba/src/xmmssensor.h b/superkaramba/src/xmmssensor.h
index bd254fb..20727b1 100644
--- a/superkaramba/src/xmmssensor.h
+++ b/superkaramba/src/xmmssensor.h
@@ -23,7 +23,7 @@
 class XMMSSensor :  public Sensor
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     XMMSSensor( int interval, const TQString &encoding=TQString() );
     ~XMMSSensor();