Browse Source

Rename additional kioslave libraries

Timothy Pearson 6 years ago
parent
commit
e3379a9953
48 changed files with 144 additions and 144 deletions
  1. 8
    8
      kdoctools/CMakeLists.txt
  2. 10
    10
      kdoctools/Makefile.am
  3. 1
    1
      kdoctools/ghelp.protocol
  4. 1
    1
      kdoctools/help.protocol
  5. 0
    3
      kdoctools/kio_help.upd
  6. 3
    3
      kdoctools/main.cpp
  7. 3
    3
      kdoctools/main_ghelp.cpp
  8. 1
    1
      kdoctools/meinproc.cpp
  9. 1
    1
      kdoctools/move_tdeio_help_cache.sh
  10. 3
    3
      kdoctools/tdeio_help.cpp
  11. 0
    0
      kdoctools/tdeio_help.h
  12. 3
    0
      kdoctools/tdeio_help.upd
  13. 2
    2
      kdoctools/xslt.cpp
  14. 2
    2
      tdeioslave/file/CMakeLists.txt
  15. 4
    4
      tdeioslave/file/Makefile.am
  16. 3
    3
      tdeioslave/file/file.cc
  17. 1
    1
      tdeioslave/file/file.protocol
  18. 2
    2
      tdeioslave/ftp/CMakeLists.txt
  19. 4
    4
      tdeioslave/ftp/Makefile.am
  20. 1
    1
      tdeioslave/ftp/configure.in.in
  21. 9
    9
      tdeioslave/ftp/ftp.cc
  22. 4
    4
      tdeioslave/ftp/ftp.h
  23. 1
    1
      tdeioslave/ftp/ftp.protocol
  24. 4
    4
      tdeioslave/http/CMakeLists.txt
  25. 9
    9
      tdeioslave/http/Makefile.am
  26. 2
    2
      tdeioslave/http/README.http_cache_cleaner
  27. 1
    1
      tdeioslave/http/README.webdav
  28. 2
    2
      tdeioslave/http/TODO
  29. 6
    6
      tdeioslave/http/http.cc
  30. 1
    1
      tdeioslave/http/http.protocol
  31. 1
    1
      tdeioslave/http/http_cache_cleaner.cpp
  32. 1
    1
      tdeioslave/http/http_cache_cleaner.desktop
  33. 1
    1
      tdeioslave/http/https.protocol
  34. 1
    1
      tdeioslave/http/kcookiejar/kcookiejar.cpp
  35. 1
    1
      tdeioslave/http/webdav.protocol
  36. 1
    1
      tdeioslave/http/webdavs.protocol
  37. 4
    4
      tdeioslave/iso/CMakeLists.txt
  38. 6
    6
      tdeioslave/iso/Makefile.am
  39. 22
    22
      tdeioslave/iso/iso.cpp
  40. 3
    3
      tdeioslave/iso/iso.h
  41. 1
    1
      tdeioslave/iso/iso.protocol
  42. 1
    1
      tdeioslave/iso/kiso.cpp
  43. 0
    0
      tdeioslave/iso/tdeio_iso.desktop
  44. 0
    0
      tdeioslave/iso/tdeio_isorc
  45. 2
    2
      tdeioslave/metainfo/CMakeLists.txt
  46. 4
    4
      tdeioslave/metainfo/Makefile.am
  47. 2
    2
      tdeioslave/metainfo/metainfo.cpp
  48. 1
    1
      tdeioslave/metainfo/metainfo.protocol

+ 8
- 8
kdoctools/CMakeLists.txt View File

@@ -33,8 +33,8 @@ link_directories(
33 33
 ##### other data ################################
34 34
 
35 35
 install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/checkXML DESTINATION ${BIN_INSTALL_DIR} )
36
-install( PROGRAMS move_kio_help_cache.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
37
-install( FILES kio_help.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
36
+install( PROGRAMS move_tdeio_help_cache.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
37
+install( FILES tdeio_help.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
38 38
 install( FILES help.protocol ghelp.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
39 39
 
40 40
 # FIXME why automake version is so complicated?
@@ -58,12 +58,12 @@ tde_add_library( kbzipfilter_dummy STATIC_PIC
58 58
 )
59 59
 
60 60
 
61
-#### kio_help ###################################
61
+#### tdeio_help ###################################
62 62
 
63
-set( target kio_help )
63
+set( target tdeio_help )
64 64
 
65 65
 set( ${target}_SRCS
66
-  kio_help.cpp main.cpp xslt.cpp
66
+  tdeio_help.cpp main.cpp xslt.cpp
67 67
 )
68 68
 
69 69
 tde_add_kpart( ${target} SHARED
@@ -73,12 +73,12 @@ tde_add_kpart( ${target} SHARED
73 73
 )
74 74
 
75 75
 
76
-#### kio_ghelp ###################################
76
+#### tdeio_ghelp ###################################
77 77
 
78
-set( target kio_ghelp )
78
+set( target tdeio_ghelp )
79 79
 
80 80
 set( ${target}_SRCS
81
-  kio_help.cpp main_ghelp.cpp xslt.cpp
81
+  tdeio_help.cpp main_ghelp.cpp xslt.cpp
82 82
 )
83 83
 
84 84
 tde_add_kpart( ${target} SHARED

+ 10
- 10
kdoctools/Makefile.am View File

@@ -8,17 +8,17 @@ libkbzipfilter_dummy_la_SOURCES = kbzip2filter.cpp
8 8
 
9 9
 ####### Files
10 10
 
11
-kde_module_LTLIBRARIES = kio_help.la kio_ghelp.la
11
+kde_module_LTLIBRARIES = tdeio_help.la tdeio_ghelp.la
12 12
 
13
-kio_help_la_SOURCES = kio_help.cpp main.cpp xslt.cpp
14
-kio_help_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS)  libkbzipfilter_dummy.la $(LIB_KIO) $(LIBBZ2) $(LIB_QT) $(LIB_TDECORE)
15
-kio_help_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
13
+tdeio_help_la_SOURCES = tdeio_help.cpp main.cpp xslt.cpp
14
+tdeio_help_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS)  libkbzipfilter_dummy.la $(LIB_KIO) $(LIBBZ2) $(LIB_QT) $(LIB_TDECORE)
15
+tdeio_help_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
16 16
 
17
-kio_ghelp_la_SOURCES = kio_help.cpp main_ghelp.cpp xslt.cpp
18
-kio_ghelp_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS) libkbzipfilter_dummy.la $(LIB_KIO) $(LIBBZ2) $(LIB_QT) $(LIB_TDECORE)
19
-kio_ghelp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
17
+tdeio_ghelp_la_SOURCES = tdeio_help.cpp main_ghelp.cpp xslt.cpp
18
+tdeio_ghelp_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS) libkbzipfilter_dummy.la $(LIB_KIO) $(LIBBZ2) $(LIB_QT) $(LIB_TDECORE)
19
+tdeio_ghelp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
20 20
 
21
-noinst_HEADERS = kio_help.h
21
+noinst_HEADERS = tdeio_help.h
22 22
 
23 23
 kdelnk_DATA = help.protocol ghelp.protocol
24 24
 kdelnkdir = $(kde_servicesdir)
@@ -36,8 +36,8 @@ bin_SCRIPTS = checkXML
36 36
 
37 37
 METASOURCES = AUTO
38 38
 
39
-update_DATA = kio_help.upd
40
-update_SCRIPTS = move_kio_help_cache.sh
39
+update_DATA = tdeio_help.upd
40
+update_SCRIPTS = move_tdeio_help_cache.sh
41 41
 updatedir = $(kde_datadir)/tdeconf_update
42 42
 
43 43
 messages:

+ 1
- 1
kdoctools/ghelp.protocol View File

@@ -1,5 +1,5 @@
1 1
 [Protocol]
2
-exec=kio_ghelp
2
+exec=tdeio_ghelp
3 3
 protocol=ghelp
4 4
 input=none
5 5
 output=filesystem

+ 1
- 1
kdoctools/help.protocol View File

@@ -1,5 +1,5 @@
1 1
 [Protocol]
2
-exec=kio_help
2
+exec=tdeio_help
3 3
 protocol=help
4 4
 input=none
5 5
 output=filesystem

+ 0
- 3
kdoctools/kio_help.upd View File

@@ -1,3 +0,0 @@
1
-# Move kio_help cache from $TDEHOME/share/apps/tdeio_help/cache to $TDEHOME/cache-$HOST/tdeio_help
2
-Id=trinity_2
3
-Script=move_kio_help_cache.sh,sh

+ 3
- 3
kdoctools/main.cpp View File

@@ -16,7 +16,7 @@
16 16
 #include <kinstance.h>
17 17
 #include <kdebug.h>
18 18
 #include <stdlib.h>
19
-#include "kio_help.h"
19
+#include "tdeio_help.h"
20 20
 #include <xslt.h>
21 21
 
22 22
 extern int xmlLoadExtDtdDefaultValue;
@@ -25,7 +25,7 @@ extern "C"
25 25
 {
26 26
     KDE_EXPORT int kdemain( int argc, char **argv )
27 27
     {
28
-        TDEInstance instance( "kio_help" );
28
+        TDEInstance instance( "tdeio_help" );
29 29
         fillInstance(instance);
30 30
         (void)instance.config(); // we need this one to make sure system globals are read
31 31
 
@@ -33,7 +33,7 @@ extern "C"
33 33
 
34 34
         if (argc != 4)
35 35
         {
36
-            fprintf(stderr, "Usage: kio_help protocol domain-socket1 domain-socket2\n");
36
+            fprintf(stderr, "Usage: tdeio_help protocol domain-socket1 domain-socket2\n");
37 37
             exit(-1);
38 38
         }
39 39
 

+ 3
- 3
kdoctools/main_ghelp.cpp View File

@@ -16,7 +16,7 @@
16 16
 #include <kinstance.h>
17 17
 #include <kdebug.h>
18 18
 #include <stdlib.h>
19
-#include "kio_help.h"
19
+#include "tdeio_help.h"
20 20
 #include <xslt.h>
21 21
 
22 22
 extern int xmlLoadExtDtdDefaultValue;
@@ -25,7 +25,7 @@ extern "C"
25 25
 {
26 26
     KDE_EXPORT int kdemain( int argc, char **argv )
27 27
     {
28
-        TDEInstance instance( "kio_ghelp" );
28
+        TDEInstance instance( "tdeio_ghelp" );
29 29
         fillInstance(instance);
30 30
         (void)instance.config(); // we need this one to make sure system globals are read
31 31
 
@@ -33,7 +33,7 @@ extern "C"
33 33
 
34 34
         if (argc != 4)
35 35
         {
36
-            fprintf(stderr, "Usage: kio_ghelp protocol domain-socket1 domain-socket2\n");
36
+            fprintf(stderr, "Usage: tdeio_ghelp protocol domain-socket1 domain-socket2\n");
37 37
             exit(-1);
38 38
         }
39 39
 

+ 1
- 1
kdoctools/meinproc.cpp View File

@@ -98,7 +98,7 @@ int main(int argc, char **argv) {
98 98
     TDECmdLineArgs::init(argc, argv, &aboutData);
99 99
     TDECmdLineArgs::addCmdLineOptions( options );
100 100
 
101
-    KLocale::setMainCatalogue("kio_help");
101
+    KLocale::setMainCatalogue("tdeio_help");
102 102
     TDEInstance ins("meinproc");
103 103
     TDEGlobal::locale();
104 104
 

kdoctools/move_kio_help_cache.sh → kdoctools/move_tdeio_help_cache.sh View File

@@ -1,6 +1,6 @@
1 1
 #!/bin/sh
2 2
 
3 3
 bas=`tde-config --localprefix`share/apps/tdeio_help
4
-mv "$bas/cache" "`tde-config --path cache`kio_help"
4
+mv "$bas/cache" "`tde-config --path cache`tdeio_help"
5 5
 rmdir "$bas"
6 6
 exit 0

kdoctools/kio_help.cpp → kdoctools/tdeio_help.cpp View File

@@ -30,7 +30,7 @@
30 30
 #include <kstandarddirs.h>
31 31
 #include <kinstance.h>
32 32
 
33
-#include "kio_help.h"
33
+#include "tdeio_help.h"
34 34
 #include <libxslt/xsltutils.h>
35 35
 #include <libxslt/transform.h>
36 36
 #include "xslt.h"
@@ -240,7 +240,7 @@ void HelpProtocol::get( const KURL& url )
240 240
                 infoMessage( i18n( "Saving to cache" ) );
241 241
                 TQString cache = file.left( file.length() - 7 );
242 242
                 saveToCache( mParsed, locateLocal( "cache",
243
-                                                        "kio_help" + cache +
243
+                                                        "tdeio_help" + cache +
244 244
                                                         "cache.bz2" ) );
245 245
             }
246 246
         } else infoMessage( i18n( "Using cached version" ) );
@@ -333,7 +333,7 @@ void HelpProtocol::mimetype( const KURL &)
333 333
     finished();
334 334
 }
335 335
 
336
-// Copied from kio_file to avoid redirects
336
+// Copied from tdeio_file to avoid redirects
337 337
 
338 338
 #define MAX_IPC_SIZE (1024*32)
339 339
 

kdoctools/kio_help.h → kdoctools/tdeio_help.h View File


+ 3
- 0
kdoctools/tdeio_help.upd View File

@@ -0,0 +1,3 @@
1
+# Move tdeio_help cache from $TDEHOME/share/apps/tdeio_help/cache to $TDEHOME/cache-$HOST/tdeio_help
2
+Id=trinity_2
3
+Script=move_tdeio_help_cache.sh,sh

+ 2
- 2
kdoctools/xslt.cpp View File

@@ -11,7 +11,7 @@
11 11
 #include <tqregexp.h>
12 12
 #include <xslt.h>
13 13
 #include <kinstance.h>
14
-#include "kio_help.h"
14
+#include "tdeio_help.h"
15 15
 #include <klocale.h>
16 16
 #include <assert.h>
17 17
 #include <kfilterbase.h>
@@ -287,7 +287,7 @@ TQString lookForCache( const TQString &filename )
287 287
         return output;
288 288
     if ( readCache( filename,
289 289
                     locateLocal( "cache",
290
-                                 "kio_help" + cache +
290
+                                 "tdeio_help" + cache +
291 291
                                  "cache.bz2" ), output ) )
292 292
         return output;
293 293
 

+ 2
- 2
tdeioslave/file/CMakeLists.txt View File

@@ -39,9 +39,9 @@ install( FILES file.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdeio )
39 39
 install( FILES file.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
40 40
 
41 41
 
42
-##### kio_file ##################################
42
+##### tdeio_file ##################################
43 43
 
44
-set( target kio_file )
44
+set( target tdeio_file )
45 45
 
46 46
 set( ${target}_SRCS
47 47
   file.cc

+ 4
- 4
tdeioslave/file/Makefile.am View File

@@ -6,11 +6,11 @@ INCLUDES = $(all_includes)
6 6
 
7 7
 ####### Files
8 8
 
9
-kde_module_LTLIBRARIES = kio_file.la
9
+kde_module_LTLIBRARIES = tdeio_file.la
10 10
 
11
-kio_file_la_SOURCES = file.cc
12
-kio_file_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(ACL_LIBS)
13
-kio_file_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(top_builddir)/dcop/libDCOP.la
11
+tdeio_file_la_SOURCES = file.cc
12
+tdeio_file_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(ACL_LIBS)
13
+tdeio_file_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(top_builddir)/dcop/libDCOP.la
14 14
 noinst_HEADERS = file.h
15 15
 
16 16
 fileinclude_HEADERS = file.h

+ 3
- 3
tdeioslave/file/file.cc View File

@@ -113,14 +113,14 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
113 113
 int kdemain( int argc, char **argv )
114 114
 {
115 115
   KLocale::setMainCatalogue("tdelibs");
116
-  TDEInstance instance( "kio_file" );
116
+  TDEInstance instance( "tdeio_file" );
117 117
   ( void ) TDEGlobal::locale();
118 118
 
119 119
   kdDebug(7101) << "Starting " << getpid() << endl;
120 120
 
121 121
   if (argc != 4)
122 122
   {
123
-     fprintf(stderr, "Usage: kio_file protocol domain-socket1 domain-socket2\n");
123
+     fprintf(stderr, "Usage: tdeio_file protocol domain-socket1 domain-socket2\n");
124 124
      exit(-1);
125 125
   }
126 126
 
@@ -998,7 +998,7 @@ bool FileProtocol::createUDSEntry( const TQString & filename, const TQCString &
998 998
 {
999 999
     assert(entry.count() == 0); // by contract :-)
1000 1000
     // Note: details = 0 (only "file or directory or symlink or doesn't exist") isn't implemented
1001
-    // because there's no real performance penalty in kio_file for returning the complete
1001
+    // because there's no real performance penalty in tdeio_file for returning the complete
1002 1002
     // details. Please consider doing it in your tdeioslave if you're using this one as a model :)
1003 1003
     UDSAtom atom;
1004 1004
     atom.m_uds = TDEIO::UDS_NAME;

+ 1
- 1
tdeioslave/file/file.protocol View File

@@ -1,5 +1,5 @@
1 1
 [Protocol]
2
-exec=kio_file
2
+exec=tdeio_file
3 3
 protocol=file
4 4
 input=none
5 5
 output=filesystem

+ 2
- 2
tdeioslave/ftp/CMakeLists.txt View File

@@ -29,9 +29,9 @@ link_directories(
29 29
 install( FILES ftp.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
30 30
 
31 31
 
32
-##### kio_ftp ###################################
32
+##### tdeio_ftp ###################################
33 33
 
34
-set( target kio_ftp )
34
+set( target tdeio_ftp )
35 35
 
36 36
 set( ${target}_SRCS
37 37
   ftp.cc

+ 4
- 4
tdeioslave/ftp/Makefile.am View File

@@ -2,11 +2,11 @@ INCLUDES= $(all_includes)
2 2
 
3 3
 ####### Files
4 4
 
5
-kde_module_LTLIBRARIES = kio_ftp.la
5
+kde_module_LTLIBRARIES = tdeio_ftp.la
6 6
 
7
-kio_ftp_la_SOURCES = ftp.cc
8
-kio_ftp_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
9
-kio_ftp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) 
7
+tdeio_ftp_la_SOURCES = ftp.cc
8
+tdeio_ftp_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
9
+tdeio_ftp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) 
10 10
 
11 11
 noinst_HEADERS = ftp.h
12 12
 

+ 1
- 1
tdeioslave/ftp/configure.in.in View File

@@ -1,4 +1,4 @@
1
-dnl For kio_ftp
1
+dnl For tdeio_ftp
2 2
 AC_LANG_SAVE
3 3
 AC_LANG_CPLUSPLUS
4 4
 AC_CHECK_FUNCS( setfsent )

+ 9
- 9
tdeioslave/ftp/ftp.cc View File

@@ -22,7 +22,7 @@
22 22
 */
23 23
 
24 24
 
25
-#define  KIO_FTP_PRIVATE_INCLUDE
25
+#define  TDEIO_FTP_PRIVATE_INCLUDE
26 26
 #include "ftp.h"
27 27
 
28 28
 #include <sys/stat.h>
@@ -81,17 +81,17 @@
81 81
 //#undef  kdDebug
82 82
 #define ENABLE_CAN_RESUME
83 83
 
84
-// JPF: somebody should find a better solution for this or move this to KIO
84
+// JPF: somebody should find a better solution for this or move this to TDEIO
85 85
 // JPF: anyhow, in KDE 3.2.0 I found diffent MAX_IPC_SIZE definitions!
86 86
 namespace TDEIO {
87 87
     enum buffersizes
88 88
     {  /**
89 89
         * largest buffer size that should be used to transfer data between
90
-        * KIO slaves using the data() function
90
+        * TDEIO slaves using the data() function
91 91
         */
92 92
         maximumIpcSize = 32 * 1024,
93 93
         /**
94
-         * this is a reasonable value for an initial read() that a KIO slave
94
+         * this is a reasonable value for an initial read() that a TDEIO slave
95 95
          * can do to obtain data via a slow network connection.
96 96
          */
97 97
         initialIpcSize =  2 * 1024,
@@ -140,14 +140,14 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
140 140
 int kdemain( int argc, char **argv )
141 141
 {
142 142
   KLocale::setMainCatalogue("tdelibs");
143
-  TDEInstance instance( "kio_ftp" );
143
+  TDEInstance instance( "tdeio_ftp" );
144 144
   ( void ) TDEGlobal::locale();
145 145
 
146 146
   kdDebug(7102) << "Starting " << getpid() << endl;
147 147
 
148 148
   if (argc != 4)
149 149
   {
150
-     fprintf(stderr, "Usage: kio_ftp protocol domain-socket1 domain-socket2\n");
150
+     fprintf(stderr, "Usage: tdeio_ftp protocol domain-socket1 domain-socket2\n");
151 151
      exit(-1);
152 152
   }
153 153
 
@@ -2481,7 +2481,7 @@ bool Ftp::ftpFolder(const TQString& path, bool bReportError)
2481 2481
 
2482 2482
 
2483 2483
 //===============================================================================
2484
-// public: copy          don't use kio data pump if one side is a local file
2484
+// public: copy          don't use tdeio data pump if one side is a local file
2485 2485
 // helper: ftpCopyPut    called from copy() on upload
2486 2486
 // helper: ftpCopyGet    called from copy() on download
2487 2487
 //===============================================================================
@@ -2590,7 +2590,7 @@ Ftp::StatusCode Ftp::ftpCopyGet(int& iError, int& iCopyFile, const TQString sCop
2590 2590
     sPart = TQFile::encodeName(sCopyFile);
2591 2591
   }
2592 2592
   else if(bPartExists && buff.st_size > 0)
2593
-  { // must not be a folder! please fix a similar bug in kio_file!!
2593
+  { // must not be a folder! please fix a similar bug in tdeio_file!!
2594 2594
     if(S_ISDIR(buff.st_mode))
2595 2595
     {
2596 2596
       iError = ERR_DIR_ALREADY_EXIST;
@@ -2607,7 +2607,7 @@ Ftp::StatusCode Ftp::ftpCopyGet(int& iError, int& iCopyFile, const TQString sCop
2607 2607
   if(bPartExists && !bResume)                  // get rid of an unwanted ".part" file
2608 2608
     remove(sPart.data());
2609 2609
 
2610
-  // JPF: in kio_file overwrite disables ".part" operations. I do not believe
2610
+  // JPF: in tdeio_file overwrite disables ".part" operations. I do not believe
2611 2611
   // JPF: that this is a good behaviour!
2612 2612
   if(bDestExists)                             // must delete for overwrite
2613 2613
     remove(sDest.data());

+ 4
- 4
tdeioslave/ftp/ftp.h View File

@@ -53,7 +53,7 @@ struct FtpEntry
53 53
 // FtpTextReader  A helper class to read text lines from a socket
54 54
 //===============================================================================
55 55
 
56
-#ifdef  KIO_FTP_PRIVATE_INCLUDE
56
+#ifdef  TDEIO_FTP_PRIVATE_INCLUDE
57 57
 class FtpSocket;
58 58
 
59 59
 class FtpTextReader
@@ -131,12 +131,12 @@ private:
131 131
    */
132 132
   int m_iTextBuff;
133 133
 };
134
-#endif // KIO_FTP_PRIVATE_INCLUDE
134
+#endif // TDEIO_FTP_PRIVATE_INCLUDE
135 135
 
136 136
 //===============================================================================
137 137
 // FtpSocket  Helper Class for Data or Control Connections
138 138
 //===============================================================================
139
-#ifdef  KIO_FTP_PRIVATE_INCLUDE
139
+#ifdef  TDEIO_FTP_PRIVATE_INCLUDE
140 140
 class FtpSocket : public FtpTextReader, public KExtendedSocket
141 141
 {
142 142
 private:
@@ -228,7 +228,7 @@ private:
228 228
 };
229 229
 #else
230 230
    class FtpSocket;
231
-#endif // KIO_FTP_PRIVATE_INCLUDE
231
+#endif // TDEIO_FTP_PRIVATE_INCLUDE
232 232
 
233 233
 //===============================================================================
234 234
 // Ftp

+ 1
- 1
tdeioslave/ftp/ftp.protocol View File

@@ -1,5 +1,5 @@
1 1
 [Protocol]
2
-exec=kio_ftp
2
+exec=tdeio_ftp
3 3
 protocol=ftp
4 4
 input=none
5 5
 output=filesystem

+ 4
- 4
tdeioslave/http/CMakeLists.txt View File

@@ -38,9 +38,9 @@ install( FILES
38 38
   DESTINATION ${SERVICES_INSTALL_DIR} )
39 39
 
40 40
 
41
-##### kio_http_cache_cleaner ####################
41
+##### tdeio_http_cache_cleaner ####################
42 42
 
43
-set( target kio_http_cache_cleaner )
43
+set( target tdeio_http_cache_cleaner )
44 44
 
45 45
 set( ${target}_SRCS
46 46
   http_cache_cleaner.cpp
@@ -52,11 +52,11 @@ tde_add_tdeinit_executable( ${target} AUTOMOC
52 52
 )
53 53
 
54 54
 
55
-##### kio_http ##################################
55
+##### tdeio_http ##################################
56 56
 
57 57
 # FIXME GSSAPI support is not handled yet
58 58
 
59
-set( target kio_http )
59
+set( target tdeio_http )
60 60
 
61 61
 set( ${target}_SRCS
62 62
   http.cc

+ 9
- 9
tdeioslave/http/Makefile.am View File

@@ -10,17 +10,17 @@ AM_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH)
10 10
 
11 11
 bin_PROGRAMS=
12 12
 lib_LTLIBRARIES=
13
-tdeinit_LTLIBRARIES = kio_http_cache_cleaner.la
14
-kde_module_LTLIBRARIES = kio_http.la
13
+tdeinit_LTLIBRARIES = tdeio_http_cache_cleaner.la
14
+kde_module_LTLIBRARIES = tdeio_http.la
15 15
 
16
-kio_http_la_SOURCES = http.cc
17
-kio_http_la_METASOURCES = AUTO
18
-kio_http_la_LIBADD = $(LIB_KIO) $(top_builddir)/tdeio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIBZ) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/tdeio/misc/tdentlm/libtdentlm.la
19
-kio_http_la_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH) -module $(KDE_PLUGIN) $(GSSAPI_LIBS)
16
+tdeio_http_la_SOURCES = http.cc
17
+tdeio_http_la_METASOURCES = AUTO
18
+tdeio_http_la_LIBADD = $(LIB_KIO) $(top_builddir)/tdeio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIBZ) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/tdeio/misc/tdentlm/libtdentlm.la
19
+tdeio_http_la_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH) -module $(KDE_PLUGIN) $(GSSAPI_LIBS)
20 20
 
21
-kio_http_cache_cleaner_la_SOURCES = http_cache_cleaner.cpp
22
-kio_http_cache_cleaner_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la
23
-kio_http_cache_cleaner_la_LDFLAGS = -module -avoid-version
21
+tdeio_http_cache_cleaner_la_SOURCES = http_cache_cleaner.cpp
22
+tdeio_http_cache_cleaner_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la
23
+tdeio_http_cache_cleaner_la_LDFLAGS = -module -avoid-version
24 24
 
25 25
 noinst_HEADERS = http.h
26 26
 

+ 2
- 2
tdeioslave/http/README.http_cache_cleaner View File

@@ -10,11 +10,11 @@ TODO:
10 10
 30 minutes / delte entries which end in .new and are
11 11
 older than 30 minutes.
12 12
 
13
-* Let kio_http fill in expire dates other than 0.
13
+* Let tdeio_http fill in expire dates other than 0.
14 14
 
15 15
 DONE:
16 16
 
17
-* Start khttpcache from kio_http if the file "cleaned"
17
+* Start khttpcache from tdeio_http if the file "cleaned"
18 18
 is older than 30(?) minutes.
19 19
 
20 20
 * Accept command line parameteres

+ 1
- 1
tdeioslave/http/README.webdav View File

@@ -15,7 +15,7 @@ Applications supporting extended webdav features
15 15
 Much of the info here is elaborated by rfc #2518; the rest can be understood by reading
16 16
 davPropStat() in http.cc, specifically the setMetaData() calls.
17 17
 
18
-Extended information is transferred via kio's metadata system...
18
+Extended information is transferred via tdeio's metadata system...
19 19
 
20 20
 === MISCELLANEOUS ===
21 21
 Display Names (names suitable for presentation to the user) are passed as the metadata

+ 2
- 2
tdeioslave/http/TODO View File

@@ -1,5 +1,5 @@
1 1
 The following is a list of items that are currently missing or partially implemented
2
-in kio_http:
2
+in tdeio_http:
3 3
 
4 4
 - HTTP/1.1 Persistant Connections:
5 5
 The header often specifies the timeout value used for connections.
@@ -19,7 +19,7 @@ features such as locking.
19 19
 - Rating(s) support.  http://www.w3.org/PICS:
20 20
 This might involve an external program to parse the labels, and something to
21 21
 configure access accordingly.  There is only some basic things that need to be
22
-added to kio_http to support this.  The majority of the work has to be done at the
22
+added to tdeio_http to support this.  The majority of the work has to be done at the
23 23
 application level.  A tdehtml plugin in tdeaddons to do this might be a nice idea.
24 24
 
25 25
 - P3P support:

+ 6
- 6
tdeioslave/http/http.cc View File

@@ -99,12 +99,12 @@ extern "C" {
99 99
 int kdemain( int argc, char **argv )
100 100
 {
101 101
   KLocale::setMainCatalogue("tdelibs");
102
-  TDEInstance instance( "kio_http" );
102
+  TDEInstance instance( "tdeio_http" );
103 103
   ( void ) TDEGlobal::locale();
104 104
 
105 105
   if (argc != 4)
106 106
   {
107
-     fprintf(stderr, "Usage: kio_http protocol domain-socket1 domain-socket2\n");
107
+     fprintf(stderr, "Usage: tdeio_http protocol domain-socket1 domain-socket2\n");
108 108
      exit(-1);
109 109
   }
110 110
 
@@ -2056,7 +2056,7 @@ bool HTTPProtocol::httpOpenConnection()
2056 2056
   kdDebug(7113) << "(" << m_pid << ") HTTPProtocol::httpOpenConnection" << endl;
2057 2057
 
2058 2058
   setBlockConnection( true );
2059
-  // kio_http uses its own proxying:
2059
+  // tdeio_http uses its own proxying:
2060 2060
   KSocks::self()->disableSocks();
2061 2061
 
2062 2062
   if ( m_state.doProxy )
@@ -2430,7 +2430,7 @@ bool HTTPProtocol::httpOpen()
2430 2430
     if ( m_request.offset > 0 )
2431 2431
     {
2432 2432
       header += TQString("Range: bytes=%1-\r\n").arg(TDEIO::number(m_request.offset));
2433
-      kdDebug(7103) << "kio_http : Range = " << TDEIO::number(m_request.offset) << endl;
2433
+      kdDebug(7103) << "tdeio_http : Range = " << TDEIO::number(m_request.offset) << endl;
2434 2434
     }
2435 2435
 
2436 2436
     if ( m_request.cache == CC_Reload )
@@ -2842,7 +2842,7 @@ try_again:
2842 2842
     {
2843 2843
       // We get XML / HTTP without a proper header
2844 2844
       // put string back
2845
-      kdDebug(7103) << "kio_http: No valid HTTP header found! Document starts with XML/HTML tag" << endl;
2845
+      kdDebug(7103) << "tdeio_http: No valid HTTP header found! Document starts with XML/HTML tag" << endl;
2846 2846
 
2847 2847
       // Document starts with a tag, assume html instead of text/plain
2848 2848
       m_strMimeType = "text/html";
@@ -3217,7 +3217,7 @@ try_again:
3217 3217
 
3218 3218
     // content?
3219 3219
     else if (strncasecmp(buf, "Content-Encoding:", 17) == 0) {
3220
-      // This is so wrong !!  No wonder kio_http is stripping the
3220
+      // This is so wrong !!  No wonder tdeio_http is stripping the
3221 3221
       // gzip encoding from downloaded files.  This solves multiple
3222 3222
       // bug reports and caitoo's problem with downloads when such a
3223 3223
       // header is encountered...

+ 1
- 1
tdeioslave/http/http.protocol View File

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

+ 1
- 1
tdeioslave/http/http_cache_cleaner.cpp View File

@@ -48,7 +48,7 @@ time_t currentDate;
48 48
 int m_maxCacheAge;
49 49
 int m_maxCacheSize;
50 50
 
51
-static const char appName[] = "kio_http_cache_cleaner";
51
+static const char appName[] = "tdeio_http_cache_cleaner";
52 52
 
53 53
 static const char description[] = I18N_NOOP("TDE HTTP cache maintenance tool");
54 54
 

+ 1
- 1
tdeioslave/http/http_cache_cleaner.desktop View File

@@ -82,7 +82,7 @@ Name[zh_CN]=HTTP 缓存清除程序
82 82
 Name[zh_HK]=HTTP 快取清除程式
83 83
 Name[zh_TW]=HTTP 快取清除程式
84 84
 Name[zu]=Umhlanzi we-Cache ye-HTTP
85
-Exec=kio_http_cache_cleaner
85
+Exec=tdeio_http_cache_cleaner
86 86
 Comment=Cleans up old entries from the HTTP cache
87 87
 Comment[af]=Skoonmaak begin ou inskrywings van die Http kas
88 88
 Comment[ar]=يزيل المداخل القديمة من كاش HTTP

+ 1
- 1
tdeioslave/http/https.protocol View File

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

+ 1
- 1
tdeioslave/http/kcookiejar/kcookiejar.cpp View File

@@ -85,7 +85,7 @@
85 85
 #define IP_ADDRESS_EXPRESSION "(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"
86 86
 
87 87
 // Note with respect to TQString::fromLatin1( )
88
-// Cookies are stored as 8 bit data and passed to kio_http as
88
+// Cookies are stored as 8 bit data and passed to tdeio_http as
89 89
 // latin1 regardless of their actual encoding.
90 90
 
91 91
 // L1 is used to indicate latin1 constants

+ 1
- 1
tdeioslave/http/webdav.protocol View File

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

+ 1
- 1
tdeioslave/http/webdavs.protocol View File

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

+ 4
- 4
tdeioslave/iso/CMakeLists.txt View File

@@ -31,13 +31,13 @@ link_directories(
31 31
 
32 32
 install( FILES iso.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
33 33
 install( FILES isoservice.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus )
34
-install( FILES kio_isorc DESTINATION ${CONFIG_INSTALL_DIR} )
35
-install( FILES kio_iso.desktop DESTINATION ${APPS_INSTALL_DIR} )
34
+install( FILES tdeio_isorc DESTINATION ${CONFIG_INSTALL_DIR} )
35
+install( FILES tdeio_iso.desktop DESTINATION ${APPS_INSTALL_DIR} )
36 36
 
37 37
 
38
-##### kio_iso ###################################
38
+##### tdeio_iso ###################################
39 39
 
40
-set( target kio_iso )
40
+set( target tdeio_iso )
41 41
 
42 42
 set( ${target}_SRCS
43 43
   kisodirectory.cpp kisofile.cpp qfilehack.cpp

+ 6
- 6
tdeioslave/iso/Makefile.am View File

@@ -1,4 +1,4 @@
1
-kde_module_LTLIBRARIES = kio_iso.la
1
+kde_module_LTLIBRARIES = tdeio_iso.la
2 2
 
3 3
 
4 4
 INCLUDES = $(all_includes)
@@ -6,18 +6,18 @@ INCLUDES = $(all_includes)
6 6
 
7 7
 #LDFLAGS =      
8 8
 
9
-kio_iso_la_METASOURCES=AUTO
9
+tdeio_iso_la_METASOURCES=AUTO
10 10
 
11
-kio_iso_la_SOURCES = kisodirectory.cpp kisofile.cpp qfilehack.cpp kiso.cpp iso.cpp
12
-kio_iso_la_LIBADD = libisofs/libisofs.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KIO)
11
+tdeio_iso_la_SOURCES = kisodirectory.cpp kisofile.cpp qfilehack.cpp kiso.cpp iso.cpp
12
+tdeio_iso_la_LIBADD = libisofs/libisofs.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KIO)
13 13
 
14
-kio_iso_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
14
+tdeio_iso_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
15 15
 
16 16
 
17 17
 SUBDIRS = libisofs
18 18
 
19 19
 noinst_HEADERS = iso.h kiso.h qfilehack.h kisofile.h kisodirectory.h
20
-EXTRA_DIST = iso.protocol isoservice.desktop kio_iso.desktop
20
+EXTRA_DIST = iso.protocol isoservice.desktop tdeio_iso.desktop
21 21
 
22 22
 install-data-local:
23 23
 	$(mkinstalldirs)  $(DESTDIR)$(kde_servicesdir)/

+ 22
- 22
tdeioslave/iso/iso.cpp View File

@@ -60,17 +60,17 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
60 60
 
61 61
 int kdemain( int argc, char **argv )
62 62
 {
63
-  TDEInstance instance( "kio_iso" );
63
+  TDEInstance instance( "tdeio_iso" );
64 64
 
65 65
   kdDebug()   << "Starting " << getpid() << endl;
66 66
 
67 67
   if (argc != 4)
68 68
   {
69
-     fprintf(stderr, "Usage: kio_iso protocol domain-socket1 domain-socket2\n");
69
+     fprintf(stderr, "Usage: tdeio_iso protocol domain-socket1 domain-socket2\n");
70 70
      exit(-1);
71 71
   }
72 72
 
73
-  kio_isoProtocol slave(argv[2], argv[3]);
73
+  tdeio_isoProtocol slave(argv[2], argv[3]);
74 74
   slave.dispatchLoop();
75 75
 
76 76
   kdDebug()   << "Done" << endl;
@@ -78,20 +78,20 @@ int kdemain( int argc, char **argv )
78 78
 }
79 79
 
80 80
 
81
-kio_isoProtocol::kio_isoProtocol( const TQCString &pool, const TQCString &app ) : SlaveBase( "iso", pool, app )
81
+tdeio_isoProtocol::tdeio_isoProtocol( const TQCString &pool, const TQCString &app ) : SlaveBase( "iso", pool, app )
82 82
 {
83
-  kdDebug() << "kio_isoProtocol::kio_isoProtocol" << endl;
83
+  kdDebug() << "tdeio_isoProtocol::tdeio_isoProtocol" << endl;
84 84
   m_isoFile = 0L;
85 85
 }
86 86
 
87
-kio_isoProtocol::~kio_isoProtocol()
87
+tdeio_isoProtocol::~tdeio_isoProtocol()
88 88
 {
89 89
     delete m_isoFile;
90 90
 }
91 91
 
92
-bool kio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int startsec )
92
+bool tdeio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int startsec )
93 93
 {
94
-    kdDebug()   << "kio_isoProtocol::checkNewFile " << fullPath << " startsec: " <<
94
+    kdDebug()   << "tdeio_isoProtocol::checkNewFile " << fullPath << " startsec: " <<
95 95
         startsec << endl;
96 96
 
97 97
     // Are we already looking at that file ?
@@ -105,7 +105,7 @@ bool kio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int star
105 105
             if ( m_mtime == statbuf.st_mtime )
106 106
             {
107 107
                 path = fullPath.mid( m_isoFile->fileName().length() );
108
-                kdDebug()   << "kio_isoProtocol::checkNewFile returning " << path << endl;
108
+                kdDebug()   << "tdeio_isoProtocol::checkNewFile returning " << path << endl;
109 109
                 return true;
110 110
             }
111 111
         }
@@ -157,7 +157,7 @@ bool kio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int star
157 157
     }
158 158
     if ( isoFile.isEmpty() )
159 159
     {
160
-        kdDebug()   << "kio_isoProtocol::checkNewFile: not found" << endl;
160
+        kdDebug()   << "tdeio_isoProtocol::checkNewFile: not found" << endl;
161 161
         return false;
162 162
     }
163 163
 
@@ -177,7 +177,7 @@ bool kio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int star
177 177
 }
178 178
 
179 179
 
180
-void kio_isoProtocol::createUDSEntry( const KArchiveEntry * isoEntry, UDSEntry & entry )
180
+void tdeio_isoProtocol::createUDSEntry( const KArchiveEntry * isoEntry, UDSEntry & entry )
181 181
 {
182 182
     UDSAtom atom;
183 183
 
@@ -230,9 +230,9 @@ void kio_isoProtocol::createUDSEntry( const KArchiveEntry * isoEntry, UDSEntry &
230 230
     entry.append( atom );
231 231
 }
232 232
 
233
-void kio_isoProtocol::listDir( const KURL & url )
233
+void tdeio_isoProtocol::listDir( const KURL & url )
234 234
 {
235
-    kdDebug() << "kio_isoProtocol::listDir " << url.url() << endl;
235
+    kdDebug() << "tdeio_isoProtocol::listDir " << url.url() << endl;
236 236
 
237 237
     TQString path;
238 238
     if ( !checkNewFile( url.path(), path, url.hasRef() ? url.htmlRef().toInt() : -1 ) )
@@ -263,7 +263,7 @@ void kio_isoProtocol::listDir( const KURL & url )
263 263
         kdDebug() << "url.path()==" << url.path() << endl;
264 264
         if (url.hasRef()) redir.setRef(url.htmlRef());
265 265
         redir.setPath( url.path() + TQString::fromLatin1("/") );
266
-        kdDebug() << "kio_isoProtocol::listDir: redirection " << redir.url() << endl;
266
+        kdDebug() << "tdeio_isoProtocol::listDir: redirection " << redir.url() << endl;
267 267
         redirection( redir );
268 268
         finished();
269 269
         return;
@@ -310,21 +310,21 @@ void kio_isoProtocol::listDir( const KURL & url )
310 310
 
311 311
     finished();
312 312
 
313
-    kdDebug()  << "kio_isoProtocol::listDir done" << endl;
313
+    kdDebug()  << "tdeio_isoProtocol::listDir done" << endl;
314 314
 }
315 315
 
316
-void kio_isoProtocol::stat( const KURL & url )
316
+void tdeio_isoProtocol::stat( const KURL & url )
317 317
 {
318 318
     TQString path;
319 319
     UDSEntry entry;
320 320
 
321
-    kdDebug() << "kio_isoProtocol::stat " << url.url() << endl;
321
+    kdDebug() << "tdeio_isoProtocol::stat " << url.url() << endl;
322 322
     if ( !checkNewFile( url.path(), path, url.hasRef() ? url.htmlRef().toInt() : -1 ) )
323 323
     {
324 324
         // We may be looking at a real directory - this happens
325 325
         // when pressing up after being in the root of an archive
326 326
         TQCString _path( TQFile::encodeName(url.path()));
327
-        kdDebug()  << "kio_isoProtocol::stat (stat) on " << _path << endl;
327
+        kdDebug()  << "tdeio_isoProtocol::stat (stat) on " << _path << endl;
328 328
         struct stat buff;
329 329
         if ( ::stat( _path.data(), &buff ) == -1 || !S_ISDIR( buff.st_mode ) ) {
330 330
             kdDebug() << "isdir=" << S_ISDIR( buff.st_mode ) << "  errno=" << strerror(errno) << endl;
@@ -336,7 +336,7 @@ void kio_isoProtocol::stat( const KURL & url )
336 336
         atom.m_uds = TDEIO::UDS_NAME;
337 337
         atom.m_str = url.fileName();
338 338
         entry.append( atom );
339
-        kdDebug()  << "kio_isoProtocol::stat returning name=" << url.fileName() << endl;
339
+        kdDebug()  << "tdeio_isoProtocol::stat returning name=" << url.fileName() << endl;
340 340
 
341 341
         atom.m_uds = TDEIO::UDS_FILE_TYPE;
342 342
         atom.m_long = buff.st_mode & S_IFMT;
@@ -371,7 +371,7 @@ void kio_isoProtocol::stat( const KURL & url )
371 371
     finished();
372 372
 }
373 373
 
374
-void kio_isoProtocol::getFile( const KIsoFile *isoFileEntry, const TQString &path )
374
+void tdeio_isoProtocol::getFile( const KIsoFile *isoFileEntry, const TQString &path )
375 375
 {
376 376
     unsigned long long size, pos = 0;
377 377
     bool mime=false,zlib=false;
@@ -485,9 +485,9 @@ void kio_isoProtocol::getFile( const KIsoFile *isoFileEntry, const TQString &pat
485 485
 
486 486
 }
487 487
 
488
-void kio_isoProtocol::get( const KURL & url )
488
+void tdeio_isoProtocol::get( const KURL & url )
489 489
 {
490
-    kdDebug()  << "kio_isoProtocol::get" << url.url() << endl;
490
+    kdDebug()  << "tdeio_isoProtocol::get" << url.url() << endl;
491 491
 
492 492
     TQString path;
493 493
     if ( !checkNewFile( url.path(), path, url.hasRef() ? url.htmlRef().toInt() : -1 ) )

+ 3
- 3
tdeioslave/iso/iso.h View File

@@ -28,11 +28,11 @@
28 28
 
29 29
 class KIso;
30 30
 
31
-class kio_isoProtocol : public TDEIO::SlaveBase
31
+class tdeio_isoProtocol : public TDEIO::SlaveBase
32 32
 {
33 33
 public:
34
-    kio_isoProtocol( const TQCString &pool, const TQCString &app );
35
-    virtual ~kio_isoProtocol();
34
+    tdeio_isoProtocol( const TQCString &pool, const TQCString &app );
35
+    virtual ~tdeio_isoProtocol();
36 36
 
37 37
     virtual void listDir( const KURL & url );
38 38
     virtual void stat( const KURL & url );

+ 1
- 1
tdeioslave/iso/iso.protocol View File

@@ -1,5 +1,5 @@
1 1
 [Protocol]
2
-exec=kio_iso
2
+exec=tdeio_iso
3 3
 protocol=iso
4 4
 listing=Name,Type,Size,Date,AccessDate,CreationDate,Access,Owner,Group,Link
5 5
 input=filesystem

+ 1
- 1
tdeioslave/iso/kiso.cpp View File

@@ -326,7 +326,7 @@ void KIso::readParams()
326 326
 {
327 327
     TDEConfig *config;
328 328
 
329
-    config = new TDEConfig("kio_isorc");
329
+    config = new TDEConfig("tdeio_isorc");
330 330
     
331 331
     showhidden=config->readBoolEntry("showhidden",false);
332 332
     showrr=config->readBoolEntry("showrr",true);

tdeioslave/iso/kio_iso.desktop → tdeioslave/iso/tdeio_iso.desktop View File


tdeioslave/iso/kio_isorc → tdeioslave/iso/tdeio_isorc View File


+ 2
- 2
tdeioslave/metainfo/CMakeLists.txt View File

@@ -28,9 +28,9 @@ link_directories(
28 28
 install( FILES metainfo.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
29 29
 
30 30
 
31
-##### kio_metainfo ##############################
31
+##### tdeio_metainfo ##############################
32 32
 
33
-set( target kio_metainfo )
33
+set( target tdeio_metainfo )
34 34
 
35 35
 set( ${target}_SRCS
36 36
   metainfo.cpp

+ 4
- 4
tdeioslave/metainfo/Makefile.am View File

@@ -5,11 +5,11 @@ INCLUDES = $(all_includes)
5 5
 AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
6 6
 METASOURCES = AUTO
7 7
 
8
-kde_module_LTLIBRARIES = kio_metainfo.la
8
+kde_module_LTLIBRARIES = tdeio_metainfo.la
9 9
 
10
-kio_metainfo_la_SOURCES = metainfo.cpp
11
-kio_metainfo_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
12
-kio_metainfo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
10
+tdeio_metainfo_la_SOURCES = metainfo.cpp
11
+tdeio_metainfo_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
12
+tdeio_metainfo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
13 13
 
14 14
 noinst_HEADERS = metainfo.h 
15 15
 

+ 2
- 2
tdeioslave/metainfo/metainfo.cpp View File

@@ -42,11 +42,11 @@ extern "C"
42 42
 
43 43
 int kdemain(int argc, char **argv)
44 44
 {
45
-    TDEApplication app(argc, argv, "kio_metainfo", false, true);
45
+    TDEApplication app(argc, argv, "tdeio_metainfo", false, true);
46 46
 
47 47
     if (argc != 4)
48 48
     {
49
-        kdError() << "Usage: kio_metainfo protocol domain-socket1 domain-socket2" << endl;
49
+        kdError() << "Usage: tdeio_metainfo protocol domain-socket1 domain-socket2" << endl;
50 50
         exit(-1);
51 51
     }
52 52
 

+ 1
- 1
tdeioslave/metainfo/metainfo.protocol View File

@@ -1,5 +1,5 @@
1 1
 [Protocol]
2
-exec=kio_metainfo
2
+exec=tdeio_metainfo
3 3
 protocol=metainfo
4 4
 input=stream
5 5
 output=stream

Loading…
Cancel
Save