summaryrefslogtreecommitdiffstats
path: root/kxkb/kxkb.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:17:06 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:17:06 -0600
commite4e0479220e9e9616b68b2a11e42cff7a8af7b3d (patch)
tree8e01571cdd132dad34ebec38b12c2dbc37d05bd9 /kxkb/kxkb.cpp
parentd41050ea3f6904e5156d35f664346b816b9e4d12 (diff)
downloadtdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz
tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kxkb/kxkb.cpp')
-rw-r--r--kxkb/kxkb.cpp4
1 files changed, 2 insertions, 2 deletions
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