From d1bd46309ad2bee123bdf9081ae5b4e0aa7ccc7e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 13:15:51 -0600 Subject: Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4 --- kio/bookmarks/kbookmark.h | 6 +++--- kio/bookmarks/kbookmarkbar.h | 2 +- kio/bookmarks/kbookmarkdombuilder.h | 2 +- kio/bookmarks/kbookmarkdrag.h | 2 +- kio/bookmarks/kbookmarkexporter.h | 2 +- kio/bookmarks/kbookmarkimporter.h | 4 ++-- kio/bookmarks/kbookmarkimporter_crash.h | 4 ++-- kio/bookmarks/kbookmarkimporter_ie.h | 6 +++--- kio/bookmarks/kbookmarkimporter_kde1.h | 2 +- kio/bookmarks/kbookmarkimporter_ns.h | 10 +++++----- kio/bookmarks/kbookmarkimporter_opera.h | 6 +++--- kio/bookmarks/kbookmarkmanager.h | 6 +++--- kio/bookmarks/kbookmarkmenu.h | 4 ++-- kio/bookmarks/kbookmarknotifier.h | 2 +- 14 files changed, 29 insertions(+), 29 deletions(-) (limited to 'kio/bookmarks') diff --git a/kio/bookmarks/kbookmark.h b/kio/bookmarks/kbookmark.h index 84f177522..4e5dc9149 100644 --- a/kio/bookmarks/kbookmark.h +++ b/kio/bookmarks/kbookmark.h @@ -28,7 +28,7 @@ class KBookmarkManager; class KBookmarkGroup; -class KIO_EXPORT KBookmark +class TDEIO_EXPORT KBookmark { friend class KBookmarkGroup; public: @@ -196,7 +196,7 @@ private: /** * A group of bookmarks */ -class KIO_EXPORT KBookmarkGroup : public KBookmark +class TDEIO_EXPORT KBookmarkGroup : public KBookmark { public: /** @@ -315,7 +315,7 @@ private: /** * @since 3.2 */ -class KIO_EXPORT KBookmarkGroupTraverser { +class TDEIO_EXPORT KBookmarkGroupTraverser { protected: virtual ~KBookmarkGroupTraverser() { ; } void traverse(const KBookmarkGroup &); diff --git a/kio/bookmarks/kbookmarkbar.h b/kio/bookmarks/kbookmarkbar.h index 310c1933d..1f100d183 100644 --- a/kio/bookmarks/kbookmarkbar.h +++ b/kio/bookmarks/kbookmarkbar.h @@ -39,7 +39,7 @@ class TQPopupMenu; * identical to using KBookmarkMenu so follow the directions * there. */ -class KIO_EXPORT KBookmarkBar : public TQObject +class TDEIO_EXPORT KBookmarkBar : public TQObject { Q_OBJECT diff --git a/kio/bookmarks/kbookmarkdombuilder.h b/kio/bookmarks/kbookmarkdombuilder.h index f1f712531..44fe7b170 100644 --- a/kio/bookmarks/kbookmarkdombuilder.h +++ b/kio/bookmarks/kbookmarkdombuilder.h @@ -27,7 +27,7 @@ /** * @since 3.2 */ -class KIO_EXPORT KBookmarkDomBuilder : public TQObject { +class TDEIO_EXPORT KBookmarkDomBuilder : public TQObject { Q_OBJECT public: KBookmarkDomBuilder(const KBookmarkGroup &group, KBookmarkManager *); diff --git a/kio/bookmarks/kbookmarkdrag.h b/kio/bookmarks/kbookmarkdrag.h index c213f2d93..016bd6849 100644 --- a/kio/bookmarks/kbookmarkdrag.h +++ b/kio/bookmarks/kbookmarkdrag.h @@ -25,7 +25,7 @@ #include // Clipboard/dnd data : URLs + XML for bookmarks -class KIO_EXPORT KBookmarkDrag : public TQUriDrag +class TDEIO_EXPORT KBookmarkDrag : public TQUriDrag { public: static KBookmarkDrag * newDrag( const TQValueList & bookmarks, diff --git a/kio/bookmarks/kbookmarkexporter.h b/kio/bookmarks/kbookmarkexporter.h index 0943d6cbe..68e8f475a 100644 --- a/kio/bookmarks/kbookmarkexporter.h +++ b/kio/bookmarks/kbookmarkexporter.h @@ -29,7 +29,7 @@ /** * @since 3.2 */ -class KIO_EXPORT KBookmarkExporterBase +class TDEIO_EXPORT KBookmarkExporterBase { public: KBookmarkExporterBase(KBookmarkManager* mgr, const TQString & fileName) diff --git a/kio/bookmarks/kbookmarkimporter.h b/kio/bookmarks/kbookmarkimporter.h index 8fb684c7e..cc87b2004 100644 --- a/kio/bookmarks/kbookmarkimporter.h +++ b/kio/bookmarks/kbookmarkimporter.h @@ -34,7 +34,7 @@ * and KActionMenu uses it to create actions directly. * @since 3.2 */ -class KIO_EXPORT KBookmarkImporterBase : public TQObject +class TDEIO_EXPORT KBookmarkImporterBase : public TQObject { Q_OBJECT public: @@ -84,7 +84,7 @@ private: /** * A class for importing XBEL files */ -class KIO_EXPORT KXBELBookmarkImporterImpl : public KBookmarkImporterBase, protected KBookmarkGroupTraverser +class TDEIO_EXPORT KXBELBookmarkImporterImpl : public KBookmarkImporterBase, protected KBookmarkGroupTraverser { Q_OBJECT public: diff --git a/kio/bookmarks/kbookmarkimporter_crash.h b/kio/bookmarks/kbookmarkimporter_crash.h index a5ae08d96..f4fc9af32 100644 --- a/kio/bookmarks/kbookmarkimporter_crash.h +++ b/kio/bookmarks/kbookmarkimporter_crash.h @@ -34,7 +34,7 @@ * A class for importing all crash sessions as bookmarks * @deprecated */ -class KIO_EXPORT_DEPRECATED KCrashBookmarkImporter : public TQObject +class TDEIO_EXPORT_DEPRECATED KCrashBookmarkImporter : public TQObject { Q_OBJECT public: @@ -57,7 +57,7 @@ protected: * A class for importing all crash sessions as bookmarks * @since 3.2 */ -class KIO_EXPORT KCrashBookmarkImporterImpl : public KBookmarkImporterBase +class TDEIO_EXPORT KCrashBookmarkImporterImpl : public KBookmarkImporterBase { public: KCrashBookmarkImporterImpl() : m_shouldDelete(false) { } diff --git a/kio/bookmarks/kbookmarkimporter_ie.h b/kio/bookmarks/kbookmarkimporter_ie.h index eddf20f41..b1b7c651c 100644 --- a/kio/bookmarks/kbookmarkimporter_ie.h +++ b/kio/bookmarks/kbookmarkimporter_ie.h @@ -33,7 +33,7 @@ * A class for importing IE bookmarks * @deprecated */ -class KIO_EXPORT_DEPRECATED KIEBookmarkImporter : public TQObject +class TDEIO_EXPORT_DEPRECATED KIEBookmarkImporter : public TQObject { Q_OBJECT public: @@ -62,7 +62,7 @@ protected: * A class for importing IE bookmarks * @since 3.2 */ -class KIO_EXPORT KIEBookmarkImporterImpl : public KBookmarkImporterBase +class TDEIO_EXPORT KIEBookmarkImporterImpl : public KBookmarkImporterBase { public: KIEBookmarkImporterImpl() { } @@ -75,7 +75,7 @@ private: /* * @since 3.2 */ -class KIO_EXPORT KIEBookmarkExporterImpl : public KBookmarkExporterBase +class TDEIO_EXPORT KIEBookmarkExporterImpl : public KBookmarkExporterBase { public: KIEBookmarkExporterImpl(KBookmarkManager* mgr, const TQString & path) diff --git a/kio/bookmarks/kbookmarkimporter_kde1.h b/kio/bookmarks/kbookmarkimporter_kde1.h index 7e6ad2395..5af4f04e9 100644 --- a/kio/bookmarks/kbookmarkimporter_kde1.h +++ b/kio/bookmarks/kbookmarkimporter_kde1.h @@ -31,7 +31,7 @@ * Separated from KBookmarkManager to save memory (we throw this one * out once the import is done) */ -class KIO_EXPORT KBookmarkImporter +class TDEIO_EXPORT KBookmarkImporter { public: KBookmarkImporter( TQDomDocument * doc ) : m_pDoc(doc) {} diff --git a/kio/bookmarks/kbookmarkimporter_ns.h b/kio/bookmarks/kbookmarkimporter_ns.h index fdf79a3b9..10844fc63 100644 --- a/kio/bookmarks/kbookmarkimporter_ns.h +++ b/kio/bookmarks/kbookmarkimporter_ns.h @@ -34,7 +34,7 @@ * A class for importing NS bookmarks * @deprecated */ -class KIO_EXPORT_DEPRECATED KNSBookmarkImporter : public TQObject +class TDEIO_EXPORT_DEPRECATED KNSBookmarkImporter : public TQObject { Q_OBJECT public: @@ -64,7 +64,7 @@ protected: * utf8 defaults to off * @since 3.2 */ -class KIO_EXPORT KNSBookmarkImporterImpl : public KBookmarkImporterBase +class TDEIO_EXPORT KNSBookmarkImporterImpl : public KBookmarkImporterBase { public: KNSBookmarkImporterImpl() : m_utf8(false) { } @@ -81,7 +81,7 @@ private: * utf8 defaults to on * @since 3.2 */ -class KIO_EXPORT KMozillaBookmarkImporterImpl : public KNSBookmarkImporterImpl +class TDEIO_EXPORT KMozillaBookmarkImporterImpl : public KNSBookmarkImporterImpl { public: KMozillaBookmarkImporterImpl() { setUtf8(true); } @@ -94,7 +94,7 @@ private: * Warning, it overwrites the existing bookmarks.html file ! * @deprecated */ -class KIO_EXPORT_DEPRECATED KNSBookmarkExporter +class TDEIO_EXPORT_DEPRECATED KNSBookmarkExporter { public: KNSBookmarkExporter(KBookmarkManager* mgr, const TQString & fileName) @@ -113,7 +113,7 @@ protected: /** * @since 3.2 */ -class KIO_EXPORT KNSBookmarkExporterImpl : public KBookmarkExporterBase +class TDEIO_EXPORT KNSBookmarkExporterImpl : public KBookmarkExporterBase { public: KNSBookmarkExporterImpl(KBookmarkManager* mgr, const TQString & fileName) diff --git a/kio/bookmarks/kbookmarkimporter_opera.h b/kio/bookmarks/kbookmarkimporter_opera.h index 0f9a3ba00..f6f1028b1 100644 --- a/kio/bookmarks/kbookmarkimporter_opera.h +++ b/kio/bookmarks/kbookmarkimporter_opera.h @@ -32,7 +32,7 @@ * A class for importing Opera bookmarks * @deprecated */ -class KIO_EXPORT_DEPRECATED KOperaBookmarkImporter : public TQObject +class TDEIO_EXPORT_DEPRECATED KOperaBookmarkImporter : public TQObject { Q_OBJECT public: @@ -58,7 +58,7 @@ protected: * A class for importing Opera bookmarks * @since 3.2 */ -class KIO_EXPORT KOperaBookmarkImporterImpl : public KBookmarkImporterBase +class TDEIO_EXPORT KOperaBookmarkImporterImpl : public KBookmarkImporterBase { public: KOperaBookmarkImporterImpl() { } @@ -71,7 +71,7 @@ private: /** * @since 3.2 */ -class KIO_EXPORT KOperaBookmarkExporterImpl : public KBookmarkExporterBase +class TDEIO_EXPORT KOperaBookmarkExporterImpl : public KBookmarkExporterBase { public: KOperaBookmarkExporterImpl(KBookmarkManager* mgr, const TQString & filename) diff --git a/kio/bookmarks/kbookmarkmanager.h b/kio/bookmarks/kbookmarkmanager.h index d076eefc7..4a129704a 100644 --- a/kio/bookmarks/kbookmarkmanager.h +++ b/kio/bookmarks/kbookmarkmanager.h @@ -50,7 +50,7 @@ * * \endcode */ -class KIO_EXPORT KBookmarkManager : public TQObject, public DCOPObject +class TDEIO_EXPORT KBookmarkManager : public TQObject, public DCOPObject { Q_OBJECT K_DCOP @@ -314,7 +314,7 @@ private: * If you wish to use your own editor or allow the user to add * bookmarks, you must overload this class. */ -class KIO_EXPORT KBookmarkOwner +class TDEIO_EXPORT KBookmarkOwner { public: /** @@ -350,7 +350,7 @@ protected: /** * @since 3.2 */ -class KIO_EXPORT KExtendedBookmarkOwner : public TQObject, virtual public KBookmarkOwner +class TDEIO_EXPORT KExtendedBookmarkOwner : public TQObject, virtual public KBookmarkOwner { Q_OBJECT public: diff --git a/kio/bookmarks/kbookmarkmenu.h b/kio/bookmarks/kbookmarkmenu.h index b54398a02..35e6191e3 100644 --- a/kio/bookmarks/kbookmarkmenu.h +++ b/kio/bookmarks/kbookmarkmenu.h @@ -76,7 +76,7 @@ namespace TDEIO { class Job; } * 1a) Reimplement your own KBookmarkOwner * 1b) Reimplement and instantiate your own KBookmarkManager */ -class KIO_EXPORT KBookmarkMenu : public TQObject +class TDEIO_EXPORT KBookmarkMenu : public TQObject { Q_OBJECT friend class KBookmarkMenuNSImporter; @@ -238,7 +238,7 @@ protected: /** * A class connected to KNSBookmarkImporter, to fill KActionMenus. */ -class KIO_EXPORT KBookmarkMenuNSImporter : public TQObject +class TDEIO_EXPORT KBookmarkMenuNSImporter : public TQObject { Q_OBJECT public: diff --git a/kio/bookmarks/kbookmarknotifier.h b/kio/bookmarks/kbookmarknotifier.h index 3982f984f..f99e570bc 100644 --- a/kio/bookmarks/kbookmarknotifier.h +++ b/kio/bookmarks/kbookmarknotifier.h @@ -28,7 +28,7 @@ * DCOP interface for a bookmark notifier (an object which emits signals * upon changes to the bookmarks) */ -class KIO_EXPORT KBookmarkNotifier : virtual public DCOPObject +class TDEIO_EXPORT KBookmarkNotifier : virtual public DCOPObject { K_DCOP -- cgit v1.2.1