Fix a few remaining references to kio_

pull/21/head
Timothy Pearson 11 years ago
parent bc42346660
commit 09bd73fbd2

@ -1534,7 +1534,7 @@ Problems addressed
* kolab/issue2036 Press "cancel" at the calender folder selection deletes an updated event. (768070) * kolab/issue2036 Press "cancel" at the calender folder selection deletes an updated event. (768070)
* kolab/issue2214 Creating a calender in local folder where the user have no rights shouldn't be possible.(768402) * kolab/issue2214 Creating a calender in local folder where the user have no rights shouldn't be possible.(768402)
* kolab/issue2433 Debug log of kio_sieve shows password in base64. (768539) * kolab/issue2433 Debug log of tdeio_sieve shows password in base64. (768539)
* kolab/issue2387 Crash when creating a subfolder of the calendar folder.(768738) * kolab/issue2387 Crash when creating a subfolder of the calendar folder.(768738)
* kolab/issue1841 Changing composer wrap margin does not affect currently open composer.(769033) * kolab/issue1841 Changing composer wrap margin does not affect currently open composer.(769033)
* kolab/issue1843 Resized composer window snaps back if settings are changed.(769035) * kolab/issue1843 Resized composer window snaps back if settings are changed.(769035)
@ -1547,7 +1547,7 @@ Monday, January 28th 2008
Warning Warning
-------- --------
The account password is shown in the debug output (See kolab/issue2344). The account password is shown in the debug output (See kolab/issue2344).
Solution is to use "kdebugdialog" and switch "kio_sieve" off. Solution is to use "kdebugdialog" and switch "tdeio_sieve" off.
Problems addressed Problems addressed
------------------- -------------------

@ -1903,7 +1903,7 @@ void KMFolderImap::setStatus(TQValueList<int>& _ids, KMMsgStatus status, bool to
/* The status has been already set in the local index. Update the flags on /* The status has been already set in the local index. Update the flags on
* the server. To avoid doing that for each message individually, group them * the server. To avoid doing that for each message individually, group them
* by the status string they will be assigned and make sets for each of those * by the status string they will be assigned and make sets for each of those
* groups of mails. This is necessary because the imap kio_slave status job * groups of mails. This is necessary because the imap tdeio_slave status job
* does not append flags but overwrites them. Example: * does not append flags but overwrites them. Example:
* *
* 2 important mails and 3 unimportant mail, all unread. Mark all as read calls * 2 important mails and 3 unimportant mail, all unread. Mark all as read calls

@ -330,7 +330,7 @@ static bool phone_entry_empty( int index, gn_memory_type memtype )
} }
#endif #endif
static int gn_error2kio_error( gn_error err ) static int gn_error2tdeio_error( gn_error err )
{ {
if (err != GN_ERR_NONE) if (err != GN_ERR_NONE)
GNOKII_CHECK_ERROR(err); GNOKII_CHECK_ERROR(err);
@ -604,7 +604,7 @@ int KMobileGnokii::readAddress( int index, KABC::Addressee &addr )
if (!err) if (!err)
m_addrList[index] = addr; m_addrList[index] = addr;
return gn_error2kio_error(err); return gn_error2tdeio_error(err);
} }
int KMobileGnokii::storeAddress( int, const KABC::Addressee &, bool ) int KMobileGnokii::storeAddress( int, const KABC::Addressee &, bool )
@ -696,7 +696,7 @@ int KMobileGnokii::readCalendarEntry( int index, KCal::Event &event )
gn_error error = gn_sm_functions(GN_OP_GetCalendarNote, &data, &state); gn_error error = gn_sm_functions(GN_OP_GetCalendarNote, &data, &state);
GNOKII_CHECK_ERROR(error); GNOKII_CHECK_ERROR(error);
if (error != GN_ERR_NONE) if (error != GN_ERR_NONE)
return gn_error2kio_error(error); return gn_error2tdeio_error(error);
print_calnote( entry ); print_calnote( entry );

@ -306,7 +306,7 @@ public:
/** /**
* Used for any command that is specific to this slave (protocol) * Used for any command that is specific to this slave (protocol)
* Examples are : HTTP POST, mount and unmount (kio_file) * Examples are : HTTP POST, mount and unmount (tdeio_file)
* *
* @param data packed data; the meaning is completely dependent on the * @param data packed data; the meaning is completely dependent on the
* slave, but usually starts with an int for the command number. * slave, but usually starts with an int for the command number.

@ -49,7 +49,7 @@ k_dcop:
* DCOP functions for the devices:/ tdeioslave * DCOP functions for the devices:/ tdeioslave
*/ */
k_dcop: k_dcop:
virtual TQStringList kio_devices_deviceInfo(TQString deviceName) = 0; virtual TQStringList tdeio_devices_deviceInfo(TQString deviceName) = 0;
}; };
#endif // _KMOBILEIFACE_H_ #endif // _KMOBILEIFACE_H_

@ -404,7 +404,7 @@ bool KMobileView::storeNote( TQString deviceName, int index, TQString note )
* active mobile devices. * active mobile devices.
* (function is only used by the devices tdeioslave - don't use elsewhere !) * (function is only used by the devices tdeioslave - don't use elsewhere !)
*/ */
TQStringList KMobileView::kio_devices_deviceInfo(TQString deviceName) TQStringList KMobileView::tdeio_devices_deviceInfo(TQString deviceName)
{ {
TQStringList mobiles = deviceNames(); TQStringList mobiles = deviceNames();
if (mobiles.count() == 0) if (mobiles.count() == 0)

@ -64,7 +64,7 @@ public:
bool storeNote( TQString deviceName, int index, TQString note ); bool storeNote( TQString deviceName, int index, TQString note );
/* devices tdeioslave support: */ /* devices tdeioslave support: */
TQStringList kio_devices_deviceInfo(TQString deviceName); TQStringList tdeio_devices_deviceInfo(TQString deviceName);
public: public:
void saveAll(); void saveAll();

@ -490,13 +490,13 @@ int create( TDECmdLineArgs *args )
code.clear(); code.clear();
code += "TDEInstance instance( \"kio_" + protocol + "\" );"; code += "TDEInstance instance( \"tdeio_" + protocol + "\" );";
code += ""; code += "";
code += "kdDebug(7000) << \"Starting kio_" + protocol + "(pid: \" << getpid() << \")\" << endl;"; code += "kdDebug(7000) << \"Starting tdeio_" + protocol + "(pid: \" << getpid() << \")\" << endl;";
code += ""; code += "";
code += "if (argc != 4) {"; code += "if (argc != 4) {";
code.indent(); code.indent();
code += "fprintf( stderr, \"Usage: kio_" + protocol + " protocol domain-socket1 domain-socket2\\n\");"; code += "fprintf( stderr, \"Usage: tdeio_" + protocol + " protocol domain-socket1 domain-socket2\\n\");";
code += "exit( -1 );"; code += "exit( -1 );";
code.unindent(); code.unindent();
code += "}"; code += "}";
@ -571,7 +571,7 @@ int create( TDECmdLineArgs *args )
am.addEntry( "kdelnk_DATA", protocol + ".protocol" ); am.addEntry( "kdelnk_DATA", protocol + ".protocol" );
KODE::AutoMakefile::Target t( "kde_module_LTLIBRARIES", KODE::AutoMakefile::Target t( "kde_module_LTLIBRARIES",
"kio_" + protocol + ".la" ); "tdeio_" + protocol + ".la" );
t.setSources( className.lower() + ".cpp" ); t.setSources( className.lower() + ".cpp" );
t.setLibAdd( "$(LIB_KIO)" ); t.setLibAdd( "$(LIB_KIO)" );
t.setLdFlags( "$(all_libraries) -module $(KDE_PLUGIN)" ); t.setLdFlags( "$(all_libraries) -module $(KDE_PLUGIN)" );
@ -594,7 +594,7 @@ int create( TDECmdLineArgs *args )
KSimpleConfig protocolFile( protocolFilename ); KSimpleConfig protocolFile( protocolFilename );
protocolFile.setGroup( "Protocol" ); protocolFile.setGroup( "Protocol" );
protocolFile.writeEntry( "exec", "kio_" + protocol ); protocolFile.writeEntry( "exec", "tdeio_" + protocol );
protocolFile.writeEntry( "protocol", protocol ); protocolFile.writeEntry( "protocol", protocol );
protocolFile.writeEntry( "input", "none" ); protocolFile.writeEntry( "input", "none" );
protocolFile.writeEntry( "output", "filesystem" ); protocolFile.writeEntry( "output", "filesystem" );

@ -1,5 +1,5 @@
[Protocol] [Protocol]
exec=kio_http exec=tdeio_http
protocol=webcal protocol=webcal
input=none input=none
output=filesystem output=filesystem

@ -45,8 +45,8 @@ tde_add_executable( korn AUTOMOC
keditlistboxman.cpp nntp_proto.cpp maildrop.cpp main.cpp polldrop.cpp keditlistboxman.cpp nntp_proto.cpp maildrop.cpp main.cpp polldrop.cpp
protocols.cpp kornshell.cpp subjectsdlg.cpp maildlg.cpp mailid.cpp protocols.cpp kornshell.cpp subjectsdlg.cpp maildlg.cpp mailid.cpp
mailsubject.cpp mbox_proto.cpp imap_proto.cpp intid.cpp stringid.cpp mailsubject.cpp mbox_proto.cpp imap_proto.cpp intid.cpp stringid.cpp
kornapp.cpp kio.cpp kio_count.cpp kio_proto.cpp kio_subjects.cpp kornapp.cpp kio.cpp tdeio_count.cpp tdeio_proto.cpp tdeio_subjects.cpp
kio_single_subject.cpp kio_read.cpp kio_delete.cpp kmail_proto.cpp tdeio_single_subject.cpp tdeio_read.cpp tdeio_delete.cpp kmail_proto.cpp
sortedmailsubject.cpp korncfgimpl.cpp kornaccountcfgimpl.cpp kornboxcfgimpl.cpp sortedmailsubject.cpp korncfgimpl.cpp kornaccountcfgimpl.cpp kornboxcfgimpl.cpp
kornaccountcfg.ui kornboxcfg.ui korncfg.ui password.cpp pop3_proto.cpp kornaccountcfg.ui kornboxcfg.ui korncfg.ui password.cpp pop3_proto.cpp
systemtray.cpp process_proto.cpp progress_dialog.ui qmail_proto.cpp label.cpp systemtray.cpp process_proto.cpp progress_dialog.ui qmail_proto.cpp label.cpp

@ -40,12 +40,12 @@ korn_SOURCES = \
stringid.cpp \ stringid.cpp \
kornapp.cpp \ kornapp.cpp \
kio.cpp \ kio.cpp \
kio_count.cpp \ tdeio_count.cpp \
kio_proto.cpp \ tdeio_proto.cpp \
kio_subjects.cpp \ tdeio_subjects.cpp \
kio_single_subject.cpp \ tdeio_single_subject.cpp \
kio_read.cpp \ tdeio_read.cpp \
kio_delete.cpp \ tdeio_delete.cpp \
kmail_proto.cpp \ kmail_proto.cpp \
sortedmailsubject.cpp \ sortedmailsubject.cpp \
korncfgimpl.cpp \ korncfgimpl.cpp \
@ -92,15 +92,15 @@ noinst_HEADERS = \
stringid.h \ stringid.h \
kornapp.h \ kornapp.h \
kio.h \ kio.h \
kio_count.h \ tdeio_count.h \
kio_subjects.h \ tdeio_subjects.h \
kio_single_subject.h \ tdeio_single_subject.h \
kio_read.h \ tdeio_read.h \
kio_delete.h \ tdeio_delete.h \
sortedmailsubject.h \ sortedmailsubject.h \
imap_proto.h \ imap_proto.h \
imaps_proto.h \ imaps_proto.h \
kio_proto.h \ tdeio_proto.h \
maildir_proto.h \ maildir_proto.h \
nntp_proto.h \ nntp_proto.h \
pop3_proto.h \ pop3_proto.h \

@ -19,12 +19,12 @@
#ifndef MK_IMAP_PROTO_H #ifndef MK_IMAP_PROTO_H
#define MK_IMAP_PROTO_H #define MK_IMAP_PROTO_H
#include "kio_proto.h" #include "tdeio_proto.h"
#include <kurl.h> #include <kurl.h>
/* /*
* With deleting and IMAP4 is a small problem: messages don't looks as deleted, as they * With deleting and IMAP4 is a small problem: messages don't looks as deleted, as they
* apear with their full body. By deletion, kio_imap marks the message with FLAGS.SILENT as \DELETED. * apear with their full body. By deletion, tdeio_imap marks the message with FLAGS.SILENT as \DELETED.
* If there is a commit-function, it should be installed in this file. * If there is a commit-function, it should be installed in this file.
*/ */
@ -101,7 +101,7 @@ public:
/** /**
* These function change the kurl and the metadata. * These function change the kurl and the metadata.
* In this case, "unseen" is added to the query to only list unlees kurls. * In this case, "unseen" is added to the query to only list unlees kurls.
* These function are called in kio_*.cpp * These function are called in tdeio_*.cpp
*/ */
virtual void recheckKURL ( KURL &kurl, TDEIO::MetaData & ) const { kurl.setQuery( "unseen" ); } virtual void recheckKURL ( KURL &kurl, TDEIO::MetaData & ) const { kurl.setQuery( "unseen" ); }
virtual void readSubjectKURL( KURL &kurl, TDEIO::MetaData & ) const { kurl.setPath( kurl.path() + ";section=ENVELOPE" ); } virtual void readSubjectKURL( KURL &kurl, TDEIO::MetaData & ) const { kurl.setPath( kurl.path() + ";section=ENVELOPE" ); }

@ -19,7 +19,7 @@
#ifndef MK_IMAPS_PROTO_H #ifndef MK_IMAPS_PROTO_H
#define MK_IMAPS_PROTO_H #define MK_IMAPS_PROTO_H
#include "kio_proto.h" #include "tdeio_proto.h"
//Looks very simular to Imap_Protocol, so I inheritanced it. //Looks very simular to Imap_Protocol, so I inheritanced it.

@ -28,10 +28,10 @@
*/ */
#include "kio.h" #include "kio.h"
#include "kio_count.h" #include "tdeio_count.h"
#include "kio_subjects.h" #include "tdeio_subjects.h"
#include "kio_read.h" #include "tdeio_read.h"
#include "kio_delete.h" #include "tdeio_delete.h"
#include "protocol.h" #include "protocol.h"
#include "protocols.h" #include "protocols.h"
#include "stringid.h" #include "stringid.h"
@ -57,7 +57,7 @@
#include<stdlib.h> #include<stdlib.h>
//Headers of protocols //Headers of protocols
#include"kio_proto.h" #include"tdeio_proto.h"
//#include"pop3_proto.h" //#include"pop3_proto.h"
//#include"pop3s_proto.h" //#include"pop3s_proto.h"
//#include"imap_proto.h" //#include"imap_proto.h"
@ -98,16 +98,16 @@ KKioDrop::KKioDrop()
//Creating children and connect them to the outside world; this class passes the messages for them... //Creating children and connect them to the outside world; this class passes the messages for them...
//This class handles all the counting. //This class handles all the counting.
_count = new KIO_Count( this, "kio_count" ); _count = new KIO_Count( this, "tdeio_count" );
//This class is responsible for providing the available subjects //This class is responsible for providing the available subjects
_subjects = new KIO_Subjects( this, "kio_subjects" ); _subjects = new KIO_Subjects( this, "tdeio_subjects" );
//This class is used when a full message has to be read. //This class is used when a full message has to be read.
_read = new KIO_Read( this, "kio_read" ); _read = new KIO_Read( this, "tdeio_read" );
//This class can delete mails. //This class can delete mails.
_delete = new KIO_Delete( this, "kio_delete" ); _delete = new KIO_Delete( this, "tdeio_delete" );
_mailurls = new TQValueList<FileInfo>; _mailurls = new TQValueList<FileInfo>;
} }
@ -136,16 +136,16 @@ KKioDrop::KKioDrop( TDEConfigGroup* )
//Creating children and connect them to the outside world; this class passes the messages for them... //Creating children and connect them to the outside world; this class passes the messages for them...
//This class handles all the counting. //This class handles all the counting.
_count = new KIO_Count( this, "kio_count" ); _count = new KIO_Count( this, "tdeio_count" );
//This class is responsible for providing the available subjects //This class is responsible for providing the available subjects
_subjects = new KIO_Subjects( this, "kio_subjects" ); _subjects = new KIO_Subjects( this, "tdeio_subjects" );
//This class is used when a full message has to be read. //This class is used when a full message has to be read.
_read = new KIO_Read( this, "kio_read" ); _read = new KIO_Read( this, "tdeio_read" );
//This class can delete mails. //This class can delete mails.
_delete = new KIO_Delete( this, "kio_delete" ); _delete = new KIO_Delete( this, "tdeio_delete" );
_mailurls = new TQValueList<FileInfo>; _mailurls = new TQValueList<FileInfo>;

@ -19,7 +19,7 @@
#include "kornaccountcfgimpl.h" #include "kornaccountcfgimpl.h"
#include "account_input.h" #include "account_input.h"
#include "kio_proto.h" #include "tdeio_proto.h"
#include "password.h" #include "password.h"
#include "protocol.h" #include "protocol.h"
#include "protocols.h" #include "protocols.h"

@ -19,7 +19,7 @@
#ifndef MK_MAILDIR_PROTO_H #ifndef MK_MAILDIR_PROTO_H
#define MK_MAILDIR_PROTO_H #define MK_MAILDIR_PROTO_H
#include "kio_proto.h" #include "tdeio_proto.h"
/* /*
* Protocol for (postfix?) maildir * Protocol for (postfix?) maildir

@ -19,7 +19,7 @@
#ifndef MK_MBOX_PROTO_H #ifndef MK_MBOX_PROTO_H
#define MK_MBOX_PROTO_H #define MK_MBOX_PROTO_H
#include "kio_proto.h" #include "tdeio_proto.h"
/* /*
* Protocol for mbox * Protocol for mbox

@ -19,7 +19,7 @@
#ifndef MK_NNTP_PROTO_H #ifndef MK_NNTP_PROTO_H
#define MK_NNTP_PROTO_H #define MK_NNTP_PROTO_H
#include "kio_proto.h" #include "tdeio_proto.h"
class Nntp_Protocol : public KIO_Protocol class Nntp_Protocol : public KIO_Protocol
{ {

@ -19,7 +19,7 @@
#ifndef MK_POP3_PROTO_H #ifndef MK_POP3_PROTO_H
#define MK_POP3_PROTO_H #define MK_POP3_PROTO_H
#include "kio_proto.h" #include "tdeio_proto.h"
#include <kurl.h> #include <kurl.h>
class Pop3_Protocol : public KIO_Protocol class Pop3_Protocol : public KIO_Protocol

@ -19,7 +19,7 @@
#ifndef MK_PROCESS_PROTOCOL #ifndef MK_PROCESS_PROTOCOL
#define MK_PROCESS_PROTOCOL #define MK_PROCESS_PROTOCOL
#include "kio_proto.h" #include "tdeio_proto.h"
class Process_Protocol : public KIO_Protocol class Process_Protocol : public KIO_Protocol
{ {

@ -18,7 +18,7 @@
#include "protocols.h" #include "protocols.h"
#include "kio_proto.h" #include "tdeio_proto.h"
#include "imap_proto.h" #include "imap_proto.h"
#include "mbox_proto.h" #include "mbox_proto.h"

@ -19,7 +19,7 @@
#ifndef MK_TQMAIL_PROTO_H #ifndef MK_TQMAIL_PROTO_H
#define MK_TQMAIL_PROTO_H #define MK_TQMAIL_PROTO_H
#include "kio_proto.h" #include "tdeio_proto.h"
class TQMail_Protocol : public KIO_Protocol class TQMail_Protocol : public KIO_Protocol
{ {

@ -16,11 +16,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "kio_count.h" #include "tdeio_count.h"
#include "kio.h" #include "kio.h"
#include "kio_proto.h" #include "tdeio_proto.h"
#include "kio_single_subject.h" #include "tdeio_single_subject.h"
#include "mailsubject.h" #include "mailsubject.h"
#include "sortedmailsubject.h" #include "sortedmailsubject.h"
@ -327,4 +327,4 @@ void KIO_Count::deleteSingleSubject( KIO_Single_Subject* single_subject )
delete single_subject; delete single_subject;
} }
#include "kio_count.moc" #include "tdeio_count.moc"

@ -16,12 +16,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "kio_delete.h" #include "tdeio_delete.h"
#include "mailid.h" #include "mailid.h"
#include "stringid.h" #include "stringid.h"
#include "kio.h" #include "kio.h"
#include "kio_proto.h" #include "tdeio_proto.h"
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
@ -198,4 +198,4 @@ void KIO_Delete::slotResult( TDEIO::Job* job )
} }
#include "kio_delete.moc" #include "tdeio_delete.moc"

@ -17,7 +17,7 @@
*/ */
#include "kio_proto.h" #include "tdeio_proto.h"
#include <tdeconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>

@ -61,7 +61,7 @@ public:
virtual TQMap< TQString, TQString >* createConfig( TDEConfigGroup *group, const TQString& password ) const; virtual TQMap< TQString, TQString >* createConfig( TDEConfigGroup *group, const TQString& password ) const;
/* /*
* @return: the name of the kio_slave * @return: the name of the tdeio_slave
*/ */
virtual TQString protocol( bool ) const { return "file"; } virtual TQString protocol( bool ) const { return "file"; }

@ -16,10 +16,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "kio_read.h" #include "tdeio_read.h"
#include "kio.h" #include "kio.h"
#include "kio_proto.h" #include "tdeio_proto.h"
#include "mailid.h" #include "mailid.h"
#include "stringid.h" #include "stringid.h"
@ -94,4 +94,4 @@ void KIO_Read::slotData( TDEIO::Job* job, const TQByteArray & data )
_message->append( data ); _message->append( data );
} }
#include "kio_read.moc" #include "tdeio_read.moc"

@ -16,10 +16,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "kio_single_subject.h" #include "tdeio_single_subject.h"
#include "mailsubject.h" #include "mailsubject.h"
#include "kio_proto.h" #include "tdeio_proto.h"
#include "stringid.h" #include "stringid.h"
#include <kdebug.h> #include <kdebug.h>
@ -152,4 +152,4 @@ void KIO_Single_Subject::slotResult( TDEIO::Job *job )
emit finished( this ); emit finished( this );
} }
#include "kio_single_subject.moc" #include "tdeio_single_subject.moc"

@ -16,11 +16,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "kio_subjects.h" #include "tdeio_subjects.h"
#include "kio.h" #include "kio.h"
#include "kio_single_subject.h" #include "tdeio_single_subject.h"
#include "kio_proto.h" #include "tdeio_proto.h"
#include "mailsubject.h" #include "mailsubject.h"
#include <tdeio/global.h> #include <tdeio/global.h>
@ -173,4 +173,4 @@ void KIO_Subjects::slotFinished( KIO_Single_Subject* item )
disConnect( true ); //Only works when all jobs are finished. disConnect( true ); //Only works when all jobs are finished.
} }
#include "kio_subjects.moc" #include "tdeio_subjects.moc"

@ -244,7 +244,7 @@ void encode_decode_convenience_qba( bool encode, const Codec * codec,
} }
} }
void encode_kio_internal( Encoder * enc, TQByteArray::ConstIterator & iit, void encode_tdeio_internal( Encoder * enc, TQByteArray::ConstIterator & iit,
TQByteArray::ConstIterator & iend, TQByteArray::ConstIterator & iend,
TQByteArray & out ) TQByteArray & out )
{ {
@ -261,7 +261,7 @@ void encode_kio_internal( Encoder * enc, TQByteArray::ConstIterator & iit,
out.truncate( oit - out.begin() ); out.truncate( oit - out.begin() );
} }
void decode_kio_internal( Decoder * dec, TQByteArray::ConstIterator & iit, void decode_tdeio_internal( Decoder * dec, TQByteArray::ConstIterator & iit,
TQByteArray::ConstIterator & iend, TQByteArray::ConstIterator & iend,
TQByteArray & out ) { TQByteArray & out ) {
out.resize( outbufsize ); out.resize( outbufsize );
@ -300,9 +300,9 @@ void encode_decode_kio( bool encode, const Codec * codec,
do { do {
out = TQByteArray(); out = TQByteArray();
if ( encode ) if ( encode )
encode_kio_internal( enc, iit, iend, out ); encode_tdeio_internal( enc, iit, iend, out );
else else
decode_kio_internal( dec, iit, iend, out ); decode_tdeio_internal( dec, iit, iend, out );
if ( writing && out.size() ) { if ( writing && out.size() ) {
TQ_LONG written = outfile.writeBlock( out ); TQ_LONG written = outfile.writeBlock( out );
assert( written == (TQ_LONG)out.size() ); assert( written == (TQ_LONG)out.size() );

@ -33,7 +33,7 @@
*/ */
/** /**
* A specialized progress widget class, heavily based on * A specialized progress widget class, heavily based on
* kio_littleprogress_dlg (it looks similar) * tdeio_littleprogress_dlg (it looks similar)
*/ */
#include <tdepimmacros.h> #include <tdepimmacros.h>

@ -96,7 +96,7 @@ extern "C"
::exit (-1); ::exit (-1);
} }
kio_sieveProtocol slave(argv[2], argv[3]); tdeio_sieveProtocol slave(argv[2], argv[3]);
slave.dispatchLoop(); slave.dispatchLoop();
sasl_done(); sasl_done();
@ -107,7 +107,7 @@ extern "C"
} }
/* ---------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------- */
tdeio_sieveResponse::kio_sieveResponse() tdeio_sieveResponse::tdeio_sieveResponse()
{ {
clear(); clear();
} }
@ -190,7 +190,7 @@ void tdeio_sieveResponse::clear()
} }
/* ---------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------- */
tdeio_sieveProtocol::kio_sieveProtocol(const TQCString &pool_socket, const TQCString &app_socket) tdeio_sieveProtocol::tdeio_sieveProtocol(const TQCString &pool_socket, const TQCString &app_socket)
: TCPSlaveBase( SIEVE_DEFAULT_PORT, "sieve", pool_socket, app_socket, false) : TCPSlaveBase( SIEVE_DEFAULT_PORT, "sieve", pool_socket, app_socket, false)
, m_connMode(NORMAL) , m_connMode(NORMAL)
, m_supportsTLS(false) , m_supportsTLS(false)
@ -200,7 +200,7 @@ tdeio_sieveProtocol::kio_sieveProtocol(const TQCString &pool_socket, const TQCSt
} }
/* ---------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------- */
tdeio_sieveProtocol::~kio_sieveProtocol() tdeio_sieveProtocol::~tdeio_sieveProtocol()
{ {
if ( isConnectionValid() ) if ( isConnectionValid() )
disconnect(); disconnect();

@ -32,7 +32,7 @@ class tdeio_sieveResponse
public: public:
enum responses { NONE, KEY_VAL_PAIR, ACTION, QUANTITY }; enum responses { NONE, KEY_VAL_PAIR, ACTION, QUANTITY };
kio_sieveResponse(); tdeio_sieveResponse();
const uint& getType() const; const uint& getType() const;
@ -65,8 +65,8 @@ public:
enum connectionModes { NORMAL, CONNECTION_ORIENTED }; enum connectionModes { NORMAL, CONNECTION_ORIENTED };
enum Results { OK, NO, BYE, OTHER }; enum Results { OK, NO, BYE, OTHER };
kio_sieveProtocol(const TQCString &pool_socket, const TQCString &app_socket); tdeio_sieveProtocol(const TQCString &pool_socket, const TQCString &app_socket);
virtual ~kio_sieveProtocol(); virtual ~tdeio_sieveProtocol();
virtual void mimetype(const KURL& url); virtual void mimetype(const KURL& url);
virtual void get(const KURL& url); virtual void get(const KURL& url);
@ -114,7 +114,7 @@ protected:
bool m_supportsTLS; bool m_supportsTLS;
// Global server respose class // Global server respose class
kio_sieveResponse r; tdeio_sieveResponse r;
// connection details // connection details
TQString m_sServer; TQString m_sServer;

@ -20,8 +20,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __kio_xmlrpcjob_h__ #ifndef __tdeio_xmlrpcjob_h__
#define __kio_xmlrpcjob_h__ #define __tdeio_xmlrpcjob_h__
#include <kurl.h> #include <kurl.h>

Loading…
Cancel
Save