From 7cd4adc908abf8c5e3b391c4a88f0514ba8468c4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 5 Oct 2014 15:59:23 -0500 Subject: Add proper refcounting option to TDEMainWindow This relates to the discussion at: http://lists.kde.org/?l=kde-core-devel&m=107208785431497&w=2 Clean up a few minor code formatting issues --- tdecore/ksock.cpp | 7 +++++-- tdecore/ksock.h | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'tdecore') diff --git a/tdecore/ksock.cpp b/tdecore/ksock.cpp index 57bfc26d1..3f4886b8a 100644 --- a/tdecore/ksock.cpp +++ b/tdecore/ksock.cpp @@ -20,8 +20,6 @@ * Boston, MA 02110-1301, USA. **/ -#define KSOCK_INTERNAL_C_COMPILATION 1 - #include #include @@ -42,7 +40,12 @@ extern "C" { #define KSOCK_NO_BROKEN #include "kdebug.h" +// FIXME +// FOR BINARY COMPATIBILITY ONLY +// REMOVE WHEN PRACTICAL! +#define TDESOCKET_BINARY_COMPAT_HACK 1 #include "ksock.h" +#undef TDESOCKET_BINARY_COMPAT_HACK #include "kextsock.h" #include "ksockaddr.h" diff --git a/tdecore/ksock.h b/tdecore/ksock.h index 422e69b9b..31ca099e6 100644 --- a/tdecore/ksock.h +++ b/tdecore/ksock.h @@ -342,10 +342,10 @@ protected: int sock; private: - // DEPRECATED -#ifdef KSOCK_INTERNAL_C_COMPILATION + // HACK +#ifdef TDESOCKET_BINARY_COMPAT_HACK KDE_EXPORT bool bindAndListen(); -#endif // KSOCK_INTERNAL_C_COMPILATION +#endif // TDESOCKET_BINARY_COMPAT_HACK TDEServerSocket(const TDEServerSocket&); TDEServerSocket& operator=(const TDEServerSocket&); -- cgit v1.2.1