summaryrefslogtreecommitdiffstats
path: root/kicker/extensions/kasbar/kasbarextension.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
commit79b21d47bce1ee428affc97534cd8b257232a871 (patch)
tree0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kicker/extensions/kasbar/kasbarextension.cpp
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kicker/extensions/kasbar/kasbarextension.cpp')
-rw-r--r--kicker/extensions/kasbar/kasbarextension.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp
index 3a3a023fb..6e011cc71 100644
--- a/kicker/extensions/kasbar/kasbarextension.cpp
+++ b/kicker/extensions/kasbar/kasbarextension.cpp
@@ -76,7 +76,7 @@ extern "C"
{
KDE_EXPORT KPanelExtension *init( TQWidget *parent, const TQString& configFile )
{
- KGlobal::locale()->insertCatalogue("kasbarextension");
+ TDEGlobal::locale()->insertCatalogue("kasbarextension");
return new KasBarExtension( configFile,
KPanelExtension::Normal,
KPanelExtension::About | KPanelExtension::Preferences,
@@ -109,7 +109,7 @@ KasBarExtension::~KasBarExtension()
{
if ( detached_ && (!kasbar.isNull()) )
kasbar->deleteLater();
- KGlobal::locale()->removeCatalogue("kasbarextension");
+ TDEGlobal::locale()->removeCatalogue("kasbarextension");
}
void KasBarExtension::setDetached( bool detach )