diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /kioslave/info | |
parent | 79b21d47bce1ee428affc97534cd8b257232a871 (diff) | |
download | tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kioslave/info')
-rw-r--r-- | kioslave/info/info.cc | 6 | ||||
-rw-r--r-- | kioslave/info/info.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kioslave/info/info.cc b/kioslave/info/info.cc index 4af1f4c63..71d2dc863 100644 --- a/kioslave/info/info.cc +++ b/kioslave/info/info.cc @@ -16,7 +16,7 @@ #include "info.h" -using namespace KIO; +using namespace TDEIO; InfoProtocol::InfoProtocol( const TQCString &pool, const TQCString &app ) : SlaveBase( "info", pool, app ) @@ -39,7 +39,7 @@ InfoProtocol::InfoProtocol( const TQCString &pool, const TQCString &app ) errorStr = "kde-info2html" + i18n( "\nUnable to locate file %1 which is necessary to run this service. " "Please check your software installation" ).arg( missing ); } - error( KIO::ERR_CANNOT_LAUNCH_PROCESS, errorStr ); + error( TDEIO::ERR_CANNOT_LAUNCH_PROCESS, errorStr ); exit(); } @@ -230,7 +230,7 @@ void InfoProtocol::stat( const KURL & ) UDSAtom uds_atom; // Regular file with rwx permission for all - uds_atom.m_uds = KIO::UDS_FILE_TYPE; + uds_atom.m_uds = TDEIO::UDS_FILE_TYPE; uds_atom.m_long = S_IFREG | S_IRWXU | S_IRWXG | S_IRWXO; uds_entry.append( uds_atom ); diff --git a/kioslave/info/info.h b/kioslave/info/info.h index 068546803..639348513 100644 --- a/kioslave/info/info.h +++ b/kioslave/info/info.h @@ -7,7 +7,7 @@ class TDEProcess; -class InfoProtocol : public KIO::SlaveBase +class InfoProtocol : public TDEIO::SlaveBase { public: |