From 73ff676f11662d6178c8854a7832ebffe2ae409d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Jan 2013 19:55:40 -0600
Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4

---
 kword/mailmerge/sql/KWQtSqlSerialDataSource.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kword/mailmerge/sql/KWQtSqlSerialDataSource.h')

diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.h b/kword/mailmerge/sql/KWQtSqlSerialDataSource.h
index 16a9051f..704ae05e 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.h
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.h
@@ -36,7 +36,7 @@
 class KWQtSqlSerialDataSource: public KWQtSqlSerialDataSourceBase
 {
     public:
-    KWQtSqlSerialDataSource(KInstance *inst,TQObject *parent);
+    KWQtSqlSerialDataSource(TDEInstance *inst,TQObject *parent);
     ~KWQtSqlSerialDataSource();
 
     virtual void save( TQDomDocument &doc,TQDomElement&);
-- 
cgit v1.2.1