1 files changed, 16 insertions, 16 deletions
diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h
index 1c36b196..6870afe1 100644
--- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h
+++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h
@@ -17,8 +17,8 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#ifndef _SERIALLETTER_TQtSql_POWER_PLUGIN_H_
-#define _SERIALLETTER_TQtSql_POWER_PLUGIN_H_
+#ifndef _SERIALLETTER_QtSql_POWER_PLUGIN_H_
+#define _SERIALLETTER_QtSql_POWER_PLUGIN_H_
 
 #include <tqdom.h>
 #include <klocale.h>
@@ -33,22 +33,22 @@
 
 #include "defs.h"
 #include "KWMailMergeDataSource.h"
-#include "KWTQtSqlSerialDataSourceBase.h"
+#include "KWQtSqlSerialDataSourceBase.h"
 #include "kwqtsqlpower.h"
 #include "KWMySqlCursor.h"
 
 /******************************************************************
  *
- * Class: KWTQtSqlSerialDataSource
+ * Class: KWQtSqlSerialDataSource
  *
  ******************************************************************/
-class KWTQtSqlPowerSerialDataSource: public KWTQtSqlSerialDataSourceBase
+class KWQtSqlPowerSerialDataSource: public KWQtSqlSerialDataSourceBase
 {
     Q_OBJECT
-  TQ_OBJECT
+//    TQ_OBJECT
     public:
-    KWTQtSqlPowerSerialDataSource(KInstance *inst,TQObject *tqparent);
-    ~KWTQtSqlPowerSerialDataSource();
+    KWQtSqlPowerSerialDataSource(KInstance *inst,TQObject *tqparent);
+    ~KWQtSqlPowerSerialDataSource();
 
     virtual void save( TQDomDocument &doc,TQDomElement&);
     virtual void load( TQDomElement& elem );
@@ -60,7 +60,7 @@ class KWTQtSqlPowerSerialDataSource: public KWTQtSqlSerialDataSourceBase
     virtual void refresh(bool force);
 
     protected:
-	friend class KWTQtSqlPowerMailMergeEditor;
+	friend class KWQtSqlPowerMailMergeEditor;
 	TQString query;
 	KWMySqlCursor *myquery;
 
@@ -71,21 +71,21 @@ class KWTQtSqlPowerSerialDataSource: public KWTQtSqlSerialDataSourceBase
 
 /******************************************************************
  *
- * Class: KWTQtSqlPowerMailMergeEditor
+ * Class: KWQtSqlPowerMailMergeEditor
  *
  ******************************************************************/
 
-class KWTQtSqlPowerMailMergeEditor : public KDialogBase
+class KWQtSqlPowerMailMergeEditor : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+//    TQ_OBJECT
 
 public:
-    KWTQtSqlPowerMailMergeEditor( TQWidget *tqparent, KWTQtSqlPowerSerialDataSource *db_ );
-    ~KWTQtSqlPowerMailMergeEditor();
+    KWQtSqlPowerMailMergeEditor( TQWidget *tqparent, KWQtSqlPowerSerialDataSource *db_ );
+    ~KWQtSqlPowerMailMergeEditor();
 private:
- KWTQtSqlPowerSerialDataSource *db;
- KWTQtSqlPowerWidget *widget;
+ KWQtSqlPowerSerialDataSource *db;
+ KWQtSqlPowerWidget *widget;
 private slots:
  void openSetup();
  void updateDBViews();