summaryrefslogtreecommitdiffstats
path: root/fifteenapplet
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:50:05 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:50:05 -0600
commit2178da111f72dc574457d5242d120b4d10ea5edd (patch)
tree3f1a143f751c624ab24c35d67229121c98c7cefa /fifteenapplet
parentf39ce360454f118af0d94b215b83dbd950276ff7 (diff)
downloadtdetoys-2178da111f72dc574457d5242d120b4d10ea5edd.tar.gz
tdetoys-2178da111f72dc574457d5242d120b4d10ea5edd.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'fifteenapplet')
-rw-r--r--fifteenapplet/fifteenapplet.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/fifteenapplet/fifteenapplet.cpp b/fifteenapplet/fifteenapplet.cpp
index 31dc572..f411f1a 100644
--- a/fifteenapplet/fifteenapplet.cpp
+++ b/fifteenapplet/fifteenapplet.cpp
@@ -41,7 +41,7 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
- KGlobal::locale()->insertCatalogue("kfifteenapplet");
+ TDEGlobal::locale()->insertCatalogue("kfifteenapplet");
return new FifteenApplet(configFile, KPanelApplet::Normal,
KPanelApplet::About, parent, "kfifteenapplet");
}
@@ -85,7 +85,7 @@ void FifteenApplet::about()
}
KAboutApplication dialog(_aboutData);
- dialog.setProgramLogo( KGlobal::instance()->iconLoader()->iconPath( "fifteenpieces", -KIcon::SizeLarge ) );
+ dialog.setProgramLogo( TDEGlobal::instance()->iconLoader()->iconPath( "fifteenpieces", -KIcon::SizeLarge ) );
dialog.exec();
}