From b19ddece21e102b8e4b292037ca7578f60b128fe Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:20:05 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kio/misc/kpac/proxyscout.cpp | 2 +- kio/misc/kpac/proxyscout.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'kio/misc/kpac') diff --git a/kio/misc/kpac/proxyscout.cpp b/kio/misc/kpac/proxyscout.cpp index 5d8b008bf..b651e2313 100644 --- a/kio/misc/kpac/proxyscout.cpp +++ b/kio/misc/kpac/proxyscout.cpp @@ -41,7 +41,7 @@ namespace KPAC ProxyScout::ProxyScout( const TQCString& name ) : KDEDModule( name ), - m_instance( new KInstance( "proxyscout" ) ), + m_instance( new TDEInstance( "proxyscout" ) ), m_downloader( 0 ), m_script( 0 ), m_suspendTime( 0 ) diff --git a/kio/misc/kpac/proxyscout.h b/kio/misc/kpac/proxyscout.h index c18e5173d..78c8fc237 100644 --- a/kio/misc/kpac/proxyscout.h +++ b/kio/misc/kpac/proxyscout.h @@ -29,7 +29,7 @@ #include class DCOPClientTransaction; -class KInstance; +class TDEInstance; namespace KPAC { @@ -56,7 +56,7 @@ namespace KPAC bool startDownload(); TQString handleRequest( const KURL& url ); - KInstance* m_instance; + TDEInstance* m_instance; Downloader* m_downloader; Script* m_script; -- cgit v1.2.1