summaryrefslogtreecommitdiffstats
path: root/tdehtml/rendering
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:51:32 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:51:32 -0600
commit0c9d97065a3d6ceb12d687555a1a33d90db96238 (patch)
tree4305105967fc03b06139b57871d5ab6d2360e75b /tdehtml/rendering
parent59d153016be1e09cb31cdb18bef0a649acfc6292 (diff)
downloadtdelibs-0c9d97065a3d6ceb12d687555a1a33d90db96238.tar.gz
tdelibs-0c9d97065a3d6ceb12d687555a1a33d90db96238.zip
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'tdehtml/rendering')
-rw-r--r--tdehtml/rendering/render_frames.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tdehtml/rendering/render_frames.cpp b/tdehtml/rendering/render_frames.cpp
index 66e2fda75..64bef11dc 100644
--- a/tdehtml/rendering/render_frames.cpp
+++ b/tdehtml/rendering/render_frames.cpp
@@ -812,7 +812,7 @@ void RenderPartObject::updateWidget()
// It is ActiveX, but the nsplugin system handling
// should also work, that's why we don't override the
// serviceType with application/x-activex-handler
- // but let the KTrader in tdehtmlpart::createPart() detect
+ // but let the TDETrader in tdehtmlpart::createPart() detect
// the user's preference: launch with activex viewer or
// with nspluginviewer (Niko)
serviceType = "application/x-shockwave-flash";