summaryrefslogtreecommitdiffstats
path: root/tdeui/kaction.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 /tdeui/kaction.cpp
parent5bca2e3e42d02f8fed9ffc399ea14f8a05694cb0 (diff)
downloadtdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.tar.gz
tdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'tdeui/kaction.cpp')
-rw-r--r--tdeui/kaction.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tdeui/kaction.cpp b/tdeui/kaction.cpp
index 270c00ec4..4937b3a87 100644
--- a/tdeui/kaction.cpp
+++ b/tdeui/kaction.cpp
@@ -1133,7 +1133,7 @@ void KAction::slotPopupActivated()
state = kpm->state();
else { // just a QPopupMenu? We'll ask for the state now then (small race condition?)
kdDebug(129) << "KAction::slotPopupActivated not a KPopupMenu -> using keyboardMouseState()" << endl;
- state = KApplication::keyboardMouseState();
+ state = TDEApplication::keyboardMouseState();
}
emit activated( KAction::PopupMenuActivation, state );
slotActivated();