From e4e0479220e9e9616b68b2a11e42cff7a8af7b3d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 20 Jan 2013 00:17:06 -0600
Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4

---
 kxkb/kxkb.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'kxkb/kxkb.cpp')

diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp
index d564241d4..572cb6852 100644
--- a/kxkb/kxkb.cpp
+++ b/kxkb/kxkb.cpp
@@ -274,7 +274,7 @@ void KXKBApp::menuActivated(int id)
 	}
 	else if (id == KxkbLabelController::HELP_MENU_ID)
 	{
-		KApplication::kApplication()->invokeHelp(0, "kxkb");
+		TDEApplication::kApplication()->invokeHelp(0, "kxkb");
 	}
 	else
 	{
@@ -321,7 +321,7 @@ void KXKBApp::windowChanged(WId winId)
 
 void KXKBApp::slotSettingsChanged(int category)
 {
-    if ( category != KApplication::SETTINGS_SHORTCUTS)
+    if ( category != TDEApplication::SETTINGS_SHORTCUTS)
 		return;
 
     KGlobal::config()->reparseConfiguration(); // kcontrol modified kdeglobals
-- 
cgit v1.2.3