summaryrefslogtreecommitdiffstats
path: root/kpf/src/Applet.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:48:31 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:48:31 -0600
commitc48e769eb275917717e2b55eb869f7e559293ac8 (patch)
tree8f650b907e21c918b826f854dbe1c8174cc2c0c6 /kpf/src/Applet.cpp
parent8011d84f483f3628f3f04ea5cb2c1c3c86b2dba7 (diff)
downloadtdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.tar.gz
tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kpf/src/Applet.cpp')
-rw-r--r--kpf/src/Applet.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/kpf/src/Applet.cpp b/kpf/src/Applet.cpp
index 04a355c6..217128a5 100644
--- a/kpf/src/Applet.cpp
+++ b/kpf/src/Applet.cpp
@@ -72,7 +72,7 @@ extern "C"
{
kpf::blockSigPipe();
- KGlobal::locale()->insertCatalogue("kpf");
+ TDEGlobal::locale()->insertCatalogue("kpf");
return new KPF::Applet
(
@@ -372,11 +372,11 @@ namespace KPF
TQPixmap px;
if (width() > 48)
- px = KGlobal::iconLoader()->loadIcon("kpf", KIcon::Panel, 48);
+ px = TDEGlobal::iconLoader()->loadIcon("kpf", KIcon::Panel, 48);
else if (width() > 32)
- px = KGlobal::iconLoader()->loadIcon("kpf", KIcon::Panel, 32);
+ px = TDEGlobal::iconLoader()->loadIcon("kpf", KIcon::Panel, 32);
else if (width() > 16)
- px = KGlobal::iconLoader()->loadIcon("kpf", KIcon::Panel, 16);
+ px = TDEGlobal::iconLoader()->loadIcon("kpf", KIcon::Panel, 16);
else
return;