diff options
| -rw-r--r-- | kalyptus/kalyptusCxxToSwig.pm | 2 | ||||
| -rw-r--r-- | kdejava/koala/org/kde/koala/KDEDesktopMimeType.java | 2 | ||||
| -rw-r--r-- | kdejava/koala/org/kde/koala/KDirLister.java | 4 | ||||
| -rw-r--r-- | kdejava/koala/org/kde/koala/KHTMLPart.java | 4 | ||||
| -rw-r--r-- | kdejava/koala/org/kde/koala/KProtocolInfo.java | 8 | ||||
| -rw-r--r-- | kdejava/koala/org/kde/koala/KProtocolManager.java | 6 | ||||
| -rw-r--r-- | kdejava/koala/org/kde/koala/NetAccess.java | 2 | ||||
| -rw-r--r-- | kdejava/koala/org/kde/koala/SlaveBase.java | 4 | ||||
| -rw-r--r-- | kdejava/koala/org/kde/koala/TDEIO.java | 6 | ||||
| -rw-r--r-- | korundum/rubylib/korundum/Korundum.cpp | 4 | ||||
| -rw-r--r-- | qtruby/rubylib/qtruby/Qt.cpp | 14 |
11 files changed, 28 insertions, 28 deletions
diff --git a/kalyptus/kalyptusCxxToSwig.pm b/kalyptus/kalyptusCxxToSwig.pm index 8cd2bc12..e4e72f54 100644 --- a/kalyptus/kalyptusCxxToSwig.pm +++ b/kalyptus/kalyptusCxxToSwig.pm @@ -838,7 +838,7 @@ sub writeClassDoc my $sourcename = $node->{Source}->{astNodeName}; - if ( $sourcename =~ m!.*(dom|kabc|tdeprint|tdesu|kio|kjs|tdeparts|tdetexteditor|libtdemid)/([^/]*$)! ) { + if ( $sourcename =~ m!.*(dom|kabc|tdeprint|tdesu|tdeio|kjs|tdeparts|tdetexteditor|libtdemid)/([^/]*$)! ) { $sourcename = $1."/".$2; } else { $sourcename =~ s!.*/([^/]*$)!$1!; diff --git a/kdejava/koala/org/kde/koala/KDEDesktopMimeType.java b/kdejava/koala/org/kde/koala/KDEDesktopMimeType.java index be932c01..2f0e3935 100644 --- a/kdejava/koala/org/kde/koala/KDEDesktopMimeType.java +++ b/kdejava/koala/org/kde/koala/KDEDesktopMimeType.java @@ -47,7 +47,7 @@ public class KDEDesktopMimeType extends KMimeType { public native String comment(KURL _url, boolean _is_local); /** Returns a list of services for the given .desktop file that are handled - by kio itself. Namely mount/unmount for FSDevice files. + by tdeio itself. Namely mount/unmount for FSDevice files. @return the list of services @short Returns a list of services for the given . diff --git a/kdejava/koala/org/kde/koala/KDirLister.java b/kdejava/koala/org/kde/koala/KDirLister.java index 83d4b608..96679a75 100644 --- a/kdejava/koala/org/kde/koala/KDirLister.java +++ b/kdejava/koala/org/kde/koala/KDirLister.java @@ -10,7 +10,7 @@ import org.kde.qt.TQObject; /** - The dir lister deals with the kiojob used to list and update a directory + The dir lister deals with the tdeiojob used to list and update a directory and has signals for the user of this class (e.g. konqueror view or kdesktop) to create/destroy its items when asked. This class is independent from the graphical representation of the dir @@ -41,7 +41,7 @@ import org.kde.qt.TQObject; See {@link KDirListerSignals} for signals emitted by KDirLister @author Michael Brade <brade@kde.org> - @short Helper class for the kiojob used to list and update a directory. + @short Helper class for the tdeiojob used to list and update a directory. */ public class KDirLister extends TQObject { diff --git a/kdejava/koala/org/kde/koala/KHTMLPart.java b/kdejava/koala/org/kde/koala/KHTMLPart.java index 13abfc0f..9b20aa31 100644 --- a/kdejava/koala/org/kde/koala/KHTMLPart.java +++ b/kdejava/koala/org/kde/koala/KHTMLPart.java @@ -923,8 +923,8 @@ public class KHTMLPart extends ReadOnlyPart { protected native KURL completeURL(String url); /** presents a detailed error message to the user. - <code>errorCode</code> kio error code, eg KIO.ERR_SERVER_TIMEOUT. - <code>text</code> kio additional information text. + <code>errorCode</code> tdeio error code, eg KIO.ERR_SERVER_TIMEOUT. + <code>text</code> tdeio additional information text. <code>url</code> the url that triggered the error. @short presents a detailed error message to the user. */ diff --git a/kdejava/koala/org/kde/koala/KProtocolInfo.java b/kdejava/koala/org/kde/koala/KProtocolInfo.java index 858bce91..01f0913b 100644 --- a/kdejava/koala/org/kde/koala/KProtocolInfo.java +++ b/kdejava/koala/org/kde/koala/KProtocolInfo.java @@ -100,14 +100,14 @@ public class KProtocolInfo extends KSycocaEntry { public static native boolean isKnownProtocol(String protocol); /** Returns the library / executable to open for the protocol <code>protocol</code> - Example : "kio_ftp", meaning either the executable "kio_ftp" or - the library "kio_ftp.la" (recommended), whichever is available. + Example : "tdeio_ftp", meaning either the executable "tdeio_ftp" or + the library "tdeio_ftp.la" (recommended), whichever is available. This corresponds to the "exec=" field in the protocol description file. @param protocol the protocol to check @return the executable of library to open, or null for unsupported protocols - @short Returns the library / executable to open for the protocol <code>protocol</code> Example : "kio_ftp", meaning either the executable "kio_ftp" or the library "kio_ftp. + @short Returns the library / executable to open for the protocol <code>protocol</code> Example : "tdeio_ftp", meaning either the executable "tdeio_ftp" or the library "tdeio_ftp. @see KURL#protocol */ public static native String exec(String protocol); @@ -355,7 +355,7 @@ public class KProtocolInfo extends KSycocaEntry { copying a file or directory to another directory. By default the destination filename is made out of the filename in the source URL. However if the ioslave displays names that are different from the filename of the URL - (e.g. kio_fonts shows Arial for arial.ttf, or kio_trash shows foo.txt and + (e.g. tdeio_fonts shows Arial for arial.ttf, or tdeio_trash shows foo.txt and uses some internal URL), using Name means that the display name (UDS_NAME) will be used to as the filename in the destination directory. This corresponds to the "fileNameUsedForCopying=" field in the protocol description file. diff --git a/kdejava/koala/org/kde/koala/KProtocolManager.java b/kdejava/koala/org/kde/koala/KProtocolManager.java index 57166d56..419d3d62 100644 --- a/kdejava/koala/org/kde/koala/KProtocolManager.java +++ b/kdejava/koala/org/kde/koala/KProtocolManager.java @@ -66,10 +66,10 @@ public class KProtocolManager implements QtSupport { </li> <li> - Automatic - Use auto login as defined in .kionetrc files. + Automatic - Use auto login as defined in .tdeionetrc files. </li> - NOTE: .kionetrc files have the same format as ftp .netrc files. - Please note the use of .kionetrc files is highly discouraged since + NOTE: .tdeionetrc files have the same format as ftp .netrc files. + Please note the use of .tdeionetrc files is highly discouraged since password is stored in clear text. For future releases the ability to store preset password for proxy servers will probably be supported through KWallet integration. diff --git a/kdejava/koala/org/kde/koala/NetAccess.java b/kdejava/koala/org/kde/koala/NetAccess.java index fc8cc15a..a28edc0f 100644 --- a/kdejava/koala/org/kde/koala/NetAccess.java +++ b/kdejava/koala/org/kde/koala/NetAccess.java @@ -22,7 +22,7 @@ import org.kde.qt.TQObject; This class isn't meant to be used as a class but only as a simple namespace for static functions, though an instance of the class is built for internal purposes. - Port to kio done by David Faure, faure@kde.org + Port to tdeio done by David Faure, faure@kde.org @short Provides an easy, synchronous interface to KIO file operations. */ diff --git a/kdejava/koala/org/kde/koala/SlaveBase.java b/kdejava/koala/org/kde/koala/SlaveBase.java index 0eb4012b..238b1641 100644 --- a/kdejava/koala/org/kde/koala/SlaveBase.java +++ b/kdejava/koala/org/kde/koala/SlaveBase.java @@ -384,11 +384,11 @@ public class SlaveBase implements QtSupport { public native void del(KURL url, boolean isfile); /** Used for any command that is specific to this slave (protocol) - Examples are : HTTP POST, mount and unmount (kio_file) + Examples are : HTTP POST, mount and unmount (tdeio_file) @param data packed data; the meaning is completely dependent on the slave, but usually starts with an int for the command number. Document your slave's commands, at least in its header file. - @short Used for any command that is specific to this slave (protocol) Examples are : HTTP POST, mount and unmount (kio_file) + @short Used for any command that is specific to this slave (protocol) Examples are : HTTP POST, mount and unmount (tdeio_file) */ public native void special(byte[] data); /** diff --git a/kdejava/koala/org/kde/koala/TDEIO.java b/kdejava/koala/org/kde/koala/TDEIO.java index 716744ac..dbe92bf0 100644 --- a/kdejava/koala/org/kde/koala/TDEIO.java +++ b/kdejava/koala/org/kde/koala/TDEIO.java @@ -645,7 +645,7 @@ public class KIO { public static native SimpleJob symlink(String target, KURL dest, boolean overwrite); /** Execute any command that is specific to one slave (protocol). - Examples are : HTTP POST, mount and unmount (kio_file) + Examples are : HTTP POST, mount and unmount (tdeio_file) @param url The URL isn't passed to the slave, but is used to know which slave to send it to :-) @param data Packed data. The meaning is completely dependent on the @@ -659,7 +659,7 @@ public class KIO { public static native SimpleJob special(KURL url, byte[] data); /** Mount filesystem. - Special job for <code>kio_file.</code> + Special job for <code>tdeio_file.</code> @param ro Mount read-only if <code>true.</code> @param fstype File system type (e.g. "ext2", can be null). @param dev Device (e.g. /dev/sda0). @@ -673,7 +673,7 @@ public class KIO { public static native SimpleJob mount(boolean ro, String fstype, String dev, String point); /** Unmount filesystem. - Special job for <code>kio_file.</code> + Special job for <code>tdeio_file.</code> @param point Point to unmount. @param showProgressInfo true to show progress information @return the job handling the operation. diff --git a/korundum/rubylib/korundum/Korundum.cpp b/korundum/rubylib/korundum/Korundum.cpp index 24fedc82..2e8125bb 100644 --- a/korundum/rubylib/korundum/Korundum.cpp +++ b/korundum/rubylib/korundum/Korundum.cpp @@ -54,7 +54,7 @@ extern "C" { extern VALUE qt_internal_module; extern VALUE tdeconfigskeleton_class; extern VALUE tdeconfigskeleton_itemenum_choice_class; -extern VALUE kio_udsatom_class; +extern VALUE tdeio_udsatom_class; extern VALUE konsole_part_class; extern VALUE set_obj_info(const char * className, smokeruby_object * o); extern void set_kde_resolve_classname(const char * (*kde_resolve_classname) (Smoke*, int, void *)); @@ -915,7 +915,7 @@ extern VALUE qt_module; extern VALUE qt_internal_module; extern VALUE qt_base_class; extern VALUE kde_module; -extern VALUE kio_module; +extern VALUE tdeio_module; extern VALUE tdeparts_module; extern VALUE tdehtml_module; diff --git a/qtruby/rubylib/qtruby/Qt.cpp b/qtruby/rubylib/qtruby/Qt.cpp index ac48ce88..f6c8c7ec 100644 --- a/qtruby/rubylib/qtruby/Qt.cpp +++ b/qtruby/rubylib/qtruby/Qt.cpp @@ -99,7 +99,7 @@ VALUE qt_module = Qnil; VALUE qext_scintilla_module = Qnil; VALUE kde_module = Qnil; VALUE tdeparts_module = Qnil; -VALUE kio_module = Qnil; +VALUE tdeio_module = Qnil; VALUE kns_module = Qnil; VALUE dom_module = Qnil; VALUE kontact_module = Qnil; @@ -113,7 +113,7 @@ VALUE qvariant_class = Qnil; VALUE tdeconfigskeleton_class = Qnil; VALUE tdeconfigskeleton_itemenum_class = Qnil; VALUE tdeconfigskeleton_itemenum_choice_class = Qnil; -VALUE kio_udsatom_class = Qnil; +VALUE tdeio_udsatom_class = Qnil; VALUE twin_class = Qnil; VALUE konsole_part_class = Qnil; bool application_terminated = false; @@ -2699,10 +2699,10 @@ static TQRegExp * scope_op = 0; klass = rb_define_class_under(kns_module, package+strlen("KNS::"), base_class); rb_define_singleton_method(klass, "new", (VALUE (*) (...)) _new_kde, -1); } else if (packageName.startsWith("TDEIO::")) { - klass = rb_define_class_under(kio_module, package+strlen("TDEIO::"), base_class); + klass = rb_define_class_under(tdeio_module, package+strlen("TDEIO::"), base_class); rb_define_singleton_method(klass, "new", (VALUE (*) (...)) _new_kde, -1); if (packageName == "TDEIO::UDSAtom") { - kio_udsatom_class = klass; + tdeio_udsatom_class = klass; } } else if (packageName.startsWith("DOM::")) { klass = rb_define_class_under(dom_module, package+strlen("DOM::"), base_class); @@ -2839,9 +2839,9 @@ set_new_kde(VALUE (*new_kde) (int, VALUE *, VALUE)) rb_define_singleton_method(kns_module, "method_missing", (VALUE (*) (...)) kde_module_method_missing, -1); rb_define_singleton_method(kns_module, "const_missing", (VALUE (*) (...)) kde_module_method_missing, -1); - kio_module = rb_define_module("KIO"); - rb_define_singleton_method(kio_module, "method_missing", (VALUE (*) (...)) kde_module_method_missing, -1); - rb_define_singleton_method(kio_module, "const_missing", (VALUE (*) (...)) kde_module_method_missing, -1); + tdeio_module = rb_define_module("KIO"); + rb_define_singleton_method(tdeio_module, "method_missing", (VALUE (*) (...)) kde_module_method_missing, -1); + rb_define_singleton_method(tdeio_module, "const_missing", (VALUE (*) (...)) kde_module_method_missing, -1); dom_module = rb_define_module("DOM"); rb_define_singleton_method(dom_module, "method_missing", (VALUE (*) (...)) kde_module_method_missing, -1); |