diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:03:49 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:03:49 -0600 |
| commit | 387a27b62f25387e42a850739ced151d64a2e760 (patch) | |
| tree | bbba39b506feb102175f10aa296b201a5a4557f5 /sip/kio | |
| parent | 3d1fa8562bf693237a1a76918b4487cca3e2e356 (diff) | |
| download | pytde-387a27b62f25387e42a850739ced151d64a2e760.tar.gz pytde-387a27b62f25387e42a850739ced151d64a2e760.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'sip/kio')
| -rw-r--r-- | sip/kio/kdatatool.sip | 10 | ||||
| -rw-r--r-- | sip/kio/kscan.sip | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sip/kio/kdatatool.sip b/sip/kio/kdatatool.sip index 8395429..46071ce 100644 --- a/sip/kio/kdatatool.sip +++ b/sip/kio/kdatatool.sip @@ -33,7 +33,7 @@ class KDataToolInfo public: KDataToolInfo (); - KDataToolInfo (const KService::Ptr&, KInstance*); + KDataToolInfo (const KService::Ptr&, TDEInstance*); KDataToolInfo (const KDataToolInfo&); TQString dataType () const; TQStringList mimeTypes () const; @@ -45,9 +45,9 @@ public: TQStringList commands () const; KDataTool* createTool (TQObject* /Transfer/ = 0, const char* = 0) const; KService::Ptr service () const; - KInstance* instance () const; + TDEInstance* instance () const; bool isValid () const; - static TQValueList<KDataToolInfo> query (const TQString&, const TQString&, KInstance*); + static TQValueList<KDataToolInfo> query (const TQString&, const TQString&, TDEInstance*); }; // class KDataToolInfo @@ -84,8 +84,8 @@ class KDataTool : TQObject public: KDataTool (TQObject* /TransferThis/ = 0, const char* = 0); - void setInstance (KInstance*); - KInstance* instance () const; + void setInstance (TDEInstance*); + TDEInstance* instance () const; virtual bool run (const TQString&, void*, const TQString&, const TQString&) = 0; protected: diff --git a/sip/kio/kscan.sip b/sip/kio/kscan.sip index 3355b34..022210e 100644 --- a/sip/kio/kscan.sip +++ b/sip/kio/kscan.sip @@ -65,7 +65,7 @@ protected: KScanDialogFactory (TQObject* /TransferThis/ = 0, const char* = 0); virtual TQObject* createObject (TQObject* /Transfer/ = 0, const char* = 0, const char* = "TQObject", const TQStringList& = TQStringList ()); void setName (const TQCString&); - KInstance* instance () const; + TDEInstance* instance () const; protected: //igx virtual void virtual_hook (int, void*); @@ -111,7 +111,7 @@ protected: KOCRDialogFactory (TQObject* /TransferThis/ = 0, const char* = 0); virtual TQObject* createObject (TQObject* /Transfer/ = 0, const char* = 0, const char* = "TQObject", const TQStringList& = TQStringList ()); void setName (const TQCString&); - KInstance* instance () const; + TDEInstance* instance () const; protected: //igx virtual void virtual_hook (int, void*); |