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/kactioncollection.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/kactioncollection.sip')
| -rw-r--r-- | sip/tdeui/kactioncollection.sip | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sip/tdeui/kactioncollection.sip b/sip/tdeui/kactioncollection.sip index 3bd6859..0f4d6ab 100644 --- a/sip/tdeui/kactioncollection.sip +++ b/sip/tdeui/kactioncollection.sip @@ -34,8 +34,8 @@ class KActionCollection : TQObject public: - KActionCollection (TQWidget* /TransferThis/, const char* = 0, KInstance* = 0); - KActionCollection (TQWidget*, TQObject* /TransferThis/, const char* = 0, KInstance* = 0); + KActionCollection (TQWidget* /TransferThis/, const char* = 0, TDEInstance* = 0); + KActionCollection (TQWidget*, TQObject* /TransferThis/, const char* = 0, TDEInstance* = 0); KActionCollection (const KActionCollection&); virtual void setWidget (TQWidget*); void setAutoConnectShortcuts (bool); @@ -53,8 +53,8 @@ public: virtual KActionPtrList actions () const; bool readShortcutSettings (const TQString& = TQString ::null , KConfigBase* = 0); bool writeShortcutSettings (const TQString& = TQString ::null , KConfigBase* = 0) const; - void setInstance (KInstance*); - KInstance* instance () const; + void setInstance (TDEInstance*); + TDEInstance* instance () const; void setXMLFile (const TQString&); const TQString& xmlFile () const; void setHighlightingEnabled (bool); @@ -76,7 +76,7 @@ signals: void clearStatusText (); public: - KActionCollection (TQObject* /TransferThis/, const char* = 0, KInstance* = 0); + KActionCollection (TQObject* /TransferThis/, const char* = 0, TDEInstance* = 0); public: void insert (KAction*); |