summaryrefslogtreecommitdiffstats
path: root/khotkeys/kcontrol/menuedit.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:43:14 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:43:14 -0600
commit79b21d47bce1ee428affc97534cd8b257232a871 (patch)
tree0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /khotkeys/kcontrol/menuedit.cpp
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'khotkeys/kcontrol/menuedit.cpp')
-rw-r--r--khotkeys/kcontrol/menuedit.cpp2
1 files changed, 1 insertions, 1 deletions
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;