summaryrefslogtreecommitdiffstats
path: root/kicker/applets/lockout
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/lockout
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kicker/applets/lockout')
-rw-r--r--kicker/applets/lockout/lockout.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp
index daec7a98f..00187fb3f 100644
--- a/kicker/applets/lockout/lockout.cpp
+++ b/kicker/applets/lockout/lockout.cpp
@@ -48,7 +48,7 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
- KGlobal::locale()->insertCatalogue("lockout");
+ TDEGlobal::locale()->insertCatalogue("lockout");
return new Lockout(configFile, parent, "lockout");
}
}
@@ -105,7 +105,7 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name
Lockout::~Lockout()
{
- KGlobal::locale()->removeCatalogue("lockout");
+ TDEGlobal::locale()->removeCatalogue("lockout");
}
// the -2 is due to kicker allowing us a width/height of 42 and the buttons