summaryrefslogtreecommitdiffstats
path: root/tdecore/kaccel.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/kaccel.cpp
parent5bca2e3e42d02f8fed9ffc399ea14f8a05694cb0 (diff)
downloadtdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.tar.gz
tdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/kaccel.cpp')
-rw-r--r--tdecore/kaccel.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tdecore/kaccel.cpp b/tdecore/kaccel.cpp
index 52175e2eb..41660e59a 100644
--- a/tdecore/kaccel.cpp
+++ b/tdecore/kaccel.cpp
@@ -71,11 +71,11 @@
// 2) If another widget accepts the AccelOverride, it will expect to get a normal
// Qt generated KeyPress event afterwards. So we let Qt handle the X11 keyboard event
// again. However, this will first generate an AccelOverride event, and we already
-// had send that one. To compnesate for this, the global event filter in KApplication
+// had send that one. To compnesate for this, the global event filter in TDEApplication
// is instructed to eat the next AccelOveride event. Qt will then send a normal KeyPress
// event and from then on everything is normal again.
//
-// kde_g_bKillAccelOverride is used to tell KApplication::notify to eat the next
+// kde_g_bKillAccelOverride is used to tell TDEApplication::notify to eat the next
// AccelOverride event.
bool kde_g_bKillAccelOverride = false;
@@ -147,7 +147,7 @@ bool KAccelEventHandler::x11Event( XEvent* pEvent )
kapp->sendEvent( kapp->focusWidget(), &ke );
// If the Override event was accepted from a non-KAccel widget,
- // then kill the next AccelOverride in KApplication::notify.
+ // then kill the next AccelOverride in TDEApplication::notify.
if( ke.isAccepted() && !g_bAccelActivated )
kde_g_bKillAccelOverride = true;