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/kscan.h | |
| parent | e729c6d549f12e27b358a1dad04ff254c033ac71 (diff) | |
| download | tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kio/kio/kscan.h')
| -rw-r--r-- | kio/kio/kscan.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kio/kio/kscan.h b/kio/kio/kscan.h index 5306156ac..755d4972a 100644 --- a/kio/kio/kscan.h +++ b/kio/kio/kscan.h @@ -213,17 +213,17 @@ protected: */ void setName( const TQCString& instanceName ) { delete m_instance; - m_instance = new KInstance( instanceName ); + m_instance = new TDEInstance( instanceName ); } /** * Returns the instance. - * @return the KInstance + * @return the TDEInstance */ - KInstance *instance() const { return m_instance; } + TDEInstance *instance() const { return m_instance; } private: - KInstance *m_instance; + TDEInstance *m_instance; protected: virtual void virtual_hook( int id, void* data ); private: @@ -349,17 +349,17 @@ protected: */ void setName( const TQCString& instanceName ) { delete m_instance; - m_instance = new KInstance( instanceName ); + m_instance = new TDEInstance( instanceName ); } /** * Returns the instance. - * @return the KInstance + * @return the TDEInstance */ - KInstance *instance() const { return m_instance; } + TDEInstance *instance() const { return m_instance; } private: - KInstance *m_instance; + TDEInstance *m_instance; protected: virtual void virtual_hook( int id, void* data ); private: |