From b19ddece21e102b8e4b292037ca7578f60b128fe Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:20:05 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- tdecore/network/ksockssocketdevice.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tdecore/network') diff --git a/tdecore/network/ksockssocketdevice.cpp b/tdecore/network/ksockssocketdevice.cpp index 02d9daa8d..6a60ce0a3 100644 --- a/tdecore/network/ksockssocketdevice.cpp +++ b/tdecore/network/ksockssocketdevice.cpp @@ -469,7 +469,7 @@ void KSocksSocketDevice::initSocks() if (kapp == 0L) return; // no TDEApplication, so don't initialise - // this should, however, test for KInstance + // this should, however, test for TDEInstance init = true; -- cgit v1.2.1