Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 11 years ago
parent 352b2ef6c0
commit 62e707662a

@ -245,7 +245,7 @@
<tr ><td><a href="tdecore/KAudioPlayer.html">KAudioPlayer</A></td></tr> <tr ><td><a href="tdecore/KAudioPlayer.html">KAudioPlayer</A></td></tr>
<tr ><td><a href="tdeui/KAuthIcon.html"><i>KAuthIcon</i></A></td></tr> <tr ><td><a href="tdeui/KAuthIcon.html"><i>KAuthIcon</i></A></td></tr>
<tr ><td><a href="kfile/KBindingPropsPlugin.html">KBindingPropsPlugin</A></td></tr> <tr ><td><a href="kfile/KBindingPropsPlugin.html">KBindingPropsPlugin</A></td></tr>
<tr ><td><a href="tdecore/KBufferedIO.html"><i>KBufferedIO</i></A></td></tr> <tr ><td><a href="tdecore/TDEBufferedIO.html"><i>TDEBufferedIO</i></A></td></tr>
<tr ><td><a href="tdeui/KBugReport.html">KBugReport</A></td></tr> <tr ><td><a href="tdeui/KBugReport.html">KBugReport</A></td></tr>
<tr ><td><a href="tdeui/KButtonBox.html">KButtonBox</A></td></tr> <tr ><td><a href="tdeui/KButtonBox.html">KButtonBox</A></td></tr>
<tr ><td><a href="tdeui/TDECModule.html">TDECModule</A></td></tr> <tr ><td><a href="tdeui/TDECModule.html">TDECModule</A></td></tr>

@ -3,7 +3,7 @@
"http://www.w3.org/TR/html4/loose.dtd""> "http://www.w3.org/TR/html4/loose.dtd"">
<html> <html>
<head> <head>
<title>class KBufferedIO</title> <title>class TDEBufferedIO</title>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta name="GENERATOR" content="wabbit dumphtml"> <meta name="GENERATOR" content="wabbit dumphtml">
</head> </head>
@ -12,7 +12,7 @@
<hr> <hr>
<table width="100%"><tr> <table width="100%"><tr>
<td width ="70%"> <td width ="70%">
<h1>class KBufferedIO</h1><hr> <h1>class TDEBufferedIO</h1><hr>
</td> </td>
<td width="30%" valign="top" align="right"> <td width="30%" valign="top" align="right">
<table> <table>
@ -28,7 +28,7 @@
<td width="30%" align=left>tdecore</td> <td width="30%" align=left>tdecore</td>
</tr> </tr>
<tr><td>Class</td> <tr><td>Class</td>
<td>KBufferedIO <a href = "sip/glossary.html#abstract">(<i>abstract</i>)</a></td> <td>TDEBufferedIO <a href = "sip/glossary.html#abstract">(<i>abstract</i>)</a></td>
</tr> </tr>
<tr><td>Inherits</td> <tr><td>Inherits</td>
<td>KAsyncIO </td> <td>KAsyncIO </td>
@ -38,8 +38,8 @@
<li><b>closeModes</b> = {availRead, dirtyWrite, involuntary, delayed, closedNow <li><b>closeModes</b> = {availRead, dirtyWrite, involuntary, delayed, closedNow
}</ul> }</ul>
<h3>methods</h3><ul> <h3>methods</h3><ul>
<li><b>KBufferedIO</b> () <li><b>TDEBufferedIO</b> ()
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>a KBufferedIO instance</i></td></tr> <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>a TDEBufferedIO instance</i></td></tr>
</table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr> </table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>bytesAvailable</b> () <li><b>bytesAvailable</b> ()
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(int)</i></td></tr> <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(int)</i></td></tr>

@ -37,7 +37,7 @@
<tr ><td><a href="TDEApplication.html">TDEApplication</a></td></tr> <tr ><td><a href="TDEApplication.html">TDEApplication</a></td></tr>
<tr ><td><a href="KAsyncIO.html"><i>KAsyncIO</i></a></td></tr> <tr ><td><a href="KAsyncIO.html"><i>KAsyncIO</i></a></td></tr>
<tr ><td><a href="KAudioPlayer.html">KAudioPlayer</a></td></tr> <tr ><td><a href="KAudioPlayer.html">KAudioPlayer</a></td></tr>
<tr ><td><a href="KBufferedIO.html"><i>KBufferedIO</i></a></td></tr> <tr ><td><a href="TDEBufferedIO.html"><i>TDEBufferedIO</i></a></td></tr>
<tr ><td><a href="KCalendarSystem.html"><i>KCalendarSystem</i></a></td></tr> <tr ><td><a href="KCalendarSystem.html"><i>KCalendarSystem</i></a></td></tr>
<tr ><td><a href="KCalendarSystemFactory.html">KCalendarSystemFactory</a></td></tr> <tr ><td><a href="KCalendarSystemFactory.html">KCalendarSystemFactory</a></td></tr>
<tr ><td><a href="KCatalogue.html">KCatalogue</a></td></tr> <tr ><td><a href="KCatalogue.html">KCatalogue</a></td></tr>

@ -22,7 +22,7 @@ tdecore,KAccelShortcutList,,,
tdecore,TDEApplication,,, tdecore,TDEApplication,,,
tdecore,KAsyncIO,,, tdecore,KAsyncIO,,,
tdecore,KAudioPlayer,,, tdecore,KAudioPlayer,,,
tdecore,KBufferedIO,,, tdecore,TDEBufferedIO,,,
tdecore,KCalendarSystem,,, tdecore,KCalendarSystem,,,
tdecore,KCalendarSystemFactory,,, tdecore,KCalendarSystemFactory,,,
tdecore,KCatalogue,,, tdecore,KCatalogue,,,

@ -47,7 +47,7 @@
* a single ':' the file-class is specific to the current application. * a single ':' the file-class is specific to the current application.
* If the file-class starts with '::' it is global to all applications. * If the file-class starts with '::' it is global to all applications.
*/ */
class KIO_EXPORT KRecentDirs class TDEIO_EXPORT KRecentDirs
{ {
public: public:
/** /**

@ -75,7 +75,7 @@ class TDECModule;
* @author Dawit Alemayehu <adawit at kde.org> * @author Dawit Alemayehu <adawit at kde.org>
*/ */
class KIO_EXPORT KURIFilterData class TDEIO_EXPORT KURIFilterData
{ {
friend class KURIFilterPlugin; friend class KURIFilterPlugin;
@ -341,7 +341,7 @@ private:
* *
* @short Abstract class for URI filter plugins. * @short Abstract class for URI filter plugins.
*/ */
class KIO_EXPORT KURIFilterPlugin : public TQObject class TDEIO_EXPORT KURIFilterPlugin : public TQObject
{ {
Q_OBJECT Q_OBJECT
@ -440,7 +440,7 @@ private:
/** /**
* A list of filter plugins. * A list of filter plugins.
*/ */
class KIO_EXPORT KURIFilterPluginList : public TQPtrList<KURIFilterPlugin> class TDEIO_EXPORT KURIFilterPluginList : public TQPtrList<KURIFilterPlugin>
{ {
public: public:
virtual int compareItems(Item a, Item b) virtual int compareItems(Item a, Item b)
@ -525,7 +525,7 @@ private:
* @short Filters a given URL into its proper format whenever possible. * @short Filters a given URL into its proper format whenever possible.
*/ */
class KIO_EXPORT KURIFilter class TDEIO_EXPORT KURIFilter
{ {
public: public:
/** /**

@ -47,7 +47,7 @@
* a single ':' the file-class is specific to the current application. * a single ':' the file-class is specific to the current application.
* If the file-class starts with '::' it is global to all applications. * If the file-class starts with '::' it is global to all applications.
*/ */
class KIO_EXPORT KRecentDirs class TDEIO_EXPORT KRecentDirs
{ {
public: public:
/** /**

@ -75,7 +75,7 @@ class TDECModule;
* @author Dawit Alemayehu <adawit at kde.org> * @author Dawit Alemayehu <adawit at kde.org>
*/ */
class KIO_EXPORT KURIFilterData class TDEIO_EXPORT KURIFilterData
{ {
friend class KURIFilterPlugin; friend class KURIFilterPlugin;
@ -341,7 +341,7 @@ private:
* *
* @short Abstract class for URI filter plugins. * @short Abstract class for URI filter plugins.
*/ */
class KIO_EXPORT KURIFilterPlugin : public TQObject class TDEIO_EXPORT KURIFilterPlugin : public TQObject
{ {
Q_OBJECT Q_OBJECT
@ -440,7 +440,7 @@ private:
/** /**
* A list of filter plugins. * A list of filter plugins.
*/ */
class KIO_EXPORT KURIFilterPluginList : public TQPtrList<KURIFilterPlugin> class TDEIO_EXPORT KURIFilterPluginList : public TQPtrList<KURIFilterPlugin>
{ {
public: public:
virtual int compareItems(Item a, Item b) virtual int compareItems(Item a, Item b)
@ -525,7 +525,7 @@ private:
* @short Filters a given URL into its proper format whenever possible. * @short Filters a given URL into its proper format whenever possible.
*/ */
class KIO_EXPORT KURIFilter class TDEIO_EXPORT KURIFilter
{ {
public: public:
/** /**

@ -47,7 +47,7 @@
* a single ':' the file-class is specific to the current application. * a single ':' the file-class is specific to the current application.
* If the file-class starts with '::' it is global to all applications. * If the file-class starts with '::' it is global to all applications.
*/ */
class KIO_EXPORT KRecentDirs class TDEIO_EXPORT KRecentDirs
{ {
public: public:
/** /**

@ -75,7 +75,7 @@ class TDECModule;
* @author Dawit Alemayehu <adawit at kde.org> * @author Dawit Alemayehu <adawit at kde.org>
*/ */
class KIO_EXPORT KURIFilterData class TDEIO_EXPORT KURIFilterData
{ {
friend class KURIFilterPlugin; friend class KURIFilterPlugin;
@ -341,7 +341,7 @@ private:
* *
* @short Abstract class for URI filter plugins. * @short Abstract class for URI filter plugins.
*/ */
class KIO_EXPORT KURIFilterPlugin : public TQObject class TDEIO_EXPORT KURIFilterPlugin : public TQObject
{ {
Q_OBJECT Q_OBJECT
@ -440,7 +440,7 @@ private:
/** /**
* A list of filter plugins. * A list of filter plugins.
*/ */
class KIO_EXPORT KURIFilterPluginList : public TQPtrList<KURIFilterPlugin> class TDEIO_EXPORT KURIFilterPluginList : public TQPtrList<KURIFilterPlugin>
{ {
public: public:
virtual int compareItems(Item a, Item b) virtual int compareItems(Item a, Item b)
@ -525,7 +525,7 @@ private:
* @short Filters a given URL into its proper format whenever possible. * @short Filters a given URL into its proper format whenever possible.
*/ */
class KIO_EXPORT KURIFilter class TDEIO_EXPORT KURIFilter
{ {
public: public:
/** /**

@ -47,7 +47,7 @@
* a single ':' the file-class is specific to the current application. * a single ':' the file-class is specific to the current application.
* If the file-class starts with '::' it is global to all applications. * If the file-class starts with '::' it is global to all applications.
*/ */
class KIO_EXPORT KRecentDirs class TDEIO_EXPORT KRecentDirs
{ {
public: public:
/** /**

@ -75,7 +75,7 @@ class TDECModule;
* @author Dawit Alemayehu <adawit at kde.org> * @author Dawit Alemayehu <adawit at kde.org>
*/ */
class KIO_EXPORT KURIFilterData class TDEIO_EXPORT KURIFilterData
{ {
friend class KURIFilterPlugin; friend class KURIFilterPlugin;
@ -341,7 +341,7 @@ private:
* *
* @short Abstract class for URI filter plugins. * @short Abstract class for URI filter plugins.
*/ */
class KIO_EXPORT KURIFilterPlugin : public TQObject class TDEIO_EXPORT KURIFilterPlugin : public TQObject
{ {
Q_OBJECT Q_OBJECT
@ -440,7 +440,7 @@ private:
/** /**
* A list of filter plugins. * A list of filter plugins.
*/ */
class KIO_EXPORT KURIFilterPluginList : public TQPtrList<KURIFilterPlugin> class TDEIO_EXPORT KURIFilterPluginList : public TQPtrList<KURIFilterPlugin>
{ {
public: public:
virtual int compareItems(Item a, Item b) virtual int compareItems(Item a, Item b)
@ -525,7 +525,7 @@ private:
* @short Filters a given URL into its proper format whenever possible. * @short Filters a given URL into its proper format whenever possible.
*/ */
class KIO_EXPORT KURIFilter class TDEIO_EXPORT KURIFilter
{ {
public: public:
/** /**

@ -47,7 +47,7 @@
* a single ':' the file-class is specific to the current application. * a single ':' the file-class is specific to the current application.
* If the file-class starts with '::' it is global to all applications. * If the file-class starts with '::' it is global to all applications.
*/ */
class KIO_EXPORT KRecentDirs class TDEIO_EXPORT KRecentDirs
{ {
public: public:
/** /**

@ -75,7 +75,7 @@ class TDECModule;
* @author Dawit Alemayehu <adawit at kde.org> * @author Dawit Alemayehu <adawit at kde.org>
*/ */
class KIO_EXPORT KURIFilterData class TDEIO_EXPORT KURIFilterData
{ {
friend class KURIFilterPlugin; friend class KURIFilterPlugin;
@ -341,7 +341,7 @@ private:
* *
* @short Abstract class for URI filter plugins. * @short Abstract class for URI filter plugins.
*/ */
class KIO_EXPORT KURIFilterPlugin : public TQObject class TDEIO_EXPORT KURIFilterPlugin : public TQObject
{ {
Q_OBJECT Q_OBJECT
@ -440,7 +440,7 @@ private:
/** /**
* A list of filter plugins. * A list of filter plugins.
*/ */
class KIO_EXPORT KURIFilterPluginList : public TQPtrList<KURIFilterPlugin> class TDEIO_EXPORT KURIFilterPluginList : public TQPtrList<KURIFilterPlugin>
{ {
public: public:
virtual int compareItems(Item a, Item b) virtual int compareItems(Item a, Item b)
@ -525,7 +525,7 @@ private:
* @short Filters a given URL into its proper format whenever possible. * @short Filters a given URL into its proper format whenever possible.
*/ */
class KIO_EXPORT KURIFilter class TDEIO_EXPORT KURIFilter
{ {
public: public:
/** /**

@ -75,7 +75,7 @@ class TDECModule;
* @author Dawit Alemayehu <adawit at kde.org> * @author Dawit Alemayehu <adawit at kde.org>
*/ */
class KIO_EXPORT KURIFilterData class TDEIO_EXPORT KURIFilterData
{ {
friend class KURIFilterPlugin; friend class KURIFilterPlugin;
@ -341,7 +341,7 @@ private:
* *
* @short Abstract class for URI filter plugins. * @short Abstract class for URI filter plugins.
*/ */
class KIO_EXPORT KURIFilterPlugin : public TQObject class TDEIO_EXPORT KURIFilterPlugin : public TQObject
{ {
Q_OBJECT Q_OBJECT
@ -440,7 +440,7 @@ private:
/** /**
* A list of filter plugins. * A list of filter plugins.
*/ */
class KIO_EXPORT KURIFilterPluginList : public TQPtrList<KURIFilterPlugin> class TDEIO_EXPORT KURIFilterPluginList : public TQPtrList<KURIFilterPlugin>
{ {
public: public:
virtual int compareItems(Item a, Item b) virtual int compareItems(Item a, Item b)
@ -525,7 +525,7 @@ private:
* @short Filters a given URL into its proper format whenever possible. * @short Filters a given URL into its proper format whenever possible.
*/ */
class KIO_EXPORT KURIFilter class TDEIO_EXPORT KURIFilter
{ {
public: public:
/** /**

@ -75,7 +75,7 @@ class TDECModule;
* @author Dawit Alemayehu <adawit at kde.org> * @author Dawit Alemayehu <adawit at kde.org>
*/ */
class KIO_EXPORT KURIFilterData class TDEIO_EXPORT KURIFilterData
{ {
friend class KURIFilterPlugin; friend class KURIFilterPlugin;
@ -341,7 +341,7 @@ private:
* *
* @short Abstract class for URI filter plugins. * @short Abstract class for URI filter plugins.
*/ */
class KIO_EXPORT KURIFilterPlugin : public TQObject class TDEIO_EXPORT KURIFilterPlugin : public TQObject
{ {
Q_OBJECT Q_OBJECT
@ -440,7 +440,7 @@ private:
/** /**
* A list of filter plugins. * A list of filter plugins.
*/ */
class KIO_EXPORT KURIFilterPluginList : public TQPtrList<KURIFilterPlugin> class TDEIO_EXPORT KURIFilterPluginList : public TQPtrList<KURIFilterPlugin>
{ {
public: public:
virtual int compareItems(Item a, Item b) virtual int compareItems(Item a, Item b)
@ -525,7 +525,7 @@ private:
* @short Filters a given URL into its proper format whenever possible. * @short Filters a given URL into its proper format whenever possible.
*/ */
class KIO_EXPORT KURIFilter class TDEIO_EXPORT KURIFilter
{ {
public: public:
/** /**

@ -75,7 +75,7 @@ class TDECModule;
* @author Dawit Alemayehu <adawit at kde.org> * @author Dawit Alemayehu <adawit at kde.org>
*/ */
class KIO_EXPORT KURIFilterData class TDEIO_EXPORT KURIFilterData
{ {
friend class KURIFilterPlugin; friend class KURIFilterPlugin;
@ -341,7 +341,7 @@ private:
* *
* @short Abstract class for URI filter plugins. * @short Abstract class for URI filter plugins.
*/ */
class KIO_EXPORT KURIFilterPlugin : public TQObject class TDEIO_EXPORT KURIFilterPlugin : public TQObject
{ {
Q_OBJECT Q_OBJECT
@ -440,7 +440,7 @@ private:
/** /**
* A list of filter plugins. * A list of filter plugins.
*/ */
class KIO_EXPORT KURIFilterPluginList : public TQPtrList<KURIFilterPlugin> class TDEIO_EXPORT KURIFilterPluginList : public TQPtrList<KURIFilterPlugin>
{ {
public: public:
virtual int compareItems(Item a, Item b) virtual int compareItems(Item a, Item b)
@ -525,7 +525,7 @@ private:
* @short Filters a given URL into its proper format whenever possible. * @short Filters a given URL into its proper format whenever possible.
*/ */
class KIO_EXPORT KURIFilter class TDEIO_EXPORT KURIFilter
{ {
public: public:
/** /**

@ -189,8 +189,8 @@ libs = -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -ltdeui -ltdecore -ld
-ltdecorecmodule -ltdeuicmodule -ltdecorecmodule -ltdeuicmodule
sipslot = sipslot =
define = "\(TDEIO::filesize_t\)\-1", "-1" define = "\(TDEIO::filesize_t\)\-1", "-1"
define = "KIO_EXPORT_DEPRECATED", "" define = "TDEIO_EXPORT_DEPRECATED", ""
define = "KIO_EXPORT", "" define = "TDEIO_EXPORT", ""
retain retain

@ -189,8 +189,8 @@ libs = -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -ltdeui -ltdecore -ld
-ltdecorecmodule -ltdeuicmodule -ltdecorecmodule -ltdeuicmodule
sipslot = sipslot =
define = "\(TDEIO::filesize_t\)\-1", "-1" define = "\(TDEIO::filesize_t\)\-1", "-1"
define = "KIO_EXPORT_DEPRECATED", "" define = "TDEIO_EXPORT_DEPRECATED", ""
define = "KIO_EXPORT", "" define = "TDEIO_EXPORT", ""
retain retain

@ -189,8 +189,8 @@ libs = -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -ltdeui -ltdecore -ld
-ltdecorecmodule -ltdeuicmodule -ltdecorecmodule -ltdeuicmodule
sipslot = sipslot =
define = "\(TDEIO::filesize_t\)\-1", "-1" define = "\(TDEIO::filesize_t\)\-1", "-1"
define = "KIO_EXPORT_DEPRECATED", "" define = "TDEIO_EXPORT_DEPRECATED", ""
define = "KIO_EXPORT", "" define = "TDEIO_EXPORT", ""
retain retain

@ -189,8 +189,8 @@ libs = -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -ltdeui -ltdecore -ld
-ltdecorecmodule -ltdeuicmodule -ltdecorecmodule -ltdeuicmodule
sipslot = sipslot =
define = "\(TDEIO::filesize_t\)\-1", "-1" define = "\(TDEIO::filesize_t\)\-1", "-1"
define = "KIO_EXPORT_DEPRECATED", "" define = "TDEIO_EXPORT_DEPRECATED", ""
define = "KIO_EXPORT", "" define = "TDEIO_EXPORT", ""
retain retain

@ -121,7 +121,7 @@ public:
{sipName_TDEApplication, &sipClass_TDEApplication}, {sipName_TDEApplication, &sipClass_TDEApplication},
{sipName_KAsyncIO, &sipClass_KAsyncIO}, {sipName_KAsyncIO, &sipClass_KAsyncIO},
{sipName_KAudioPlayer, &sipClass_KAudioPlayer}, {sipName_KAudioPlayer, &sipClass_KAudioPlayer},
{sipName_KBufferedIO, &sipClass_KBufferedIO}, {sipName_TDEBufferedIO, &sipClass_TDEBufferedIO},
#if TDE_VERSION >= 0x030100 #if TDE_VERSION >= 0x030100
{sipName_TDEClipboardSynchronizer, &sipClass_TDEClipboardSynchronizer}, {sipName_TDEClipboardSynchronizer, &sipClass_TDEClipboardSynchronizer},
#endif #endif

@ -24,7 +24,7 @@
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
class KBufferedIO : KAsyncIO class TDEBufferedIO : KAsyncIO
{ {
%TypeHeaderCode %TypeHeaderCode
#include <kbufferedio.h> #include <kbufferedio.h>
@ -32,7 +32,7 @@ class KBufferedIO : KAsyncIO
protected: protected:
KBufferedIO (); TDEBufferedIO ();
public: public:
@ -69,5 +69,5 @@ protected:
protected: protected:
//igx virtual void virtual_hook (int, void*); //igx virtual void virtual_hook (int, void*);
}; // class KBufferedIO }; // class TDEBufferedIO

Loading…
Cancel
Save