diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:37:21 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:37:21 -0600 |
commit | 86d8364ac704bdc8ad2dfcf52307d9626cfac567 (patch) | |
tree | 97d3ac2c2f60780d9a1de4f82caac7cb27534501 /kioslaves/mbox | |
parent | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff) | |
download | tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kioslaves/mbox')
-rw-r--r-- | kioslaves/mbox/mbox.cc | 14 | ||||
-rw-r--r-- | kioslaves/mbox/mbox.h | 4 | ||||
-rw-r--r-- | kioslaves/mbox/readmbox.cc | 6 | ||||
-rw-r--r-- | kioslaves/mbox/stat.cc | 48 | ||||
-rw-r--r-- | kioslaves/mbox/stat.h | 12 |
5 files changed, 42 insertions, 42 deletions
diff --git a/kioslaves/mbox/mbox.cc b/kioslaves/mbox/mbox.cc index 3d56c09ff..0c4fca815 100644 --- a/kioslaves/mbox/mbox.cc +++ b/kioslaves/mbox/mbox.cc @@ -59,7 +59,7 @@ int kdemain( int argc, char * argv[] ) } MBoxProtocol::MBoxProtocol( const TQCString& arg1, const TQCString& arg2 ) - : KIO::SlaveBase( "mbox2", arg1, arg2 ), + : TDEIO::SlaveBase( "mbox2", arg1, arg2 ), m_errorState( true ) { @@ -79,7 +79,7 @@ void MBoxProtocol::get( const KURL& url ) if( info.type() == UrlInfo::invalid && !m_errorState ) { - error( KIO::ERR_DOES_NOT_EXIST, info.url() ); + error( TDEIO::ERR_DOES_NOT_EXIST, info.url() ); return; } @@ -106,7 +106,7 @@ void MBoxProtocol::listDir( const KURL& url ) { m_errorState = false; - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; UrlInfo info( url, UrlInfo::directory ); ReadMBox mbox( &info, this, hasMetaData( "onlynew" ), hasMetaData( "savetime" ) ); @@ -115,7 +115,7 @@ void MBoxProtocol::listDir( const KURL& url ) if( info.type() != UrlInfo::directory ) { - error( KIO::ERR_DOES_NOT_EXIST, info.url() ); + error( TDEIO::ERR_DOES_NOT_EXIST, info.url() ); return; } @@ -126,7 +126,7 @@ void MBoxProtocol::listDir( const KURL& url ) listEntry( entry, false ); } - listEntry( KIO::UDSEntry(), true ); + listEntry( TDEIO::UDSEntry(), true ); finished(); } @@ -135,7 +135,7 @@ void MBoxProtocol::stat( const KURL& url ) UrlInfo info( url ); if( info.type() == UrlInfo::invalid ) { - error( KIO::ERR_DOES_NOT_EXIST, url.path() ); + error( TDEIO::ERR_DOES_NOT_EXIST, url.path() ); return; } else { @@ -154,7 +154,7 @@ void MBoxProtocol::mimetype( const KURL& url ) return; if( info.type() == UrlInfo::invalid ) - error( KIO::ERR_DOES_NOT_EXIST, i18n( "Invalid URL" ) ); + error( TDEIO::ERR_DOES_NOT_EXIST, i18n( "Invalid URL" ) ); else mimeType( info.mimetype() ); finished(); diff --git a/kioslaves/mbox/mbox.h b/kioslaves/mbox/mbox.h index 6d207ab3c..159c4213e 100644 --- a/kioslaves/mbox/mbox.h +++ b/kioslaves/mbox/mbox.h @@ -28,11 +28,11 @@ class KURL; * This class is the main class and implements all function * which can be called through the user. */ -class MBoxProtocol : public KIO::SlaveBase +class MBoxProtocol : public TDEIO::SlaveBase { public: /** - * Constructor, for the parameters, See KIO::SlaveBase + * Constructor, for the parameters, See TDEIO::SlaveBase */ MBoxProtocol( const TQCString&, const TQCString& ); /** diff --git a/kioslaves/mbox/readmbox.cc b/kioslaves/mbox/readmbox.cc index 280bb4615..3125fd747 100644 --- a/kioslaves/mbox/readmbox.cc +++ b/kioslaves/mbox/readmbox.cc @@ -53,14 +53,14 @@ ReadMBox::ReadMBox( const UrlInfo* info, MBoxProtocol* parent, bool onlynew, boo { if( m_info->type() == UrlInfo::invalid ) - m_mbox->emitError( KIO::ERR_DOES_NOT_EXIST, info->url() ); + m_mbox->emitError( TDEIO::ERR_DOES_NOT_EXIST, info->url() ); if( !open( savetime ) ) - m_mbox->emitError( KIO::ERR_CANNOT_OPEN_FOR_READING, info->url() ); + m_mbox->emitError( TDEIO::ERR_CANNOT_OPEN_FOR_READING, info->url() ); if( m_info->type() == UrlInfo::message ) if( !searchMessage( m_info->id() ) ) - m_mbox->emitError( KIO::ERR_DOES_NOT_EXIST, info->url() ); + m_mbox->emitError( TDEIO::ERR_DOES_NOT_EXIST, info->url() ); } ReadMBox::~ReadMBox() diff --git a/kioslaves/mbox/stat.cc b/kioslaves/mbox/stat.cc index 00285b149..c5d9a3bdf 100644 --- a/kioslaves/mbox/stat.cc +++ b/kioslaves/mbox/stat.cc @@ -26,20 +26,20 @@ #include <sys/stat.h> -KIO::UDSEntry Stat::stat( const UrlInfo& info ) +TDEIO::UDSEntry Stat::stat( const UrlInfo& info ) { if( info.type() == UrlInfo::message ) return Stat::statMessage( info ); else if( info.type() == UrlInfo::directory ) return Stat::statDirectory( info ); else - return KIO::UDSEntry(); + return TDEIO::UDSEntry(); } -KIO::UDSEntry Stat::stat( ReadMBox& mbox, const UrlInfo& info ) +TDEIO::UDSEntry Stat::stat( ReadMBox& mbox, const UrlInfo& info ) { kdDebug() << "Stat::stat()" << endl; - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; TQString url; if( info.type() == UrlInfo::invalid ) @@ -47,54 +47,54 @@ KIO::UDSEntry Stat::stat( ReadMBox& mbox, const UrlInfo& info ) else if( info.type() == UrlInfo::message ) mbox.searchMessage( info.id() ); - Stat::addAtom( entry, KIO::UDS_FILE_TYPE, S_IFREG ); - Stat::addAtom( entry, KIO::UDS_MIME_TYPE, "message/rfc822" ); + Stat::addAtom( entry, TDEIO::UDS_FILE_TYPE, S_IFREG ); + Stat::addAtom( entry, TDEIO::UDS_MIME_TYPE, "message/rfc822" ); url = TQString( "mbox:%1/%2" ).arg( info.filename(), mbox.currentID() ); - Stat::addAtom( entry, KIO::UDS_URL, url ); + Stat::addAtom( entry, TDEIO::UDS_URL, url ); if( mbox.currentID().isEmpty() ) - Stat::addAtom( entry, KIO::UDS_NAME, "foobar" ); + Stat::addAtom( entry, TDEIO::UDS_NAME, "foobar" ); else - Stat::addAtom( entry, KIO::UDS_NAME, mbox.currentID() ); + Stat::addAtom( entry, TDEIO::UDS_NAME, mbox.currentID() ); - Stat::addAtom( entry, KIO::UDS_SIZE, mbox.skipMessage() ); + Stat::addAtom( entry, TDEIO::UDS_SIZE, mbox.skipMessage() ); return entry; } -KIO::UDSEntry Stat::statDirectory( const UrlInfo& info ) +TDEIO::UDSEntry Stat::statDirectory( const UrlInfo& info ) { kdDebug() << "statDirectory()" << endl; - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; //Specific things for a directory - Stat::addAtom( entry, KIO::UDS_FILE_TYPE, S_IFDIR ); - Stat::addAtom( entry, KIO::UDS_NAME, info.filename() ); + Stat::addAtom( entry, TDEIO::UDS_FILE_TYPE, S_IFDIR ); + Stat::addAtom( entry, TDEIO::UDS_NAME, info.filename() ); return entry; } -KIO::UDSEntry Stat::statMessage( const UrlInfo& info ) +TDEIO::UDSEntry Stat::statMessage( const UrlInfo& info ) { kdDebug() << "statMessage( " << info.url() << " )" << endl; - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; TQString url = TQString( "mbox:%1" ).arg( info.url() ); //Specific things for a message - Stat::addAtom( entry, KIO::UDS_FILE_TYPE, S_IFREG ); - Stat::addAtom( entry, KIO::UDS_MIME_TYPE, "message/rfc822" ); + Stat::addAtom( entry, TDEIO::UDS_FILE_TYPE, S_IFREG ); + Stat::addAtom( entry, TDEIO::UDS_MIME_TYPE, "message/rfc822" ); - Stat::addAtom( entry, KIO::UDS_URL, url ); + Stat::addAtom( entry, TDEIO::UDS_URL, url ); url = url.right( url.length() - url.findRev( "/" ) - 1 ); - Stat::addAtom( entry, KIO::UDS_NAME, url ); + Stat::addAtom( entry, TDEIO::UDS_NAME, url ); return entry; } -void Stat::addAtom( KIO::UDSEntry& entry, unsigned int uds, const TQString& str ) +void Stat::addAtom( TDEIO::UDSEntry& entry, unsigned int uds, const TQString& str ) { - KIO::UDSAtom atom; + TDEIO::UDSAtom atom; atom.m_uds = uds; atom.m_str = str; atom.m_long = 0; @@ -103,9 +103,9 @@ void Stat::addAtom( KIO::UDSEntry& entry, unsigned int uds, const TQString& str } -void Stat::addAtom( KIO::UDSEntry& entry, unsigned int uds, long lng ) +void Stat::addAtom( TDEIO::UDSEntry& entry, unsigned int uds, long lng ) { - KIO::UDSAtom atom; + TDEIO::UDSAtom atom; atom.m_uds = uds; atom.m_str = TQString(); atom.m_long = lng; diff --git a/kioslaves/mbox/stat.h b/kioslaves/mbox/stat.h index 3efbcaf64..8ce593cc0 100644 --- a/kioslaves/mbox/stat.h +++ b/kioslaves/mbox/stat.h @@ -50,7 +50,7 @@ public: * @param info The file information * @return The information of the file as destribed in UrlInfo. */ - static KIO::UDSEntry stat( const UrlInfo& info ); + static TDEIO::UDSEntry stat( const UrlInfo& info ); /** * This function gives information with a given ReadMBox and UrlInfo. * Through this, it is possible to ask the stats of the next message, @@ -59,24 +59,24 @@ public: * @param info The url information. * @return The requesteds information. */ - static KIO::UDSEntry stat( ReadMBox& mbox, const UrlInfo& info ); + static TDEIO::UDSEntry stat( ReadMBox& mbox, const UrlInfo& info ); /** * This function gets the stats of a given mbox-file in an UDSEntry. * @param info The location of the mbox-file. * @return A list of Atoms. */ - static KIO::UDSEntry statDirectory( const UrlInfo& info ); + static TDEIO::UDSEntry statDirectory( const UrlInfo& info ); /** * This function gets the stats of a geven mbox-message in a UDSEntry. * @param info The url of the mbox-message. * @return Information shipped in an UDSEntry. */ - static KIO::UDSEntry statMessage( const UrlInfo& info ); + static TDEIO::UDSEntry statMessage( const UrlInfo& info ); private: - static void addAtom( KIO::UDSEntry& entry, unsigned int key, const TQString& value ); - static void addAtom( KIO::UDSEntry& entry, unsigned int key, const long value ); + static void addAtom( TDEIO::UDSEntry& entry, unsigned int key, const TQString& value ); + static void addAtom( TDEIO::UDSEntry& entry, unsigned int key, const long value ); }; #endif |