diff options
34 files changed, 89 insertions, 89 deletions
diff --git a/NewsLog.txt b/NewsLog.txt index 9b36e32f7..411fc0213 100644 --- a/NewsLog.txt +++ b/NewsLog.txt @@ -1534,7 +1534,7 @@ Problems addressed * 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/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/issue1841 Changing composer wrap margin does not affect currently open composer.(769033) * kolab/issue1843 Resized composer window snaps back if settings are changed.(769035) @@ -1547,7 +1547,7 @@ Monday, January 28th 2008 Warning -------- 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 ------------------- diff --git a/kmail/kmfolderimap.cpp b/kmail/kmfolderimap.cpp index ead0a9437..b0686dbba 100644 --- a/kmail/kmfolderimap.cpp +++ b/kmail/kmfolderimap.cpp @@ -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 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 - * 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: * * 2 important mails and 3 unimportant mail, all unread. Mark all as read calls diff --git a/kmobile/devices/gnokii/gnokii_mobile.cpp b/kmobile/devices/gnokii/gnokii_mobile.cpp index 1f33996e7..a999fed0d 100644 --- a/kmobile/devices/gnokii/gnokii_mobile.cpp +++ b/kmobile/devices/gnokii/gnokii_mobile.cpp @@ -330,7 +330,7 @@ static bool phone_entry_empty( int index, gn_memory_type memtype ) } #endif -static int gn_error2kio_error( gn_error err ) +static int gn_error2tdeio_error( gn_error err ) { if (err != GN_ERR_NONE) GNOKII_CHECK_ERROR(err); @@ -604,7 +604,7 @@ int KMobileGnokii::readAddress( int index, KABC::Addressee &addr ) if (!err) m_addrList[index] = addr; - return gn_error2kio_error(err); + return gn_error2tdeio_error(err); } 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); GNOKII_CHECK_ERROR(error); if (error != GN_ERR_NONE) - return gn_error2kio_error(error); + return gn_error2tdeio_error(error); print_calnote( entry ); diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h index ffd568ea9..9dbad07a1 100644 --- a/kmobile/kmobiledevice.h +++ b/kmobile/kmobiledevice.h @@ -306,7 +306,7 @@ public: /** * 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 * slave, but usually starts with an int for the command number. diff --git a/kmobile/kmobileiface.h b/kmobile/kmobileiface.h index bac1a9ae6..12b33da91 100644 --- a/kmobile/kmobileiface.h +++ b/kmobile/kmobileiface.h @@ -49,7 +49,7 @@ k_dcop: * DCOP functions for the devices:/ tdeioslave */ k_dcop: - virtual TQStringList kio_devices_deviceInfo(TQString deviceName) = 0; + virtual TQStringList tdeio_devices_deviceInfo(TQString deviceName) = 0; }; #endif // _KMOBILEIFACE_H_ diff --git a/kmobile/kmobileview.cpp b/kmobile/kmobileview.cpp index f90c9adf2..5356c879e 100644 --- a/kmobile/kmobileview.cpp +++ b/kmobile/kmobileview.cpp @@ -404,7 +404,7 @@ bool KMobileView::storeNote( TQString deviceName, int index, TQString note ) * active mobile devices. * (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(); if (mobiles.count() == 0) diff --git a/kmobile/kmobileview.h b/kmobile/kmobileview.h index 4672349fd..166b8eb92 100644 --- a/kmobile/kmobileview.h +++ b/kmobile/kmobileview.h @@ -64,7 +64,7 @@ public: bool storeNote( TQString deviceName, int index, TQString note ); /* devices tdeioslave support: */ - TQStringList kio_devices_deviceInfo(TQString deviceName); + TQStringList tdeio_devices_deviceInfo(TQString deviceName); public: void saveAll(); diff --git a/kode/kodemain.cpp b/kode/kodemain.cpp index 288b9ac54..bf3fbb5ef 100644 --- a/kode/kodemain.cpp +++ b/kode/kodemain.cpp @@ -490,13 +490,13 @@ int create( TDECmdLineArgs *args ) code.clear(); - code += "TDEInstance instance( \"kio_" + protocol + "\" );"; + code += "TDEInstance instance( \"tdeio_" + protocol + "\" );"; code += ""; - code += "kdDebug(7000) << \"Starting kio_" + protocol + "(pid: \" << getpid() << \")\" << endl;"; + code += "kdDebug(7000) << \"Starting tdeio_" + protocol + "(pid: \" << getpid() << \")\" << endl;"; code += ""; code += "if (argc != 4) {"; 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.unindent(); code += "}"; @@ -571,7 +571,7 @@ int create( TDECmdLineArgs *args ) am.addEntry( "kdelnk_DATA", protocol + ".protocol" ); KODE::AutoMakefile::Target t( "kde_module_LTLIBRARIES", - "kio_" + protocol + ".la" ); + "tdeio_" + protocol + ".la" ); t.setSources( className.lower() + ".cpp" ); t.setLibAdd( "$(LIB_KIO)" ); t.setLdFlags( "$(all_libraries) -module $(KDE_PLUGIN)" ); @@ -594,7 +594,7 @@ int create( TDECmdLineArgs *args ) KSimpleConfig protocolFile( protocolFilename ); protocolFile.setGroup( "Protocol" ); - protocolFile.writeEntry( "exec", "kio_" + protocol ); + protocolFile.writeEntry( "exec", "tdeio_" + protocol ); protocolFile.writeEntry( "protocol", protocol ); protocolFile.writeEntry( "input", "none" ); protocolFile.writeEntry( "output", "filesystem" ); diff --git a/korganizer/webcal.protocol b/korganizer/webcal.protocol index 953f3eac0..96b4552c7 100644 --- a/korganizer/webcal.protocol +++ b/korganizer/webcal.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_http +exec=tdeio_http protocol=webcal input=none output=filesystem diff --git a/korn/CMakeLists.txt b/korn/CMakeLists.txt index f3dd942bf..081d1aaf2 100644 --- a/korn/CMakeLists.txt +++ b/korn/CMakeLists.txt @@ -45,8 +45,8 @@ tde_add_executable( korn AUTOMOC keditlistboxman.cpp nntp_proto.cpp maildrop.cpp main.cpp polldrop.cpp protocols.cpp kornshell.cpp subjectsdlg.cpp maildlg.cpp mailid.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 - kio_single_subject.cpp kio_read.cpp kio_delete.cpp kmail_proto.cpp + kornapp.cpp kio.cpp tdeio_count.cpp tdeio_proto.cpp tdeio_subjects.cpp + tdeio_single_subject.cpp tdeio_read.cpp tdeio_delete.cpp kmail_proto.cpp sortedmailsubject.cpp korncfgimpl.cpp kornaccountcfgimpl.cpp kornboxcfgimpl.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 diff --git a/korn/Makefile.am b/korn/Makefile.am index 50e5c731b..9dafb61c7 100644 --- a/korn/Makefile.am +++ b/korn/Makefile.am @@ -40,12 +40,12 @@ korn_SOURCES = \ stringid.cpp \ kornapp.cpp \ kio.cpp \ - kio_count.cpp \ - kio_proto.cpp \ - kio_subjects.cpp \ - kio_single_subject.cpp \ - kio_read.cpp \ - kio_delete.cpp \ + tdeio_count.cpp \ + tdeio_proto.cpp \ + tdeio_subjects.cpp \ + tdeio_single_subject.cpp \ + tdeio_read.cpp \ + tdeio_delete.cpp \ kmail_proto.cpp \ sortedmailsubject.cpp \ korncfgimpl.cpp \ @@ -92,15 +92,15 @@ noinst_HEADERS = \ stringid.h \ kornapp.h \ kio.h \ - kio_count.h \ - kio_subjects.h \ - kio_single_subject.h \ - kio_read.h \ - kio_delete.h \ + tdeio_count.h \ + tdeio_subjects.h \ + tdeio_single_subject.h \ + tdeio_read.h \ + tdeio_delete.h \ sortedmailsubject.h \ imap_proto.h \ imaps_proto.h \ - kio_proto.h \ + tdeio_proto.h \ maildir_proto.h \ nntp_proto.h \ pop3_proto.h \ diff --git a/korn/imap_proto.h b/korn/imap_proto.h index f34f32a83..4030c5cc5 100644 --- a/korn/imap_proto.h +++ b/korn/imap_proto.h @@ -19,12 +19,12 @@ #ifndef MK_IMAP_PROTO_H #define MK_IMAP_PROTO_H -#include "kio_proto.h" +#include "tdeio_proto.h" #include <kurl.h> /* * 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. */ @@ -101,7 +101,7 @@ public: /** * These function change the kurl and the metadata. * 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 readSubjectKURL( KURL &kurl, TDEIO::MetaData & ) const { kurl.setPath( kurl.path() + ";section=ENVELOPE" ); } diff --git a/korn/imaps_proto.h b/korn/imaps_proto.h index 00964dab5..07f3cfdbe 100644 --- a/korn/imaps_proto.h +++ b/korn/imaps_proto.h @@ -19,7 +19,7 @@ #ifndef 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. diff --git a/korn/kio.cpp b/korn/kio.cpp index f2ff37fa5..195f73d8c 100644 --- a/korn/kio.cpp +++ b/korn/kio.cpp @@ -28,10 +28,10 @@ */ #include "kio.h" -#include "kio_count.h" -#include "kio_subjects.h" -#include "kio_read.h" -#include "kio_delete.h" +#include "tdeio_count.h" +#include "tdeio_subjects.h" +#include "tdeio_read.h" +#include "tdeio_delete.h" #include "protocol.h" #include "protocols.h" #include "stringid.h" @@ -57,7 +57,7 @@ #include<stdlib.h> //Headers of protocols -#include"kio_proto.h" +#include"tdeio_proto.h" //#include"pop3_proto.h" //#include"pop3s_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... //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 - _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. - _read = new KIO_Read( this, "kio_read" ); + _read = new KIO_Read( this, "tdeio_read" ); //This class can delete mails. - _delete = new KIO_Delete( this, "kio_delete" ); + _delete = new KIO_Delete( this, "tdeio_delete" ); _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... //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 - _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. - _read = new KIO_Read( this, "kio_read" ); + _read = new KIO_Read( this, "tdeio_read" ); //This class can delete mails. - _delete = new KIO_Delete( this, "kio_delete" ); + _delete = new KIO_Delete( this, "tdeio_delete" ); _mailurls = new TQValueList<FileInfo>; diff --git a/korn/kornaccountcfgimpl.cpp b/korn/kornaccountcfgimpl.cpp index df6a0e504..7b57d1f68 100644 --- a/korn/kornaccountcfgimpl.cpp +++ b/korn/kornaccountcfgimpl.cpp @@ -19,7 +19,7 @@ #include "kornaccountcfgimpl.h" #include "account_input.h" -#include "kio_proto.h" +#include "tdeio_proto.h" #include "password.h" #include "protocol.h" #include "protocols.h" diff --git a/korn/maildir_proto.h b/korn/maildir_proto.h index d7700ac3d..b06564e9c 100644 --- a/korn/maildir_proto.h +++ b/korn/maildir_proto.h @@ -19,7 +19,7 @@ #ifndef MK_MAILDIR_PROTO_H #define MK_MAILDIR_PROTO_H -#include "kio_proto.h" +#include "tdeio_proto.h" /* * Protocol for (postfix?) maildir diff --git a/korn/mbox_proto.h b/korn/mbox_proto.h index f017f3b6f..5375413ce 100644 --- a/korn/mbox_proto.h +++ b/korn/mbox_proto.h @@ -19,7 +19,7 @@ #ifndef MK_MBOX_PROTO_H #define MK_MBOX_PROTO_H -#include "kio_proto.h" +#include "tdeio_proto.h" /* * Protocol for mbox diff --git a/korn/nntp_proto.h b/korn/nntp_proto.h index c08c0d078..d42e26094 100644 --- a/korn/nntp_proto.h +++ b/korn/nntp_proto.h @@ -19,7 +19,7 @@ #ifndef MK_NNTP_PROTO_H #define MK_NNTP_PROTO_H -#include "kio_proto.h" +#include "tdeio_proto.h" class Nntp_Protocol : public KIO_Protocol { diff --git a/korn/pop3_proto.h b/korn/pop3_proto.h index 2d4e7661f..8fd0f0019 100644 --- a/korn/pop3_proto.h +++ b/korn/pop3_proto.h @@ -19,7 +19,7 @@ #ifndef MK_POP3_PROTO_H #define MK_POP3_PROTO_H -#include "kio_proto.h" +#include "tdeio_proto.h" #include <kurl.h> class Pop3_Protocol : public KIO_Protocol diff --git a/korn/process_proto.h b/korn/process_proto.h index 70c8cb671..ddea2a0b0 100644 --- a/korn/process_proto.h +++ b/korn/process_proto.h @@ -19,7 +19,7 @@ #ifndef MK_PROCESS_PROTOCOL #define MK_PROCESS_PROTOCOL -#include "kio_proto.h" +#include "tdeio_proto.h" class Process_Protocol : public KIO_Protocol { diff --git a/korn/protocols.cpp b/korn/protocols.cpp index d604e0870..17365535d 100644 --- a/korn/protocols.cpp +++ b/korn/protocols.cpp @@ -18,7 +18,7 @@ #include "protocols.h" -#include "kio_proto.h" +#include "tdeio_proto.h" #include "imap_proto.h" #include "mbox_proto.h" diff --git a/korn/qmail_proto.h b/korn/qmail_proto.h index 0d9374055..60483b7ec 100644 --- a/korn/qmail_proto.h +++ b/korn/qmail_proto.h @@ -19,7 +19,7 @@ #ifndef MK_TQMAIL_PROTO_H #define MK_TQMAIL_PROTO_H -#include "kio_proto.h" +#include "tdeio_proto.h" class TQMail_Protocol : public KIO_Protocol { diff --git a/korn/tdeio_count.cpp b/korn/tdeio_count.cpp index 1531a9b9e..8ad07dcfc 100644 --- a/korn/tdeio_count.cpp +++ b/korn/tdeio_count.cpp @@ -16,11 +16,11 @@ * 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_proto.h" -#include "kio_single_subject.h" +#include "tdeio_proto.h" +#include "tdeio_single_subject.h" #include "mailsubject.h" #include "sortedmailsubject.h" @@ -327,4 +327,4 @@ void KIO_Count::deleteSingleSubject( KIO_Single_Subject* single_subject ) delete single_subject; } -#include "kio_count.moc" +#include "tdeio_count.moc" diff --git a/korn/tdeio_delete.cpp b/korn/tdeio_delete.cpp index a73b0dd40..4550f20dd 100644 --- a/korn/tdeio_delete.cpp +++ b/korn/tdeio_delete.cpp @@ -16,12 +16,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "kio_delete.h" +#include "tdeio_delete.h" #include "mailid.h" #include "stringid.h" #include "kio.h" -#include "kio_proto.h" +#include "tdeio_proto.h" #include <kdebug.h> #include <klocale.h> @@ -198,4 +198,4 @@ void KIO_Delete::slotResult( TDEIO::Job* job ) } -#include "kio_delete.moc" +#include "tdeio_delete.moc" diff --git a/korn/tdeio_proto.cpp b/korn/tdeio_proto.cpp index e63a71666..c6ebe85cb 100644 --- a/korn/tdeio_proto.cpp +++ b/korn/tdeio_proto.cpp @@ -17,7 +17,7 @@ */ -#include "kio_proto.h" +#include "tdeio_proto.h" #include <tdeconfig.h> #include <kdebug.h> diff --git a/korn/tdeio_proto.h b/korn/tdeio_proto.h index 510e97d37..e56de6885 100644 --- a/korn/tdeio_proto.h +++ b/korn/tdeio_proto.h @@ -61,7 +61,7 @@ public: 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"; } diff --git a/korn/tdeio_read.cpp b/korn/tdeio_read.cpp index f98669d8d..6ec5a12b2 100644 --- a/korn/tdeio_read.cpp +++ b/korn/tdeio_read.cpp @@ -16,10 +16,10 @@ * 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_proto.h" +#include "tdeio_proto.h" #include "mailid.h" #include "stringid.h" @@ -94,4 +94,4 @@ void KIO_Read::slotData( TDEIO::Job* job, const TQByteArray & data ) _message->append( data ); } -#include "kio_read.moc" +#include "tdeio_read.moc" diff --git a/korn/tdeio_single_subject.cpp b/korn/tdeio_single_subject.cpp index 0c20b1ab4..b98a2edb0 100644 --- a/korn/tdeio_single_subject.cpp +++ b/korn/tdeio_single_subject.cpp @@ -16,10 +16,10 @@ * 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 "kio_proto.h" +#include "tdeio_proto.h" #include "stringid.h" #include <kdebug.h> @@ -152,4 +152,4 @@ void KIO_Single_Subject::slotResult( TDEIO::Job *job ) emit finished( this ); } -#include "kio_single_subject.moc" +#include "tdeio_single_subject.moc" diff --git a/korn/tdeio_subjects.cpp b/korn/tdeio_subjects.cpp index f40a86f64..f76a1c99e 100644 --- a/korn/tdeio_subjects.cpp +++ b/korn/tdeio_subjects.cpp @@ -16,11 +16,11 @@ * 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_single_subject.h" -#include "kio_proto.h" +#include "tdeio_single_subject.h" +#include "tdeio_proto.h" #include "mailsubject.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. } -#include "kio_subjects.moc" +#include "tdeio_subjects.moc" diff --git a/libkmime/tests/test_kmime_codec.cpp b/libkmime/tests/test_kmime_codec.cpp index 7417c8aea..eb758ea7c 100644 --- a/libkmime/tests/test_kmime_codec.cpp +++ b/libkmime/tests/test_kmime_codec.cpp @@ -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 & out ) { @@ -261,7 +261,7 @@ void encode_kio_internal( Encoder * enc, TQByteArray::ConstIterator & iit, 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 & out ) { out.resize( outbufsize ); @@ -300,9 +300,9 @@ void encode_decode_kio( bool encode, const Codec * codec, do { out = TQByteArray(); if ( encode ) - encode_kio_internal( enc, iit, iend, out ); + encode_tdeio_internal( enc, iit, iend, out ); else - decode_kio_internal( dec, iit, iend, out ); + decode_tdeio_internal( dec, iit, iend, out ); if ( writing && out.size() ) { TQ_LONG written = outfile.writeBlock( out ); assert( written == (TQ_LONG)out.size() ); diff --git a/libtdepim/statusbarprogresswidget.h b/libtdepim/statusbarprogresswidget.h index 5cd049747..87271d69d 100644 --- a/libtdepim/statusbarprogresswidget.h +++ b/libtdepim/statusbarprogresswidget.h @@ -33,7 +33,7 @@ */ /** * A specialized progress widget class, heavily based on - * kio_littleprogress_dlg (it looks similar) + * tdeio_littleprogress_dlg (it looks similar) */ #include <tdepimmacros.h> diff --git a/tdeioslaves/sieve/sieve.cpp b/tdeioslaves/sieve/sieve.cpp index 880bcb237..4a84997cb 100644 --- a/tdeioslaves/sieve/sieve.cpp +++ b/tdeioslaves/sieve/sieve.cpp @@ -96,7 +96,7 @@ extern "C" ::exit (-1); } - kio_sieveProtocol slave(argv[2], argv[3]); + tdeio_sieveProtocol slave(argv[2], argv[3]); slave.dispatchLoop(); sasl_done(); @@ -107,7 +107,7 @@ extern "C" } /* ---------------------------------------------------------------------------------- */ -tdeio_sieveResponse::kio_sieveResponse() +tdeio_sieveResponse::tdeio_sieveResponse() { 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) , m_connMode(NORMAL) , 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() ) disconnect(); diff --git a/tdeioslaves/sieve/sieve.h b/tdeioslaves/sieve/sieve.h index 3e19df5bc..09cf3060b 100644 --- a/tdeioslaves/sieve/sieve.h +++ b/tdeioslaves/sieve/sieve.h @@ -32,7 +32,7 @@ class tdeio_sieveResponse public: enum responses { NONE, KEY_VAL_PAIR, ACTION, QUANTITY }; - kio_sieveResponse(); + tdeio_sieveResponse(); const uint& getType() const; @@ -65,8 +65,8 @@ public: enum connectionModes { NORMAL, CONNECTION_ORIENTED }; enum Results { OK, NO, BYE, OTHER }; - kio_sieveProtocol(const TQCString &pool_socket, const TQCString &app_socket); - virtual ~kio_sieveProtocol(); + tdeio_sieveProtocol(const TQCString &pool_socket, const TQCString &app_socket); + virtual ~tdeio_sieveProtocol(); virtual void mimetype(const KURL& url); virtual void get(const KURL& url); @@ -114,7 +114,7 @@ protected: bool m_supportsTLS; // Global server respose class - kio_sieveResponse r; + tdeio_sieveResponse r; // connection details TQString m_sServer; diff --git a/tderesources/blogging/xmlrpcjob.h b/tderesources/blogging/xmlrpcjob.h index 4cf9a5dbd..d58384487 100644 --- a/tderesources/blogging/xmlrpcjob.h +++ b/tderesources/blogging/xmlrpcjob.h @@ -20,8 +20,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef __kio_xmlrpcjob_h__ -#define __kio_xmlrpcjob_h__ +#ifndef __tdeio_xmlrpcjob_h__ +#define __tdeio_xmlrpcjob_h__ #include <kurl.h> |