summaryrefslogtreecommitdiffstats
path: root/kicker/applets/trash
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/applets/trash
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kicker/applets/trash')
-rw-r--r--kicker/applets/trash/trashapplet.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp
index 94d8a92db..6e1f11504 100644
--- a/kicker/applets/trash/trashapplet.cpp
+++ b/kicker/applets/trash/trashapplet.cpp
@@ -33,7 +33,7 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile)
{
- KGlobal::locale()->insertCatalogue("trashapplet");
+ TDEGlobal::locale()->insertCatalogue("trashapplet");
return new TrashApplet(configFile, KPanelApplet::Normal,
KPanelApplet::About, parent, "trashapplet");
}
@@ -70,7 +70,7 @@ TrashApplet::~TrashApplet()
disconnect( mpDirLister, TQT_SIGNAL( clear() ),
this, TQT_SLOT( slotClear() ) );
delete mpDirLister;
- KGlobal::locale()->removeCatalogue("trashapplet");
+ TDEGlobal::locale()->removeCatalogue("trashapplet");
}
void TrashApplet::about()