summaryrefslogtreecommitdiffstats
path: root/tdecore/network
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:20:05 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:20:05 -0600
commitb19ddece21e102b8e4b292037ca7578f60b128fe (patch)
tree6572ca25aba80849cdfa7578bbbc9121d23afbc3 /tdecore/network
parente729c6d549f12e27b358a1dad04ff254c033ac71 (diff)
downloadtdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz
tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/network')
-rw-r--r--tdecore/network/ksockssocketdevice.cpp2
1 files changed, 1 insertions, 1 deletions
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;