From c5be1ff9d2953156ddc74c6c71ecdd1a9a710b1c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:56:02 -0600 Subject: [PATCH] Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit d067f88edb90a046f0ce07501bc401492630ff02. --- kcpuload/kcpuload/kcpudock.cpp | 2 +- kcpuload/kcpuload/kcpuload.cpp | 22 +++++++++++----------- kcpuload/kcpuload/statdock.cpp | 22 +++++++++++----------- kcpuload/kcpuload/statpopup.cpp | 12 ++++++------ 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/kcpuload/kcpuload/kcpudock.cpp b/kcpuload/kcpuload/kcpudock.cpp index 32352c3..9385f73 100644 --- a/kcpuload/kcpuload/kcpudock.cpp +++ b/kcpuload/kcpuload/kcpudock.cpp @@ -27,6 +27,6 @@ void KCPUDock::setCPULabel(int set) { else setLabel(i18n("C")); - repaint(); + tqrepaint(); } diff --git a/kcpuload/kcpuload/kcpuload.cpp b/kcpuload/kcpuload/kcpuload.cpp index 7278e41..500b18a 100644 --- a/kcpuload/kcpuload/kcpuload.cpp +++ b/kcpuload/kcpuload/kcpuload.cpp @@ -66,7 +66,7 @@ void KCPULoad::setSMP(bool set) { } TQString KCPULoad::dockName(int which) const { - return i18n("CPU %1").arg(which+1); + return i18n("CPU %1").tqarg(which+1); } TQColor KCPULoad::defaultDockColor(int which) const { @@ -124,32 +124,32 @@ void KCPULoad::takeReadingInternal() { if (isSplit()) { TQString user = i18n("Current CPU User: %1%") - .arg(proc->all.userPercent()); + .tqarg(proc->all.userPercent()); TQString sys = i18n("Current CPU System: %1%") - .arg(proc->all.systemPercent()); + .tqarg(proc->all.systemPercent()); for (int i = 0; i < r.size(); i++) { - user += i18n(", C%1: %2%").arg(i+1).arg(r[i].upper); - sys += i18n(", C%1: %2%").arg(i+1).arg(r[i].lower); + user += i18n(", C%1: %2%").tqarg(i+1).tqarg(r[i].upper); + sys += i18n(", C%1: %2%").tqarg(i+1).tqarg(r[i].lower); } - fullReading = i18n("%1.\n%2.").arg(user, sys); + fullReading = i18n("%1.\n%2.").tqarg(user, sys); } else { TQString total = i18n("Current CPU usage: %1%") - .arg(proc->all.totalPercent()); + .tqarg(proc->all.totalPercent()); for (int i = 0; i < r.size(); i++) { - total += i18n(", C%1: %2%").arg(i+1).arg(r[i].upper); + total += i18n(", C%1: %2%").tqarg(i+1).tqarg(r[i].upper); } - fullReading = i18n("%1.").arg(total); + fullReading = i18n("%1.").tqarg(total); } } else if (r.size() > 0) { if (isSplit()) { fullReading = i18n( "Current CPU User: %1%.\n" "Current CPU System: %2%.") - .arg(r[0].upper).arg(r[0].lower); + .tqarg(r[0].upper).tqarg(r[0].lower); } else { - fullReading = i18n("Current CPU usage: %1%.").arg(r[0].upper); + fullReading = i18n("Current CPU usage: %1%.").tqarg(r[0].upper); } } } diff --git a/kcpuload/kcpuload/statdock.cpp b/kcpuload/kcpuload/statdock.cpp index 36d33cc..5622144 100644 --- a/kcpuload/kcpuload/statdock.cpp +++ b/kcpuload/kcpuload/statdock.cpp @@ -78,54 +78,54 @@ void StatDock::resizeEvent ( TQResizeEvent * ) delete[] bufUpperOld; delete[] bufLowerOld; - repaint(); + tqrepaint(); } void StatDock::setGrid(bool set) { grid = set; - repaint(); + tqrepaint(); } void StatDock::setActive(bool set) { active = set; - repaint(); + tqrepaint(); } void StatDock::setSoft(bool set) { soft = set; - repaint(); + tqrepaint(); } void StatDock::setSplit(bool set) { split = set; - repaint(); + tqrepaint(); } void StatDock::setLabelled(bool set) { labelled = set; - repaint(); + tqrepaint(); } void StatDock::setLabel(const TQString& set) { label = set; - repaint(); + tqrepaint(); } void StatDock::setFill(int set) { fill = set; - repaint(); + tqrepaint(); } void StatDock::setColor(const TQColor& set) { colorUpper = set; colorUpperInactive = colorUpper.dark(); - repaint(); + tqrepaint(); } void StatDock::clearHistory(void) { for (i = 0; i < DOCK_SIZE; i++) bufUpper[i] = bufLower[i] = 0; - repaint(); + tqrepaint(); } void StatDock::addPercentReading(int upper, int lower) { @@ -164,7 +164,7 @@ void StatDock::addPercentReading(int upper, int lower) { } // Refresh the diagram. - repaint(); + tqrepaint(); } void StatDock::paintEvent(TQPaintEvent*) { diff --git a/kcpuload/kcpuload/statpopup.cpp b/kcpuload/kcpuload/statpopup.cpp index 668614b..b1b59b9 100644 --- a/kcpuload/kcpuload/statpopup.cpp +++ b/kcpuload/kcpuload/statpopup.cpp @@ -54,7 +54,7 @@ void StatPopup::Reading::Init(int which, StatPopup* popup) color = popup->defaultDockColor(which); color = popup->config->readColorEntry(colorid, &color); - actColor = new KAction(i18n("Color (%1)...").arg(popup->dockName(which)), + actColor = new KAction(i18n("Color (%1)...").tqarg(popup->dockName(which)), "color", 0, TQT_TQOBJECT(popup), TQT_SLOT(selectColor()), popup->coll, colorid); } @@ -399,7 +399,7 @@ void StatPopup::paintEvent(TQPaintEvent*) { // Draw the text. p.setFont(font()); - p.setPen(colorGroup().foreground()); + p.setPen(tqcolorGroup().foreground()); p.drawText(rect(), AlignHCenter | AlignVCenter, fullReading); } @@ -412,7 +412,7 @@ void StatPopup::mousePressEvent(TQMouseEvent* e) { isDragged = true; relX = e->x(); relY = e->y(); - repaint(); + tqrepaint(); } } @@ -425,7 +425,7 @@ void StatPopup::mouseReleaseEvent(TQMouseEvent* e) { // The end of a drag operation. move(e->globalX() - relX, e->globalY() - relY); isDragged = false; - repaint(); + tqrepaint(); } void StatPopup::closeEvent(TQCloseEvent* e) { @@ -469,7 +469,7 @@ void StatPopup::takeReading() { if (resizeRequested) resizeToText(); - repaint(); + tqrepaint(); } } @@ -479,7 +479,7 @@ void StatPopup::resizeToText() { TQSize size = fontMetrics().size(0, fullReading); resize(size.width() + 2 * TEXT_EXPANSION_HORIZONTAL, size.height() + 2 * TEXT_EXPANSION_VERTICAL); - repaint(); + tqrepaint(); } #include "statpopup.moc"