From 387a27b62f25387e42a850739ced151d64a2e760 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Jan 2013 20:03:49 -0600
Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4

---
 sip/tdecore/knotifyclient.sip | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'sip/tdecore/knotifyclient.sip')

diff --git a/sip/tdecore/knotifyclient.sip b/sip/tdecore/knotifyclient.sip
index d0aeb62..5320ff8 100644
--- a/sip/tdecore/knotifyclient.sip
+++ b/sip/tdecore/knotifyclient.sip
@@ -38,9 +38,9 @@ class Instance
 
 
 public:
-                         Instance (KInstance*);
+                         Instance (TDEInstance*);
     bool                 useSystemBell () const;
-    static KInstance*    current ();
+    static TDEInstance*    current ();
     static KNotifyClient::Instance* currentInstance ();
 
 };  // class Instance
@@ -102,7 +102,7 @@ int                  getPresentation (const TQString&);
 TQString              getFile (const TQString&, int);
 int                  getDefaultPresentation (const TQString&);
 TQString              getDefaultFile (const TQString&, int);
-KInstance*           instance ();
+TDEInstance*           instance ();
 
 %If ( KDE_3_1_0 - KDE_3_2_0 )
 
-- 
cgit v1.2.1