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