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/misc/kpac/proxyscout.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/misc/kpac/proxyscout.h')
-rw-r--r-- | kio/misc/kpac/proxyscout.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 <time.h> 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; |