diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
| commit | b19ddece21e102b8e4b292037ca7578f60b128fe (patch) | |
| tree | 6572ca25aba80849cdfa7578bbbc9121d23afbc3 /kio/kio/kdatatool.cpp | |
| parent | e729c6d549f12e27b358a1dad04ff254c033ac71 (diff) | |
| download | tdelibs-b19ddece.tar.gz tdelibs-b19ddece.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kio/kio/kdatatool.cpp')
| -rw-r--r-- | kio/kio/kdatatool.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kio/kio/kdatatool.cpp b/kio/kio/kdatatool.cpp index c5e04537e..76cf7836b 100644 --- a/kio/kio/kdatatool.cpp +++ b/kio/kio/kdatatool.cpp @@ -42,7 +42,7 @@ KDataToolInfo::KDataToolInfo() m_service = 0; } -KDataToolInfo::KDataToolInfo( const KService::Ptr& service, KInstance* instance ) +KDataToolInfo::KDataToolInfo( const KService::Ptr& service, TDEInstance* instance ) { m_service = service; m_instance = instance; @@ -159,7 +159,7 @@ KService::Ptr KDataToolInfo::service() const return m_service; } -TQValueList<KDataToolInfo> KDataToolInfo::query( const TQString& datatype, const TQString& mimetype, KInstance* instance ) +TQValueList<KDataToolInfo> KDataToolInfo::query( const TQString& datatype, const TQString& mimetype, TDEInstance* instance ) { TQValueList<KDataToolInfo> lst; @@ -271,7 +271,7 @@ KDataTool::KDataTool( TQObject* parent, const char* name ) { } -KInstance* KDataTool::instance() const +TDEInstance* KDataTool::instance() const { return m_instance; } |