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/KWQtSqlSerialDataSourceBase.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp')

diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
index 9a333a8d9..41e971be0 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
@@ -46,7 +46,7 @@
 
 int KWQtSqlSerialDataSourceBase::connectionId=0;
 
-KWQtSqlSerialDataSourceBase::KWQtSqlSerialDataSourceBase(KInstance *inst,TQObject *parent)
+KWQtSqlSerialDataSourceBase::KWQtSqlSerialDataSourceBase(TDEInstance *inst,TQObject *parent)
 	: KWMailMergeDataSource(inst,parent)
 {
 	DataBaseConnection=TQString("KWTQTSQLPOWER")+parent->name()+TQString("--%1").arg(connectionId++);
-- 
cgit v1.2.3