summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2011-12-16 09:56:23 -0600
committerTimothy Pearson <[email protected]>2011-12-16 09:56:23 -0600
commit1c79537824ee60520a8af1de99d329eeb986c738 (patch)
tree5cdda273093075ca54ac432a0c6662939dea599b
parent7088c12e1b4fae3d0ff4d8bc86b91ca002773df8 (diff)
downloadknetload-1c79537824ee60520a8af1de99d329eeb986c738.tar.gz
knetload-1c79537824ee60520a8af1de99d329eeb986c738.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 7088c12e1b4fae3d0ff4d8bc86b91ca002773df8.
-rw-r--r--knetload/knetload.cpp10
-rw-r--r--knetload/statdock.cpp22
-rw-r--r--knetload/statpopup.cpp14
3 files changed, 23 insertions, 23 deletions
diff --git a/knetload/knetload.cpp b/knetload/knetload.cpp
index 3ce2b81..aaec347 100644
--- a/knetload/knetload.cpp
+++ b/knetload/knetload.cpp
@@ -328,8 +328,8 @@ void KNetLoad::takeReadingInternal() {
fullReading = i18n(
"Current In: %1 KBit/s, Total In: %2 MB.\n"
"Current Out: %3 KBit/s, Total Out: %4 MB.")
- .arg(KGlobal::locale()->formatNumber((int)((bitRateIn + 50) / 100) / 10.0)).arg(KGlobal::locale()->formatNumber(proc->totalMbIn()))
- .arg(KGlobal::locale()->formatNumber((int)((bitRateOut + 50) / 100) / 10.0)).arg(KGlobal::locale()->formatNumber(proc->totalMbOut()));
+ .tqarg(KGlobal::locale()->formatNumber((int)((bitRateIn + 50) / 100) / 10.0)).tqarg(KGlobal::locale()->formatNumber(proc->totalMbIn()))
+ .tqarg(KGlobal::locale()->formatNumber((int)((bitRateOut + 50) / 100) / 10.0)).tqarg(KGlobal::locale()->formatNumber(proc->totalMbOut()));
}
void KNetLoad::updateDeviceMenu(KPopupMenu* menu) {
@@ -369,7 +369,7 @@ void KNetLoad::updateDeviceMenu(KPopupMenu* menu) {
menu->setItemChecked(otherId, false);
} else {
menu->changeItem(otherId, SmallIcon("devotheron"),
- TQString(i18n("Other (%1)...")).arg(dev));
+ TQString(i18n("Other (%1)...")).tqarg(dev));
menu->setItemChecked(otherId, true);
}
}
@@ -403,7 +403,7 @@ void KNetLoad::updateScaleInMenu(KPopupMenu* menu) {
if (found)
menu->changeItem(otherId, i18n("Other..."));
else {
- TQString text = i18n("Other (%1KBit/s)...").arg(int(((float) scaleIn) / 1000));
+ TQString text = i18n("Other (%1KBit/s)...").tqarg(int(((float) scaleIn) / 1000));
menu->changeItem(otherId, text);
}
@@ -441,7 +441,7 @@ void KNetLoad::updateScaleOutMenu(KPopupMenu* menu) {
if (found)
menu->changeItem(otherId, i18n("Other..."));
else {
- TQString text = i18n("Other (%1KBit/s)...").arg(int(((float) scaleOut) / 1000));
+ TQString text = i18n("Other (%1KBit/s)...").tqarg(int(((float) scaleOut) / 1000));
menu->changeItem(otherId, text);
}
diff --git a/knetload/statdock.cpp b/knetload/statdock.cpp
index ec73794..e8e4f37 100644
--- a/knetload/statdock.cpp
+++ b/knetload/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 char* 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/knetload/statpopup.cpp b/knetload/statpopup.cpp
index a501437..81e52d0 100644
--- a/knetload/statpopup.cpp
+++ b/knetload/statpopup.cpp
@@ -395,13 +395,13 @@ void StatPopup::setupActions() {
color[0] = defaultDockColor(0);
color[0] = config->readColorEntry("Color0", color);
- actColor0 = new KAction(TQString(i18n("Color (%1)...")).arg(dockName(0)),
+ actColor0 = new KAction(TQString(i18n("Color (%1)...")).tqarg(dockName(0)),
"color0", 0, TQT_TQOBJECT(this), TQT_SLOT(selectColor0()), coll, "color0");
actColor0->setEnabled(false);
color[1] = defaultDockColor(1);
color[1] = config->readColorEntry("Color1", color + 1);
- actColor1 = new KAction(TQString(i18n("Color (%1)...")).arg(dockName(1)),
+ actColor1 = new KAction(TQString(i18n("Color (%1)...")).tqarg(dockName(1)),
"color1", 0, TQT_TQOBJECT(this), TQT_SLOT(selectColor1()), coll, "color1");
actColor1->setEnabled(false);
@@ -424,7 +424,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);
}
@@ -437,7 +437,7 @@ void StatPopup::mousePressEvent(TQMouseEvent* e) {
isDragged = true;
relX = e->x();
relY = e->y();
- repaint();
+ tqrepaint();
}
}
@@ -450,7 +450,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) {
@@ -492,7 +492,7 @@ void StatPopup::takeReading() {
if (resizeRequested)
resizeToText();
- repaint();
+ tqrepaint();
}
}
@@ -502,7 +502,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();
}