Преглед изворни кода

Fix a few remaining references to kio_

tags/r14.0.0
Timothy Pearson пре 6 година
родитељ
комит
21bc754111
46 измењених фајлова са 131 додато и 131 уклоњено
  1. 2
    2
      NAMING
  2. 3
    3
      arts/kde/kplayobjectfactory.cc
  3. 1
    1
      kabc/ldif.cpp
  4. 1
    1
      kate/part/katedocument.h
  5. 1
    1
      kinit/tdelauncher.cpp
  6. 5
    5
      tdeconf_update/README.tdeconf_update
  7. 27
    27
      tdecore/kdebug.areas
  8. 2
    2
      tdecore/kdebugrc
  9. 1
    1
      tdecore/kglobalsettings.cpp
  10. 1
    1
      tdecore/kprotocolinfo_tdecore.cpp
  11. 1
    1
      tdecore/ksimpledirwatch.cpp
  12. 2
    2
      tdehtml/ecma/xmlhttprequest.cpp
  13. 1
    1
      tdehtml/tdehtml_pagecache.h
  14. 4
    4
      tdehtml/tdehtml_part.cpp
  15. 1
    1
      tdehtml/tdemultipart/tdemultipart.cpp
  16. 1
    1
      tdeio/DESIGN.metadata
  17. 3
    3
      tdeio/misc/tdeio_uiserver.desktop
  18. 1
    1
      tdeio/tdefile/kpropertiesdialog.cpp
  19. 2
    2
      tdeio/tdeio/chmodjob.h
  20. 6
    6
      tdeio/tdeio/dataprotocol.cpp
  21. 2
    2
      tdeio/tdeio/davjob.h
  22. 2
    2
      tdeio/tdeio/global.h
  23. 4
    4
      tdeio/tdeio/job.cpp
  24. 5
    5
      tdeio/tdeio/job.h
  25. 3
    3
      tdeio/tdeio/jobclasses.h
  26. 1
    1
      tdeio/tdeio/kdirwatch.cpp
  27. 1
    1
      tdeio/tdeio/kmimetype.cpp
  28. 3
    3
      tdeio/tdeio/kprotocolinfo.h
  29. 1
    1
      tdeio/tdeio/kprotocolmanager.cpp
  30. 2
    2
      tdeio/tdeio/metainfojob.h
  31. 2
    2
      tdeio/tdeio/netaccess.h
  32. 2
    2
      tdeio/tdeio/observer.h
  33. 2
    2
      tdeio/tdeio/passdlg.h
  34. 2
    2
      tdeio/tdeio/paste.h
  35. 2
    2
      tdeio/tdeio/previewjob.h
  36. 2
    2
      tdeio/tdeio/renamedlg.h
  37. 2
    2
      tdeio/tdeio/scheduler.h
  38. 2
    2
      tdeio/tdeio/skipdlg.h
  39. 2
    2
      tdeio/tdeio/slavebase.h
  40. 1
    1
      tdeio/tdeio/slaveconfig.h
  41. 2
    2
      tdeio/tdeio/slaveinterface.h
  42. 2
    2
      tdeio/tdeioslave.upd
  43. 10
    10
      tdeio/tests/dataprotocoltest.cpp
  44. 6
    6
      tdeio/tests/jobtest.cpp
  45. 1
    1
      tdeio/tests/jobtest.h
  46. 1
    1
      tdeio/tests/kprotocolinfotest.cpp

+ 2
- 2
NAMING Прегледај датотеку

@@ -43,8 +43,8 @@ LDFLAGS: -module $(KDE_PLUGIN)
43 43
 
44 44
 KIOSlave
45 45
 ========
46
-Name: kio_<protocol>.la
47
-Definition: kde_module_LTLIBRARIES = kio_<protocol>.la
46
+Name: tdeio_<protocol>.la
47
+Definition: kde_module_LTLIBRARIES = tdeio_<protocol>.la
48 48
 LDFLAGS: -module $(KDE_PLUGIN)
49 49
 
50 50
 

+ 3
- 3
arts/kde/kplayobjectfactory.cc Прегледај датотеку

@@ -68,7 +68,7 @@ KPlayObject *KPlayObjectFactory::createPlayObject(const KURL& _url, const TQStri
68 68
 	// I hate it
69 69
 	// I hate it
70 70
 	// It sucks
71
-	// kio_media please die
71
+	// tdeio_media please die
72 72
 	KURL url = TDEIO::NetAccess::mostLocalURL(_url, 0);
73 73
 
74 74
 	if(!m_server.isNull())
@@ -139,7 +139,7 @@ KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& _url, cons
139 139
 	// I hate it
140 140
 	// I hate it
141 141
 	// It sucks
142
-	// kio_media please die
142
+	// tdeio_media please die
143 143
 	KURL url = TDEIO::NetAccess::mostLocalURL(_url, 0);
144 144
 	
145 145
 	// return a NULL playobject if the server is NULL
@@ -154,7 +154,7 @@ KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& _url, cons
154 154
 		createBUS = false;
155 155
 	}
156 156
 
157
-	// decide if it's a local file. mpeglib provides cdda reading and decoding, so we prefer that over kio_audiocd
157
+	// decide if it's a local file. mpeglib provides cdda reading and decoding, so we prefer that over tdeio_audiocd
158 158
 	if ( url.isLocalFile() || !d->allowStreaming || (url.protocol() == "audiocd" && mimetype == "application/x-cda" && mimeTypes().contains( "application/x-cda" ) ) )
159 159
 	{
160 160
 		// we rely on the delivered mimetype if it's a local file

+ 1
- 1
kabc/ldif.cpp Прегледај датотеку

@@ -254,7 +254,7 @@ LDIF::ParseVal LDIF::processLine()
254 254
       break;
255 255
     case Entry_Mod:
256 256
       if ( mModType == Mod_None ) {
257
-        kdDebug(5700) << "kio_ldap: new modtype " << mAttr << endl;
257
+        kdDebug(5700) << "tdeio_ldap: new modtype " << mAttr << endl;
258 258
         if ( mAttr.isEmpty() && mVal.size() == 0 ) {
259 259
           retval = EndEntry;
260 260
         } else if ( attrLower == "add" ) {

+ 1
- 1
kate/part/katedocument.h Прегледај датотеку

@@ -565,7 +565,7 @@ class KateDocument : public Kate::Document,
565 565
     void setModified( bool m );
566 566
 
567 567
   private slots:
568
-    void slotDataKate ( TDEIO::Job* kio_job, const TQByteArray &data );
568
+    void slotDataKate ( TDEIO::Job* tdeio_job, const TQByteArray &data );
569 569
     void slotFinishedKate ( TDEIO::Job * job );
570 570
 
571 571
   private:

+ 1
- 1
kinit/tdelauncher.cpp Прегледај датотеку

@@ -1283,7 +1283,7 @@ KLauncher::requestSlave(const TQString &protocol,
1283 1283
         return 0;
1284 1284
     }
1285 1285
 
1286
-    TQCString name = _name.latin1(); // ex: "kio_ftp"
1286
+    TQCString name = _name.latin1(); // ex: "tdeio_ftp"
1287 1287
     TQCString arg1 = protocol.latin1();
1288 1288
     TQCString arg2 = TQFile::encodeName(mPoolSocketName);
1289 1289
     TQCString arg3 = TQFile::encodeName(app_socket);

+ 5
- 5
tdeconf_update/README.tdeconf_update Прегледај датотеку

@@ -167,7 +167,7 @@ Example update file
167 167
 
168 168
 # This is comment
169 169
 Id=kde2.2
170
-File=tdeioslaverc,kio_httprc
170
+File=tdeioslaverc,tdeio_httprc
171 171
 Group=Proxy Settings
172 172
 Key=NoProxyFor
173 173
 Key=UseProxy
@@ -182,20 +182,20 @@ RemoveGroup=KDE
182 182
 
183 183
 
184 184
 The above update file extracts config information from the file "tdeioslaverc" 
185
-and stores it into the file "kio_httprc". 
185
+and stores it into the file "tdeio_httprc". 
186 186
 
187 187
 It reads the keys "NoProxyFor", "UseProxy" and "httpProxy" from the group 
188 188
 "Proxy Settings" in the "tdeioslaverc" file. If any of these options are present
189 189
 they are written to the keys "NoProxyFor", "UseProxy" and "Proxy" (!) in
190
-the group "Proxy Settings" in the "kio_httprc" file.
190
+the group "Proxy Settings" in the "tdeio_httprc" file.
191 191
 
192 192
 It also reads the keys "MaxCacheSize" and "UseCache" from the group 
193 193
 "Cache Settings" in the "tdeioslaverc" file and writes this information to the
194 194
 keys "MaxCacheSize" and "UseCache" in the group "Cache" (!) in the 
195
-"kio_httprc" file.
195
+"tdeio_httprc" file.
196 196
 
197 197
 Then it takes all keys in the "UserAgent" group of the file "tdeioslaverc" 
198
-and moves then to the "UserAgent" group in the "kio_httprc" file.
198
+and moves then to the "UserAgent" group in the "tdeio_httprc" file.
199 199
 
200 200
 Finally it removes the entire "KDE" group in the tdeioslaverc file.
201 201
 

+ 27
- 27
tdecore/kdebug.areas Прегледај датотеку

@@ -261,34 +261,34 @@
261 261
 7043        kio (bookmarks)
262 262
 
263 263
 # 71xx      are for tdeioslaves
264
-7101        kio_file
265
-7102        kio_ftp
266
-7103        kio_http
264
+7101        tdeio_file
265
+7102        tdeio_ftp
266
+7103        tdeio_http
267 267
 7104        kcookiejar
268
-7105        kio_pop3
269
-7106        kio_smb
270
-7107        kio_man
271
-7108        kio_info
272
-7109        kio_tar
273
-7110        kio_gzip
274
-7111        kio_sql
275
-7112        kio_smtp
276
-7113        kio_http_debug
277
-7114        kio_nntp
278
-7115        kio_thumbnail
279
-7116        kio_imap
280
-7117        kio_audiocd
281
-7118        kio_bzip2
282
-7119        kio_help
283
-7120        kio_sftp
284
-7121        kio_nfs
285
-7122        kio_sieve
286
-7123        kio_kamera
287
-7124        kio_cgi
288
-7125        kio_ldap
289
-7126        kio_devices
290
-7127        kio_fish
291
-7128        kio_svn
268
+7105        tdeio_pop3
269
+7106        tdeio_smb
270
+7107        tdeio_man
271
+7108        tdeio_info
272
+7109        tdeio_tar
273
+7110        tdeio_gzip
274
+7111        tdeio_sql
275
+7112        tdeio_smtp
276
+7113        tdeio_http_debug
277
+7114        tdeio_nntp
278
+7115        tdeio_thumbnail
279
+7116        tdeio_imap
280
+7117        tdeio_audiocd
281
+7118        tdeio_bzip2
282
+7119        tdeio_help
283
+7120        tdeio_sftp
284
+7121        tdeio_nfs
285
+7122        tdeio_sieve
286
+7123        tdeio_kamera
287
+7124        tdeio_cgi
288
+7125        tdeio_ldap
289
+7126        tdeio_devices
290
+7127        tdeio_fish
291
+7128        tdeio_svn
292 292
 
293 293
 # tdesdk
294 294
 8100        kompare

+ 2
- 2
tdecore/kdebugrc Прегледај датотеку

@@ -112,7 +112,7 @@ InfoOutput=4
112 112
 [5901]
113 113
 InfoOutput=4
114 114
 
115
-# kio_http_debug debug info off
115
+# tdeio_http_debug debug info off
116 116
 [7113]
117 117
 InfoOutput=4
118 118
 
@@ -120,7 +120,7 @@ InfoOutput=4
120 120
 [7118]
121 121
 InfoOutput=4
122 122
 
123
-# kio_nntp debug info off
123
+# tdeio_nntp debug info off
124 124
 [7114]
125 125
 InfoOutput=4
126 126
 

+ 1
- 1
tdecore/kglobalsettings.cpp Прегледај датотеку

@@ -539,7 +539,7 @@ void TDEGlobalSettings::initStatic() // should be called initPaths(). Don't put
539 539
     if ( !s_documentPath->endsWith("/"))
540 540
       s_documentPath->append('/');
541 541
 
542
-    // Trash Path - TODO remove in KDE4 (kio_trash can't use it for interoperability reasons)
542
+    // Trash Path - TODO remove in KDE4 (tdeio_trash can't use it for interoperability reasons)
543 543
     *s_trashPath = *s_desktopPath + i18n("Trash") + "/";
544 544
     *s_trashPath = g.readPathEntry( "Trash" , *s_trashPath);
545 545
     *s_trashPath = TQDir::cleanDirPath( *s_trashPath );

+ 1
- 1
tdecore/kprotocolinfo_tdecore.cpp Прегледај датотеку

@@ -403,7 +403,7 @@ TQString KProtocolInfo::config( const TQString& _protocol )
403 403
   if ( !prot )
404 404
     return TQString::null;
405 405
 
406
-  return TQString("kio_%1rc").arg(prot->m_config);
406
+  return TQString("tdeio_%1rc").arg(prot->m_config);
407 407
 }
408 408
 
409 409
 int KProtocolInfo::maxSlaves( const TQString& _protocol )

+ 1
- 1
tdecore/ksimpledirwatch.cpp Прегледај датотеку

@@ -1377,7 +1377,7 @@ bool KSimpleDirWatchPrivate::isNoisyFile( const char * filename )
1377 1377
     if (strncmp(filename, ".X.err", 6) == 0) return true;
1378 1378
     if (strncmp(filename, ".xsession-errors", 16) == 0) return true;
1379 1379
     // fontconfig updates the cache on every KDE app start
1380
-    // (inclusive kio_thumbnail slaves)
1380
+    // (inclusive tdeio_thumbnail slaves)
1381 1381
     if (strncmp(filename, ".fonts.cache", 12) == 0) return true;
1382 1382
   }
1383 1383
 

+ 2
- 2
tdehtml/ecma/xmlhttprequest.cpp Прегледај датотеку

@@ -393,7 +393,7 @@ void XMLHttpRequest::send(const TQString& _body)
393 393
 
394 394
   // Set the default referrer if one is not already supplied
395 395
   // through setRequestHeader. NOTE: the user can still disable
396
-  // this feature at the protocol level (kio_http).
396
+  // this feature at the protocol level (tdeio_http).
397 397
   // ### does find() ever succeed? the headers are stored in lower case!
398 398
   if (requestHeaders.find("Referer") == requestHeaders.end()) {
399 399
     KURL documentURL(doc->URL());
@@ -476,7 +476,7 @@ void XMLHttpRequest::setRequestHeader(const TQString& _name, const TQString &val
476 476
 
477 477
   // Sanitize the request headers below and handle them as if they are
478 478
   // calls to open. Otherwise, we will end up ignoring them all together!
479
-  // TODO: Do something about "put" which kio_http sort of supports and
479
+  // TODO: Do something about "put" which tdeio_http sort of supports and
480 480
   // the webDAV headers such as PROPFIND etc...
481 481
   if (name == "get"  || name == "post") {
482 482
     KURL reqURL (doc->URL(), value.stripWhiteSpace());

+ 1
- 1
tdehtml/tdehtml_pagecache.h Прегледај датотеку

@@ -36,7 +36,7 @@ class TDEHTMLPageCachePrivate;
36 36
  * These operations always want to use the original document and 
37 37
  * don't want to fetch the data from the network again.
38 38
  *
39
- * It operates completely independent from the kio_http cache.
39
+ * It operates completely independent from the tdeio_http cache.
40 40
  */
41 41
 class TDEHTMLPageCache : public TQObject
42 42
 {

+ 4
- 4
tdehtml/tdehtml_part.cpp Прегледај датотеку

@@ -1511,9 +1511,9 @@ DOM::DocumentImpl *TDEHTMLPart::xmlDocImpl() const
1511 1511
     return 0;
1512 1512
 }
1513 1513
 
1514
-void TDEHTMLPart::slotInfoMessage(TDEIO::Job* kio_job, const TQString& msg)
1514
+void TDEHTMLPart::slotInfoMessage(TDEIO::Job* tdeio_job, const TQString& msg)
1515 1515
 {
1516
-  assert(d->m_job == kio_job);
1516
+  assert(d->m_job == tdeio_job);
1517 1517
 
1518 1518
   if (!parentPart())
1519 1519
     setStatusBarText(msg, BarDefaultText);
@@ -1562,9 +1562,9 @@ void TDEHTMLPart::setPageSecurity( PageSecurity sec )
1562 1562
     d->m_statusBarIconLabel->setPixmap( SmallIcon( iconName, instance() ) );
1563 1563
 }
1564 1564
 
1565
-void TDEHTMLPart::slotData( TDEIO::Job* kio_job, const TQByteArray &data )
1565
+void TDEHTMLPart::slotData( TDEIO::Job* tdeio_job, const TQByteArray &data )
1566 1566
 {
1567
-  assert ( d->m_job == kio_job );
1567
+  assert ( d->m_job == tdeio_job );
1568 1568
 
1569 1569
   //kdDebug( 6050 ) << "slotData: " << data.size() << endl;
1570 1570
   // The first data ?

+ 1
- 1
tdehtml/tdemultipart/tdemultipart.cpp Прегледај датотеку

@@ -260,7 +260,7 @@ void KMultiPart::slotData( TDEIO::Job *job, const TQByteArray &data )
260 260
 #endif
261 261
                     startOfData();
262 262
                 }
263
-                // First header (when we know it from kio_http)
263
+                // First header (when we know it from tdeio_http)
264 264
                 else if ( line == m_boundary )
265 265
                     ; // nothing to do
266 266
                 else if ( !line.isEmpty() ) // this happens with e.g. Set-Cookie:

+ 1
- 1
tdeio/DESIGN.metadata Прегледај датотеку

@@ -109,7 +109,7 @@ ssl_proxied	bool		Presently exists only if true.  Set in TCPSlaveBase to indicat
109 109
 
110 110
 main_frame_request	bool	Actually for SSL, this is set in the caller to tell TCPSlaveBase if this is the request for the main frame of an html page. (dfault: true)
111 111
 
112
-HTTP-Version		string	The HTTP version in use for kio_http (set by http)
112
+HTTP-Version		string	The HTTP version in use for tdeio_http (set by http)
113 113
 
114 114
 PropagateHttpHeader	bool	Whether HTTP headers should be send back (read by http)
115 115
 

+ 3
- 3
tdeio/misc/tdeio_uiserver.desktop Прегледај датотеку

@@ -3,14 +3,14 @@ Type=Service
3 3
 Name=tdeio_uiserver
4 4
 Name[de]=Server der graphischen Oberfläche
5 5
 Name[fy]=Kio_uiserver
6
-Name[ja]=kio_uiサーバ
6
+Name[ja]=tdeio_uiサーバ
7 7
 Name[mn]=График гадаргуугийн сервер
8 8
 Name[nds]=tdeio_uiserver, Server för de graafsche Böversiet
9 9
 Name[nl]=Kio_uiserver
10
-Name[nso]=kio_uiseabi
10
+Name[nso]=tdeio_uiseabi
11 11
 Name[ro]=Kio_uiserver
12 12
 Name[sv]=Kio-gränssnittsserver
13
-Name[ta]=kio_uiசேவையகம்
13
+Name[ta]=tdeio_uiசேவையகம்
14 14
 Name[te]=కేఐఓ_యుఐసెర్వర్
15 15
 Exec=tdeio_uiserver
16 16
 Comment=TDE's Progress Info UI server

+ 1
- 1
tdeio/tdefile/kpropertiesdialog.cpp Прегледај датотеку

@@ -781,7 +781,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
781 781
     // Extract the file name only
782 782
     filename = properties->defaultName();
783 783
     if ( filename.isEmpty() ) { // no template
784
-      filename = item->name(); // this gives support for UDS_NAME, e.g. for kio_trash or kio_system
784
+      filename = item->name(); // this gives support for UDS_NAME, e.g. for tdeio_trash or tdeio_system
785 785
     } else {
786 786
       m_bFromTemplate = true;
787 787
       setDirty(); // to enforce that the copy happens

+ 2
- 2
tdeio/tdeio/chmodjob.h Прегледај датотеку

@@ -18,8 +18,8 @@
18 18
     Boston, MA 02110-1301, USA.
19 19
 */
20 20
 
21
-#ifndef __kio_chmodjob_h__
22
-#define __kio_chmodjob_h__
21
+#ifndef __tdeio_chmodjob_h__
22
+#define __tdeio_chmodjob_h__
23 23
 
24 24
 #include <kurl.h>
25 25
 #include <tqstring.h>

+ 6
- 6
tdeio/tdeio/dataprotocol.cpp Прегледај датотеку

@@ -47,19 +47,19 @@ using namespace TDEIO;
47 47
 extern "C" {
48 48
 
49 49
   int kdemain( int argc, char **argv ) {
50
-    TDEInstance instance( "kio_data" );
50
+    TDEInstance instance( "tdeio_data" );
51 51
 
52
-    kdDebug(7101) << "*** Starting kio_data " << endl;
52
+    kdDebug(7101) << "*** Starting tdeio_data " << endl;
53 53
 
54 54
     if (argc != 4) {
55
-      kdDebug(7101) << "Usage: kio_data  protocol domain-socket1 domain-socket2" << endl;
55
+      kdDebug(7101) << "Usage: tdeio_data  protocol domain-socket1 domain-socket2" << endl;
56 56
       exit(-1);
57 57
     }
58 58
 
59 59
     DataProtocol slave(argv[2], argv[3]);
60 60
     slave.dispatchLoop();
61 61
 
62
-    kdDebug(7101) << "*** kio_data Done" << endl;
62
+    kdDebug(7101) << "*** tdeio_data Done" << endl;
63 63
     return 0;
64 64
   }
65 65
 }
@@ -242,7 +242,7 @@ static void parseDataHeader(const KURL &url, DataHeader &header_info) {
242 242
 
243 243
 #ifdef DATAKIOSLAVE
244 244
 DataProtocol::DataProtocol(const TQCString &pool_socket, const TQCString &app_socket)
245
-	: SlaveBase("kio_data", pool_socket, app_socket) {
245
+	: SlaveBase("tdeio_data", pool_socket, app_socket) {
246 246
 #else
247 247
 DataProtocol::DataProtocol() {
248 248
 #endif
@@ -260,7 +260,7 @@ DataProtocol::~DataProtocol() {
260 260
 void DataProtocol::get(const KURL& url) {
261 261
   ref();
262 262
   //kdDebug() << "===============================================================================================================================================================================" << endl;
263
-  kdDebug() << "kio_data@"<<this<<"::get(const KURL& url)" << endl ;
263
+  kdDebug() << "tdeio_data@"<<this<<"::get(const KURL& url)" << endl ;
264 264
 
265 265
   DataHeader hdr;
266 266
   parseDataHeader(url,hdr);

+ 2
- 2
tdeio/tdeio/davjob.h Прегледај датотеку

@@ -18,8 +18,8 @@
18 18
     Boston, MA 02110-1301, USA.
19 19
 */
20 20
 
21
-#ifndef __kio_davjob_h__
22
-#define __kio_davjob_h__
21
+#ifndef __tdeio_davjob_h__
22
+#define __tdeio_davjob_h__
23 23
 
24 24
 #include <kurl.h>
25 25
 

+ 2
- 2
tdeio/tdeio/global.h Прегледај датотеку

@@ -15,8 +15,8 @@
15 15
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
16 16
    Boston, MA 02110-1301, USA.
17 17
 */
18
-#ifndef __kio_global_h__
19
-#define __kio_global_h__
18
+#ifndef __tdeio_global_h__
19
+#define __tdeio_global_h__
20 20
 
21 21
 #include <tqstring.h>
22 22
 #include <tqvaluelist.h>

+ 4
- 4
tdeio/tdeio/job.cpp Прегледај датотеку

@@ -1354,7 +1354,7 @@ TransferJob *TDEIO::http_post( const KURL& url, const TQByteArray &postData, boo
1354 1354
 	static TQValueList< int >* overriden_ports = NULL;
1355 1355
 	if( !override_loaded )
1356 1356
 	{
1357
-	    TDEConfig cfg( "kio_httprc", true );
1357
+	    TDEConfig cfg( "tdeio_httprc", true );
1358 1358
 	    overriden_ports = new TQValueList< int >;
1359 1359
 	    *overriden_ports = cfg.readIntListEntry( "OverriddenPorts" );
1360 1360
 	    override_loaded = true;
@@ -2307,7 +2307,7 @@ void CopyJob::slotStart()
2307 2307
 }
2308 2308
 
2309 2309
 // For unit test purposes
2310
-TDEIO_EXPORT bool kio_resolve_local_urls = true;
2310
+TDEIO_EXPORT bool tdeio_resolve_local_urls = true;
2311 2311
 
2312 2312
 void CopyJob::slotResultStating( Job *job )
2313 2313
 {
@@ -2376,7 +2376,7 @@ void CopyJob::slotResultStating( Job *job )
2376 2376
         if ( isGlobalDest )
2377 2377
             d->m_globalDestinationState = destinationState;
2378 2378
 
2379
-        if ( !sLocalPath.isEmpty() && kio_resolve_local_urls ) {
2379
+        if ( !sLocalPath.isEmpty() && tdeio_resolve_local_urls ) {
2380 2380
             m_dest = KURL();
2381 2381
             m_dest.setPath(sLocalPath);
2382 2382
             if ( isGlobalDest )
@@ -2586,7 +2586,7 @@ void CopyJob::slotEntries(TDEIO::Job* job, const UDSEntryList& list)
2586 2586
                 }
2587 2587
             }
2588 2588
             //kdDebug(7007) << "displayName=" << displayName << " url=" << url << endl;
2589
-            if (!localPath.isEmpty() && kio_resolve_local_urls) {
2589
+            if (!localPath.isEmpty() && tdeio_resolve_local_urls) {
2590 2590
                 url = KURL();
2591 2591
                 url.setPath(localPath);
2592 2592
             }

+ 5
- 5
tdeio/tdeio/job.h Прегледај датотеку

@@ -19,8 +19,8 @@
19 19
     Boston, MA 02110-1301, USA.
20 20
 */
21 21
 
22
-#ifndef __kio_job_h__
23
-#define __kio_job_h__
22
+#ifndef __tdeio_job_h__
23
+#define __tdeio_job_h__
24 24
 
25 25
 #include <tdeio/jobclasses.h>
26 26
 
@@ -92,7 +92,7 @@ namespace TDEIO {
92 92
     /**
93 93
      * Execute any command that is specific to one slave (protocol).
94 94
      *
95
-     * Examples are : HTTP POST, mount and unmount (kio_file)
95
+     * Examples are : HTTP POST, mount and unmount (tdeio_file)
96 96
      *
97 97
      * @param url The URL isn't passed to the slave, but is used to know
98 98
      *        which slave to send it to :-)
@@ -106,7 +106,7 @@ namespace TDEIO {
106 106
     /**
107 107
      * Mount filesystem.
108 108
      *
109
-     * Special job for @p kio_file.
109
+     * Special job for @p tdeio_file.
110 110
      *
111 111
      * @param ro Mount read-only if @p true.
112 112
      * @param fstype File system type (e.g. "ext2", can be 0L).
@@ -120,7 +120,7 @@ namespace TDEIO {
120 120
     /**
121 121
      * Unmount filesystem.
122 122
      *
123
-     * Special job for @p kio_file.
123
+     * Special job for @p tdeio_file.
124 124
      *
125 125
      * @param point Point to unmount.
126 126
      * @param showProgressInfo true to show progress information

+ 3
- 3
tdeio/tdeio/jobclasses.h Прегледај датотеку

@@ -19,8 +19,8 @@
19 19
     Boston, MA 02110-1301, USA.
20 20
 */
21 21
 
22
-#ifndef __kio_jobclasses_h__
23
-#define __kio_jobclasses_h__
22
+#ifndef __tdeio_jobclasses_h__
23
+#define __tdeio_jobclasses_h__
24 24
 
25 25
 #include <tqobject.h>
26 26
 #include <tqptrlist.h>
@@ -37,7 +37,7 @@
37 37
 class Observer;
38 38
 class TQTimer;
39 39
 
40
-#define KIO_COPYJOB_HAS_SETINTERACTIVE // new in 3.4. Used by kio_trash.
40
+#define KIO_COPYJOB_HAS_SETINTERACTIVE // new in 3.4. Used by tdeio_trash.
41 41
 
42 42
 namespace TDEIO {
43 43
 

+ 1
- 1
tdeio/tdeio/kdirwatch.cpp Прегледај датотеку

@@ -1396,7 +1396,7 @@ bool KDirWatchPrivate::isNoisyFile( const char * filename )
1396 1396
     if (strncmp(filename, ".X.err", 6) == 0) return true;
1397 1397
     if (strncmp(filename, ".xsession-errors", 16) == 0) return true;
1398 1398
     // fontconfig updates the cache on every KDE app start
1399
-    // (inclusive kio_thumbnail slaves)
1399
+    // (inclusive tdeio_thumbnail slaves)
1400 1400
     if (strncmp(filename, ".fonts.cache", 12) == 0) return true;
1401 1401
   }
1402 1402
 

+ 1
- 1
tdeio/tdeio/kmimetype.cpp Прегледај датотеку

@@ -729,7 +729,7 @@ TQString KDEDesktopMimeType::icon( const KURL& _url, bool _is_local ) const
729 729
           const KURL url( u );
730 730
           if ( url.protocol() == "trash" ) {
731 731
               // We need to find if the trash is empty, preferrably without using a KIO job.
732
-              // So instead kio_trash leaves an entry in its config file for us.
732
+              // So instead tdeio_trash leaves an entry in its config file for us.
733 733
               KSimpleConfig trashConfig( "trashrc", true );
734 734
               trashConfig.setGroup( "Status" );
735 735
               if ( trashConfig.readBoolEntry( "Empty", true ) ) {

+ 3
- 3
tdeio/tdeio/kprotocolinfo.h Прегледај датотеку

@@ -104,8 +104,8 @@ public:
104 104
 
105 105
   /**
106 106
    * Returns the library / executable to open for the protocol @p protocol
107
-   * Example : "kio_ftp", meaning either the executable "kio_ftp" or
108
-   * the library "kio_ftp.la" (recommended), whichever is available.
107
+   * Example : "tdeio_ftp", meaning either the executable "tdeio_ftp" or
108
+   * the library "tdeio_ftp.la" (recommended), whichever is available.
109 109
    *
110 110
    * This corresponds to the "exec=" field in the protocol description file.
111 111
    * @param protocol the protocol to check
@@ -422,7 +422,7 @@ public:
422 422
    * copying a file or directory to another directory. By default the destination
423 423
    * filename is made out of the filename in the source URL. However if the
424 424
    * ioslave displays names that are different from the filename of the URL
425
-   * (e.g. kio_fonts shows Arial for arial.ttf, or kio_trash shows foo.txt and
425
+   * (e.g. tdeio_fonts shows Arial for arial.ttf, or tdeio_trash shows foo.txt and
426 426
    * uses some internal URL), using Name means that the display name (UDS_NAME)
427 427
    * will be used to as the filename in the destination directory.
428 428
    *

+ 1
- 1
tdeio/tdeio/kprotocolmanager.cpp Прегледај датотеку

@@ -102,7 +102,7 @@ TDEConfig *KProtocolManager::http_config()
102 102
 
103 103
   if (!d->http_config)
104 104
   {
105
-     d->http_config = new TDEConfig("kio_httprc", false, false);
105
+     d->http_config = new TDEConfig("tdeio_httprc", false, false);
106 106
   }
107 107
   return d->http_config;
108 108
 }

+ 2
- 2
tdeio/tdeio/metainfojob.h Прегледај датотеку

@@ -19,8 +19,8 @@
19 19
     Boston, MA 02110-1301, USA.
20 20
 */
21 21
 
22
-#ifndef __kio_metainfojob_h__
23
-#define __kio_metainfojob_h__
22
+#ifndef __tdeio_metainfojob_h__
23
+#define __tdeio_metainfojob_h__
24 24
 
25 25
 #include <tdeio/job.h>
26 26
 #include <tdefileitem.h>

+ 2
- 2
tdeio/tdeio/netaccess.h Прегледај датотеку

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

+ 2
- 2
tdeio/tdeio/observer.h Прегледај датотеку

@@ -16,8 +16,8 @@
16 16
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
17 17
    Boston, MA 02110-1301, USA.
18 18
 */
19
-#ifndef __kio_observer_h__
20
-#define __kio_observer_h__
19
+#ifndef __tdeio_observer_h__
20
+#define __tdeio_observer_h__
21 21
 
22 22
 #include <tqobject.h>
23 23
 #include <dcopobject.h>

+ 2
- 2
tdeio/tdeio/passdlg.h Прегледај датотеку

@@ -17,8 +17,8 @@
17 17
    Fifth Floor, Boston, MA 02110-1301, USA.
18 18
 */
19 19
 
20
-#ifndef __kio_pass_dlg_h__
21
-#define __kio_pass_dlg_h__
20
+#ifndef __tdeio_pass_dlg_h__
21
+#define __tdeio_pass_dlg_h__
22 22
 
23 23
 #include <kdialogbase.h>
24 24
 

+ 2
- 2
tdeio/tdeio/paste.h Прегледај датотеку

@@ -16,8 +16,8 @@
16 16
    Boston, MA 02110-1301, USA.
17 17
 */
18 18
 
19
-#ifndef __kio_paste_h__
20
-#define __kio_paste_h__
19
+#ifndef __tdeio_paste_h__
20
+#define __tdeio_paste_h__
21 21
 
22 22
 #include <tqstring.h>
23 23
 #include <tqmemarray.h>

+ 2
- 2
tdeio/tdeio/previewjob.h Прегледај датотеку

@@ -21,8 +21,8 @@
21 21
     Boston, MA 02110-1301, USA.
22 22
 */
23 23
 
24
-#ifndef __kio_previewjob_h__
25
-#define __kio_previewjob_h__
24
+#ifndef __tdeio_previewjob_h__
25
+#define __tdeio_previewjob_h__
26 26
 
27 27
 #include <tdefileitem.h>
28 28
 #include <tdeio/job.h>

+ 2
- 2
tdeio/tdeio/renamedlg.h Прегледај датотеку

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

+ 2
- 2
tdeio/tdeio/scheduler.h Прегледај датотеку

@@ -19,8 +19,8 @@
19 19
     Boston, MA 02110-1301, USA.
20 20
 */
21 21
 
22
-#ifndef _kio_scheduler_h
23
-#define _kio_scheduler_h
22
+#ifndef _tdeio_scheduler_h
23
+#define _tdeio_scheduler_h
24 24
 
25 25
 #include "tdeio/job.h"
26 26
 #include "tdeio/jobclasses.h"

+ 2
- 2
tdeio/tdeio/skipdlg.h Прегледај датотеку

@@ -16,8 +16,8 @@
16 16
    Boston, MA 02110-1301, USA.
17 17
 */
18 18
 
19
-#ifndef __kio_skip_dlg__
20
-#define __kio_skip_dlg__
19
+#ifndef __tdeio_skip_dlg__
20
+#define __tdeio_skip_dlg__
21 21
 
22 22
 #include <tdelibs_export.h>
23 23
 #include <kdialog.h>

+ 2
- 2
tdeio/tdeio/slavebase.h Прегледај датотеку

@@ -482,11 +482,11 @@ public:
482 482
     virtual void del( const KURL &url, bool isfile);
483 483
 
484 484
     // TODO KDE4: add setLinkDest() or something, to modify symlink targets.
485
-    // Will be used for kio_file but also kio_remote (#97129)
485
+    // Will be used for tdeio_file but also tdeio_remote (#97129)
486 486
 
487 487
     /**
488 488
      * Used for any command that is specific to this slave (protocol)
489
-     * Examples are : HTTP POST, mount and unmount (kio_file)
489
+     * Examples are : HTTP POST, mount and unmount (tdeio_file)
490 490
      *
491 491
      * @param data packed data; the meaning is completely dependent on the
492 492
      *        slave, but usually starts with an int for the command number.

+ 1
- 1
tdeio/tdeio/slaveconfig.h Прегледај датотеку

@@ -38,7 +38,7 @@ namespace TDEIO {
38 38
      * configuration items of an io-slave when the io-slave is used by
39 39
      * your application. 
40 40
      *
41
-     * Normally io-slaves are being configured by "kio_<protocol>rc" 
41
+     * Normally io-slaves are being configured by "tdeio_<protocol>rc" 
42 42
      * configuration files. Groups defined in such files are treated as host 
43 43
      * or domain specification. Configuration items defined in a group are 
44 44
      * only applied when the slave is connecting with a host that matches with 

+ 2
- 2
tdeio/tdeio/slaveinterface.h Прегледај датотеку

@@ -17,8 +17,8 @@
17 17
    Boston, MA 02110-1301, USA.
18 18
 */
19 19
 
20
-#ifndef __kio_slaveinterface_h
21
-#define __kio_slaveinterface_h
20
+#ifndef __tdeio_slaveinterface_h
21
+#define __tdeio_slaveinterface_h
22 22
 
23 23
 #include <unistd.h>
24 24
 #include <sys/types.h>

+ 2
- 2
tdeio/tdeioslave.upd Прегледај датотеку

@@ -1,6 +1,6 @@
1 1
 # Hello world
2 2
 Id=kde2.2/r1
3
-File=tdeioslaverc,kio_httprc
3
+File=tdeioslaverc,tdeio_httprc
4 4
 Group=Cache Settings,
5 5
 Key=MaxCacheSize
6 6
 Key=MaxCacheAge
@@ -9,7 +9,7 @@ File=tdeioslaverc
9 9
 Group=Browser Settings/UserAgent,UserAgent
10 10
 AllKeys
11 11
 Id=kde2.2/r2
12
-File=tdeioslaverc,kio_httprc
12
+File=tdeioslaverc,tdeio_httprc
13 13
 Group=UserAgent
14 14
 Script=useragent.pl,perl
15 15
 Id=kde2.2/r3

+ 10
- 10
tdeio/tests/dataprotocoltest.cpp Прегледај датотеку

@@ -250,12 +250,12 @@ const TQChar * const charset_urls[] = {
250 250
 #endif
251 251
 
252 252
 int main(int /*argc*/,char* /*argv*/[]) {
253
-  DataProtocol kio_data;
253
+  DataProtocol tdeio_data;
254 254
 
255
-  kio_data.initTestrun();
255
+  tdeio_data.initTestrun();
256 256
   for (uint i = 0; i < sizeof testcases/sizeof testcases[0]; i++) {
257
-    kio_data.beginTestcase(testcases[i].name);
258
-    kio_data.setExpectedMimeType(testcases[i].exp_mime_type != 0
257
+    tdeio_data.beginTestcase(testcases[i].name);
258
+    tdeio_data.setExpectedMimeType(testcases[i].exp_mime_type != 0
259 259
     		? testcases[i].exp_mime_type : "text/plain");
260 260
 
261 261
     bool has_charset = false;
@@ -268,20 +268,20 @@ int main(int /*argc*/,char* /*argv*/[]) {
268 268
       }/*next j*/
269 269
     }
270 270
     if (!has_charset) exp_attrs["charset"] = "us-ascii";
271
-    kio_data.setExpectedAttributes(exp_attrs);
271
+    tdeio_data.setExpectedAttributes(exp_attrs);
272 272
 
273 273
     TQByteArray exp_content;
274 274
     uint exp_content_len = strlen(testcases[i].exp_content);
275 275
     exp_content.setRawData(testcases[i].exp_content,exp_content_len);
276
-    kio_data.setExpectedContent(exp_content);
276
+    tdeio_data.setExpectedContent(exp_content);
277 277
 
278
-    kio_data.get(testcases[i].url);
278
+    tdeio_data.get(testcases[i].url);
279 279
 
280
-    kio_data.endTestcase();
280
+    tdeio_data.endTestcase();
281 281
     exp_content.resetRawData(testcases[i].exp_content,exp_content_len);
282 282
   }/*next i*/
283
-  kio_data.endTestrun();
283
+  tdeio_data.endTestrun();
284 284
 
285
-  return kio_data.hasFailedTestcases() ? 1 : 0;
285
+  return tdeio_data.hasFailedTestcases() ? 1 : 0;
286 286
 }
287 287
 

+ 6
- 6
tdeio/tests/jobtest.cpp Прегледај датотеку

@@ -227,7 +227,7 @@ void JobTest::copyLocalFile( const TQString& src, const TQString& dest )
227 227
 
228 228
     {
229 229
         // check that the timestamp is the same (#24443)
230
-        // Note: this only works because of copy() in kio_file.
230
+        // Note: this only works because of copy() in tdeio_file.
231 231
         // The datapump solution ignores mtime, the app has to call FileCopyJob::setModificationTime()
232 232
         TQFileInfo srcInfo( src );
233 233
         TQFileInfo destInfo( dest );
@@ -533,7 +533,7 @@ void JobTest::slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& lst )
533 533
 void JobTest::copyFileToSystem()
534 534
 {
535 535
     if ( !KProtocolInfo::isKnownProtocol( TQString::fromLatin1( "system" ) ) ) {
536
-        kdDebug() << k_funcinfo << "no kio_system, skipping test" << endl;
536
+        kdDebug() << k_funcinfo << "no tdeio_system, skipping test" << endl;
537 537
         return;
538 538
     }
539 539
 
@@ -551,8 +551,8 @@ void JobTest::copyFileToSystem()
551 551
 void JobTest::copyFileToSystem( bool resolve_local_urls )
552 552
 {
553 553
     kdDebug() << k_funcinfo << resolve_local_urls << endl;
554
-    extern TDEIO_EXPORT bool kio_resolve_local_urls;
555
-    kio_resolve_local_urls = resolve_local_urls;
554
+    extern TDEIO_EXPORT bool tdeio_resolve_local_urls;
555
+    tdeio_resolve_local_urls = resolve_local_urls;
556 556
 
557 557
     const TQString src = homeTmpDir() + "fileFromHome";
558 558
     createTestFile( src );
@@ -583,7 +583,7 @@ void JobTest::copyFileToSystem( bool resolve_local_urls )
583 583
 
584 584
     // Check mimetype
585 585
     kdDebug() << m_mimetype << endl;
586
-    // There's no mimemagic determination in kio_file in trinity. Fixing this for kde4...
586
+    // There's no mimemagic determination in tdeio_file in trinity. Fixing this for kde4...
587 587
     assert( m_mimetype == "application/octet-stream" );
588 588
     //assert( m_mimetype == "text/plain" );
589 589
 
@@ -601,7 +601,7 @@ void JobTest::copyFileToSystem( bool resolve_local_urls )
601 601
     }
602 602
 
603 603
     // restore normal behavior
604
-    kio_resolve_local_urls = true;
604
+    tdeio_resolve_local_urls = true;
605 605
 }
606 606
 
607 607
 void JobTest::slotMimetype(TDEIO::Job* job, const TQString& type)

+ 1
- 1
tdeio/tests/jobtest.h Прегледај датотеку

@@ -34,7 +34,7 @@ public:
34 34
     void runAll();
35 35
     void cleanup();
36 36
 
37
-    // Local tests (kio_file only)
37
+    // Local tests (tdeio_file only)
38 38
     void get();
39 39
     void copyFileToSamePartition();
40 40
     void copyDirectoryToSamePartition();

+ 1
- 1
tdeio/tests/kprotocolinfotest.cpp Прегледај датотеку

@@ -52,7 +52,7 @@ int main(int argc, char **argv) {
52 52
     assert( protocol == "http" );
53 53
 
54 54
     TQStringList capabilities = KProtocolInfo::capabilities( "imap" );
55
-    kdDebug() << "kio_imap capabilities: " << capabilities << endl;
55
+    kdDebug() << "tdeio_imap capabilities: " << capabilities << endl;
56 56
     //assert(capabilities.contains("ACL"));
57 57
 
58 58
     return 0;

Loading…
Откажи
Сачувај