diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /khotkeys/kcontrol | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'khotkeys/kcontrol')
| -rw-r--r-- | khotkeys/kcontrol/kcmkhotkeys.cpp | 2 | ||||
| -rw-r--r-- | khotkeys/kcontrol/menuedit.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp index 45c406d0e..5f1ca3df3 100644 --- a/khotkeys/kcontrol/kcmkhotkeys.cpp +++ b/khotkeys/kcontrol/kcmkhotkeys.cpp @@ -51,7 +51,7 @@ extern "C" KDE_EXPORT KCModule* create_khotkeys( TQWidget* parent_P, const char* name_P ) { // sleep( 20 ); // CHECKME DEBUG - KGlobal::locale()->insertCatalogue("khotkeys"); + TDEGlobal::locale()->insertCatalogue("khotkeys"); KHotKeys::Module* ret = new KHotKeys::Module( parent_P, name_P ); ret->load(); // CHECKME return ret; diff --git a/khotkeys/kcontrol/menuedit.cpp b/khotkeys/kcontrol/menuedit.cpp index 2d0d23b13..990cd4ff5 100644 --- a/khotkeys/kcontrol/menuedit.cpp +++ b/khotkeys/kcontrol/menuedit.cpp @@ -39,7 +39,7 @@ static TQObject* owner = NULL; void khotkeys_init() { // I hope this works - KGlobal::locale()->insertCatalogue("khotkeys"); + TDEGlobal::locale()->insertCatalogue("khotkeys"); // CHECKME hack assert( owner == NULL ); owner = new TQObject; |