summaryrefslogtreecommitdiffstats
path: root/khotkeys
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:15:55 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:15:55 -0600
commit1d061b286a8b183b39be60fe531f2b1c2915f03a (patch)
tree0a4c6ee79918e366077094fb59e9c1196d7f4156 /khotkeys
parent1e0a98b8623428064963b1627e4e09ea02c1e87e (diff)
downloadtdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz
tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'khotkeys')
-rw-r--r--khotkeys/kcontrol/kcmkhotkeys.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp
index bd3a055ca..45c406d0e 100644
--- a/khotkeys/kcontrol/kcmkhotkeys.cpp
+++ b/khotkeys/kcontrol/kcmkhotkeys.cpp
@@ -86,9 +86,9 @@ Module::Module( TQWidget* parent_P, const char* )
connect( buttons_widget, TQT_SIGNAL( global_settings_pressed()), TQT_SLOT( global_settings()));
// listview_current_action_changed(); // init
- KAboutData* about = new KAboutData("kcmkhotkeys", I18N_NOOP("KHotKeys"), KHOTKEYS_VERSION,
+ TDEAboutData* about = new TDEAboutData("kcmkhotkeys", I18N_NOOP("KHotKeys"), KHOTKEYS_VERSION,
0,
- KAboutData::License_GPL,
+ TDEAboutData::License_GPL,
I18N_NOOP("(c) 1999-2005 Lubos Lunak"), 0, 0);
about->addAuthor("Lubos Lunak", I18N_NOOP("Maintainer"), "l.lunak@kde.org");
setAboutData( about );