10 files changed, 13 insertions, 13 deletions
diff --git a/kword/mailmerge/KWClassicSerialDataSource.h b/kword/mailmerge/KWClassicSerialDataSource.h
index 03e1ddb30..6f6133e21 100644
--- a/kword/mailmerge/KWClassicSerialDataSource.h
+++ b/kword/mailmerge/KWClassicSerialDataSource.h
@@ -46,7 +46,7 @@ typedef TQValueList< DbRecord > Db;
 class KWClassicSerialDataSource: public KWMailMergeDataSource
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
     KWClassicSerialDataSource(KInstance *inst,TQObject *parent);
     ~KWClassicSerialDataSource();
@@ -104,7 +104,7 @@ protected:
 class KWClassicMailMergeEditorList : public TQListView
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     KWClassicMailMergeEditorList( TQWidget *parent, KWClassicSerialDataSource *db_ );
@@ -137,7 +137,7 @@ protected:
 class KWClassicMailMergeEditor : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     KWClassicMailMergeEditor( TQWidget *parent, KWClassicSerialDataSource *db_ );
diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.h b/kword/mailmerge/kabc/KWMailMergeKABC.h
index 0c40f47d7..818a06e81 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABC.h
+++ b/kword/mailmerge/kabc/KWMailMergeKABC.h
@@ -33,7 +33,7 @@
 class KWMailMergeKABC: public KWMailMergeDataSource
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     KWMailMergeKABC( KInstance *inst, TQObject *parent );
diff --git a/kword/mailmerge/kabc/KWMailMergeKABCConfig.h b/kword/mailmerge/kabc/KWMailMergeKABCConfig.h
index 0d0240f1e..a7fec8505 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABCConfig.h
+++ b/kword/mailmerge/kabc/KWMailMergeKABCConfig.h
@@ -34,7 +34,7 @@ class KWMailMergeKABC;
 class KWMailMergeKABCConfig: public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KWMailMergeKABCConfig( TQWidget *parent, KWMailMergeKABC *db_ );
     virtual ~KWMailMergeKABCConfig();
diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.h b/kword/mailmerge/kspread/kwmailmerge_kspread.h
index e5b1bb2fa..c093cb719 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread.h
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread.h
@@ -32,7 +32,7 @@
 class KWMailMergeKSpread: public KWMailMergeDataSource
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KWMailMergeKSpread( KInstance *inst, TQObject *parent );
diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread_config.h b/kword/mailmerge/kspread/kwmailmerge_kspread_config.h
index 21d6206e8..d6f67acd6 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread_config.h
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread_config.h
@@ -33,7 +33,7 @@ class KWMailMergeKSpread;
 class KWMailMergeKSpreadConfig: public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KWMailMergeKSpreadConfig( TQWidget *parent, KWMailMergeKSpread *object );
diff --git a/kword/mailmerge/sql/KWQtSqlEasyFilter.h b/kword/mailmerge/sql/KWQtSqlEasyFilter.h
index f95f46b3b..3b0b6e558 100644
--- a/kword/mailmerge/sql/KWQtSqlEasyFilter.h
+++ b/kword/mailmerge/sql/KWQtSqlEasyFilter.h
@@ -10,7 +10,7 @@ class TQStringList;
 class KWQtSqlEasyFilter: public KDialogBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KWQtSqlEasyFilter( TQWidget *parent);
     virtual ~KWQtSqlEasyFilter();
diff --git a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.h b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.h
index 39430517c..68fb4b485 100644
--- a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.h
+++ b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.h
@@ -36,7 +36,7 @@
 class KWQtSqlMailMergeOpen : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     KWQtSqlMailMergeOpen( TQWidget *parent, KWQtSqlSerialDataSourceBase *db_ );
diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h
index 3d3643382..4df94a070 100644
--- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h
+++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h
@@ -45,7 +45,7 @@
 class KWQtSqlPowerSerialDataSource: public KWQtSqlSerialDataSourceBase
 {
     Q_OBJECT
-//    TQ_OBJECT
+//    
     public:
     KWQtSqlPowerSerialDataSource(KInstance *inst,TQObject *parent);
     ~KWQtSqlPowerSerialDataSource();
@@ -78,7 +78,7 @@ class KWQtSqlPowerSerialDataSource: public KWQtSqlSerialDataSourceBase
 class KWQtSqlPowerMailMergeEditor : public KDialogBase
 {
     Q_OBJECT
-//    TQ_OBJECT
+//    
 
 public:
     KWQtSqlPowerMailMergeEditor( TQWidget *parent, KWQtSqlPowerSerialDataSource *db_ );
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.h b/kword/mailmerge/sql/KWQtSqlSerialDataSource.h
index ed25b4ee5..16a9051f8 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.h
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.h
@@ -64,7 +64,7 @@ class KWQtSqlSerialDataSource: public KWQtSqlSerialDataSourceBase
 class KWQtSqlDataSourceEditor : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     KWQtSqlDataSourceEditor( TQWidget *parent, KWQtSqlSerialDataSource *db_ );
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h
index 1f3e43966..388e9751b 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h
@@ -38,7 +38,7 @@
 class KWQtSqlSerialDataSourceBase: public KWMailMergeDataSource
 {
     Q_OBJECT
-//    TQ_OBJECT
+//    
     K_DCOP
     public:
     KWQtSqlSerialDataSourceBase(KInstance *inst,TQObject *parent);