From 62e707662a0943c63abdd7df358e323c95a97eda Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 12:59:34 -0600 Subject: Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4 --- extra/kde340/krecentdirs.h | 2 +- extra/kde340/kurifilter.h | 8 ++++---- extra/kde341/krecentdirs.h | 2 +- extra/kde341/kurifilter.h | 8 ++++---- extra/kde342/krecentdirs.h | 2 +- extra/kde342/kurifilter.h | 8 ++++---- extra/kde343/krecentdirs.h | 2 +- extra/kde343/kurifilter.h | 8 ++++---- extra/kde350/krecentdirs.h | 2 +- extra/kde350/kurifilter.h | 8 ++++---- extra/kde351/kurifilter.h | 8 ++++---- extra/kde352/kurifilter.h | 8 ++++---- extra/kde353/kurifilter.h | 8 ++++---- 13 files changed, 37 insertions(+), 37 deletions(-) (limited to 'extra') diff --git a/extra/kde340/krecentdirs.h b/extra/kde340/krecentdirs.h index e8c6c94..774655e 100644 --- a/extra/kde340/krecentdirs.h +++ b/extra/kde340/krecentdirs.h @@ -47,7 +47,7 @@ * a single ':' the file-class is specific to the current application. * If the file-class starts with '::' it is global to all applications. */ -class KIO_EXPORT KRecentDirs +class TDEIO_EXPORT KRecentDirs { public: /** diff --git a/extra/kde340/kurifilter.h b/extra/kde340/kurifilter.h index 33efcdd..53dbaa6 100644 --- a/extra/kde340/kurifilter.h +++ b/extra/kde340/kurifilter.h @@ -75,7 +75,7 @@ class TDECModule; * @author Dawit Alemayehu */ -class KIO_EXPORT KURIFilterData +class TDEIO_EXPORT KURIFilterData { friend class KURIFilterPlugin; @@ -341,7 +341,7 @@ private: * * @short Abstract class for URI filter plugins. */ -class KIO_EXPORT KURIFilterPlugin : public TQObject +class TDEIO_EXPORT KURIFilterPlugin : public TQObject { Q_OBJECT @@ -440,7 +440,7 @@ private: /** * A list of filter plugins. */ -class KIO_EXPORT KURIFilterPluginList : public TQPtrList +class TDEIO_EXPORT KURIFilterPluginList : public TQPtrList { public: virtual int compareItems(Item a, Item b) @@ -525,7 +525,7 @@ private: * @short Filters a given URL into its proper format whenever possible. */ -class KIO_EXPORT KURIFilter +class TDEIO_EXPORT KURIFilter { public: /** diff --git a/extra/kde341/krecentdirs.h b/extra/kde341/krecentdirs.h index e8c6c94..774655e 100644 --- a/extra/kde341/krecentdirs.h +++ b/extra/kde341/krecentdirs.h @@ -47,7 +47,7 @@ * a single ':' the file-class is specific to the current application. * If the file-class starts with '::' it is global to all applications. */ -class KIO_EXPORT KRecentDirs +class TDEIO_EXPORT KRecentDirs { public: /** diff --git a/extra/kde341/kurifilter.h b/extra/kde341/kurifilter.h index 33efcdd..53dbaa6 100644 --- a/extra/kde341/kurifilter.h +++ b/extra/kde341/kurifilter.h @@ -75,7 +75,7 @@ class TDECModule; * @author Dawit Alemayehu */ -class KIO_EXPORT KURIFilterData +class TDEIO_EXPORT KURIFilterData { friend class KURIFilterPlugin; @@ -341,7 +341,7 @@ private: * * @short Abstract class for URI filter plugins. */ -class KIO_EXPORT KURIFilterPlugin : public TQObject +class TDEIO_EXPORT KURIFilterPlugin : public TQObject { Q_OBJECT @@ -440,7 +440,7 @@ private: /** * A list of filter plugins. */ -class KIO_EXPORT KURIFilterPluginList : public TQPtrList +class TDEIO_EXPORT KURIFilterPluginList : public TQPtrList { public: virtual int compareItems(Item a, Item b) @@ -525,7 +525,7 @@ private: * @short Filters a given URL into its proper format whenever possible. */ -class KIO_EXPORT KURIFilter +class TDEIO_EXPORT KURIFilter { public: /** diff --git a/extra/kde342/krecentdirs.h b/extra/kde342/krecentdirs.h index e8c6c94..774655e 100644 --- a/extra/kde342/krecentdirs.h +++ b/extra/kde342/krecentdirs.h @@ -47,7 +47,7 @@ * a single ':' the file-class is specific to the current application. * If the file-class starts with '::' it is global to all applications. */ -class KIO_EXPORT KRecentDirs +class TDEIO_EXPORT KRecentDirs { public: /** diff --git a/extra/kde342/kurifilter.h b/extra/kde342/kurifilter.h index 33efcdd..53dbaa6 100644 --- a/extra/kde342/kurifilter.h +++ b/extra/kde342/kurifilter.h @@ -75,7 +75,7 @@ class TDECModule; * @author Dawit Alemayehu */ -class KIO_EXPORT KURIFilterData +class TDEIO_EXPORT KURIFilterData { friend class KURIFilterPlugin; @@ -341,7 +341,7 @@ private: * * @short Abstract class for URI filter plugins. */ -class KIO_EXPORT KURIFilterPlugin : public TQObject +class TDEIO_EXPORT KURIFilterPlugin : public TQObject { Q_OBJECT @@ -440,7 +440,7 @@ private: /** * A list of filter plugins. */ -class KIO_EXPORT KURIFilterPluginList : public TQPtrList +class TDEIO_EXPORT KURIFilterPluginList : public TQPtrList { public: virtual int compareItems(Item a, Item b) @@ -525,7 +525,7 @@ private: * @short Filters a given URL into its proper format whenever possible. */ -class KIO_EXPORT KURIFilter +class TDEIO_EXPORT KURIFilter { public: /** diff --git a/extra/kde343/krecentdirs.h b/extra/kde343/krecentdirs.h index e8c6c94..774655e 100644 --- a/extra/kde343/krecentdirs.h +++ b/extra/kde343/krecentdirs.h @@ -47,7 +47,7 @@ * a single ':' the file-class is specific to the current application. * If the file-class starts with '::' it is global to all applications. */ -class KIO_EXPORT KRecentDirs +class TDEIO_EXPORT KRecentDirs { public: /** diff --git a/extra/kde343/kurifilter.h b/extra/kde343/kurifilter.h index 33efcdd..53dbaa6 100644 --- a/extra/kde343/kurifilter.h +++ b/extra/kde343/kurifilter.h @@ -75,7 +75,7 @@ class TDECModule; * @author Dawit Alemayehu */ -class KIO_EXPORT KURIFilterData +class TDEIO_EXPORT KURIFilterData { friend class KURIFilterPlugin; @@ -341,7 +341,7 @@ private: * * @short Abstract class for URI filter plugins. */ -class KIO_EXPORT KURIFilterPlugin : public TQObject +class TDEIO_EXPORT KURIFilterPlugin : public TQObject { Q_OBJECT @@ -440,7 +440,7 @@ private: /** * A list of filter plugins. */ -class KIO_EXPORT KURIFilterPluginList : public TQPtrList +class TDEIO_EXPORT KURIFilterPluginList : public TQPtrList { public: virtual int compareItems(Item a, Item b) @@ -525,7 +525,7 @@ private: * @short Filters a given URL into its proper format whenever possible. */ -class KIO_EXPORT KURIFilter +class TDEIO_EXPORT KURIFilter { public: /** diff --git a/extra/kde350/krecentdirs.h b/extra/kde350/krecentdirs.h index e8c6c94..774655e 100644 --- a/extra/kde350/krecentdirs.h +++ b/extra/kde350/krecentdirs.h @@ -47,7 +47,7 @@ * a single ':' the file-class is specific to the current application. * If the file-class starts with '::' it is global to all applications. */ -class KIO_EXPORT KRecentDirs +class TDEIO_EXPORT KRecentDirs { public: /** diff --git a/extra/kde350/kurifilter.h b/extra/kde350/kurifilter.h index f290f62..639366f 100644 --- a/extra/kde350/kurifilter.h +++ b/extra/kde350/kurifilter.h @@ -75,7 +75,7 @@ class TDECModule; * @author Dawit Alemayehu */ -class KIO_EXPORT KURIFilterData +class TDEIO_EXPORT KURIFilterData { friend class KURIFilterPlugin; @@ -341,7 +341,7 @@ private: * * @short Abstract class for URI filter plugins. */ -class KIO_EXPORT KURIFilterPlugin : public TQObject +class TDEIO_EXPORT KURIFilterPlugin : public TQObject { Q_OBJECT @@ -440,7 +440,7 @@ private: /** * A list of filter plugins. */ -class KIO_EXPORT KURIFilterPluginList : public TQPtrList +class TDEIO_EXPORT KURIFilterPluginList : public TQPtrList { public: virtual int compareItems(Item a, Item b) @@ -525,7 +525,7 @@ private: * @short Filters a given URL into its proper format whenever possible. */ -class KIO_EXPORT KURIFilter +class TDEIO_EXPORT KURIFilter { public: /** diff --git a/extra/kde351/kurifilter.h b/extra/kde351/kurifilter.h index f290f62..639366f 100644 --- a/extra/kde351/kurifilter.h +++ b/extra/kde351/kurifilter.h @@ -75,7 +75,7 @@ class TDECModule; * @author Dawit Alemayehu */ -class KIO_EXPORT KURIFilterData +class TDEIO_EXPORT KURIFilterData { friend class KURIFilterPlugin; @@ -341,7 +341,7 @@ private: * * @short Abstract class for URI filter plugins. */ -class KIO_EXPORT KURIFilterPlugin : public TQObject +class TDEIO_EXPORT KURIFilterPlugin : public TQObject { Q_OBJECT @@ -440,7 +440,7 @@ private: /** * A list of filter plugins. */ -class KIO_EXPORT KURIFilterPluginList : public TQPtrList +class TDEIO_EXPORT KURIFilterPluginList : public TQPtrList { public: virtual int compareItems(Item a, Item b) @@ -525,7 +525,7 @@ private: * @short Filters a given URL into its proper format whenever possible. */ -class KIO_EXPORT KURIFilter +class TDEIO_EXPORT KURIFilter { public: /** diff --git a/extra/kde352/kurifilter.h b/extra/kde352/kurifilter.h index f290f62..639366f 100644 --- a/extra/kde352/kurifilter.h +++ b/extra/kde352/kurifilter.h @@ -75,7 +75,7 @@ class TDECModule; * @author Dawit Alemayehu */ -class KIO_EXPORT KURIFilterData +class TDEIO_EXPORT KURIFilterData { friend class KURIFilterPlugin; @@ -341,7 +341,7 @@ private: * * @short Abstract class for URI filter plugins. */ -class KIO_EXPORT KURIFilterPlugin : public TQObject +class TDEIO_EXPORT KURIFilterPlugin : public TQObject { Q_OBJECT @@ -440,7 +440,7 @@ private: /** * A list of filter plugins. */ -class KIO_EXPORT KURIFilterPluginList : public TQPtrList +class TDEIO_EXPORT KURIFilterPluginList : public TQPtrList { public: virtual int compareItems(Item a, Item b) @@ -525,7 +525,7 @@ private: * @short Filters a given URL into its proper format whenever possible. */ -class KIO_EXPORT KURIFilter +class TDEIO_EXPORT KURIFilter { public: /** diff --git a/extra/kde353/kurifilter.h b/extra/kde353/kurifilter.h index f290f62..639366f 100644 --- a/extra/kde353/kurifilter.h +++ b/extra/kde353/kurifilter.h @@ -75,7 +75,7 @@ class TDECModule; * @author Dawit Alemayehu */ -class KIO_EXPORT KURIFilterData +class TDEIO_EXPORT KURIFilterData { friend class KURIFilterPlugin; @@ -341,7 +341,7 @@ private: * * @short Abstract class for URI filter plugins. */ -class KIO_EXPORT KURIFilterPlugin : public TQObject +class TDEIO_EXPORT KURIFilterPlugin : public TQObject { Q_OBJECT @@ -440,7 +440,7 @@ private: /** * A list of filter plugins. */ -class KIO_EXPORT KURIFilterPluginList : public TQPtrList +class TDEIO_EXPORT KURIFilterPluginList : public TQPtrList { public: virtual int compareItems(Item a, Item b) @@ -525,7 +525,7 @@ private: * @short Filters a given URL into its proper format whenever possible. */ -class KIO_EXPORT KURIFilter +class TDEIO_EXPORT KURIFilter { public: /** -- cgit v1.2.3