From 703fb0c89c2eee56a1e613e67a446db9d4287929 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:35:07 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kdoctools/kio_help.cpp | 16 ++++++++-------- kdoctools/kio_help.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'kdoctools') diff --git a/kdoctools/kio_help.cpp b/kdoctools/kio_help.cpp index dda8fa324..19712f826 100644 --- a/kdoctools/kio_help.cpp +++ b/kdoctools/kio_help.cpp @@ -35,7 +35,7 @@ #include #include "xslt.h" -using namespace KIO; +using namespace TDEIO; TQString HelpProtocol::langLookup(const TQString& fname) { @@ -169,7 +169,7 @@ void HelpProtocol::get( const KURL& url ) if (doc.isEmpty()) { - error( KIO::ERR_DOES_NOT_EXIST, url.url() ); + error( TDEIO::ERR_DOES_NOT_EXIST, url.url() ); return; } @@ -345,24 +345,24 @@ void HelpProtocol::get_file( const KURL& url ) struct stat buff; if ( ::stat( _path.data(), &buff ) == -1 ) { if ( errno == EACCES ) - error( KIO::ERR_ACCESS_DENIED, url.path() ); + error( TDEIO::ERR_ACCESS_DENIED, url.path() ); else - error( KIO::ERR_DOES_NOT_EXIST, url.path() ); + error( TDEIO::ERR_DOES_NOT_EXIST, url.path() ); return; } if ( S_ISDIR( buff.st_mode ) ) { - error( KIO::ERR_IS_DIRECTORY, url.path() ); + error( TDEIO::ERR_IS_DIRECTORY, url.path() ); return; } if ( S_ISFIFO( buff.st_mode ) || S_ISSOCK ( buff.st_mode ) ) { - error( KIO::ERR_CANNOT_OPEN_FOR_READING, url.path() ); + error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.path() ); return; } int fd = open( _path.data(), O_RDONLY); if ( fd < 0 ) { - error( KIO::ERR_CANNOT_OPEN_FOR_READING, url.path() ); + error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.path() ); return; } @@ -379,7 +379,7 @@ void HelpProtocol::get_file( const KURL& url ) { if (errno == EINTR) continue; - error( KIO::ERR_COULD_NOT_READ, url.path()); + error( TDEIO::ERR_COULD_NOT_READ, url.path()); close(fd); return; } diff --git a/kdoctools/kio_help.h b/kdoctools/kio_help.h index 13c198af1..957a0e2e5 100644 --- a/kdoctools/kio_help.h +++ b/kdoctools/kio_help.h @@ -18,7 +18,7 @@ #include #include -class HelpProtocol : public KIO::SlaveBase +class HelpProtocol : public TDEIO::SlaveBase { public: -- cgit v1.2.3