Browse Source

Fix a few remaining references to kio_

Timothy Pearson 6 years ago
parent
commit
09bd73fbd2

+ 2
- 2
NewsLog.txt View File

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

+ 1
- 1
kmail/kmfolderimap.cpp View File

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

+ 3
- 3
kmobile/devices/gnokii/gnokii_mobile.cpp View File

@@ -330,7 +330,7 @@ static bool phone_entry_empty( int index, gn_memory_type memtype )
330 330
 }
331 331
 #endif
332 332
 
333
-static int gn_error2kio_error( gn_error err )
333
+static int gn_error2tdeio_error( gn_error err )
334 334
 {
335 335
   if (err != GN_ERR_NONE)
336 336
 	GNOKII_CHECK_ERROR(err);
@@ -604,7 +604,7 @@ int KMobileGnokii::readAddress( int index, KABC::Addressee &addr )
604 604
   if (!err)
605 605
 	m_addrList[index] = addr;
606 606
 
607
-  return gn_error2kio_error(err);
607
+  return gn_error2tdeio_error(err);
608 608
 }
609 609
 
610 610
 int KMobileGnokii::storeAddress( int, const KABC::Addressee &, bool )
@@ -696,7 +696,7 @@ int KMobileGnokii::readCalendarEntry( int index, KCal::Event &event )
696 696
   gn_error error = gn_sm_functions(GN_OP_GetCalendarNote, &data, &state);
697 697
   GNOKII_CHECK_ERROR(error);
698 698
   if (error != GN_ERR_NONE)
699
-	return gn_error2kio_error(error);
699
+	return gn_error2tdeio_error(error);
700 700
 
701 701
   print_calnote( entry );
702 702
 

+ 1
- 1
kmobile/kmobiledevice.h View File

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

+ 1
- 1
kmobile/kmobileiface.h View File

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

+ 1
- 1
kmobile/kmobileview.cpp View File

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

+ 1
- 1
kmobile/kmobileview.h View File

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

+ 5
- 5
kode/kodemain.cpp View File

@@ -490,13 +490,13 @@ int create( TDECmdLineArgs *args )
490 490
     
491 491
     code.clear();
492 492
 
493
-    code += "TDEInstance instance( \"kio_" + protocol + "\" );";
493
+    code += "TDEInstance instance( \"tdeio_" + protocol + "\" );";
494 494
     code += "";
495
-    code += "kdDebug(7000) << \"Starting kio_" + protocol + "(pid:  \" << getpid() << \")\" << endl;";
495
+    code += "kdDebug(7000) << \"Starting tdeio_" + protocol + "(pid:  \" << getpid() << \")\" << endl;";
496 496
     code += "";
497 497
     code += "if (argc != 4) {";
498 498
     code.indent();
499
-    code += "fprintf( stderr, \"Usage: kio_" + protocol + " protocol domain-socket1 domain-socket2\\n\");";
499
+    code += "fprintf( stderr, \"Usage: tdeio_" + protocol + " protocol domain-socket1 domain-socket2\\n\");";
500 500
     code += "exit( -1 );";
501 501
     code.unindent();
502 502
     code += "}";
@@ -571,7 +571,7 @@ int create( TDECmdLineArgs *args )
571 571
     am.addEntry( "kdelnk_DATA", protocol + ".protocol" );
572 572
 
573 573
     KODE::AutoMakefile::Target t( "kde_module_LTLIBRARIES",
574
-      "kio_" + protocol + ".la" );
574
+      "tdeio_" + protocol + ".la" );
575 575
     t.setSources( className.lower() + ".cpp" );
576 576
     t.setLibAdd( "$(LIB_KIO)" );
577 577
     t.setLdFlags( "$(all_libraries) -module $(KDE_PLUGIN)" );
@@ -594,7 +594,7 @@ int create( TDECmdLineArgs *args )
594 594
     KSimpleConfig protocolFile( protocolFilename );
595 595
 
596 596
     protocolFile.setGroup( "Protocol" );
597
-    protocolFile.writeEntry( "exec", "kio_" + protocol );
597
+    protocolFile.writeEntry( "exec", "tdeio_" + protocol );
598 598
     protocolFile.writeEntry( "protocol", protocol );
599 599
     protocolFile.writeEntry( "input", "none" );
600 600
     protocolFile.writeEntry( "output", "filesystem" );

+ 1
- 1
korganizer/webcal.protocol View File

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

+ 2
- 2
korn/CMakeLists.txt View File

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

+ 12
- 12
korn/Makefile.am View File

@@ -40,12 +40,12 @@ korn_SOURCES = \
40 40
   stringid.cpp \
41 41
   kornapp.cpp \
42 42
   kio.cpp \
43
-  kio_count.cpp \
44
-  kio_proto.cpp \
45
-  kio_subjects.cpp \
46
-  kio_single_subject.cpp \
47
-  kio_read.cpp \
48
-  kio_delete.cpp \
43
+  tdeio_count.cpp \
44
+  tdeio_proto.cpp \
45
+  tdeio_subjects.cpp \
46
+  tdeio_single_subject.cpp \
47
+  tdeio_read.cpp \
48
+  tdeio_delete.cpp \
49 49
   kmail_proto.cpp \
50 50
   sortedmailsubject.cpp \
51 51
   korncfgimpl.cpp \
@@ -92,15 +92,15 @@ noinst_HEADERS = \
92 92
   stringid.h \
93 93
   kornapp.h \
94 94
   kio.h \
95
-  kio_count.h \
96
-  kio_subjects.h \
97
-  kio_single_subject.h \
98
-  kio_read.h \
99
-  kio_delete.h \
95
+  tdeio_count.h \
96
+  tdeio_subjects.h \
97
+  tdeio_single_subject.h \
98
+  tdeio_read.h \
99
+  tdeio_delete.h \
100 100
   sortedmailsubject.h \
101 101
   imap_proto.h \
102 102
   imaps_proto.h \
103
-  kio_proto.h \
103
+  tdeio_proto.h \
104 104
   maildir_proto.h \
105 105
   nntp_proto.h \
106 106
   pop3_proto.h \

+ 3
- 3
korn/imap_proto.h View File

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

+ 1
- 1
korn/imaps_proto.h View File

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

+ 13
- 13
korn/kio.cpp View File

@@ -28,10 +28,10 @@
28 28
  */
29 29
 
30 30
 #include "kio.h"
31
-#include "kio_count.h"
32
-#include "kio_subjects.h"
33
-#include "kio_read.h"
34
-#include "kio_delete.h"
31
+#include "tdeio_count.h"
32
+#include "tdeio_subjects.h"
33
+#include "tdeio_read.h"
34
+#include "tdeio_delete.h"
35 35
 #include "protocol.h"
36 36
 #include "protocols.h"
37 37
 #include "stringid.h"
@@ -57,7 +57,7 @@
57 57
 #include<stdlib.h>
58 58
 
59 59
 //Headers of protocols
60
-#include"kio_proto.h"
60
+#include"tdeio_proto.h"
61 61
 //#include"pop3_proto.h"
62 62
 //#include"pop3s_proto.h"
63 63
 //#include"imap_proto.h"
@@ -98,16 +98,16 @@ KKioDrop::KKioDrop()
98 98
 
99 99
 	//Creating children and connect them to the outside world; this class passes the messages for them...
100 100
 	//This class handles all the counting.
101
-	_count = new KIO_Count( this, "kio_count" );
101
+	_count = new KIO_Count( this, "tdeio_count" );
102 102
 		
103 103
 	//This class is responsible for providing the available subjects
104
-	_subjects = new KIO_Subjects( this, "kio_subjects" );
104
+	_subjects = new KIO_Subjects( this, "tdeio_subjects" );
105 105
 			
106 106
 	//This class is used when a full message has to be read.
107
-	_read = new KIO_Read( this, "kio_read" );
107
+	_read = new KIO_Read( this, "tdeio_read" );
108 108
 	
109 109
 	//This class can delete mails.
110
-	_delete = new KIO_Delete( this, "kio_delete" );
110
+	_delete = new KIO_Delete( this, "tdeio_delete" );
111 111
 	
112 112
 	_mailurls = new TQValueList<FileInfo>;
113 113
 }
@@ -136,16 +136,16 @@ KKioDrop::KKioDrop( TDEConfigGroup* )
136 136
 		
137 137
 	//Creating children and connect them to the outside world; this class passes the messages for them...
138 138
 	//This class handles all the counting.
139
-	_count = new KIO_Count( this, "kio_count" );
139
+	_count = new KIO_Count( this, "tdeio_count" );
140 140
 	
141 141
 	//This class is responsible for providing the available subjects
142
-	_subjects = new KIO_Subjects( this, "kio_subjects" );
142
+	_subjects = new KIO_Subjects( this, "tdeio_subjects" );
143 143
 	
144 144
 	//This class is used when a full message has to be read.
145
-	_read = new KIO_Read( this, "kio_read" );
145
+	_read = new KIO_Read( this, "tdeio_read" );
146 146
 	
147 147
 	//This class can delete mails.
148
-	_delete = new KIO_Delete( this, "kio_delete" );
148
+	_delete = new KIO_Delete( this, "tdeio_delete" );
149 149
 	
150 150
 	_mailurls = new TQValueList<FileInfo>;
151 151
 

+ 1
- 1
korn/kornaccountcfgimpl.cpp View File

@@ -19,7 +19,7 @@
19 19
 #include "kornaccountcfgimpl.h"
20 20
 
21 21
 #include "account_input.h"
22
-#include "kio_proto.h"
22
+#include "tdeio_proto.h"
23 23
 #include "password.h"
24 24
 #include "protocol.h"
25 25
 #include "protocols.h"

+ 1
- 1
korn/maildir_proto.h View File

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

+ 1
- 1
korn/mbox_proto.h View File

@@ -19,7 +19,7 @@
19 19
 #ifndef MK_MBOX_PROTO_H
20 20
 #define MK_MBOX_PROTO_H
21 21
 
22
-#include "kio_proto.h"
22
+#include "tdeio_proto.h"
23 23
 
24 24
 /*
25 25
  * Protocol for mbox

+ 1
- 1
korn/nntp_proto.h View File

@@ -19,7 +19,7 @@
19 19
 #ifndef MK_NNTP_PROTO_H
20 20
 #define MK_NNTP_PROTO_H
21 21
 
22
-#include "kio_proto.h"
22
+#include "tdeio_proto.h"
23 23
 
24 24
 class Nntp_Protocol : public KIO_Protocol
25 25
 {

+ 1
- 1
korn/pop3_proto.h View File

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

+ 1
- 1
korn/process_proto.h View File

@@ -19,7 +19,7 @@
19 19
 #ifndef MK_PROCESS_PROTOCOL
20 20
 #define MK_PROCESS_PROTOCOL
21 21
 
22
-#include "kio_proto.h"
22
+#include "tdeio_proto.h"
23 23
 
24 24
 class Process_Protocol : public KIO_Protocol
25 25
 {

+ 1
- 1
korn/protocols.cpp View File

@@ -18,7 +18,7 @@
18 18
 
19 19
 #include "protocols.h"
20 20
 
21
-#include "kio_proto.h"
21
+#include "tdeio_proto.h"
22 22
 
23 23
 #include "imap_proto.h"
24 24
 #include "mbox_proto.h"

+ 1
- 1
korn/qmail_proto.h View File

@@ -19,7 +19,7 @@
19 19
 #ifndef MK_TQMAIL_PROTO_H
20 20
 #define MK_TQMAIL_PROTO_H
21 21
 
22
-#include "kio_proto.h"
22
+#include "tdeio_proto.h"
23 23
 
24 24
 class TQMail_Protocol : public KIO_Protocol
25 25
 {

+ 4
- 4
korn/tdeio_count.cpp View File

@@ -16,11 +16,11 @@
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
17 17
  */
18 18
 
19
-#include "kio_count.h"
19
+#include "tdeio_count.h"
20 20
 
21 21
 #include "kio.h"
22
-#include "kio_proto.h"
23
-#include "kio_single_subject.h"
22
+#include "tdeio_proto.h"
23
+#include "tdeio_single_subject.h"
24 24
 #include "mailsubject.h"
25 25
 #include "sortedmailsubject.h"
26 26
 
@@ -327,4 +327,4 @@ void KIO_Count::deleteSingleSubject( KIO_Single_Subject* single_subject )
327 327
 	delete single_subject;
328 328
 }
329 329
 
330
-#include "kio_count.moc"
330
+#include "tdeio_count.moc"

+ 3
- 3
korn/tdeio_delete.cpp View File

@@ -16,12 +16,12 @@
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
17 17
  */
18 18
 
19
-#include "kio_delete.h"
19
+#include "tdeio_delete.h"
20 20
 
21 21
 #include "mailid.h"
22 22
 #include "stringid.h"
23 23
 #include "kio.h"
24
-#include "kio_proto.h"
24
+#include "tdeio_proto.h"
25 25
 
26 26
 #include <kdebug.h>
27 27
 #include <klocale.h>
@@ -198,4 +198,4 @@ void KIO_Delete::slotResult( TDEIO::Job* job )
198 198
 }
199 199
 
200 200
 
201
-#include "kio_delete.moc"
201
+#include "tdeio_delete.moc"

+ 1
- 1
korn/tdeio_proto.cpp View File

@@ -17,7 +17,7 @@
17 17
  */
18 18
 
19 19
 
20
-#include "kio_proto.h"
20
+#include "tdeio_proto.h"
21 21
 
22 22
 #include <tdeconfig.h>
23 23
 #include <kdebug.h>

+ 1
- 1
korn/tdeio_proto.h View File

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

+ 3
- 3
korn/tdeio_read.cpp View File

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

+ 3
- 3
korn/tdeio_single_subject.cpp View File

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

+ 4
- 4
korn/tdeio_subjects.cpp View File

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

+ 4
- 4
libkmime/tests/test_kmime_codec.cpp View File

@@ -244,7 +244,7 @@ void encode_decode_convenience_qba( bool encode, const Codec * codec,
244 244
   }
245 245
 }
246 246
 
247
-void encode_kio_internal( Encoder * enc, TQByteArray::ConstIterator & iit,
247
+void encode_tdeio_internal( Encoder * enc, TQByteArray::ConstIterator & iit,
248 248
 			  TQByteArray::ConstIterator & iend,
249 249
 			  TQByteArray & out )
250 250
 {
@@ -261,7 +261,7 @@ void encode_kio_internal( Encoder * enc, TQByteArray::ConstIterator & iit,
261 261
   out.truncate( oit - out.begin() );
262 262
 }
263 263
 
264
-void decode_kio_internal( Decoder * dec, TQByteArray::ConstIterator & iit,
264
+void decode_tdeio_internal( Decoder * dec, TQByteArray::ConstIterator & iit,
265 265
 			  TQByteArray::ConstIterator & iend,
266 266
 			  TQByteArray & out ) {
267 267
   out.resize( outbufsize );
@@ -300,9 +300,9 @@ void encode_decode_kio( bool encode, const Codec * codec,
300 300
   do {
301 301
     out = TQByteArray();
302 302
     if ( encode )
303
-      encode_kio_internal( enc, iit, iend, out );
303
+      encode_tdeio_internal( enc, iit, iend, out );
304 304
     else
305
-      decode_kio_internal( dec, iit, iend, out );
305
+      decode_tdeio_internal( dec, iit, iend, out );
306 306
     if ( writing && out.size() ) {
307 307
       TQ_LONG written = outfile.writeBlock( out );
308 308
       assert( written == (TQ_LONG)out.size() );

+ 1
- 1
libtdepim/statusbarprogresswidget.h View File

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

+ 4
- 4
tdeioslaves/sieve/sieve.cpp View File

@@ -96,7 +96,7 @@ extern "C"
96 96
       ::exit (-1);
97 97
     }
98 98
 
99
-		kio_sieveProtocol slave(argv[2], argv[3]);
99
+		tdeio_sieveProtocol slave(argv[2], argv[3]);
100 100
 		slave.dispatchLoop();
101 101
 
102 102
     sasl_done();
@@ -107,7 +107,7 @@ extern "C"
107 107
 }
108 108
 
109 109
 /* ---------------------------------------------------------------------------------- */
110
-tdeio_sieveResponse::kio_sieveResponse()
110
+tdeio_sieveResponse::tdeio_sieveResponse()
111 111
 {
112 112
 	clear();
113 113
 }
@@ -190,7 +190,7 @@ void tdeio_sieveResponse::clear()
190 190
 }
191 191
 
192 192
 /* ---------------------------------------------------------------------------------- */
193
-tdeio_sieveProtocol::kio_sieveProtocol(const TQCString &pool_socket, const TQCString &app_socket)
193
+tdeio_sieveProtocol::tdeio_sieveProtocol(const TQCString &pool_socket, const TQCString &app_socket)
194 194
 	: TCPSlaveBase( SIEVE_DEFAULT_PORT, "sieve", pool_socket, app_socket, false)
195 195
 	, m_connMode(NORMAL)
196 196
 	, m_supportsTLS(false)
@@ -200,7 +200,7 @@ tdeio_sieveProtocol::kio_sieveProtocol(const TQCString &pool_socket, const TQCSt
200 200
 }
201 201
 
202 202
 /* ---------------------------------------------------------------------------------- */
203
-tdeio_sieveProtocol::~kio_sieveProtocol()
203
+tdeio_sieveProtocol::~tdeio_sieveProtocol()
204 204
 {
205 205
 	if ( isConnectionValid() )
206 206
 		disconnect();

+ 4
- 4
tdeioslaves/sieve/sieve.h View File

@@ -32,7 +32,7 @@ class tdeio_sieveResponse
32 32
 public:
33 33
 	enum responses { NONE, KEY_VAL_PAIR, ACTION, QUANTITY };
34 34
 
35
-	kio_sieveResponse();
35
+	tdeio_sieveResponse();
36 36
 
37 37
 	const uint& getType() const;
38 38
 
@@ -65,8 +65,8 @@ public:
65 65
 	enum connectionModes { NORMAL, CONNECTION_ORIENTED };
66 66
 	enum Results { OK, NO, BYE, OTHER };
67 67
 
68
-	kio_sieveProtocol(const TQCString &pool_socket, const TQCString &app_socket);
69
-	virtual ~kio_sieveProtocol();
68
+	tdeio_sieveProtocol(const TQCString &pool_socket, const TQCString &app_socket);
69
+	virtual ~tdeio_sieveProtocol();
70 70
 
71 71
 	virtual void mimetype(const KURL& url);
72 72
 	virtual void get(const KURL& url);
@@ -114,7 +114,7 @@ protected:
114 114
 	bool				m_supportsTLS;
115 115
 
116 116
 	// Global server respose class
117
-	kio_sieveResponse	r;
117
+	tdeio_sieveResponse	r;
118 118
 
119 119
 	// connection details
120 120
 	TQString				m_sServer;

+ 2
- 2
tderesources/blogging/xmlrpcjob.h View File

@@ -20,8 +20,8 @@
20 20
     Boston, MA 02110-1301, USA.
21 21
 */
22 22
 
23
-#ifndef __kio_xmlrpcjob_h__
24
-#define __kio_xmlrpcjob_h__
23
+#ifndef __tdeio_xmlrpcjob_h__
24
+#define __tdeio_xmlrpcjob_h__
25 25
 
26 26
 #include <kurl.h>
27 27
 

Loading…
Cancel
Save