summaryrefslogtreecommitdiffstats
path: root/tdecore/network/ksockssocketdevice.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:21:02 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:21:02 -0600
commit8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a (patch)
tree19ff5ecf5e6b5168e5503677f18b85f3dfa91f95 /tdecore/network/ksockssocketdevice.cpp
parent5bca2e3e42d02f8fed9ffc399ea14f8a05694cb0 (diff)
downloadtdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.tar.gz
tdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/network/ksockssocketdevice.cpp')
-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 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;