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

(limited to 'kword/mailmerge/kspread/kwmailmerge_kspread.h')

diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.h b/kword/mailmerge/kspread/kwmailmerge_kspread.h
index c093cb71..8f2a4f97 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread.h
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread.h
@@ -35,7 +35,7 @@ class KWMailMergeKSpread: public KWMailMergeDataSource
   
 
   public:
-    KWMailMergeKSpread( KInstance *inst, TQObject *parent );
+    KWMailMergeKSpread( TDEInstance *inst, TQObject *parent );
     ~KWMailMergeKSpread();
 
     /**
-- 
cgit v1.2.1