diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:03:49 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:03:49 -0600 |
| commit | 387a27b62f25387e42a850739ced151d64a2e760 (patch) | |
| tree | bbba39b506feb102175f10aa296b201a5a4557f5 /sip/tdeui/kxmlguiclient.sip | |
| parent | 3d1fa8562bf693237a1a76918b4487cca3e2e356 (diff) | |
| download | pytde-387a27b62f25387e42a850739ced151d64a2e760.tar.gz pytde-387a27b62f25387e42a850739ced151d64a2e760.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'sip/tdeui/kxmlguiclient.sip')
| -rw-r--r-- | sip/tdeui/kxmlguiclient.sip | 4 |
1 files changed, 2 insertions, 2 deletions
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); |