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/ktimemon/timemon.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'kicker-applets/ktimemon/timemon.cc') diff --git a/kicker-applets/ktimemon/timemon.cc b/kicker-applets/ktimemon/timemon.cc index 991a2e9..ef32118 100644 --- a/kicker-applets/ktimemon/timemon.cc +++ b/kicker-applets/ktimemon/timemon.cc @@ -37,7 +37,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { - KGlobal::locale()->insertCatalogue("ktimemon"); + TDEGlobal::locale()->insertCatalogue("ktimemon"); KTimeMon *mon = new KTimeMon(configFile, KPanelApplet::Normal, KPanelApplet::Preferences, parent, "ktimemon"); return mon; @@ -172,9 +172,9 @@ void KTimeMon::maybeTip(const TQPoint& p) idle = 0; TQString str = i18n("cpu: %1% idle\nmem: %2 MB %3% free\nswap: %4 MB %5% free") .arg(idle) - .arg(KGlobal::locale()->formatNumber(s.used/100.*s.mtotal, 0)) + .arg(TDEGlobal::locale()->formatNumber(s.used/100.*s.mtotal, 0)) .arg(100-s.used) - .arg(KGlobal::locale()->formatNumber(s.stotal, 0)) + .arg(TDEGlobal::locale()->formatNumber(s.stotal, 0)) .arg(100-s.sused); tip(rect(), str); @@ -265,7 +265,7 @@ KTimeMon::~KTimeMon() { delete sample; delete bgProcess; - KGlobal::locale()->removeCatalogue("ktimemon"); + TDEGlobal::locale()->removeCatalogue("ktimemon"); } @@ -413,15 +413,15 @@ void KTimeMon::runCommand(int index) bgProcess = new KShellProcess; *bgProcess << mouseActionCommand[index]; - connect(bgProcess, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), - this, TQT_SLOT(commandStderr(KProcess *, char *, int))); - bgProcess->start(KProcess::DontCare, KProcess::Stderr); + connect(bgProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQT_SLOT(commandStderr(TDEProcess *, char *, int))); + bgProcess->start(TDEProcess::DontCare, TDEProcess::Stderr); } // ----------------------------------------------------------------------------- // Check if there is any diagnostic output (command not found or such) -void KTimeMon::commandStderr(KProcess * /*proc*/, char *buffer, int /*length*/) +void KTimeMon::commandStderr(TDEProcess * /*proc*/, char *buffer, int /*length*/) { TQString msgbuf; -- cgit v1.2.1