diff --git a/conduits/abbrowserconduit/abbrowser-conduit.h b/conduits/abbrowserconduit/abbrowser-conduit.h
index 464378f..ee73d4f 100644
--- a/conduits/abbrowserconduit/abbrowser-conduit.h
+++ b/conduits/abbrowserconduit/abbrowser-conduit.h
@@ -54,7 +54,7 @@ typedef TQValueList<recordid_t> RecordIDList;
 class AbbrowserConduit : public ConduitAction
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	AbbrowserConduit(KPilotLink *o,const char *n = 0L,
 		const TQStringList &a = TQStringList() );
diff --git a/conduits/abbrowserconduit/resolutionDialog.h b/conduits/abbrowserconduit/resolutionDialog.h
index 9f0edeb..848cfdf 100644
--- a/conduits/abbrowserconduit/resolutionDialog.h
+++ b/conduits/abbrowserconduit/resolutionDialog.h
@@ -40,7 +40,7 @@ class ResolutionTable;
 class ResolutionDlg : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	ResolutionDlg( TQWidget* parent=0, 
diff --git a/conduits/docconduit/DOC-converter.h b/conduits/docconduit/DOC-converter.h
index 68eca2b..4351646 100644
--- a/conduits/docconduit/DOC-converter.h
+++ b/conduits/docconduit/DOC-converter.h
@@ -105,7 +105,7 @@ class docRegExpBookmark:public docMatchBookmark {
 
 class DOCConverter:public TQObject {
 Q_OBJECT
-  TQ_OBJECT
+  
 private:
 	PilotDatabase * docdb;
 	TQString txtfilename;
diff --git a/conduits/docconduit/doc-conduit.h b/conduits/docconduit/doc-conduit.h
index a7e7a44..a152072 100644
--- a/conduits/docconduit/doc-conduit.h
+++ b/conduits/docconduit/doc-conduit.h
@@ -55,7 +55,7 @@ TQString dirToString(eSyncDirectionEnum dir);
 
 class DOCConduit:public ConduitAction {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	eSyncDirectionEnum eSyncDirection;
 
diff --git a/conduits/docconduit/doc-conflictdialog.h b/conduits/docconduit/doc-conflictdialog.h
index e59c17c..410a1cd 100644
--- a/conduits/docconduit/doc-conflictdialog.h
+++ b/conduits/docconduit/doc-conflictdialog.h
@@ -54,7 +54,7 @@ typedef struct conflictEntry {
 class ResolutionDialog : public KDialogBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	ResolutionDialog( TQWidget* parent=0, const TQString& caption=i18n("Resolution Dialog"), syncInfoList*sinfo=0L, KPilotLink*lnk=0L);
diff --git a/conduits/docconduit/doc-factory.h b/conduits/docconduit/doc-factory.h
index a91faa6..f8968d9 100644
--- a/conduits/docconduit/doc-factory.h
+++ b/conduits/docconduit/doc-factory.h
@@ -38,7 +38,7 @@ class KAboutData;
 class DOCConduitFactory:public KLibFactory 
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	DOCConduitFactory(TQObject * = 0L, const char * = 0L);
diff --git a/conduits/docconduit/kpalmdoc_dlg.h b/conduits/docconduit/kpalmdoc_dlg.h
index ac33ca7..2fd44fd 100644
--- a/conduits/docconduit/kpalmdoc_dlg.h
+++ b/conduits/docconduit/kpalmdoc_dlg.h
@@ -35,7 +35,7 @@ class DOCConverter;
 class ConverterDlg : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	ConverterDlg( TQWidget *parent=0, const TQString& caption=0);
diff --git a/conduits/knotes/knotes-action.h b/conduits/knotes/knotes-action.h
index bd057b7..3c2288b 100644
--- a/conduits/knotes/knotes-action.h
+++ b/conduits/knotes/knotes-action.h
@@ -37,7 +37,7 @@ class PilotMemo;
 class KNotesAction : public ConduitAction
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	KNotesAction(
 		KPilotLink *o,
diff --git a/conduits/knotes/knotes-factory.h b/conduits/knotes/knotes-factory.h
index 035d238..5fc6a09 100644
--- a/conduits/knotes/knotes-factory.h
+++ b/conduits/knotes/knotes-factory.h
@@ -37,7 +37,7 @@ class KAboutData;
 class KNotesConduitFactory : public KLibFactory
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	KNotesConduitFactory(TQObject * = 0L,const char * = 0L);
diff --git a/conduits/malconduit/mal-conduit.h b/conduits/malconduit/mal-conduit.h
index 46e5551..861772a 100644
--- a/conduits/malconduit/mal-conduit.h
+++ b/conduits/malconduit/mal-conduit.h
@@ -38,7 +38,7 @@
 class MALConduit : public ConduitAction
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	MALConduit(
 		KPilotLink *o,
diff --git a/conduits/malconduit/mal-factory.h b/conduits/malconduit/mal-factory.h
index 8c95acf..8c4f235 100644
--- a/conduits/malconduit/mal-factory.h
+++ b/conduits/malconduit/mal-factory.h
@@ -40,7 +40,7 @@ class KAboutData;
 class MALConduitFactory : public KLibFactory
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	MALConduitFactory(TQObject * = 0L,const char * = 0L);
diff --git a/conduits/malconduit/mal-setup.h b/conduits/malconduit/mal-setup.h
index 6114c28..6bcd6c6 100644
--- a/conduits/malconduit/mal-setup.h
+++ b/conduits/malconduit/mal-setup.h
@@ -40,7 +40,7 @@ class MALWidget;
 class MALWidgetSetup : public ConduitConfigBase
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	MALWidgetSetup(TQWidget *,const char *);
 	virtual ~MALWidgetSetup();
diff --git a/conduits/memofileconduit/memofile-conduit.h b/conduits/memofileconduit/memofile-conduit.h
index d2d07d1..8166313 100644
--- a/conduits/memofileconduit/memofile-conduit.h
+++ b/conduits/memofileconduit/memofile-conduit.h
@@ -37,7 +37,7 @@ class PilotMemo;
 class MemofileConduit : public ConduitAction
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	MemofileConduit(KPilotLink *,
 		const char *name=0L,
diff --git a/conduits/popmail/setupDialog.h b/conduits/popmail/setupDialog.h
index cc9d831..151ad09 100644
--- a/conduits/popmail/setupDialog.h
+++ b/conduits/popmail/setupDialog.h
@@ -40,7 +40,7 @@ class PopMailWidget; // From setup-dialog.ui
 class PopMailWidgetConfig : public ConduitConfigBase
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	PopMailWidgetConfig(TQWidget *, const char *);
 	virtual void load();
diff --git a/conduits/sysinfoconduit/sysinfo-conduit.h b/conduits/sysinfoconduit/sysinfo-conduit.h
index 6fde73c..db3d14e 100644
--- a/conduits/sysinfoconduit/sysinfo-conduit.h
+++ b/conduits/sysinfoconduit/sysinfo-conduit.h
@@ -33,7 +33,7 @@
 class SysInfoConduit : public ConduitAction
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	SysInfoConduit(
 		KPilotLink *o,
diff --git a/conduits/timeconduit/time-setup.h b/conduits/timeconduit/time-setup.h
index d1ed262..7089624 100644
--- a/conduits/timeconduit/time-setup.h
+++ b/conduits/timeconduit/time-setup.h
@@ -37,7 +37,7 @@ class KAboutData;
 class TimeWidgetConfig : public ConduitConfigBase
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	TimeWidgetConfig(TQWidget *parent, const char *);
 	virtual void commit();
diff --git a/conduits/vcalconduit/todo-conduit.h b/conduits/vcalconduit/todo-conduit.h
index 5938d41..50490e2 100644
--- a/conduits/vcalconduit/todo-conduit.h
+++ b/conduits/vcalconduit/todo-conduit.h
@@ -64,7 +64,7 @@ public:
 class TodoConduit : public VCalConduitBase
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	TodoConduit(KPilotLink *,
 		const char *name=0L,
diff --git a/conduits/vcalconduit/vcal-conduit.h b/conduits/vcalconduit/vcal-conduit.h
index 482e8e7..6833fd4 100644
--- a/conduits/vcalconduit/vcal-conduit.h
+++ b/conduits/vcalconduit/vcal-conduit.h
@@ -67,7 +67,7 @@ public:
 class VCalConduit : public VCalConduitBase
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	VCalConduit(KPilotLink *,
 		const char *name=0L,
diff --git a/conduits/vcalconduit/vcal-conduitbase.h b/conduits/vcalconduit/vcal-conduitbase.h
index 7f04cfd..bf55248 100644
--- a/conduits/vcalconduit/vcal-conduitbase.h
+++ b/conduits/vcalconduit/vcal-conduitbase.h
@@ -75,7 +75,7 @@ public:
 class VCalConduitBase : public ConduitAction
 {
         Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	VCalConduitBase(KPilotLink *,
 		const char *name = 0L,
diff --git a/kpilot/addressEditor.h b/kpilot/addressEditor.h
index 4561da1..134ebbb 100644
--- a/kpilot/addressEditor.h
+++ b/kpilot/addressEditor.h
@@ -39,7 +39,7 @@ class TQLineEdit;
 class AddressEditor : public KDialogBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 
 public:
diff --git a/kpilot/addressWidget.h b/kpilot/addressWidget.h
index 3109f8f..278a025 100644
--- a/kpilot/addressWidget.h
+++ b/kpilot/addressWidget.h
@@ -44,7 +44,7 @@ class PilotDatabase;
 class AddressWidget : public PilotComponent
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	AddressWidget(TQWidget* parent,const TQString& dbpath);
diff --git a/kpilot/conduitConfigDialog.h b/kpilot/conduitConfigDialog.h
index 6640c00..57ad6a7 100644
--- a/kpilot/conduitConfigDialog.h
+++ b/kpilot/conduitConfigDialog.h
@@ -45,7 +45,7 @@ class ConduitConfig;
 class ConduitConfigWidgetBase : public KCModule
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	ConduitConfigWidgetBase(TQWidget *p=0L,const char *n=0L);
 
@@ -60,7 +60,7 @@ public:
 class ConduitConfigWidget : public ConduitConfigWidgetBase
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	ConduitConfigWidget(TQWidget *,
 		const char *name=0L, bool ownButtons=false);
diff --git a/kpilot/datebookWidget.h b/kpilot/datebookWidget.h
index 5933c7c..c5f4cfc 100644
--- a/kpilot/datebookWidget.h
+++ b/kpilot/datebookWidget.h
@@ -39,7 +39,7 @@ class KListView;
 class DatebookWidget : public PilotComponent
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	DatebookWidget(TQWidget* parent, const TQString& dbpath);
diff --git a/kpilot/dbAppInfoEditor.h b/kpilot/dbAppInfoEditor.h
index bb1111c..a21fba7 100644
--- a/kpilot/dbAppInfoEditor.h
+++ b/kpilot/dbAppInfoEditor.h
@@ -35,7 +35,7 @@ class TQWidget;
 class DBAppInfoEditor : public KDialogBase
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	DBAppInfoEditor(char*appInfoData, int l, TQWidget *parent = 0);
 	~DBAppInfoEditor();
diff --git a/kpilot/dbFlagsEditor.h b/kpilot/dbFlagsEditor.h
index be58d5c..3aab7fa 100644
--- a/kpilot/dbFlagsEditor.h
+++ b/kpilot/dbFlagsEditor.h
@@ -38,7 +38,7 @@ struct DBInfo;
 class DBFlagsEditor : public KDialogBase
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	DBFlagsEditor(DBInfo*dbinfo=0L, TQWidget *parent = 0);
 	~DBFlagsEditor();
diff --git a/kpilot/dbRecordEditor.h b/kpilot/dbRecordEditor.h
index aa61a92..43f13dd 100644
--- a/kpilot/dbRecordEditor.h
+++ b/kpilot/dbRecordEditor.h
@@ -54,7 +54,7 @@ class PilotRecord;
 class DBRecordEditor : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	DBRecordEditor(PilotRecord*r=0L, int n=-1, TQWidget *parent = 0);
 	~DBRecordEditor();
diff --git a/kpilot/dbSelectionDialog.h b/kpilot/dbSelectionDialog.h
index fd309f2..ed2acbc 100644
--- a/kpilot/dbSelectionDialog.h
+++ b/kpilot/dbSelectionDialog.h
@@ -37,7 +37,7 @@ class KPilotDBSelectionWidget;
 class KPilotDBSelectionDialog : public KDialogBase
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	KPilotDBSelectionDialog(TQStringList &selectedDBs, TQStringList &deviceDBs,
 		TQStringList &addedDBs,  TQWidget *, const char *);
diff --git a/kpilot/dbviewerWidget.h b/kpilot/dbviewerWidget.h
index 760ac45..17b75bb 100644
--- a/kpilot/dbviewerWidget.h
+++ b/kpilot/dbviewerWidget.h
@@ -43,7 +43,7 @@ class KListView;
 class GenericDBWidget : public PilotComponent
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	GenericDBWidget(TQWidget* parent, const TQString& dbpath);
diff --git a/kpilot/fileInstallWidget.h b/kpilot/fileInstallWidget.h
index 29e3daa..78ad385 100644
--- a/kpilot/fileInstallWidget.h
+++ b/kpilot/fileInstallWidget.h
@@ -45,7 +45,7 @@ class FileInstaller;
 class FileInstallWidget : public PilotComponent
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	FileInstallWidget(TQWidget* parent, const TQString& dbPath);
diff --git a/kpilot/fileInstaller.h b/kpilot/fileInstaller.h
index 60b5805..652e4ac 100644
--- a/kpilot/fileInstaller.h
+++ b/kpilot/fileInstaller.h
@@ -42,7 +42,7 @@ class TQString;
 class FileInstaller : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	FileInstaller();
 	virtual ~FileInstaller();
diff --git a/kpilot/hotSync.h b/kpilot/hotSync.h
index b81dbff..308cd3e 100644
--- a/kpilot/hotSync.h
+++ b/kpilot/hotSync.h
@@ -52,7 +52,7 @@ protected:
 class BackupAction : public SyncAction
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	/** Constructor. Back up all the databases on
@@ -118,7 +118,7 @@ private:
 class FileInstallAction : public SyncAction
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	FileInstallAction(KPilotLink *,
 		const TQString &fileDir);
@@ -146,7 +146,7 @@ private:
 class RestoreAction : public SyncAction
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	RestoreAction(KPilotLink *,TQWidget *w=0L);
 
diff --git a/kpilot/internalEditorAction.h b/kpilot/internalEditorAction.h
index b43f408..ec9712a 100644
--- a/kpilot/internalEditorAction.h
+++ b/kpilot/internalEditorAction.h
@@ -36,7 +36,7 @@
 class InternalEditorAction : public SyncAction
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	InternalEditorAction(KPilotLink *);
diff --git a/kpilot/kpilot.h b/kpilot/kpilot.h
index e86f6e2..9d7065c 100644
--- a/kpilot/kpilot.h
+++ b/kpilot/kpilot.h
@@ -50,7 +50,7 @@ class LogWidget;
 class KPilotInstaller : public KMainWindow, public KPilotDCOP
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	KPilotInstaller();
diff --git a/kpilot/kpilotConfigDialog.h b/kpilot/kpilotConfigDialog.h
index 7fbe6a7..ac4dfa3 100644
--- a/kpilot/kpilotConfigDialog.h
+++ b/kpilot/kpilotConfigDialog.h
@@ -53,7 +53,7 @@ protected:
 class DeviceConfigPage : public ConfigPage
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	DeviceConfigPage( TQWidget *, const char * );
 
@@ -91,7 +91,7 @@ private:
 class BackupConfigPage : public ConfigPage
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	BackupConfigPage( TQWidget *, const char * );
 
diff --git a/kpilot/kpilotConfigWizard.h b/kpilot/kpilotConfigWizard.h
index 5cf9fe6..b5961cf 100644
--- a/kpilot/kpilotConfigWizard.h
+++ b/kpilot/kpilotConfigWizard.h
@@ -37,7 +37,7 @@ class ConfigWizard_base3;
 class ConfigWizard : public KWizard
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	enum Mode { InDialog=0, Standalone=1 } ;
 
diff --git a/kpilot/kpilotProbeDialog.h b/kpilot/kpilotProbeDialog.h
index c32e557..311b326 100644
--- a/kpilot/kpilotProbeDialog.h
+++ b/kpilot/kpilotProbeDialog.h
@@ -46,7 +46,7 @@ typedef TQMap<TQString, KPilotDeviceLink*> PilotLinkMap;
 class ProbeDialog : public KDialogBase
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	ProbeDialog(TQWidget *p=0L,const char *n=0L);
 	~ProbeDialog();
diff --git a/kpilot/listCat.h b/kpilot/listCat.h
index c0dae94..ca6f43c 100644
--- a/kpilot/listCat.h
+++ b/kpilot/listCat.h
@@ -64,7 +64,7 @@ class TQStringList;
 class ListCategorizer : public KListView
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	/**
diff --git a/kpilot/logFile.h b/kpilot/logFile.h
index ef1ff2f..de4fbd5 100644
--- a/kpilot/logFile.h
+++ b/kpilot/logFile.h
@@ -39,7 +39,7 @@ class TQTextStream;
 class LogFile : public TQObject, public LoggerDCOP
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	LogFile();
diff --git a/kpilot/logWidget.h b/kpilot/logWidget.h
index 2c569a4..3dca85f 100644
--- a/kpilot/logWidget.h
+++ b/kpilot/logWidget.h
@@ -40,7 +40,7 @@ class KProgress;
 class LogWidget : public PilotComponent , public LoggerDCOP
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	LogWidget(TQWidget *);
diff --git a/kpilot/memoWidget.h b/kpilot/memoWidget.h
index c979d5d..fa509b4 100644
--- a/kpilot/memoWidget.h
+++ b/kpilot/memoWidget.h
@@ -42,7 +42,7 @@ class PilotListItem;
 class MemoWidget : public PilotComponent
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	MemoWidget(TQWidget* parent, const TQString& dbpath);
diff --git a/kpilot/pilotComponent.h b/kpilot/pilotComponent.h
index 8e64792..f34fc29 100644
--- a/kpilot/pilotComponent.h
+++ b/kpilot/pilotComponent.h
@@ -41,7 +41,7 @@ class TQString;
 class PilotComponent : public TQWidget
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 friend class KPilotInstaller;
 
 public:
diff --git a/kpilot/pilotDaemon.h b/kpilot/pilotDaemon.h
index 9e03360..3768a3f 100644
--- a/kpilot/pilotDaemon.h
+++ b/kpilot/pilotDaemon.h
@@ -54,7 +54,7 @@ class KPilotDeviceLink;
 class PilotDaemonTray : public KSystemTray
 {
 	Q_OBJECT
-	TQ_OBJECT
+	
 
 friend class PilotDaemon;
 
@@ -128,7 +128,7 @@ private:
 class PilotDaemon : public TQObject, virtual public PilotDaemonDCOP
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 // The tray must be our friend so that we can let it stop the daemon.
 friend class PilotDaemonTray;
diff --git a/kpilot/todoEditor.h b/kpilot/todoEditor.h
index 1a0d017..e8d2acf 100644
--- a/kpilot/todoEditor.h
+++ b/kpilot/todoEditor.h
@@ -44,7 +44,7 @@ class TodoEditorBase;
 class TodoEditor : public KDialogBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 
 public:
diff --git a/kpilot/todoWidget.h b/kpilot/todoWidget.h
index 9a8259d..0651092 100644
--- a/kpilot/todoWidget.h
+++ b/kpilot/todoWidget.h
@@ -41,7 +41,7 @@ class TQTextView;
 class TodoListView : public KListView
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	TodoListView(TQWidget * parent = 0, const char * name = 0 ):KListView(parent, name){};
 	~TodoListView() {};
@@ -67,7 +67,7 @@ public:
 class TodoWidget : public PilotComponent
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	TodoWidget(TQWidget* parent,const TQString& dbpath);
diff --git a/lib/actionQueue.h b/lib/actionQueue.h
index b50e8aa..3d53373 100644
--- a/lib/actionQueue.h
+++ b/lib/actionQueue.h
@@ -57,7 +57,7 @@
 KDE_EXPORT class ActionQueue : public SyncAction
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	/**
 	* Constructor. Pass in a KPilot device link for it to act on.
diff --git a/lib/kpilotdevicelink.h b/lib/kpilotdevicelink.h
index 6fe02ef..673cfb0 100644
--- a/lib/kpilotdevicelink.h
+++ b/lib/kpilotdevicelink.h
@@ -75,7 +75,7 @@ friend class PilotSerialDatabase;
 friend class DeviceCommThread;
 
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	/**
diff --git a/lib/kpilotdevicelinkPrivate.h b/lib/kpilotdevicelinkPrivate.h
index defdb86..573f3e4 100644
--- a/lib/kpilotdevicelinkPrivate.h
+++ b/lib/kpilotdevicelinkPrivate.h
@@ -216,7 +216,7 @@ class DeviceCommThread : public TQObject, public TQThread
 friend class KPilotDeviceLink;
 
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	DeviceCommThread(KPilotDeviceLink *d);
diff --git a/lib/kpilotlink.h b/lib/kpilotlink.h
index 7b00669..bfb8e92 100644
--- a/lib/kpilotlink.h
+++ b/lib/kpilotlink.h
@@ -171,7 +171,7 @@ class PilotDatabase;
 class KDE_EXPORT KPilotLink : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 friend class SyncAction;
 public:
 	/** A list of DBInfo structures. */
diff --git a/lib/kpilotlocallink.h b/lib/kpilotlocallink.h
index 05efdd5..fd74bab 100644
--- a/lib/kpilotlocallink.h
+++ b/lib/kpilotlocallink.h
@@ -43,7 +43,7 @@
 class KDE_EXPORT KPilotLocalLink : public KPilotLink
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	KPilotLocalLink( TQObject *parent=0L, const char *name=0L );
 	virtual ~KPilotLocalLink();
diff --git a/lib/plugin.h b/lib/plugin.h
index f1dbec8..33cdee4 100644
--- a/lib/plugin.h
+++ b/lib/plugin.h
@@ -78,7 +78,7 @@ namespace Pilot
 class KDE_EXPORT ConduitConfigBase : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	/**
 	* Constructor. Creates a conduit configuration support object
@@ -261,7 +261,7 @@ private:
 class KDE_EXPORT ConduitAction : public SyncAction
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	ConduitAction(KPilotLink *,
@@ -369,7 +369,7 @@ private:
 class ConduitProxy : public ConduitAction
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	ConduitProxy(KPilotLink *,
@@ -421,7 +421,7 @@ namespace PluginUtility
 * class KPilotPlugin : public KLibFactory
 * {
 * Q_OBJECT
-  TQ_OBJECT
+  
 *
 * public:
 * 	KPilotPlugin(TQObject * = 0L,const char * = 0L) ;
diff --git a/lib/recordConduit.h b/lib/recordConduit.h
index 87aa44e..6dbb136 100644
--- a/lib/recordConduit.h
+++ b/lib/recordConduit.h
@@ -56,7 +56,7 @@ class KPilotDeviceLink;
 class RecordConduitBase : public ConduitAction
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	/** Constructor. The TQStringList @p a sets flags for the ConduitAction.
 	*/
diff --git a/lib/syncAction.h b/lib/syncAction.h
index 8636731..e2e7f97 100644
--- a/lib/syncAction.h
+++ b/lib/syncAction.h
@@ -50,7 +50,7 @@ class SyncAction;
 class KDE_EXPORT SyncAction : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	SyncAction(KPilotLink *p,