summaryrefslogtreecommitdiffstats
path: root/khotkeys/kcontrol/kcmkhotkeys.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-25 00:30:47 -0600
committerTimothy Pearson <[email protected]>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /khotkeys/kcontrol/kcmkhotkeys.cpp
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'khotkeys/kcontrol/kcmkhotkeys.cpp')
-rw-r--r--khotkeys/kcontrol/kcmkhotkeys.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp
index 5f1ca3df3..46f96c9fc 100644
--- a/khotkeys/kcontrol/kcmkhotkeys.cpp
+++ b/khotkeys/kcontrol/kcmkhotkeys.cpp
@@ -48,7 +48,7 @@
extern "C"
{
- KDE_EXPORT KCModule* create_khotkeys( TQWidget* parent_P, const char* name_P )
+ KDE_EXPORT TDECModule* create_khotkeys( TQWidget* parent_P, const char* name_P )
{
// sleep( 20 ); // CHECKME DEBUG
TDEGlobal::locale()->insertCatalogue("khotkeys");
@@ -62,7 +62,7 @@ namespace KHotKeys
{
Module::Module( TQWidget* parent_P, const char* )
- : KCModule( parent_P, "khotkeys" ), _actions_root( NULL ), _current_action_data( NULL ),
+ : TDECModule( parent_P, "khotkeys" ), _actions_root( NULL ), _current_action_data( NULL ),
listview_is_changed( false ), deleting_action( false )
{
setButtons( Help | Cancel | Apply | Ok );
@@ -114,7 +114,7 @@ void Module::load()
kdDebug( 1217 ) << "actions_root:" << _actions_root << endl;
actions_listview_widget->build_up();
tab_widget->load_current_action();
- emit KCModule::changed( false ); // HACK otherwise the module would be changed from the very beginning
+ emit TDECModule::changed( false ); // HACK otherwise the module would be changed from the very beginning
}
void Module::save()
@@ -142,7 +142,7 @@ void Module::save()
kdDebug( 1217 ) << "telling khotkeys daemon to reread configuration" << endl;
}
}
- emit KCModule::changed( false );
+ emit TDECModule::changed( false );
}
@@ -287,12 +287,12 @@ void Module::import()
actions_listview_widget->clear();
actions_listview_widget->build_up();
tab_widget->load_current_action();
- emit KCModule::changed( true );
+ emit TDECModule::changed( true );
}
void Module::changed()
{
- emit KCModule::changed( true );
+ emit TDECModule::changed( true );
}
void Module::init_arts()