diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
| commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
| tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /khotkeys/kcontrol | |
| parent | 79b21d47bce1ee428affc97534cd8b257232a871 (diff) | |
| download | tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'khotkeys/kcontrol')
| -rw-r--r-- | khotkeys/kcontrol/init.cpp | 2 | ||||
| -rw-r--r-- | khotkeys/kcontrol/kcmkhotkeys.cpp | 12 | ||||
| -rw-r--r-- | khotkeys/kcontrol/kcmkhotkeys.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/khotkeys/kcontrol/init.cpp b/khotkeys/kcontrol/init.cpp index 2278fa038..518e45972 100644 --- a/khotkeys/kcontrol/init.cpp +++ b/khotkeys/kcontrol/init.cpp @@ -24,7 +24,7 @@ extern "C" { KDE_EXPORT void init_khotkeys() { - KConfig cfg( "khotkeysrc", true ); + TDEConfig cfg( "khotkeysrc", true ); cfg.setGroup( "Main" ); if( !cfg.readBoolEntry( "Autostart", false )) return; 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() diff --git a/khotkeys/kcontrol/kcmkhotkeys.h b/khotkeys/kcontrol/kcmkhotkeys.h index b406df8fe..fdc12a8f2 100644 --- a/khotkeys/kcontrol/kcmkhotkeys.h +++ b/khotkeys/kcontrol/kcmkhotkeys.h @@ -28,7 +28,7 @@ class Action_data_base; class Main_buttons_widget; class Module - : public KCModule + : public TDECModule { Q_OBJECT public: |