summaryrefslogtreecommitdiffstats
path: root/kicker/applets/menu
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 /kicker/applets/menu
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kicker/applets/menu')
-rw-r--r--kicker/applets/menu/menuapplet.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp
index 2b864e33a..1a0ab5ebe 100644
--- a/kicker/applets/menu/menuapplet.cpp
+++ b/kicker/applets/menu/menuapplet.cpp
@@ -61,7 +61,7 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init( TQWidget* parent_P, const TQString& configFile_P )
{
- KGlobal::locale()->insertCatalogue("kmenuapplet");
+ TDEGlobal::locale()->insertCatalogue("kmenuapplet");
return new KickerMenuApplet::Applet( configFile_P, parent_P );
}
}
@@ -102,7 +102,7 @@ Applet::~Applet()
delete selection;
delete selection_watcher;
delete module;
- KGlobal::locale()->removeCatalogue("kmenuapplet");
+ TDEGlobal::locale()->removeCatalogue("kmenuapplet");
}
void Applet::windowAdded( WId w_P )