From 4c097708c4cc24f3b8e4c21f14644f5715767d47 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:40:51 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kicker-applets/math/mathapplet.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'kicker-applets/math/mathapplet.cpp') diff --git a/kicker-applets/math/mathapplet.cpp b/kicker-applets/math/mathapplet.cpp index 37e0bd6..7051e68 100644 --- a/kicker-applets/math/mathapplet.cpp +++ b/kicker-applets/math/mathapplet.cpp @@ -51,7 +51,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { - KGlobal::locale()->insertCatalogue("kmathapplet"); + TDEGlobal::locale()->insertCatalogue("kmathapplet"); return new MathApplet(configFile, KPanelApplet::Stretch, 0, parent, "kmathapplet"); } } @@ -99,8 +99,8 @@ MathApplet::MathApplet(const TQString& configFile, Type type, int actions, _input->completionObject()->setItems(list); list = c->readListEntry("History list"); _input->setHistoryItems(list); - int mode = c->readNumEntry( "CompletionMode", KGlobalSettings::completionMode() ); - _input->setCompletionMode( (KGlobalSettings::Completion) mode ); + int mode = c->readNumEntry( "CompletionMode", TDEGlobalSettings::completionMode() ); + _input->setCompletionMode( (TDEGlobalSettings::Completion) mode ); _hbox = new TQHBox( 0, 0, WStyle_Customize | WType_Popup ); _hbox->setFixedSize(120, 22); @@ -131,7 +131,7 @@ MathApplet::~MathApplet() c->writeEntry( "CompletionMode", (int) _input->completionMode() ); c->sync(); - KGlobal::locale()->removeCatalogue("kmathapplet"); + TDEGlobal::locale()->removeCatalogue("kmathapplet"); } void MathApplet::useDegrees() { -- cgit v1.2.1