From 09bd73fbd2ff59f5e6eb420a5c1f22d61ceeaf66 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 30 Jan 2013 13:51:03 -0600 Subject: Fix a few remaining references to kio_ --- korn/CMakeLists.txt | 4 ++-- korn/Makefile.am | 24 ++++++++++++------------ korn/imap_proto.h | 6 +++--- korn/imaps_proto.h | 2 +- korn/kio.cpp | 26 +++++++++++++------------- korn/kornaccountcfgimpl.cpp | 2 +- korn/maildir_proto.h | 2 +- korn/mbox_proto.h | 2 +- korn/nntp_proto.h | 2 +- korn/pop3_proto.h | 2 +- korn/process_proto.h | 2 +- korn/protocols.cpp | 2 +- korn/qmail_proto.h | 2 +- korn/tdeio_count.cpp | 8 ++++---- korn/tdeio_delete.cpp | 6 +++--- korn/tdeio_proto.cpp | 2 +- korn/tdeio_proto.h | 2 +- korn/tdeio_read.cpp | 6 +++--- korn/tdeio_single_subject.cpp | 6 +++--- korn/tdeio_subjects.cpp | 8 ++++---- 20 files changed, 58 insertions(+), 58 deletions(-) (limited to 'korn') diff --git a/korn/CMakeLists.txt b/korn/CMakeLists.txt index f3dd942b..081d1aaf 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 50e5c731..9dafb61c 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 f34f32a8..4030c5cc 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 /* * 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 00964dab..07f3cfdb 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 f2ff37fa..195f73d8 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 //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; } @@ -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; diff --git a/korn/kornaccountcfgimpl.cpp b/korn/kornaccountcfgimpl.cpp index df6a0e50..7b57d1f6 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 d7700ac3..b06564e9 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 f017f3b6..5375413c 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 c08c0d07..d42e2609 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 2d4e7661..8fd0f001 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 class Pop3_Protocol : public KIO_Protocol diff --git a/korn/process_proto.h b/korn/process_proto.h index 70c8cb67..ddea2a0b 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 d604e087..17365535 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 0d937405..60483b7e 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 1531a9b9..8ad07dcf 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 a73b0dd4..4550f20d 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 #include @@ -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 e63a7166..c6ebe85c 100644 --- a/korn/tdeio_proto.cpp +++ b/korn/tdeio_proto.cpp @@ -17,7 +17,7 @@ */ -#include "kio_proto.h" +#include "tdeio_proto.h" #include #include diff --git a/korn/tdeio_proto.h b/korn/tdeio_proto.h index 510e97d3..e56de688 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 f98669d8..6ec5a12b 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 0c20b1ab..b98a2edb 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 @@ -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 f40a86f6..f76a1c99 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 @@ -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" -- cgit v1.2.3