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 --- tdecore/kprotocolinfo_tdecore.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tdecore/kprotocolinfo_tdecore.cpp') diff --git a/tdecore/kprotocolinfo_tdecore.cpp b/tdecore/kprotocolinfo_tdecore.cpp index 943ad1b9a..1c6232068 100644 --- a/tdecore/kprotocolinfo_tdecore.cpp +++ b/tdecore/kprotocolinfo_tdecore.cpp @@ -17,8 +17,8 @@ */ #ifdef MAKE_TDECORE_LIB //needed for proper linkage (win32) -#undef KIO_EXPORT -#define KIO_EXPORT KDE_EXPORT +#undef TDEIO_EXPORT +#define TDEIO_EXPORT KDE_EXPORT #endif #define KPROTOCOLINFO_TDECORE -- cgit v1.2.1 From dfe289850f068f19ba4a83ab4e7e22a7e09c13c9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:17:21 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- tdecore/kprotocolinfo_tdecore.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tdecore/kprotocolinfo_tdecore.cpp') diff --git a/tdecore/kprotocolinfo_tdecore.cpp b/tdecore/kprotocolinfo_tdecore.cpp index 1c6232068..de16f0128 100644 --- a/tdecore/kprotocolinfo_tdecore.cpp +++ b/tdecore/kprotocolinfo_tdecore.cpp @@ -150,7 +150,7 @@ void KProtocolInfo::load( TQDataStream& _str) { // You may add new fields at the end. Make sure to update the version - // number in ksycoca.h + // number in tdesycoca.h TQ_INT32 i_inputType, i_outputType; TQ_INT8 i_isSourceProtocol, i_isHelperProtocol, i_supportsListing, i_supportsReading, @@ -205,7 +205,7 @@ KProtocolInfo::save( TQDataStream& _str) KSycocaEntry::save( _str ); // You may add new fields at the end. Make sure to update the version - // number in ksycoca.h + // number in tdesycoca.h TQ_INT32 i_inputType, i_outputType; TQ_INT8 i_isSourceProtocol, i_isHelperProtocol, i_supportsListing, i_supportsReading, -- cgit v1.2.1 From 5159cd2beb2e87806a5b54e9991b7895285c9d3e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 01:04:16 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- tdecore/kprotocolinfo_tdecore.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tdecore/kprotocolinfo_tdecore.cpp') diff --git a/tdecore/kprotocolinfo_tdecore.cpp b/tdecore/kprotocolinfo_tdecore.cpp index de16f0128..02976616e 100644 --- a/tdecore/kprotocolinfo_tdecore.cpp +++ b/tdecore/kprotocolinfo_tdecore.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include class KProtocolInfo::KProtocolInfoPrivate @@ -555,7 +555,7 @@ TQDataStream& operator<<( TQDataStream& s, const KProtocolInfo::ExtraField& fiel return s; } -// KURL based static functions are implemented in ../kio/kio/kprotocolinfo.cpp +// KURL based static functions are implemented in ../tdeio/tdeio/kprotocolinfo.cpp void KProtocolInfo::virtual_hook( int id, void* data ) { KSycocaEntry::virtual_hook( id, data ); } -- cgit v1.2.1 From 21bc7541114fb026606284e45dc10e3320f39f1d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 30 Jan 2013 13:50:27 -0600 Subject: Fix a few remaining references to kio_ --- tdecore/kprotocolinfo_tdecore.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tdecore/kprotocolinfo_tdecore.cpp') diff --git a/tdecore/kprotocolinfo_tdecore.cpp b/tdecore/kprotocolinfo_tdecore.cpp index 02976616e..088ea0363 100644 --- a/tdecore/kprotocolinfo_tdecore.cpp +++ b/tdecore/kprotocolinfo_tdecore.cpp @@ -403,7 +403,7 @@ TQString KProtocolInfo::config( const TQString& _protocol ) if ( !prot ) return TQString::null; - return TQString("kio_%1rc").arg(prot->m_config); + return TQString("tdeio_%1rc").arg(prot->m_config); } int KProtocolInfo::maxSlaves( const TQString& _protocol ) -- cgit v1.2.1 From 8bd62a3b0d3b362b783a273e2460811392485bbd Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 14 Feb 2013 17:17:18 -0600 Subject: Rename common header files for consistency with class renaming --- tdecore/kprotocolinfo_tdecore.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tdecore/kprotocolinfo_tdecore.cpp') diff --git a/tdecore/kprotocolinfo_tdecore.cpp b/tdecore/kprotocolinfo_tdecore.cpp index 088ea0363..8cc5091c5 100644 --- a/tdecore/kprotocolinfo_tdecore.cpp +++ b/tdecore/kprotocolinfo_tdecore.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include -- cgit v1.2.1 From ed99a30644c19b0a3cf0d2147243532df4daa16b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 15 Feb 2013 21:57:54 -0600 Subject: Rename additional header files to avoid conflicts with KDE4 --- tdecore/kprotocolinfo_tdecore.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tdecore/kprotocolinfo_tdecore.cpp') diff --git a/tdecore/kprotocolinfo_tdecore.cpp b/tdecore/kprotocolinfo_tdecore.cpp index 8cc5091c5..86a9a6fcc 100644 --- a/tdecore/kprotocolinfo_tdecore.cpp +++ b/tdecore/kprotocolinfo_tdecore.cpp @@ -26,7 +26,7 @@ #include "kprotocolinfofactory.h" #include -#include +#include #include #include #include -- cgit v1.2.1