From 387a27b62f25387e42a850739ced151d64a2e760 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:03:49 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- sip/tdeui/kxmlguiclient.sip | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sip/tdeui/kxmlguiclient.sip') diff --git a/sip/tdeui/kxmlguiclient.sip b/sip/tdeui/kxmlguiclient.sip index 800801a..3ea9d70 100644 --- a/sip/tdeui/kxmlguiclient.sip +++ b/sip/tdeui/kxmlguiclient.sip @@ -37,7 +37,7 @@ public: KAction* action (const char*) const; virtual KAction* action (const TQDomElement&) const; virtual KActionCollection* actionCollection () const; - virtual KInstance* instance () const; + virtual TDEInstance* instance () const; virtual TQDomDocument domDocument () const; virtual TQString xmlFile () const; virtual TQString localXMLFile () const; @@ -86,7 +86,7 @@ public: protected: - virtual void setInstance (KInstance*); + virtual void setInstance (TDEInstance*); virtual void setXMLFile (const TQString&, bool = 0, bool = 1); virtual void setLocalXMLFile (const TQString&); virtual void setXML (const TQString&, bool = 0); -- cgit v1.2.1