summaryrefslogtreecommitdiffstats
path: root/kcachegrind
diff options
context:
space:
mode:
Diffstat (limited to 'kcachegrind')
-rwxr-xr-xkcachegrind/converters/memprof2calltree4
-rw-r--r--kcachegrind/kcachegrind/cachegrindloader.cpp4
-rw-r--r--kcachegrind/kcachegrind/callgraphview.cpp90
-rw-r--r--kcachegrind/kcachegrind/callitem.cpp4
-rw-r--r--kcachegrind/kcachegrind/callmapview.cpp36
-rw-r--r--kcachegrind/kcachegrind/callmapview.h6
-rw-r--r--kcachegrind/kcachegrind/callview.cpp4
-rw-r--r--kcachegrind/kcachegrind/configdlg.cpp2
-rw-r--r--kcachegrind/kcachegrind/configuration.cpp30
-rw-r--r--kcachegrind/kcachegrind/costlistitem.cpp6
-rw-r--r--kcachegrind/kcachegrind/costtypeitem.cpp4
-rw-r--r--kcachegrind/kcachegrind/costtypeview.cpp6
-rw-r--r--kcachegrind/kcachegrind/coverage.cpp2
-rw-r--r--kcachegrind/kcachegrind/coverageitem.cpp24
-rw-r--r--kcachegrind/kcachegrind/coverageview.cpp2
-rw-r--r--kcachegrind/kcachegrind/functionitem.cpp8
-rw-r--r--kcachegrind/kcachegrind/functionselection.cpp14
-rw-r--r--kcachegrind/kcachegrind/instritem.cpp20
-rw-r--r--kcachegrind/kcachegrind/instritem.h2
-rw-r--r--kcachegrind/kcachegrind/instrview.cpp10
-rw-r--r--kcachegrind/kcachegrind/multiview.cpp6
-rw-r--r--kcachegrind/kcachegrind/partgraph.cpp30
-rw-r--r--kcachegrind/kcachegrind/partgraph.h6
-rw-r--r--kcachegrind/kcachegrind/partlistitem.cpp6
-rw-r--r--kcachegrind/kcachegrind/partselection.cpp8
-rw-r--r--kcachegrind/kcachegrind/partview.cpp4
-rw-r--r--kcachegrind/kcachegrind/sourceitem.cpp20
-rw-r--r--kcachegrind/kcachegrind/sourceitem.h2
-rw-r--r--kcachegrind/kcachegrind/sourceview.cpp16
-rw-r--r--kcachegrind/kcachegrind/stackitem.cpp4
-rw-r--r--kcachegrind/kcachegrind/tabview.cpp14
-rw-r--r--kcachegrind/kcachegrind/tabview.h2
-rw-r--r--kcachegrind/kcachegrind/toplevel.cpp72
-rw-r--r--kcachegrind/kcachegrind/tracedata.cpp216
-rw-r--r--kcachegrind/kcachegrind/tracedata.h12
-rw-r--r--kcachegrind/kcachegrind/traceitemview.cpp2
-rw-r--r--kcachegrind/kcachegrind/treemap.cpp138
-rw-r--r--kcachegrind/kcachegrind/treemap.h24
38 files changed, 430 insertions, 430 deletions
diff --git a/kcachegrind/converters/memprof2calltree b/kcachegrind/converters/memprof2calltree
index a04eaa38..e82d6e85 100755
--- a/kcachegrind/converters/memprof2calltree
+++ b/kcachegrind/converters/memprof2calltree
@@ -13,8 +13,8 @@ while(<>) {
print "\nfn=$1\n";
next;
}
- if (/^ tqchildren:/) {
- $next = 1; #tqchildren
+ if (/^ children:/) {
+ $next = 1; #children
next;
}
if (/^ inherited:/) {
diff --git a/kcachegrind/kcachegrind/cachegrindloader.cpp b/kcachegrind/kcachegrind/cachegrindloader.cpp
index 64483512..4fe57d34 100644
--- a/kcachegrind/kcachegrind/cachegrindloader.cpp
+++ b/kcachegrind/kcachegrind/cachegrindloader.cpp
@@ -735,7 +735,7 @@ bool CachegrindLoader::loadTraceInternal(TracePart* part)
return false;
}
kdDebug() << "Loading " << _filename << " ..." << endl;
- TQString statusMsg = i18n("Loading %1").tqarg(_filename);
+ TQString statusMsg = i18n("Loading %1").arg(_filename);
int statusProgress = 0;
emit updateStatus(statusMsg,statusProgress);
@@ -1310,7 +1310,7 @@ bool CachegrindLoader::loadTraceInternal(TracePart* part)
emit updateStatus(statusMsg,100);
- _part->tqinvalidate();
+ _part->invalidate();
if (!totalsSet) {
_part->totals()->clear();
_part->totals()->addCost(_part);
diff --git a/kcachegrind/kcachegrind/callgraphview.cpp b/kcachegrind/kcachegrind/callgraphview.cpp
index f9ebb10c..b02d441a 100644
--- a/kcachegrind/kcachegrind/callgraphview.cpp
+++ b/kcachegrind/kcachegrind/callgraphview.cpp
@@ -303,8 +303,8 @@ GraphEdge::GraphEdge()
TQString GraphEdge::prettyName()
{
if (_c) return _c->prettyName();
- if (_from) return i18n("Call(s) from %1").tqarg(_from->prettyName());
- if (_to) return i18n("Call(s) to %1").tqarg(_to->prettyName());
+ if (_from) return i18n("Call(s) from %1").arg(_from->prettyName());
+ if (_to) return i18n("Call(s) to %1").arg(_to->prettyName());
return i18n("(unknown call)");
}
@@ -579,7 +579,7 @@ void GraphExporter::writeDot()
break;
}
if (f)
- *stream << TQString(" center=F%1;\n").tqarg((long)f, 0, 16);
+ *stream << TQString(" center=F%1;\n").arg((long)f, 0, 16);
*stream << TQString(" overlap=false;\n splines=true;\n");
}
@@ -619,7 +619,7 @@ void GraphExporter::writeDot()
iabr = iabr.left(Configuration::maxSymbolLength()) + "...";
*stream << TQString("subgraph \"cluster%1\" { label=\"%2\";\n")
- .tqarg(cluster).tqarg(iabr);
+ .arg(cluster).arg(iabr);
}
GraphNode* np;
@@ -630,17 +630,17 @@ void GraphExporter::writeDot()
if ((int)abr.length() > Configuration::maxSymbolLength())
abr = abr.left(Configuration::maxSymbolLength()) + "...";
- *stream << TQString(" F%1 [").tqarg((long)f, 0, 16);
+ *stream << TQString(" F%1 [").arg((long)f, 0, 16);
if (_useBox) {
// make label 3 lines for CallGraphView
- *stream << TQString("tqshape=box,label=\"** %1 **\\n**\\n%2\"];\n")
- .tqarg(abr)
- .tqarg(SubCost(np->incl).pretty());
+ *stream << TQString("shape=box,label=\"** %1 **\\n**\\n%2\"];\n")
+ .arg(abr)
+ .arg(SubCost(np->incl).pretty());
}
else
*stream << TQString("label=\"%1\\n%2\"];\n")
- .tqarg(abr)
- .tqarg(SubCost(np->incl).pretty());
+ .arg(abr)
+ .arg(SubCost(np->incl).pretty());
}
if (_go->clusterGroups() && i)
@@ -675,17 +675,17 @@ void GraphExporter::writeDot()
to.callerSet.remove(&e);
*stream << TQString(" F%1 -> F%2 [weight=%3")
- .tqarg((long)e.from(), 0, 16)
- .tqarg((long)e.to(), 0, 16)
- .tqarg((long)log(log(e.cost)));
+ .arg((long)e.from(), 0, 16)
+ .arg((long)e.to(), 0, 16)
+ .arg((long)log(log(e.cost)));
if (_go->detailLevel() ==1)
*stream << TQString(",label=\"%1\"")
- .tqarg(SubCost(e.cost).pretty());
+ .arg(SubCost(e.cost).pretty());
else if (_go->detailLevel() ==2)
*stream << TQString(",label=\"%3\\n%4 x\"")
- .tqarg(SubCost(e.cost).pretty())
- .tqarg(SubCost(e.count).pretty());
+ .arg(SubCost(e.cost).pretty())
+ .arg(SubCost(e.count).pretty());
*stream << TQString("];\n");
}
@@ -713,14 +713,14 @@ void GraphExporter::writeDot()
e->cost = costSum;
e->count = countSum;
- *stream << TQString(" R%1 [tqshape=point,label=\"\"];\n")
- .tqarg((long)n.function(), 0, 16);
+ *stream << TQString(" R%1 [shape=point,label=\"\"];\n")
+ .arg((long)n.function(), 0, 16);
*stream << TQString(" R%1 -> F%2 [label=\"%3\\n%4 x\",weight=%5];\n")
- .tqarg((long)n.function(), 0, 16)
- .tqarg((long)n.function(), 0, 16)
- .tqarg(SubCost(costSum).pretty())
- .tqarg(SubCost(countSum).pretty())
- .tqarg((int)log(costSum));
+ .arg((long)n.function(), 0, 16)
+ .arg((long)n.function(), 0, 16)
+ .arg(SubCost(costSum).pretty())
+ .arg(SubCost(countSum).pretty())
+ .arg((int)log(costSum));
}
costSum = countSum = 0.0;
@@ -736,14 +736,14 @@ void GraphExporter::writeDot()
e->cost = costSum;
e->count = countSum;
- *stream << TQString(" S%1 [tqshape=point,label=\"\"];\n")
- .tqarg((long)n.function(), 0, 16);
+ *stream << TQString(" S%1 [shape=point,label=\"\"];\n")
+ .arg((long)n.function(), 0, 16);
*stream << TQString(" F%1 -> S%2 [label=\"%3\\n%4 x\",weight=%5];\n")
- .tqarg((long)n.function(), 0, 16)
- .tqarg((long)n.function(), 0, 16)
- .tqarg(SubCost(costSum).pretty())
- .tqarg(SubCost(countSum).pretty())
- .tqarg((int)log(costSum));
+ .arg((long)n.function(), 0, 16)
+ .arg((long)n.function(), 0, 16)
+ .arg(SubCost(costSum).pretty())
+ .arg(SubCost(countSum).pretty())
+ .arg((int)log(costSum));
}
}
}
@@ -1062,7 +1062,7 @@ CanvasNode::CanvasNode(CallGraphView* v, GraphNode* n,
double inclP = 100.0 * n->incl / total;
if (_view->topLevel()->showPercentage())
setText(1, TQString("%1 %")
- .tqarg(inclP, 0, 'f', Configuration::percentPrecision()));
+ .arg(inclP, 0, 'f', Configuration::percentPrecision()));
else
setText(1, SubCost(n->incl).pretty());
setPixmap(1, percentagePixmap(25,10,(int)(inclP+.5), TQt::blue, true));
@@ -1121,7 +1121,7 @@ CanvasEdgeLabel::CanvasEdgeLabel(CallGraphView* v, CanvasEdge* ce,
if (!e) return;
setPosition(1, DrawParams::TopCenter);
- setText(1, TQString("%1 x").tqarg(SubCost(e->count).pretty()));
+ setText(1, TQString("%1 x").arg(SubCost(e->count).pretty()));
setPosition(0, DrawParams::BottomCenter);
@@ -1142,7 +1142,7 @@ CanvasEdgeLabel::CanvasEdgeLabel(CallGraphView* v, CanvasEdge* ce,
double inclP = 100.0 * e->cost / total;
if (_view->topLevel()->showPercentage())
setText(0, TQString("%1 %")
- .tqarg(inclP, 0, 'f', Configuration::percentPrecision()));
+ .arg(inclP, 0, 'f', Configuration::percentPrecision()));
else
setText(0, SubCost(e->cost).pretty());
setPixmap(0, percentagePixmap(25,10,(int)(inclP+.5), TQt::blue, true));
@@ -1331,7 +1331,7 @@ void CallGraphTip::maybeTip( const TQPoint& pos )
if (0) qDebug("CallGraphTip: Mouse on Node '%s'",
n->function()->prettyName().ascii());
- TQString tipStr = TQString("%1 (%2)").tqarg(cn->text(0)).tqarg(cn->text(1));
+ TQString tipStr = TQString("%1 (%2)").arg(cn->text(0)).arg(cn->text(1));
TQPoint vPosTL = cgv->contentsToViewport(i->boundingRect().topLeft());
TQPoint vPosBR = cgv->contentsToViewport(i->boundingRect().bottomRight());
tip(TQRect(vPosTL, vPosBR), tipStr);
@@ -1356,7 +1356,7 @@ void CallGraphTip::maybeTip( const TQPoint& pos )
tipStr = e->prettyName();
else
tipStr = TQString("%1 (%2)")
- .tqarg(ce->label()->text(0)).tqarg(ce->label()->text(1));
+ .arg(ce->label()->text(0)).arg(ce->label()->text(1));
tip(TQRect(pos.x()-5,pos.y()-5,pos.x()+5,pos.y()+5), tipStr);
}
}
@@ -1745,7 +1745,7 @@ void CallGraphView::doUpdate(int changeType)
}
if (changeType & dataChanged) {
- // tqinvalidate old selection and graph part
+ // invalidate old selection and graph part
_exporter.reset(_data, _activeItem, _costType, _groupType);
_selectedNode = 0;
_selectedEdge = 0;
@@ -1792,8 +1792,8 @@ void CallGraphView::showRenderWarning()
s = i18n("Layouting stopped.\n");
s.append(i18n("The call graph has %1 nodes and %2 edges.\n")
- .tqarg(_exporter.nodeCount())
- .tqarg(_exporter.edgeCount()));
+ .arg(_exporter.nodeCount())
+ .arg(_exporter.edgeCount()));
showText(s);
}
@@ -1866,7 +1866,7 @@ void CallGraphView::refresh()
if ( !_renderProcess->start() ) {
TQString e = i18n("No call graph is available because the following\n"
"command cannot be run:\n'%1'\n")
- .tqarg(_renderProcess->arguments().join(" "));
+ .arg(_renderProcess->arguments().join(" "));
e += i18n("Please check that 'dot' is installed (package GraphViz).");
showText(e);
@@ -2206,7 +2206,7 @@ void CallGraphView::dotExited()
TQString s = i18n("There is no call graph available for function\n"
"\t'%1'\n"
"because it has no cost of the selected event type.");
- TQCanvasText* t = new TQCanvasText(s.tqarg(_activeItem->name()), _canvas);
+ TQCanvasText* t = new TQCanvasText(s.arg(_activeItem->name()), _canvas);
// t->setTextFlags(TQt::AlignHCenter | TQt::AlignVCenter);
t->move(5,5);
t->show();
@@ -2394,10 +2394,10 @@ void CallGraphView::contentsContextMenuEvent(TQContextMenuEvent* e)
TQString name = f->prettyName();
popup.insertItem(i18n("Go to '%1'")
- .tqarg(Configuration::shortenSymbol(name)), 93);
+ .arg(Configuration::shortenSymbol(name)), 93);
if (cycle && (cycle != f)) {
name = Configuration::shortenSymbol(cycle->prettyName());
- popup.insertItem(i18n("Go to '%1'").tqarg(name), 94);
+ popup.insertItem(i18n("Go to '%1'").arg(name), 94);
}
popup.insertSeparator();
}
@@ -2416,7 +2416,7 @@ void CallGraphView::contentsContextMenuEvent(TQContextMenuEvent* e)
if (c) {
TQString name = c->prettyName();
popup.insertItem(i18n("Go to '%1'")
- .tqarg(Configuration::shortenSymbol(name)), 95);
+ .arg(Configuration::shortenSymbol(name)), 95);
popup.insertSeparator();
}
@@ -2457,7 +2457,7 @@ void CallGraphView::contentsContextMenuEvent(TQContextMenuEvent* e)
case 10: gpopup1.setItemChecked(104,true); break;
case 15: gpopup1.setItemChecked(105,true); break;
default:
- gpopup1.insertItem(i18n("< %1").tqarg(_maxCallerDepth), 106);
+ gpopup1.insertItem(i18n("< %1").arg(_maxCallerDepth), 106);
gpopup1.setItemChecked(106,true); break;
}
@@ -2480,7 +2480,7 @@ void CallGraphView::contentsContextMenuEvent(TQContextMenuEvent* e)
case 10: gpopup2.setItemChecked(114,true); break;
case 15: gpopup2.setItemChecked(115,true); break;
default:
- gpopup2.insertItem(i18n("< %1").tqarg(_maxCallingDepth), 116);
+ gpopup2.insertItem(i18n("< %1").arg(_maxCallingDepth), 116);
gpopup2.setItemChecked(116,true); break;
}
diff --git a/kcachegrind/kcachegrind/callitem.cpp b/kcachegrind/kcachegrind/callitem.cpp
index 3a3a7266..ebca4903 100644
--- a/kcachegrind/kcachegrind/callitem.cpp
+++ b/kcachegrind/kcachegrind/callitem.cpp
@@ -110,7 +110,7 @@ void CallItem::updateCost()
if (_view->topLevel()->showPercentage())
setText(0, TQString("%1")
- .tqarg(sum, 0, 'f', Configuration::percentPrecision()));
+ .arg(sum, 0, 'f', Configuration::percentPrecision()));
else
setText(0, _call->prettySubCost(ct));
@@ -134,7 +134,7 @@ void CallItem::updateCost()
if (_view->topLevel()->showPercentage())
setText(1, TQString("%1")
- .tqarg(sum, 0, 'f', Configuration::percentPrecision()));
+ .arg(sum, 0, 'f', Configuration::percentPrecision()));
else
setText(1, _call->prettySubCost(ct2));
diff --git a/kcachegrind/kcachegrind/callmapview.cpp b/kcachegrind/kcachegrind/callmapview.cpp
index 7aa6db40..0e4d5e38 100644
--- a/kcachegrind/kcachegrind/callmapview.cpp
+++ b/kcachegrind/kcachegrind/callmapview.cpp
@@ -115,12 +115,12 @@ TQString CallMapView::whatsThis() const
"choose 'Hide incorrect borders'. As this mode can be "
"<em>very</em> time consuming, you may want to limit "
"the maximum drawn nesting level before. "
- "'Best' determinates the split direction for tqchildren "
+ "'Best' determinates the split direction for children "
"from the aspect ratio of the parent. "
"'Always Best' decides on remaining space for each "
"sibling. "
"'Ignore Proportions' takes space for function name "
- "drawing <em>before</em> drawing tqchildren. Note that "
+ "drawing <em>before</em> drawing children. Note that "
"size proportions can get <em>heavily</em> wrong.</p>"
"<p>This is a <em>TreeMap</em> widget. "
@@ -196,13 +196,13 @@ void CallMapView::context(TreeMapItem* i,const TQPoint & p)
if (i) {
l1popup.insertSeparator();
l1popup.insertItem(i18n("Depth of '%1' (%2)")
- .tqarg(shortCurrentName).tqarg(i->depth()), 55);
+ .arg(shortCurrentName).arg(i->depth()), 55);
l1popup.setItemChecked(55, maxDepth == i->depth());
}
if (maxDepth>0) {
l1popup.insertSeparator();
- l1popup.insertItem(i18n("Decrement Depth (to %1)").tqarg(maxDepth-1), 56);
- l1popup.insertItem(i18n("Increment Depth (to %1)").tqarg(maxDepth+1), 57);
+ l1popup.insertItem(i18n("Decrement Depth (to %1)").arg(maxDepth-1), 56);
+ l1popup.insertItem(i18n("Increment Depth (to %1)").arg(maxDepth+1), 57);
}
l2popup.setCheckable(true);
@@ -256,15 +256,15 @@ void CallMapView::context(TreeMapItem* i,const TQPoint & p)
currentArea = i->width() * i->height();
l3popup.insertSeparator();
l3popup.insertItem(i18n("Area of '%1' (%2)")
- .tqarg(shortCurrentName).tqarg(currentArea), 67);
+ .arg(shortCurrentName).arg(currentArea), 67);
l3popup.setItemChecked(67, mArea == currentArea);
}
if (mArea>0) {
l3popup.insertSeparator();
l3popup.insertItem(i18n("Double Area Limit (to %1)")
- .tqarg(mArea*2), 68);
+ .arg(mArea*2), 68);
l3popup.insertItem(i18n("Half Area Limit (to %1)")
- .tqarg(mArea/2), 69);
+ .arg(mArea/2), 69);
}
popup.insertSeparator();
@@ -428,7 +428,7 @@ void CallMapView::selectedSlot(TreeMapItem* item, bool kbd)
if (item->text(0).isEmpty()) return;
if (kbd) {
- TQString msg = i18n("Call Map: Current is '%1'").tqarg(item->text(0));
+ TQString msg = i18n("Call Map: Current is '%1'").arg(item->text(0));
if (_topLevel)
_topLevel->showMessage(msg, 5000);
}
@@ -618,7 +618,7 @@ TQString CallMapBaseItem::text(int textNo) const
sum = 100.0 * _f->inclusive()->subCost(ct) / total;
return TQString("%1 %")
- .tqarg(sum, 0, 'f', Configuration::percentPrecision());
+ .arg(sum, 0, 'f', Configuration::percentPrecision());
}
return _f->inclusive()->prettySubCost(ct);
}
@@ -663,7 +663,7 @@ bool CallMapBaseItem::isMarked(int) const
return ((CallMapView*)widget())->selectedItem() == _f;
}
-TreeMapItemList* CallMapBaseItem::tqchildren()
+TreeMapItemList* CallMapBaseItem::children()
{
if (_f && !initialized()) {
CallMapView* w = (CallMapView*)widget();
@@ -706,7 +706,7 @@ TreeMapItemList* CallMapBaseItem::tqchildren()
setSorting(-2, false);
}
- return _tqchildren;
+ return _children;
}
TQColor CallMapBaseItem::backColor() const
@@ -756,7 +756,7 @@ TQString CallMapCallingItem::text(int textNo) const
TraceCost* t = ((CallMapView*)widget())->totalCost();
double p = 100.0 * _factor * _c->subCost(ct) / t->subCost(ct);
return TQString("%1 %")
- .tqarg(p, 0, 'f', Configuration::percentPrecision());
+ .arg(p, 0, 'f', Configuration::percentPrecision());
}
return val.pretty();
}
@@ -792,7 +792,7 @@ bool CallMapCallingItem::isMarked(int) const
}
-TreeMapItemList* CallMapCallingItem::tqchildren()
+TreeMapItemList* CallMapCallingItem::children()
{
if (!initialized()) {
if (0) qDebug("Create Calling subitems (%s)", path(0).join("/").ascii());
@@ -832,7 +832,7 @@ TreeMapItemList* CallMapCallingItem::tqchildren()
setSorting(-2, false);
}
- return _tqchildren;
+ return _children;
}
@@ -872,7 +872,7 @@ TQString CallMapCallerItem::text(int textNo) const
TraceCost* t = ((CallMapView*)widget())->totalCost();
double p = 100.0 * _factor * _c->subCost(ct) / t->subCost(ct);
return TQString("%1 %")
- .tqarg(p, 0, 'f', Configuration::percentPrecision());
+ .arg(p, 0, 'f', Configuration::percentPrecision());
}
return val.pretty();
}
@@ -904,7 +904,7 @@ bool CallMapCallerItem::isMarked(int) const
}
-TreeMapItemList* CallMapCallerItem::tqchildren()
+TreeMapItemList* CallMapCallerItem::children()
{
if (!initialized()) {
//qDebug("Create Caller subitems (%s)", name().ascii());
@@ -939,7 +939,7 @@ TreeMapItemList* CallMapCallerItem::tqchildren()
setSorting(-2, false);
}
- return _tqchildren;
+ return _children;
}
TQColor CallMapCallerItem::backColor() const
diff --git a/kcachegrind/kcachegrind/callmapview.h b/kcachegrind/kcachegrind/callmapview.h
index 1ee45258..860743fe 100644
--- a/kcachegrind/kcachegrind/callmapview.h
+++ b/kcachegrind/kcachegrind/callmapview.h
@@ -78,7 +78,7 @@ public:
bool isMarked(int) const;
TQString text(int) const;
TQPixmap pixmap(int) const;
- TreeMapItemList* tqchildren();
+ TreeMapItemList* children();
TQColor backColor() const;
private:
@@ -99,7 +99,7 @@ public:
bool isMarked(int) const;
TQString text(int) const;
TQPixmap pixmap(int) const;
- TreeMapItemList* tqchildren();
+ TreeMapItemList* children();
TQColor backColor() const;
private:
@@ -118,7 +118,7 @@ public:
bool isMarked(int) const;
TQString text(int) const;
TQPixmap pixmap(int) const;
- TreeMapItemList* tqchildren();
+ TreeMapItemList* children();
TQColor backColor() const;
private:
diff --git a/kcachegrind/kcachegrind/callview.cpp b/kcachegrind/kcachegrind/callview.cpp
index 2eb08f68..317d137b 100644
--- a/kcachegrind/kcachegrind/callview.cpp
+++ b/kcachegrind/kcachegrind/callview.cpp
@@ -121,11 +121,11 @@ void CallView::context(TQListViewItem* i, const TQPoint & p, int col)
cycle = f->cycle();
popup.insertItem(i18n("Go to '%1'")
- .tqarg(Configuration::shortenSymbol(name)), 93);
+ .arg(Configuration::shortenSymbol(name)), 93);
if (cycle) {
name = Configuration::shortenSymbol(cycle->prettyName());
- popup.insertItem(i18n("Go to '%1'").tqarg(name), 94);
+ popup.insertItem(i18n("Go to '%1'").arg(name), 94);
}
popup.insertSeparator();
diff --git a/kcachegrind/kcachegrind/configdlg.cpp b/kcachegrind/kcachegrind/configdlg.cpp
index 7e56c686..e0b45470 100644
--- a/kcachegrind/kcachegrind/configdlg.cpp
+++ b/kcachegrind/kcachegrind/configdlg.cpp
@@ -210,7 +210,7 @@ bool ConfigDlg::configure(Configuration* c, TraceData* d, TQWidget* p)
TQMessageBox::warning(p, i18n("KCachegrind Configuration"),
i18n("The Maximum Number of List Items should be below 500."
"The previous set value (%1) will still be used.")
- .tqarg(TQString::number(c->_maxListCount)),
+ .arg(TQString::number(c->_maxListCount)),
TQMessageBox::Ok, 0);
c->_maxSymbolCount = dlg.symbolCount->text().toInt();
diff --git a/kcachegrind/kcachegrind/configuration.cpp b/kcachegrind/kcachegrind/configuration.cpp
index 66abd563..02d5c096 100644
--- a/kcachegrind/kcachegrind/configuration.cpp
+++ b/kcachegrind/kcachegrind/configuration.cpp
@@ -132,9 +132,9 @@ void Configuration::saveOptions(KConfig* kconfig)
int count = 1;
for( ; it.current(); ++it ) {
if ( !(*it)->automatic ) {
- colorConfig.writeEntry( TQString("Name%1").tqarg(count),
+ colorConfig.writeEntry( TQString("Name%1").arg(count),
it.currentKey());
- colorConfig.writeEntry( TQString("Color%1").tqarg(count),
+ colorConfig.writeEntry( TQString("Color%1").arg(count),
(*it)->color);
//qDebug("Written Color %s (%d)", it.currentKey().ascii(), count);
@@ -149,9 +149,9 @@ void Configuration::saveOptions(KConfig* kconfig)
TQDictIterator<TQStringList> it2( c->_objectSourceDirs );
count = 1;
for( ; it2.current(); ++it2 ) {
- sourceConfig.writeEntry( TQString("Object%1").tqarg(count),
+ sourceConfig.writeEntry( TQString("Object%1").arg(count),
it2.currentKey());
- sourceConfig.writeEntry( TQString("Dirs%1").tqarg(count),
+ sourceConfig.writeEntry( TQString("Dirs%1").arg(count),
*(*it2), ':');
count++;
}
@@ -176,15 +176,15 @@ void Configuration::saveOptions(KConfig* kconfig)
ctConfig.writeEntry( "Count", ctCount);
for (int i=0; i<ctCount; i++) {
TraceCostType* t = TraceCostType::knownType(i);
- ctConfig.writeEntry( TQString("Name%1").tqarg(i+1), t->name());
+ ctConfig.writeEntry( TQString("Name%1").arg(i+1), t->name());
// Use localized key
TraceItemView::writeConfigEntry(&ctConfig,
- TQString("Longname%1").tqarg(i+1).ascii(),
+ TQString("Longname%1").arg(i+1).ascii(),
t->longName(),
knownLongName(t->name()).utf8().data() /*, true */ );
TraceItemView::writeConfigEntry(&ctConfig,
- TQString("Formula%1").tqarg(i+1).ascii(),
+ TQString("Formula%1").arg(i+1).ascii(),
t->formula(), knownFormula(t->name()).utf8().data());
}
}
@@ -217,8 +217,8 @@ void Configuration::readOptions(KConfig* kconfig)
KConfigGroup colorConfig(kconfig, TQCString("CostColors"));
count = colorConfig.readNumEntry("Count", 0);
for (i=1;i<=count;i++) {
- TQString n = colorConfig.readEntry(TQString("Name%1").tqarg(i));
- TQColor color = colorConfig.readColorEntry(TQString("Color%1").tqarg(i));
+ TQString n = colorConfig.readEntry(TQString("Name%1").arg(i));
+ TQColor color = colorConfig.readColorEntry(TQString("Color%1").arg(i));
if (n.isEmpty()) continue;
@@ -241,8 +241,8 @@ void Configuration::readOptions(KConfig* kconfig)
c->_objectSourceDirs.clear();
if (count>17) c->_objectSourceDirs.resize(count);
for (i=1;i<=count;i++) {
- TQString n = sourceConfig.readEntry(TQString("Object%1").tqarg(i));
- dirs = sourceConfig.readListEntry(TQString("Dirs%1").tqarg(i), ':');
+ TQString n = sourceConfig.readEntry(TQString("Object%1").arg(i));
+ dirs = sourceConfig.readListEntry(TQString("Dirs%1").arg(i), ':');
if (n.isEmpty() || (dirs.count()==0)) continue;
@@ -271,10 +271,10 @@ void Configuration::readOptions(KConfig* kconfig)
int ctCount = ctConfig.readNumEntry("Count", 0);
if (ctCount>0) {
for (int i=1;i<=ctCount;i++) {
- TQString n = ctConfig.readEntry(TQString("Name%1").tqarg(i));
- TQString l = ctConfig.readEntry(TQString("Longname%1").tqarg(i));
+ TQString n = ctConfig.readEntry(TQString("Name%1").arg(i));
+ TQString l = ctConfig.readEntry(TQString("Longname%1").arg(i));
if (l.isEmpty()) l = knownLongName(n);
- TQString f = ctConfig.readEntry(TQString("Formula%1").tqarg(i));
+ TQString f = ctConfig.readEntry(TQString("Formula%1").arg(i));
if (f.isEmpty()) f = knownFormula(n);
TraceCostType::add(new TraceCostType(n, l, f));
@@ -316,7 +316,7 @@ TQColor Configuration::costTypeColor(TraceCostType* t)
if (!t)
n = TQString("CostType-default");
else
- n = TQString("CostType-%1").tqarg(t->name());
+ n = TQString("CostType-%1").arg(t->name());
return color(n)->color;
}
diff --git a/kcachegrind/kcachegrind/costlistitem.cpp b/kcachegrind/kcachegrind/costlistitem.cpp
index 3129838a..1e777b05 100644
--- a/kcachegrind/kcachegrind/costlistitem.cpp
+++ b/kcachegrind/kcachegrind/costlistitem.cpp
@@ -71,7 +71,7 @@ void CostListItem::updateName()
if (!_costItem) return;
TQString n = _costItem->prettyName();
- if (_groupSize>=0) n += TQString(" (%1)").tqarg(_groupSize);
+ if (_groupSize>=0) n += TQString(" (%1)").arg(_groupSize);
setText(1, n);
}
@@ -98,13 +98,13 @@ void CostListItem::update()
double pure = 100.0 * _pure / total;
TQString str;
if (Configuration::showPercentage())
- str = TQString("%1").tqarg(pure, 0, 'f', Configuration::percentPrecision());
+ str = TQString("%1").arg(pure, 0, 'f', Configuration::percentPrecision());
else
str = _costItem->prettySubCost(_costType);
if (_skipped) {
// special handling for skip entries...
- setText(0, TQString("< %1").tqarg(str));
+ setText(0, TQString("< %1").arg(str));
return;
}
diff --git a/kcachegrind/kcachegrind/costtypeitem.cpp b/kcachegrind/kcachegrind/costtypeitem.cpp
index df5bf35a..dc35cb2b 100644
--- a/kcachegrind/kcachegrind/costtypeitem.cpp
+++ b/kcachegrind/kcachegrind/costtypeitem.cpp
@@ -104,7 +104,7 @@ void CostTypeItem::update()
double pure = 100.0 * _pure / selfTotal;
if (Configuration::showPercentage()) {
setText(2, TQString("%1")
- .tqarg(pure, 0, 'f', Configuration::percentPrecision()));
+ .arg(pure, 0, 'f', Configuration::percentPrecision()));
}
else
setText(2, _costItem->prettySubCost(_costType));
@@ -121,7 +121,7 @@ void CostTypeItem::update()
double sum = 100.0 * _sum / total;
if (Configuration::showPercentage()) {
setText(1, TQString("%1")
- .tqarg(sum, 0, 'f', Configuration::percentPrecision()));
+ .arg(sum, 0, 'f', Configuration::percentPrecision()));
}
else
setText(1, _sum.pretty());
diff --git a/kcachegrind/kcachegrind/costtypeview.cpp b/kcachegrind/kcachegrind/costtypeview.cpp
index d4087eba..3f5417e9 100644
--- a/kcachegrind/kcachegrind/costtypeview.cpp
+++ b/kcachegrind/kcachegrind/costtypeview.cpp
@@ -146,13 +146,13 @@ void CostTypeView::context(TQListViewItem* i, const TQPoint & p, int)
else if (r == 97) {
int i = 1;
while(1) {
- if (!TraceCostType::knownVirtualType(i18n("New%1").tqarg(i)))
+ if (!TraceCostType::knownVirtualType(i18n("New%1").arg(i)))
break;
i++;
}
// add same new cost type to this mapping and to known types
- TQString shortName = i18n("New%1").tqarg(i);
- TQString longName = i18n("New Cost Type %1").tqarg(i);
+ TQString shortName = i18n("New%1").arg(i);
+ TQString longName = i18n("New Cost Type %1").arg(i);
TraceCostType::add(new TraceCostType(shortName, longName, "0"));
_data->mapping()->add(new TraceCostType(shortName, longName, "0"));
refresh();
diff --git a/kcachegrind/kcachegrind/coverage.cpp b/kcachegrind/kcachegrind/coverage.cpp
index dc4a9764..86e6f7ff 100644
--- a/kcachegrind/kcachegrind/coverage.cpp
+++ b/kcachegrind/kcachegrind/coverage.cpp
@@ -81,7 +81,7 @@ int Coverage::selfMedian()
TraceFunctionList Coverage::coverage(TraceFunction* f, CoverageMode m,
TraceCostType* ct)
{
- tqinvalidate(f->data(), Coverage::Rtti);
+ invalidate(f->data(), Coverage::Rtti);
_costType = ct;
diff --git a/kcachegrind/kcachegrind/coverageitem.cpp b/kcachegrind/kcachegrind/coverageitem.cpp
index 569359a8..26e5b36e 100644
--- a/kcachegrind/kcachegrind/coverageitem.cpp
+++ b/kcachegrind/kcachegrind/coverageitem.cpp
@@ -97,12 +97,12 @@ void CallerCoverageItem::update()
_sum = SubCost(realSum * _coverage->inclusive());
TQString str;
if (Configuration::showPercentage())
- str = TQString("%1").tqarg(_pSum, 0, 'f', Configuration::percentPrecision());
+ str = TQString("%1").arg(_pSum, 0, 'f', Configuration::percentPrecision());
else
str = _sum.pretty();
if (_skipped) {
- setText(0, TQString("< %1").tqarg(str));
+ setText(0, TQString("< %1").arg(str));
return;
}
@@ -121,9 +121,9 @@ void CallerCoverageItem::update()
distString = TQString::number(_distance);
else
distString = TQString("%1-%2 (%3)")
- .tqarg(_coverage->minDistance())
- .tqarg(_coverage->maxDistance())
- .tqarg(_distance);
+ .arg(_coverage->minDistance())
+ .arg(_coverage->maxDistance())
+ .arg(_distance);
setText(1, distString);
}
@@ -242,12 +242,12 @@ void CalleeCoverageItem::update()
TQString str;
if (Configuration::showPercentage())
- str = TQString("%1").tqarg(_pSum, 0, 'f', Configuration::percentPrecision());
+ str = TQString("%1").arg(_pSum, 0, 'f', Configuration::percentPrecision());
else
str = _sum.pretty();
if (_skipped) {
- str = TQString("< %1").tqarg(str);
+ str = TQString("< %1").arg(str);
setText(0, str);
setText(1, str);
return;
@@ -259,7 +259,7 @@ void CalleeCoverageItem::update()
if (Configuration::showPercentage()) {
setText(1, TQString("%1")
- .tqarg(_pSelf, 0, 'f', Configuration::percentPrecision()));
+ .arg(_pSelf, 0, 'f', Configuration::percentPrecision()));
}
else {
setText(1, _self.pretty());
@@ -285,12 +285,12 @@ void CalleeCoverageItem::update()
if (_distance == sMed)
med = TQString::number(_distance);
else
- med = TQString("%1/%2").tqarg(_distance).tqarg(sMed);
+ med = TQString("%1/%2").arg(_distance).arg(sMed);
distString = TQString("%1-%2 (%3)")
- .tqarg(_coverage->minDistance())
- .tqarg(_coverage->maxDistance())
- .tqarg(med);
+ .arg(_coverage->minDistance())
+ .arg(_coverage->maxDistance())
+ .arg(med);
}
setText(2, distString);
}
diff --git a/kcachegrind/kcachegrind/coverageview.cpp b/kcachegrind/kcachegrind/coverageview.cpp
index 6243d8af..6657e923 100644
--- a/kcachegrind/kcachegrind/coverageview.cpp
+++ b/kcachegrind/kcachegrind/coverageview.cpp
@@ -163,7 +163,7 @@ void CoverageView::context(TQListViewItem* i, const TQPoint & p, int c)
TQString name = f->name();
if ((int)name.length()>Configuration::maxSymbolLength())
name = name.left(Configuration::maxSymbolLength()) + "...";
- popup.insertItem(i18n("Go to '%1'").tqarg(name), 93);
+ popup.insertItem(i18n("Go to '%1'").arg(name), 93);
popup.insertSeparator();
}
diff --git a/kcachegrind/kcachegrind/functionitem.cpp b/kcachegrind/kcachegrind/functionitem.cpp
index 9df7e651..3b694ddf 100644
--- a/kcachegrind/kcachegrind/functionitem.cpp
+++ b/kcachegrind/kcachegrind/functionitem.cpp
@@ -103,7 +103,7 @@ void FunctionItem::setGroupType(TraceCost::CostType gt)
#if 0
_groupPixValid = false;
- viewList()->tqrepaint();
+ viewList()->repaint();
#else
TQColor c = Configuration::functionColor(_groupType, _function);
setPixmap(3, colorPixmap(10, 10, c));
@@ -141,7 +141,7 @@ void FunctionItem::update()
_sum = _function->inclusive()->subCost(_costType);
double incl = 100.0 * _sum / inclTotal;
if (Configuration::showPercentage())
- str = TQString("%1").tqarg(incl, 0, 'f', Configuration::percentPrecision());
+ str = TQString("%1").arg(incl, 0, 'f', Configuration::percentPrecision());
else
str = _function->inclusive()->prettySubCost(_costType);
str = "< " + str;
@@ -171,7 +171,7 @@ void FunctionItem::update()
double incl = 100.0 * _sum / inclTotal;
if (Configuration::showPercentage())
setText(0, TQString("%1")
- .tqarg(incl, 0, 'f', Configuration::percentPrecision()));
+ .arg(incl, 0, 'f', Configuration::percentPrecision()));
else
setText(0, _function->inclusive()->prettySubCost(_costType));
@@ -189,7 +189,7 @@ void FunctionItem::update()
if (Configuration::showPercentage())
setText(1, TQString("%1")
- .tqarg(self, 0, 'f', Configuration::percentPrecision()));
+ .arg(self, 0, 'f', Configuration::percentPrecision()));
else
setText(1, _function->prettySubCost(_costType));
diff --git a/kcachegrind/kcachegrind/functionselection.cpp b/kcachegrind/kcachegrind/functionselection.cpp
index 437a17bf..c5646dd6 100644
--- a/kcachegrind/kcachegrind/functionselection.cpp
+++ b/kcachegrind/kcachegrind/functionselection.cpp
@@ -173,7 +173,7 @@ void FunctionSelection::functionContext(TQListViewItem* i,
if (i) {
f = ((FunctionItem*) i)->function();
if (f) {
- popup.insertItem(i18n("Go to %1").tqarg(f->prettyName()), 93);
+ popup.insertItem(i18n("Go to %1").arg(f->prettyName()), 93);
popup.insertSeparator();
}
}
@@ -417,7 +417,7 @@ void FunctionSelection::refresh()
if (!_data || _data->parts().count()==0) {
functionList->clear();
groupList->setUpdatesEnabled(true);
- groupList->tqrepaint();
+ groupList->repaint();
// this clears all other lists
functionList->setSelected(functionList->firstChild(), true);
@@ -547,9 +547,9 @@ void FunctionSelection::refresh()
functionList->clearSelection();
//functionList->setUpdatesEnabled(true);
- //functionList->tqrepaint();
+ //functionList->repaint();
groupList->setUpdatesEnabled(true);
- groupList->tqrepaint();
+ groupList->repaint();
return;
}
}
@@ -581,7 +581,7 @@ void FunctionSelection::refresh()
groupList->clearSelection();
groupList->setUpdatesEnabled(true);
- groupList->tqrepaint();
+ groupList->repaint();
}
@@ -628,7 +628,7 @@ void FunctionSelection::groupSelected(TQListViewItem* i)
#if 0
if (total == 0.0) {
functionList->setUpdatesEnabled(true);
- functionList->tqrepaint();
+ functionList->repaint();
return;
}
#endif
@@ -668,7 +668,7 @@ void FunctionSelection::groupSelected(TQListViewItem* i)
}
//functionList->setUpdatesEnabled(true);
- //functionList->tqrepaint();
+ //functionList->repaint();
// Don't emit signal if cost item was changed programatically
if (!_inSetGroup) {
diff --git a/kcachegrind/kcachegrind/instritem.cpp b/kcachegrind/kcachegrind/instritem.cpp
index 985582a1..ce5e81bb 100644
--- a/kcachegrind/kcachegrind/instritem.cpp
+++ b/kcachegrind/kcachegrind/instritem.cpp
@@ -107,7 +107,7 @@ InstrItem::InstrItem(InstrView* iv, TQListViewItem* parent, Addr addr,
else
templ += i18n("%n call to '%1'", "%n calls to '%1'", cc);
- TQString callStr = templ.tqarg(_instrCall->call()->calledName());
+ TQString callStr = templ.arg(_instrCall->call()->calledName());
TraceFunction* calledF = _instrCall->call()->called();
calledF->addPrettyLocation(callStr);
@@ -135,13 +135,13 @@ InstrItem::InstrItem(InstrView* iv, TQListViewItem* parent, Addr addr,
TQString jStr;
if (_instrJump->isCondJump())
jStr = i18n("Jump %1 of %2 times to 0x%3")
- .tqarg(_instrJump->followedCount().pretty())
- .tqarg(_instrJump->executedCount().pretty())
- .tqarg(_instrJump->instrTo()->addr().toString());
+ .arg(_instrJump->followedCount().pretty())
+ .arg(_instrJump->executedCount().pretty())
+ .arg(_instrJump->instrTo()->addr().toString());
else
jStr = i18n("Jump %1 times to 0x%2")
- .tqarg(_instrJump->executedCount().pretty())
- .tqarg(_instrJump->instrTo()->addr().toString());
+ .arg(_instrJump->executedCount().pretty())
+ .arg(_instrJump->instrTo()->addr().toString());
setText(6, jStr);
@@ -209,7 +209,7 @@ void InstrItem::updateCost()
if (Configuration::showPercentage())
setText(1, TQString("%1")
- .tqarg(pure, 0, 'f', Configuration::percentPrecision()));
+ .arg(pure, 0, 'f', Configuration::percentPrecision()));
else
setText(1, _pure.pretty());
@@ -228,7 +228,7 @@ void InstrItem::updateCost()
if (Configuration::showPercentage())
setText(2, TQString("%1")
- .tqarg(pure, 0, 'f', Configuration::percentPrecision()));
+ .arg(pure, 0, 'f', Configuration::percentPrecision()));
else
setText(2, _pure2.pretty());
@@ -297,7 +297,7 @@ int InstrItem::compare(TQListViewItem * i, int col, bool ascending ) const
}
void InstrItem::paintCell( TQPainter *p, const TQColorGroup &cg,
- int column, int width, int tqalignment )
+ int column, int width, int alignment )
{
TQColorGroup _cg( cg );
@@ -309,7 +309,7 @@ void InstrItem::paintCell( TQPainter *p, const TQColorGroup &cg,
if (column == 3)
paintArrows(p, _cg, width);
else
- TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
+ TQListViewItem::paintCell( p, _cg, column, width, alignment );
}
void InstrItem::setJumpArray(const TQMemArray<TraceInstrJump*>& a)
diff --git a/kcachegrind/kcachegrind/instritem.h b/kcachegrind/kcachegrind/instritem.h
index e521ebe0..2bbce71f 100644
--- a/kcachegrind/kcachegrind/instritem.h
+++ b/kcachegrind/kcachegrind/instritem.h
@@ -58,7 +58,7 @@ public:
int compare(TQListViewItem * i, int col, bool ascending ) const;
void paintCell(TQPainter *p, const TQColorGroup &cg,
- int column, int width, int tqalignment );
+ int column, int width, int alignment );
int width( const TQFontMetrics& fm,
const TQListView* lv, int c ) const;
diff --git a/kcachegrind/kcachegrind/instrview.cpp b/kcachegrind/kcachegrind/instrview.cpp
index 39bd9b0b..3df16793 100644
--- a/kcachegrind/kcachegrind/instrview.cpp
+++ b/kcachegrind/kcachegrind/instrview.cpp
@@ -188,11 +188,11 @@ void InstrView::context(TQListViewItem* i, const TQPoint & p, int c)
TQString name = f->name();
if ((int)name.length()>Configuration::maxSymbolLength())
name = name.left(Configuration::maxSymbolLength()) + "...";
- popup.insertItem(i18n("Go to '%1'").tqarg(name), 93);
+ popup.insertItem(i18n("Go to '%1'").arg(name), 93);
popup.insertSeparator();
}
else if (instr) {
- popup.insertItem(i18n("Go to Address %1").tqarg(instr->name()), 93);
+ popup.insertItem(i18n("Go to Address %1").arg(instr->name()), 93);
popup.insertSeparator();
}
@@ -618,8 +618,8 @@ bool InstrView::fillInstrRange(TraceFunction* function,
objfile = objfile.replace(TQRegExp("[\"']"), ""); // security...
popencmd = TQString("objdump -C -d "
"--start-address=0x%1 --stop-address=0x%2 \"%3\"")
- .tqarg(dumpStartAddr.toString()).tqarg(dumpEndAddr.toString())
- .tqarg(objfile);
+ .arg(dumpStartAddr.toString()).arg(dumpEndAddr.toString())
+ .arg(objfile);
if (1) qDebug("Running '%s'...", popencmd.ascii());
// and run...
@@ -875,7 +875,7 @@ bool InstrView::fillInstrRange(TraceFunction* function,
"There are %n cost lines without assembler code.", noAssLines));
new InstrItem(this, this, 2,
i18n("This happens because the code of"));
- new InstrItem(this, this, 3, TQString(" %1").tqarg(objfile));
+ new InstrItem(this, this, 3, TQString(" %1").arg(objfile));
new InstrItem(this, this, 4,
i18n("does not seem to match the profile data file."));
new InstrItem(this, this, 5, "");
diff --git a/kcachegrind/kcachegrind/multiview.cpp b/kcachegrind/kcachegrind/multiview.cpp
index 18148927..4288e2df 100644
--- a/kcachegrind/kcachegrind/multiview.cpp
+++ b/kcachegrind/kcachegrind/multiview.cpp
@@ -65,7 +65,7 @@ void MultiView::appendView()
int n = _views.count()+1;
TabView* tv = new TabView(this, this,
- TQString("TabView-%1").tqarg(n).ascii());
+ TQString("TabView-%1").arg(n).ascii());
connect(tv, TQT_SIGNAL(activated(TabView*)),
this, TQT_SLOT(tabActivated(TabView*)) );
_views.append(tv);
@@ -187,7 +187,7 @@ void MultiView::readViewConfig(KConfig* c,
TabView* tv, *activeTV = 0;
for(tv=_views.first();tv;tv=_views.next()) {
if (tv->name() == active) activeTV=tv;
- tv->readViewConfig(c, TQString("%1-%2").tqarg(prefix).tqarg(tv->name()),
+ tv->readViewConfig(c, TQString("%1-%2").arg(prefix).arg(tv->name()),
postfix, withOptions);
}
@@ -216,7 +216,7 @@ void MultiView::saveViewConfig(KConfig* c,
TabView* tv;
for(tv=_views.first();tv;tv=_views.next())
- tv->saveViewConfig(c, TQString("%1-%2").tqarg(prefix).tqarg(tv->name()),
+ tv->saveViewConfig(c, TQString("%1-%2").arg(prefix).arg(tv->name()),
postfix, withOptions);
}
diff --git a/kcachegrind/kcachegrind/partgraph.cpp b/kcachegrind/kcachegrind/partgraph.cpp
index aa01e627..a20f53dc 100644
--- a/kcachegrind/kcachegrind/partgraph.cpp
+++ b/kcachegrind/kcachegrind/partgraph.cpp
@@ -90,7 +90,7 @@ void PartAreaWidget::refreshParts()
{
// rebuild only subparts to keep part selection state
TreeMapItem* i;
- TreeMapItemList* l = base()->tqchildren();
+ TreeMapItemList* l = base()->children();
if (l)
for (i=l->first();i;i=l->next())
i->refresh();
@@ -115,7 +115,7 @@ void PartAreaWidget::setGroupType(TraceCost::CostType gt)
// rebuild hierarchy below parts.
// thus, selected parts stay selected
TreeMapItem* i;
- TreeMapItemList* l = base()->tqchildren();
+ TreeMapItemList* l = base()->children();
if (l)
for (i=l->first();i;i=l->next())
i->refresh();
@@ -164,7 +164,7 @@ TQString PartAreaWidget::tipString(TreeMapItem* i) const
while (i && i->rtti()==3) i = i->parent();
if (i && i->rtti()==2) {
- itemTip = i18n("Profile Part %1").tqarg(i->text(0));
+ itemTip = i18n("Profile Part %1").arg(i->text(0));
if (!i->text(1).isEmpty())
itemTip += " (" + i->text(1) + ")";
@@ -201,9 +201,9 @@ void BasePartItem::setData(TraceData* data)
refresh();
}
-TreeMapItemList* BasePartItem::tqchildren()
+TreeMapItemList* BasePartItem::children()
{
- if (!_data) return _tqchildren;
+ if (!_data) return _children;
if (!initialized()) {
// qDebug("Create Parts (%s)", name().ascii());
@@ -216,7 +216,7 @@ TreeMapItemList* BasePartItem::tqchildren()
addItem(new PartItem(part));
}
- return _tqchildren;
+ return _children;
}
TQString BasePartItem::text(int textNo) const
@@ -276,7 +276,7 @@ TQString PartItem::text(int textNo) const
TraceCost* t = _p->data()->totals();
double p = 100.0 * v / t->subCost(ct);
return TQString("%1 %")
- .tqarg(p, 0, 'f', Configuration::percentPrecision());
+ .arg(p, 0, 'f', Configuration::percentPrecision());
}
return v.pretty();
}
@@ -324,9 +324,9 @@ double PartItem::sum() const
return 0.0;
}
-TreeMapItemList* PartItem::tqchildren()
+TreeMapItemList* PartItem::children()
{
- if (initialized()) return _tqchildren;
+ if (initialized()) return _children;
TraceCost* c;
// qDebug("Create Part subitems (%s)", name().ascii());
@@ -339,7 +339,7 @@ TreeMapItemList* PartItem::tqchildren()
if (c) addItem(new SubPartItem(c));
}
- return _tqchildren;
+ return _children;
}
@@ -397,7 +397,7 @@ TreeMapItemList* PartItem::tqchildren()
break;
}
- return _tqchildren;
+ return _children;
}
@@ -443,7 +443,7 @@ TQString SubPartItem::text(int textNo) const
_partCostItem->part() : _partCostItem->part()->data()->totals();
double p = 100.0 * v / t->subCost(ct);
return TQString("%1 %")
- .tqarg(p, 0, 'f', Configuration::percentPrecision());
+ .arg(p, 0, 'f', Configuration::percentPrecision());
}
return v.pretty();
}
@@ -491,7 +491,7 @@ double SubPartItem::sum() const
return 0.0;
}
-TreeMapItemList* SubPartItem::tqchildren()
+TreeMapItemList* SubPartItem::children()
{
if (!initialized()) {
// qDebug("Create Part sub-subitems (%s)", name().ascii());
@@ -499,7 +499,7 @@ TreeMapItemList* SubPartItem::tqchildren()
PartAreaWidget* w = (PartAreaWidget*)widget();
if (depth()-2 > w->callLevels())
- return _tqchildren;
+ return _children;
if (w->visualisation() == PartAreaWidget::Inclusive) {
TracePartCall* call;
@@ -517,7 +517,7 @@ TreeMapItemList* SubPartItem::tqchildren()
}
}
- return _tqchildren;
+ return _children;
}
diff --git a/kcachegrind/kcachegrind/partgraph.h b/kcachegrind/kcachegrind/partgraph.h
index f8ad4ccd..f28f12eb 100644
--- a/kcachegrind/kcachegrind/partgraph.h
+++ b/kcachegrind/kcachegrind/partgraph.h
@@ -83,7 +83,7 @@ public:
double value() const;
TQString text(int) const;
int borderWidth() const { return 0; }
- TreeMapItemList* tqchildren();
+ TreeMapItemList* children();
TQColor backColor() const;
private:
@@ -101,7 +101,7 @@ public:
int borderWidth() const { return 0; }
TQString text(int) const;
TQPixmap pixmap(int) const;
- TreeMapItemList* tqchildren();
+ TreeMapItemList* children();
TQColor backColor() const;
private:
@@ -120,7 +120,7 @@ public:
SplitMode splitMode() const { return Vertical; }
TQString text(int) const;
TQPixmap pixmap(int) const;
- TreeMapItemList* tqchildren();
+ TreeMapItemList* children();
TQColor backColor() const;
private:
diff --git a/kcachegrind/kcachegrind/partlistitem.cpp b/kcachegrind/kcachegrind/partlistitem.cpp
index debea16a..40c2db36 100644
--- a/kcachegrind/kcachegrind/partlistitem.cpp
+++ b/kcachegrind/kcachegrind/partlistitem.cpp
@@ -46,7 +46,7 @@ PartListItem::PartListItem(TQListView* parent, TraceCostItem* costItem,
#if 0
TQString partName = TQString::number(part->partNumber());
if (part->data()->maxThreadID() >1)
- partName += i18n(" (Thread %1)").tqarg(part->threadID());
+ partName += i18n(" (Thread %1)").arg(part->threadID());
setText(0, partName);
#else
setText(0, _part->prettyName());
@@ -107,7 +107,7 @@ void PartListItem::update()
double pure = 100.0 * _pure / selfTotal;
if (Configuration::showPercentage()) {
setText(2, TQString("%1")
- .tqarg(pure, 0, 'f', Configuration::percentPrecision()));
+ .arg(pure, 0, 'f', Configuration::percentPrecision()));
}
else
setText(2, _partCostItem->prettySubCost(_costType));
@@ -123,7 +123,7 @@ void PartListItem::update()
double sum = 100.0 * _sum / total;
if (Configuration::showPercentage()) {
setText(1, TQString("%1")
- .tqarg(sum, 0, 'f', Configuration::percentPrecision()));
+ .arg(sum, 0, 'f', Configuration::percentPrecision()));
}
else
setText(1, _sum.pretty());
diff --git a/kcachegrind/kcachegrind/partselection.cpp b/kcachegrind/kcachegrind/partselection.cpp
index c501702d..703dd75f 100644
--- a/kcachegrind/kcachegrind/partselection.cpp
+++ b/kcachegrind/kcachegrind/partselection.cpp
@@ -148,7 +148,7 @@ void PartSelection::currentChangedSlot(TreeMapItem* i, bool kbd)
TQString str = i->text(0);
if (!i->text(1).isEmpty())
str += " (" + i->text(1) + ")";
- TQString msg = i18n("Profile Part Overview: Current is '%1'").tqarg(str);
+ TQString msg = i18n("Profile Part Overview: Current is '%1'").arg(str);
emit showMessage(msg, 5000);
if (_showInfo) fillInfo();
@@ -203,7 +203,7 @@ void PartSelection::selectionChanged()
TracePart* part;
// if nothing is selected, activate all parts
- TreeMapItemList* list = partAreaWidget->base()->tqchildren();
+ TreeMapItemList* list = partAreaWidget->base()->children();
if (!list) return;
for (i=list->first();i;i=list->next())
@@ -235,7 +235,7 @@ void PartSelection::activePartsChangedSlot(const TracePartList& list)
kdDebug() << "Entering PartSelection::activePartsChangedSlot" << endl;
TreeMapItem* i;
- TreeMapItemList l = *partAreaWidget->base()->tqchildren();
+ TreeMapItemList l = *partAreaWidget->base()->children();
// first deselect inactive, then select active (makes current active)
for (i=l.first();i;i=l.next()) {
TracePart* part = ((PartItem*)i)->part();
@@ -381,7 +381,7 @@ void PartSelection::contextMenuRequested(TreeMapItem* i,
case 2:
// select all parts
{
- TreeMapItemList list = *partAreaWidget->base()->tqchildren();
+ TreeMapItemList list = *partAreaWidget->base()->children();
partAreaWidget->setRangeSelection(list.first(), list.last(), true);
}
break;
diff --git a/kcachegrind/kcachegrind/partview.cpp b/kcachegrind/kcachegrind/partview.cpp
index 853e9928..3f344bbc 100644
--- a/kcachegrind/kcachegrind/partview.cpp
+++ b/kcachegrind/kcachegrind/partview.cpp
@@ -103,8 +103,8 @@ void PartView::context(TQListViewItem* i, const TQPoint & pos, int)
TracePart* p = i ? ((PartListItem*) i)->part() : 0;
if (p) {
- popup.insertItem(i18n("Select '%1'").tqarg(p->name()), 93);
- popup.insertItem(i18n("Hide '%1'").tqarg(p->name()), 94);
+ popup.insertItem(i18n("Select '%1'").arg(p->name()), 93);
+ popup.insertItem(i18n("Hide '%1'").arg(p->name()), 94);
popup.insertSeparator();
}
diff --git a/kcachegrind/kcachegrind/sourceitem.cpp b/kcachegrind/kcachegrind/sourceitem.cpp
index 6bfc33ac..305b8244 100644
--- a/kcachegrind/kcachegrind/sourceitem.cpp
+++ b/kcachegrind/kcachegrind/sourceitem.cpp
@@ -87,7 +87,7 @@ SourceItem::SourceItem(SourceView* sv, TQListViewItem* parent,
else
templ += i18n("%n call to '%1'", "%n calls to '%1'", cc);
- TQString callStr = templ.tqarg(_lineCall->call()->calledName());
+ TQString callStr = templ.arg(_lineCall->call()->calledName());
TraceFunction* calledF = _lineCall->call()->called();
calledF->addPrettyLocation(callStr);
@@ -123,13 +123,13 @@ SourceItem::SourceItem(SourceView* sv, TQListViewItem* parent,
TQString jStr;
if (_lineJump->isCondJump())
jStr = i18n("Jump %1 of %2 times to %3")
- .tqarg(_lineJump->followedCount().pretty())
- .tqarg(_lineJump->executedCount().pretty())
- .tqarg(to);
+ .arg(_lineJump->followedCount().pretty())
+ .arg(_lineJump->executedCount().pretty())
+ .arg(to);
else
jStr = i18n("Jump %1 times to %2")
- .tqarg(_lineJump->executedCount().pretty())
- .tqarg(to);
+ .arg(_lineJump->executedCount().pretty())
+ .arg(to);
setText(4, jStr);
}
@@ -193,7 +193,7 @@ void SourceItem::updateCost()
if (Configuration::showPercentage())
setText(1, TQString("%1")
- .tqarg(pure, 0, 'f', Configuration::percentPrecision()));
+ .arg(pure, 0, 'f', Configuration::percentPrecision()));
else
setText(1, _pure.pretty());
@@ -212,7 +212,7 @@ void SourceItem::updateCost()
if (Configuration::showPercentage())
setText(2, TQString("%1")
- .tqarg(pure2, 0, 'f', Configuration::percentPrecision()));
+ .arg(pure2, 0, 'f', Configuration::percentPrecision()));
else
setText(2, _pure2.pretty());
@@ -285,7 +285,7 @@ int SourceItem::compare(TQListViewItem * i, int col, bool ascending ) const
}
void SourceItem::paintCell( TQPainter *p, const TQColorGroup &cg,
- int column, int width, int tqalignment )
+ int column, int width, int alignment )
{
TQColorGroup _cg( cg );
@@ -297,7 +297,7 @@ void SourceItem::paintCell( TQPainter *p, const TQColorGroup &cg,
if (column == 3)
paintArrows(p, _cg, width);
else
- TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
+ TQListViewItem::paintCell( p, _cg, column, width, alignment );
}
void SourceItem::setJumpArray(const TQMemArray<TraceLineJump*>& a)
diff --git a/kcachegrind/kcachegrind/sourceitem.h b/kcachegrind/kcachegrind/sourceitem.h
index 30589835..925e575b 100644
--- a/kcachegrind/kcachegrind/sourceitem.h
+++ b/kcachegrind/kcachegrind/sourceitem.h
@@ -57,7 +57,7 @@ public:
int compare(TQListViewItem * i, int col, bool ascending ) const;
void paintCell( TQPainter *p, const TQColorGroup &cg,
- int column, int width, int tqalignment );
+ int column, int width, int alignment );
int width( const TQFontMetrics& fm,
const TQListView* lv, int c ) const;
void updateGroup();
diff --git a/kcachegrind/kcachegrind/sourceview.cpp b/kcachegrind/kcachegrind/sourceview.cpp
index 64b3e995..dde291ea 100644
--- a/kcachegrind/kcachegrind/sourceview.cpp
+++ b/kcachegrind/kcachegrind/sourceview.cpp
@@ -113,11 +113,11 @@ void SourceView::context(TQListViewItem* i, const TQPoint & p, int c)
TQString name = f->name();
if ((int)name.length()>Configuration::maxSymbolLength())
name = name.left(Configuration::maxSymbolLength()) + "...";
- popup.insertItem(i18n("Go to '%1'").tqarg(name), 93);
+ popup.insertItem(i18n("Go to '%1'").arg(name), 93);
popup.insertSeparator();
}
else if (line) {
- popup.insertItem(i18n("Go to Line %1").tqarg(line->name()), 93);
+ popup.insertItem(i18n("Go to Line %1").arg(line->name()), 93);
popup.insertSeparator();
}
@@ -513,7 +513,7 @@ void SourceView::fillSourceFile(TraceFunctionSource* sf, int fileno)
new SourceItem(this, this, fileno, 1, false,
i18n("with any source line of this function in file"));
new SourceItem(this, this, fileno, 2, false,
- TQString(" '%1'").tqarg(sf->function()->prettyName()));
+ TQString(" '%1'").arg(sf->function()->prettyName()));
new SourceItem(this, this, fileno, 3, false,
i18n("Thus, no annotated source can be shown."));
return;
@@ -550,13 +550,13 @@ void SourceView::fillSourceFile(TraceFunctionSource* sf, int fileno)
// do it here, because the source directory could have been set before
if (childCount()==0) {
setColumnText(4, validSourceFile ?
- i18n("Source ('%1')").tqarg(filename) :
+ i18n("Source ('%1')").arg(filename) :
i18n("Source (unknown)"));
}
else {
new SourceItem(this, this, fileno, 0, true,
validSourceFile ?
- i18n("--- Inlined from '%1' ---").tqarg(filename) :
+ i18n("--- Inlined from '%1' ---").arg(filename) :
i18n("--- Inlined from unknown source ---"));
}
@@ -564,7 +564,7 @@ void SourceView::fillSourceFile(TraceFunctionSource* sf, int fileno)
new SourceItem(this, this, fileno, 0, false,
i18n("There is no source available for the following function:"));
new SourceItem(this, this, fileno, 1, false,
- TQString(" '%1'").tqarg(sf->function()->prettyName()));
+ TQString(" '%1'").arg(sf->function()->prettyName()));
if (sf->file()->name().isEmpty()) {
new SourceItem(this, this, fileno, 2, false,
i18n("This is because no debug information is present."));
@@ -575,14 +575,14 @@ void SourceView::fillSourceFile(TraceFunctionSource* sf, int fileno)
i18n("The function is located in this ELF object:"));
new SourceItem(this, this, fileno, 5, false,
TQString(" '%1'")
- .tqarg(sf->function()->object()->prettyName()));
+ .arg(sf->function()->object()->prettyName()));
}
}
else {
new SourceItem(this, this, fileno, 2, false,
i18n("This is because its source file cannot be found:"));
new SourceItem(this, this, fileno, 3, false,
- TQString(" '%1'").tqarg(sf->file()->name()));
+ TQString(" '%1'").arg(sf->file()->name()));
new SourceItem(this, this, fileno, 4, false,
i18n("Add the folder of this file to the source folder list."));
new SourceItem(this, this, fileno, 5, false,
diff --git a/kcachegrind/kcachegrind/stackitem.cpp b/kcachegrind/kcachegrind/stackitem.cpp
index af0499ba..e3763ab4 100644
--- a/kcachegrind/kcachegrind/stackitem.cpp
+++ b/kcachegrind/kcachegrind/stackitem.cpp
@@ -85,7 +85,7 @@ void StackItem::updateCost()
if (Configuration::showPercentage())
setText(0, TQString("%1")
- .tqarg(sum, 0, 'f', Configuration::percentPrecision()));
+ .arg(sum, 0, 'f', Configuration::percentPrecision()));
else
setText(0, _call->prettySubCost(ct));
@@ -107,7 +107,7 @@ void StackItem::updateCost()
if (Configuration::showPercentage())
setText(1, TQString("%1")
- .tqarg(sum, 0, 'f', Configuration::percentPrecision()));
+ .arg(sum, 0, 'f', Configuration::percentPrecision()));
else
setText(1, _call->prettySubCost(ct2));
diff --git a/kcachegrind/kcachegrind/tabview.cpp b/kcachegrind/kcachegrind/tabview.cpp
index 52f728b5..0049d1e2 100644
--- a/kcachegrind/kcachegrind/tabview.cpp
+++ b/kcachegrind/kcachegrind/tabview.cpp
@@ -419,7 +419,7 @@ void TabView::updateVisibility()
s.append(100);
- // tqchildren of mainSplitter
+ // children of mainSplitter
if (_rightTW->isHidden() != (r == 0)) {
if (r == 0) {
_rightTW->hide();
@@ -441,7 +441,7 @@ void TabView::updateVisibility()
_leftSplitter->show();
}
- // tqchildren of leftSplitter
+ // children of leftSplitter
if (_topTW->isHidden() != (t == 0)) {
if (t == 0) {
_topTW->hide();
@@ -463,7 +463,7 @@ void TabView::updateVisibility()
_bottomSplitter->show();
}
- // tqchildren of bottomSplitter
+ // children of bottomSplitter
if (_bottomTW->isHidden() != (b == 0)) {
if (b == 0) {
_bottomTW->hide();
@@ -700,7 +700,7 @@ void TabView::resizeEvent(TQResizeEvent* e)
void TabView::selected(TraceItemView*, TraceItem* s)
{
- // we set selected item for our own tqchildren
+ // we set selected item for our own children
select(s);
updateView();
@@ -771,7 +771,7 @@ void TabView::readViewConfig(KConfig* c,
if (withOptions)
v->readViewConfig(c, TQString("%1-%2")
- .tqarg(prefix).tqarg(v->widget()->name()),
+ .arg(prefix).arg(v->widget()->name()),
postfix, true);
}
if (activeTop) _topTW->showPage(activeTop->widget());
@@ -883,8 +883,8 @@ void TabView::saveViewConfig(KConfig* c,
if (withOptions)
for (v=_tabs.first();v;v=_tabs.next())
- v->saveViewConfig(c, TQString("%1-%2").tqarg(prefix)
- .tqarg(v->widget()->name()), postfix, true);
+ v->saveViewConfig(c, TQString("%1-%2").arg(prefix)
+ .arg(v->widget()->name()), postfix, true);
}
#include "tabview.moc"
diff --git a/kcachegrind/kcachegrind/tabview.h b/kcachegrind/kcachegrind/tabview.h
index 221e6e08..b9b40269 100644
--- a/kcachegrind/kcachegrind/tabview.h
+++ b/kcachegrind/kcachegrind/tabview.h
@@ -55,7 +55,7 @@ class TabBar : public TQTabBar
/**
* Own Splitter:
- * Call checkVisiblity for all TabWidget tqchildren of the splitter
+ * Call checkVisiblity for all TabWidget children of the splitter
* on a MoveEvent. This typically is produced when collapsing the widget
* inside of another splitter.
*/
diff --git a/kcachegrind/kcachegrind/toplevel.cpp b/kcachegrind/kcachegrind/toplevel.cpp
index b063dd24..58cd6577 100644
--- a/kcachegrind/kcachegrind/toplevel.cpp
+++ b/kcachegrind/kcachegrind/toplevel.cpp
@@ -226,21 +226,21 @@ void TopLevel::saveTraceSettings()
TQString key = traceKey();
KConfigGroup pConfig(KGlobal::config(), TQCString("TracePositions"));
- pConfig.writeEntry(TQString("CostType%1").tqarg(key),
+ pConfig.writeEntry(TQString("CostType%1").arg(key),
_costType ? _costType->name() : TQString("?"));
- pConfig.writeEntry(TQString("CostType2%1").tqarg(key),
+ pConfig.writeEntry(TQString("CostType2%1").arg(key),
_costType2 ? _costType2->name() : TQString("?"));
- pConfig.writeEntry(TQString("GroupType%1").tqarg(key),
+ pConfig.writeEntry(TQString("GroupType%1").arg(key),
TraceItem::typeName(_groupType));
if (!_data) return;
KConfigGroup aConfig(KGlobal::config(), TQCString("Layouts"));
- aConfig.writeEntry(TQString("Count%1").tqarg(key), _layoutCount);
- aConfig.writeEntry(TQString("Current%1").tqarg(key), _layoutCurrent);
+ aConfig.writeEntry(TQString("Count%1").arg(key), _layoutCount);
+ aConfig.writeEntry(TQString("Current%1").arg(key), _layoutCurrent);
saveCurrentState(key);
- pConfig.writeEntry(TQString("Group%1").tqarg(key),
+ pConfig.writeEntry(TQString("Group%1").arg(key),
_group ? _group->name() : TQString());
}
@@ -1137,7 +1137,7 @@ void TopLevel::exportGraph()
ge.writeDot();
TQString cmd = TQString("(dot %1 -Tps > %2.ps; kghostview %3.ps)&")
- .tqarg(n).tqarg(n).tqarg(n);
+ .arg(n).arg(n).arg(n);
system(TQFile::encodeName( cmd ));
}
@@ -1725,9 +1725,9 @@ void TopLevel::restoreTraceTypes()
KConfigGroup pConfig(KGlobal::config(), TQCString("TracePositions"));
TQString groupType, costType, costType2;
- groupType = pConfig.readEntry(TQString("GroupType%1").tqarg(key));
- costType = pConfig.readEntry(TQString("CostType%1").tqarg(key));
- costType2 = pConfig.readEntry(TQString("CostType2%1").tqarg(key));
+ groupType = pConfig.readEntry(TQString("GroupType%1").arg(key));
+ costType = pConfig.readEntry(TQString("CostType%1").arg(key));
+ costType2 = pConfig.readEntry(TQString("CostType2%1").arg(key));
if (groupType.isEmpty()) groupType = cConfig.readEntry("GroupType");
if (costType.isEmpty()) costType = cConfig.readEntry("CostType");
@@ -1742,8 +1742,8 @@ void TopLevel::restoreTraceTypes()
costTypeSelected(_saCost->items().first());
KConfigGroup aConfig(KGlobal::config(), TQCString("Layouts"));
- _layoutCount = aConfig.readNumEntry(TQString("Count%1").tqarg(key), 0);
- _layoutCurrent = aConfig.readNumEntry(TQString("Current%1").tqarg(key), 0);
+ _layoutCount = aConfig.readNumEntry(TQString("Count%1").arg(key), 0);
+ _layoutCurrent = aConfig.readNumEntry(TQString("Current%1").arg(key), 0);
if (_layoutCount == 0) layoutRestore();
updateLayoutActions();
}
@@ -1761,7 +1761,7 @@ void TopLevel::restoreTraceSettings()
TQString key = traceKey();
KConfigGroup pConfig(KGlobal::config(), TQCString("TracePositions"));
- TQString group = pConfig.readEntry(TQString("Group%1").tqarg(key));
+ TQString group = pConfig.readEntry(TQString("Group%1").arg(key));
if (!group.isEmpty()) setGroup(group);
restoreCurrentState(key);
@@ -1782,7 +1782,7 @@ void TopLevel::layoutDuplicate()
{
// save current and allocate a new slot
_multiView->saveViewConfig(KGlobal::config(),
- TQString("Layout%1-MainView").tqarg(_layoutCurrent),
+ TQString("Layout%1-MainView").arg(_layoutCurrent),
traceKey(), false);
_layoutCurrent = _layoutCount;
_layoutCount++;
@@ -1800,7 +1800,7 @@ void TopLevel::layoutRemove()
if (_layoutCurrent == from) { _layoutCurrent--; from--; }
// restore from last and decrement count
_multiView->readViewConfig(KGlobal::config(),
- TQString("Layout%1-MainView").tqarg(from),
+ TQString("Layout%1-MainView").arg(from),
traceKey(), false);
_layoutCount--;
@@ -1815,13 +1815,13 @@ void TopLevel::layoutNext()
TQString key = traceKey();
_multiView->saveViewConfig(config,
- TQString("Layout%1-MainView").tqarg(_layoutCurrent),
+ TQString("Layout%1-MainView").arg(_layoutCurrent),
key, false);
_layoutCurrent++;
if (_layoutCurrent == _layoutCount) _layoutCurrent = 0;
_multiView->readViewConfig(config,
- TQString("Layout%1-MainView").tqarg(_layoutCurrent),
+ TQString("Layout%1-MainView").arg(_layoutCurrent),
key, false);
if (0) kdDebug() << "TopLevel::layoutNext: current "
@@ -1836,13 +1836,13 @@ void TopLevel::layoutPrevious()
TQString key = traceKey();
_multiView->saveViewConfig(config,
- TQString("Layout%1-MainView").tqarg(_layoutCurrent),
+ TQString("Layout%1-MainView").arg(_layoutCurrent),
key, false);
_layoutCurrent--;
if (_layoutCurrent <0) _layoutCurrent = _layoutCount-1;
_multiView->readViewConfig(config,
- TQString("Layout%1-MainView").tqarg(_layoutCurrent),
+ TQString("Layout%1-MainView").arg(_layoutCurrent),
key, false);
if (0) kdDebug() << "TopLevel::layoutPrevious: current "
@@ -1855,20 +1855,20 @@ void TopLevel::layoutSave()
TQString key = traceKey();
_multiView->saveViewConfig(config,
- TQString("Layout%1-MainView").tqarg(_layoutCurrent),
+ TQString("Layout%1-MainView").arg(_layoutCurrent),
key, false);
for(int i=0;i<_layoutCount;i++) {
_multiView->readViewConfig(config,
- TQString("Layout%1-MainView").tqarg(i),
+ TQString("Layout%1-MainView").arg(i),
key, false);
_multiView->saveViewConfig(config,
- TQString("Layout%1-MainView").tqarg(i),
+ TQString("Layout%1-MainView").arg(i),
TQString(), false);
}
_multiView->readViewConfig(config,
- TQString("Layout%1-MainView").tqarg(_layoutCurrent),
+ TQString("Layout%1-MainView").arg(_layoutCurrent),
key, false);
KConfigGroup aConfig(config, TQCString("Layouts"));
@@ -1890,15 +1890,15 @@ void TopLevel::layoutRestore()
TQString key = traceKey();
for(int i=0;i<_layoutCount;i++) {
_multiView->readViewConfig(config,
- TQString("Layout%1-MainView").tqarg(i),
+ TQString("Layout%1-MainView").arg(i),
TQString(), false);
_multiView->saveViewConfig(config,
- TQString("Layout%1-MainView").tqarg(i),
+ TQString("Layout%1-MainView").arg(i),
key, false);
}
_multiView->readViewConfig(config,
- TQString("Layout%1-MainView").tqarg(_layoutCurrent),
+ TQString("Layout%1-MainView").arg(_layoutCurrent),
key, false);
updateLayoutActions();
@@ -1918,7 +1918,7 @@ void TopLevel::updateLayoutActions()
ka = actionCollection()->action("layout_remove");
if (ka) ka->setEnabled(_layoutCount>1);
- _statusbar->message(i18n("Layout Count: %1").tqarg(_layoutCount), 1000);
+ _statusbar->message(i18n("Layout Count: %1").arg(_layoutCount), 1000);
}
@@ -1930,19 +1930,19 @@ void TopLevel::updateStatusBar()
}
TQString status = TQString("%1 [%2] - ")
- .tqarg(_data->shortTraceName())
- .tqarg(_data->activePartRange());
+ .arg(_data->shortTraceName())
+ .arg(_data->activePartRange());
if (_costType) {
status += i18n("Total %1 Cost: %2")
- .tqarg(_costType->longName())
- .tqarg(_data->prettySubCost(_costType));
+ .arg(_costType->longName())
+ .arg(_data->prettySubCost(_costType));
/* this gets too long...
if (_costType2 && (_costType2 != _costType))
status += i18n(", %1 Cost: %2")
- .tqarg(_costType2->longName())
- .tqarg(_data->prettySubCost(_costType2));
+ .arg(_costType2->longName())
+ .arg(_data->prettySubCost(_costType2));
*/
}
else
@@ -1952,8 +1952,8 @@ void TopLevel::updateStatusBar()
if (_groupType != TraceItem::Function) {
status += TQString(" - %1 '%2'")
- .tqarg(TraceItem::i18nTypeName(_groupType))
- .tqarg(_group ? _group->prettyName() : i18n("(None)"));
+ .arg(TraceItem::i18nTypeName(_groupType))
+ .arg(_group ? _group->prettyName() : i18n("(None)"));
}
*/
@@ -2048,7 +2048,7 @@ void TopLevel::configChanged()
//qDebug("TopLevel::configChanged");
//_showPercentage->setChecked(Configuration::showPercentage());
- // tqinvalidate found/cached dirs of source files
+ // invalidate found/cached dirs of source files
_data->resetSourceDirs();
_partSelection->refresh();
diff --git a/kcachegrind/kcachegrind/tracedata.cpp b/kcachegrind/kcachegrind/tracedata.cpp
index 6e1a8ad3..f129c2e5 100644
--- a/kcachegrind/kcachegrind/tracedata.cpp
+++ b/kcachegrind/kcachegrind/tracedata.cpp
@@ -226,7 +226,7 @@ TraceItem::CostType TraceItem::i18nCostType(TQString s)
void TraceItem::clear()
{
- tqinvalidate();
+ invalidate();
}
@@ -239,8 +239,8 @@ TQString TraceItem::name() const
{
if (part()) {
return i18n("%1 from %2")
- .tqarg(_dep->name())
- .tqarg(part()->name());
+ .arg(_dep->name())
+ .arg(part()->name());
}
if (_dep)
@@ -259,21 +259,21 @@ TQString TraceItem::prettyName() const
TQString TraceItem::fullName() const
{
return TQString("%1 %2")
- .tqarg(typeName(type())).tqarg(prettyName());
+ .arg(typeName(type())).arg(prettyName());
}
TQString TraceItem::toString()
{
- return TQString("%1\n [%3]").tqarg(fullName()).tqarg(costString(0));
+ return TQString("%1\n [%3]").arg(fullName()).arg(costString(0));
}
-void TraceItem::tqinvalidate()
+void TraceItem::invalidate()
{
if (_dirty) return;
_dirty = true;
if (_dep)
- _dep->tqinvalidate();
+ _dep->invalidate();
}
void TraceItem::update()
@@ -360,7 +360,7 @@ void TraceCost::set(TraceSubMapping* sm, const char* s)
_count = maxIndex;
}
// a cost change has to be propagated (esp. in subclasses)
- tqinvalidate();
+ invalidate();
}
void TraceCost::set(TraceSubMapping* sm, FixString & s)
@@ -391,7 +391,7 @@ void TraceCost::set(TraceSubMapping* sm, FixString & s)
_cost[i] = 0;
_count = maxIndex+1;
}
- tqinvalidate();
+ invalidate();
}
@@ -436,13 +436,13 @@ void TraceCost::addCost(TraceSubMapping* sm, const char* s)
}
// a cost change has to be propagated (esp. in subclasses)
- tqinvalidate();
+ invalidate();
#if TRACE_DEBUG
_dirty = false; // don't recurse !
qDebug("%s\n now %s", fullName().ascii(),
TraceCost::costString(0).ascii());
- _dirty = true; // because of tqinvalidate()
+ _dirty = true; // because of invalidate()
#endif
}
@@ -488,13 +488,13 @@ void TraceCost::addCost(TraceSubMapping* sm, FixString & s)
}
}
- tqinvalidate();
+ invalidate();
#if TRACE_DEBUG
_dirty = false; // don't recurse !
qDebug("%s\n now %s", fullName().ascii(),
TraceCost::costString(0).ascii());
- _dirty = true; // because of tqinvalidate()
+ _dirty = true; // because of invalidate()
#endif
}
@@ -544,13 +544,13 @@ void TraceCost::maxCost(TraceSubMapping* sm, FixString & s)
}
}
- tqinvalidate();
+ invalidate();
#if TRACE_DEBUG
_dirty = false; // don't recurse !
qDebug("%s\n now %s", fullName().ascii(),
TraceCost::costString(0).ascii());
- _dirty = true; // because of tqinvalidate()
+ _dirty = true; // because of invalidate()
#endif
}
@@ -578,14 +578,14 @@ void TraceCost::addCost(TraceCost* item)
}
// a cost change has to be propagated (esp. in subclasses)
- tqinvalidate();
+ invalidate();
#if TRACE_DEBUG
_dirty = false; // don't recurse !
qDebug("%s added cost item\n %s\n now %s",
fullName().ascii(), item->fullName().ascii(),
TraceCost::costString(0).ascii());
- _dirty = true; // because of tqinvalidate()
+ _dirty = true; // because of invalidate()
#endif
}
@@ -612,14 +612,14 @@ void TraceCost::maxCost(TraceCost* item)
}
// a cost change has to be propagated (esp. in subclasses)
- tqinvalidate();
+ invalidate();
#if TRACE_DEBUG
_dirty = false; // don't recurse !
qDebug("%s added cost item\n %s\n now %s",
fullName().ascii(), item->fullName().ascii(),
TraceCost::costString(0).ascii());
- _dirty = true; // because of tqinvalidate()
+ _dirty = true; // because of invalidate()
#endif
}
@@ -636,7 +636,7 @@ void TraceCost::addCost(int type, SubCost value)
}
// a cost change has to be propagated (esp. in subclasses)
- tqinvalidate();
+ invalidate();
}
void TraceCost::maxCost(int type, SubCost value)
@@ -653,7 +653,7 @@ void TraceCost::maxCost(int type, SubCost value)
}
// a cost change has to be propagated (esp. in subclasses)
- tqinvalidate();
+ invalidate();
}
@@ -691,14 +691,14 @@ TQString TraceCost::costString(TraceCostMapping* m)
}
-void TraceCost::tqinvalidate()
+void TraceCost::invalidate()
{
if (_dirty) return;
_dirty = true;
_cachedType = 0; // cached value is invalid, too
if (_dep)
- _dep->tqinvalidate();
+ _dep->invalidate();
}
void TraceCost::update()
@@ -767,8 +767,8 @@ TQString TraceJumpCost::costString(TraceCostMapping*)
if (_dirty) update();
return TQString("%1/%2")
- .tqarg(_followedCount.pretty())
- .tqarg(_executedCount.pretty());
+ .arg(_followedCount.pretty())
+ .arg(_executedCount.pretty());
}
void TraceJumpCost::clear()
@@ -913,7 +913,7 @@ TQString TraceCostType::parsedFormula()
if (!t) continue;
if (!t->name().isEmpty())
- res += TQString(" * %1").tqarg(t->name());
+ res += TQString(" * %1").arg(t->name());
}
return res;
@@ -1362,8 +1362,8 @@ TraceCallCost::~TraceCallCost()
TQString TraceCallCost::costString(TraceCostMapping* m)
{
return TQString("%1, Calls %2")
- .tqarg(TraceCost::costString(m))
- .tqarg(_callCount.pretty());
+ .arg(TraceCost::costString(m))
+ .arg(_callCount.pretty());
}
TQString TraceCallCost::prettyCallCount()
@@ -1388,7 +1388,7 @@ void TraceCallCost::addCallCount(SubCost c)
{
_callCount += c;
- tqinvalidate();
+ invalidate();
}
@@ -1404,8 +1404,8 @@ TraceInclusiveCost::~TraceInclusiveCost()
TQString TraceInclusiveCost::costString(TraceCostMapping* m)
{
return TQString("%1, Inclusive %2")
- .tqarg(TraceCost::costString(m))
- .tqarg(_inclusive.costString(m));
+ .arg(TraceCost::costString(m))
+ .arg(_inclusive.costString(m));
}
void TraceInclusiveCost::clear()
@@ -1425,7 +1425,7 @@ void TraceInclusiveCost::addInclusive(TraceCost* c)
{
_inclusive.addCost(c);
- tqinvalidate();
+ invalidate();
}
@@ -1452,7 +1452,7 @@ void TraceListCost::addDep(TraceCost* dep)
_deps.append(dep);
_lastDep = dep;
- tqinvalidate();
+ invalidate();
#if TRACE_DEBUG
qDebug("%s added\n %s (now %d)",
@@ -1526,7 +1526,7 @@ void TraceJumpListCost::addDep(TraceJumpCost* dep)
_deps.append(dep);
_lastDep = dep;
- tqinvalidate();
+ invalidate();
#if TRACE_DEBUG
qDebug("%s added\n %s (now %d)",
@@ -1600,7 +1600,7 @@ void TraceCallListCost::addDep(TraceCallCost* dep)
_deps.append(dep);
_lastDep = dep;
- tqinvalidate();
+ invalidate();
#if TRACE_DEBUG
qDebug("%s added\n %s (now %d)",
@@ -1679,7 +1679,7 @@ void TraceInclusiveListCost::addDep(TraceInclusiveCost* dep)
_deps.append(dep);
_lastDep = dep;
- tqinvalidate();
+ invalidate();
#if TRACE_DEBUG
qDebug("%s added\n %s (now %d)",
@@ -1897,9 +1897,9 @@ TQString TracePartFunction::costString(TraceCostMapping* m)
TQString res = TraceInclusiveCost::costString(m);
res += TQString(", called from %1: %2")
- .tqarg(_calledContexts).tqarg(prettyCalledCount());
+ .arg(_calledContexts).arg(prettyCalledCount());
res += TQString(", calling from %1: %2")
- .tqarg(_callingContexts).tqarg(prettyCallingCount());
+ .arg(_callingContexts).arg(prettyCallingCount());
return res;
}
@@ -1916,7 +1916,7 @@ void TracePartFunction::addPartInstr(TracePartInstr* ref)
#endif
_partInstr.append(ref);
- tqinvalidate();
+ invalidate();
#if TRACE_DEBUG
qDebug("%s added\n %s (now %d)",
@@ -1937,7 +1937,7 @@ void TracePartFunction::addPartLine(TracePartLine* ref)
#endif
_partLines.append(ref);
- tqinvalidate();
+ invalidate();
#if TRACE_DEBUG
qDebug("%s added\n %s (now %d)",
@@ -1958,7 +1958,7 @@ void TracePartFunction::addPartCaller(TracePartCall* ref)
#endif
_partCallers.append(ref);
- tqinvalidate();
+ invalidate();
#if TRACE_DEBUG
qDebug("%s added Caller\n %s (now %d)",
@@ -1979,7 +1979,7 @@ void TracePartFunction::addPartCalling(TracePartCall* ref)
#endif
_partCallings.append(ref);
- tqinvalidate();
+ invalidate();
#if TRACE_DEBUG
qDebug("%s added Calling\n %s (now %d)",
@@ -2136,8 +2136,8 @@ TracePartClass::~TracePartClass()
TQString TracePartClass::prettyName() const
{
return TQString("%1 from %2")
- .tqarg( _dep->name().isEmpty() ? TQString("(global)") : _dep->name())
- .tqarg(part()->name());
+ .arg( _dep->name().isEmpty() ? TQString("(global)") : _dep->name())
+ .arg(part()->name());
}
//---------------------------------------------------
@@ -2233,8 +2233,8 @@ void TraceInstrJump::update()
TQString TraceInstrJump::name() const
{
return TQString("jump at 0x%1 to 0x%2")
- .tqarg(_instrFrom->addr().toString())
- .tqarg(_instrTo->addr().toString());
+ .arg(_instrFrom->addr().toString())
+ .arg(_instrTo->addr().toString());
}
@@ -2316,8 +2316,8 @@ TracePartLineJump* TraceLineJump::partLineJump(TracePart* part)
TQString TraceLineJump::name() const
{
return TQString("jump at %1 to %2")
- .tqarg(_lineFrom->prettyName())
- .tqarg(_lineTo->prettyName());
+ .arg(_lineFrom->prettyName())
+ .arg(_lineTo->prettyName());
}
@@ -2395,7 +2395,7 @@ TracePartInstrCall* TraceInstrCall::partInstrCall(TracePart* part,
TQString TraceInstrCall::name() const
{
- return TQString("%1 at %2").tqarg(_call->name()).tqarg(_instr->name());
+ return TQString("%1 at %2").arg(_call->name()).arg(_instr->name());
}
@@ -2431,7 +2431,7 @@ TracePartLineCall* TraceLineCall::partLineCall(TracePart* part,
TQString TraceLineCall::name() const
{
- return TQString("%1 at %2").tqarg(_call->name()).tqarg(_line->name());
+ return TQString("%1 at %2").arg(_call->name()).arg(_line->name());
}
@@ -2478,7 +2478,7 @@ TraceInstrCall* TraceCall::instrCall(TraceInstr* i)
icall = new TraceInstrCall(this, i);
_instrCalls.append(icall);
- tqinvalidate();
+ invalidate();
#if TRACE_DEBUG
qDebug("Created %s [TraceCall::instrCall]", icall->fullName().ascii());
@@ -2500,7 +2500,7 @@ TraceLineCall* TraceCall::lineCall(TraceLine* l)
lcall = new TraceLineCall(this, l);
_lineCalls.append(lcall);
- tqinvalidate();
+ invalidate();
#if TRACE_DEBUG
qDebug("Created %s [TraceCall::lineCall]", lcall->fullName().ascii());
@@ -2515,21 +2515,21 @@ void TraceCall::invalidateDynamicCost()
{
TraceLineCall* lc;
for (lc=_lineCalls.first();lc;lc=_lineCalls.next())
- lc->tqinvalidate();
+ lc->invalidate();
TraceInstrCall* ic;
for (ic=_instrCalls.first();ic;ic=_instrCalls.next())
- ic->tqinvalidate();
+ ic->invalidate();
- tqinvalidate();
+ invalidate();
}
TQString TraceCall::name() const
{
return TQString("%1 => %2")
- .tqarg(_caller->name())
- .tqarg(_called->name());
+ .arg(_caller->name())
+ .arg(_called->name());
}
int TraceCall::inCycle()
@@ -2587,7 +2587,7 @@ TQString TraceCall::callerName(bool skipCycle) const
TraceFunctionCycle* c = _called->cycle();
if (c && _caller && (_caller->cycle() != c)) {
TQString via = _called->prettyName();
- return i18n("%1 via %2").tqarg(_caller->prettyName()).tqarg(via);
+ return i18n("%1 via %2").arg(_caller->prettyName()).arg(via);
}
}
@@ -2606,7 +2606,7 @@ TQString TraceCall::calledName(bool skipCycle) const
_called->setCycle(0);
TQString via = _called->prettyName();
_called->setCycle(c);
- return i18n("%1 via %2").tqarg(c->name()).tqarg(via);
+ return i18n("%1 via %2").arg(c->name()).arg(via);
}
}
return _called->prettyName();
@@ -2692,7 +2692,7 @@ void TraceInstr::addInstrCall(TraceInstrCall* instrCall)
#endif
_instrCalls.append(instrCall);
- tqinvalidate();
+ invalidate();
#if TRACE_DEBUG
qDebug("%s added\n %s (now %d)",
@@ -2704,12 +2704,12 @@ void TraceInstr::addInstrCall(TraceInstrCall* instrCall)
TQString TraceInstr::name() const
{
- return TQString("0x%1").tqarg(_addr.toString());
+ return TQString("0x%1").arg(_addr.toString());
}
TQString TraceInstr::prettyName() const
{
- return TQString("0x%1").tqarg(_addr.toString());
+ return TQString("0x%1").arg(_addr.toString());
}
@@ -2807,7 +2807,7 @@ void TraceLine::addLineCall(TraceLineCall* lineCall)
}
_lineCalls.append(lineCall);
- tqinvalidate();
+ invalidate();
#if TRACE_DEBUG
qDebug("%s added\n %s (now %d)",
@@ -2824,13 +2824,13 @@ TQString TraceLine::name() const
return i18n("(unknown)");
return TQString("%1:%2")
- .tqarg(fileShortName).tqarg(_lineno);
+ .arg(fileShortName).arg(_lineno);
}
TQString TraceLine::prettyName() const
{
return TQString("%1 [%2]")
- .tqarg(name()).tqarg(_sourceFile->function()->prettyName());
+ .arg(name()).arg(_sourceFile->function()->prettyName());
}
//---------------------------------------------------
@@ -2869,7 +2869,7 @@ TraceFunctionSource::~TraceFunctionSource()
TQString TraceFunctionSource::name() const
{
- return TQString("%1 for %2").tqarg(_file->name()).tqarg(_function->name());
+ return TQString("%1 for %2").arg(_file->name()).arg(_function->name());
}
uint TraceFunctionSource::firstLineno()
@@ -2952,10 +2952,10 @@ void TraceFunctionSource::invalidateDynamicCost()
TraceLineMap::Iterator lit;
for ( lit = _lineMap->begin();
lit != _lineMap->end(); ++lit )
- (*lit).tqinvalidate();
+ (*lit).invalidate();
}
- tqinvalidate();
+ invalidate();
}
TraceLineMap* TraceFunctionSource::lineMap()
@@ -3125,7 +3125,7 @@ void TraceAssoziation::clear(TraceData* d, int rtti)
(*it).removeAssoziation(rtti);
}
-void TraceAssoziation::tqinvalidate(TraceData* d, int rtti)
+void TraceAssoziation::invalidate(TraceData* d, int rtti)
{
TraceFunctionMap::Iterator it;
for ( it = d->functionMap().begin();
@@ -3203,7 +3203,7 @@ void TraceFunction::invalidateAssoziation(int rtti)
TraceAssoziation* a;
for (a=_assoziations.first();a;a=_assoziations.next())
if ((rtti==0) || (a->rtti() == rtti))
- a->tqinvalidate();
+ a->invalidate();
}
TraceAssoziation* TraceFunction::assoziation(int rtti)
@@ -3254,9 +3254,9 @@ TQString TraceFunction::prettyName() const
// cycle members
if (_cycle) {
if (_cycle != this)
- res = TQString("%1 <cycle %2>").tqarg(res).tqarg(_cycle->cycleNo());
+ res = TQString("%1 <cycle %2>").arg(res).arg(_cycle->cycleNo());
else
- res = TQString("<cycle %2>").tqarg(_cycle->cycleNo());
+ res = TQString("<cycle %2>").arg(_cycle->cycleNo());
}
@@ -3279,9 +3279,9 @@ TQString TraceFunction::location(int maxFiles) const
uint to = lastAddress();
if (from != 0 && to != 0) {
if (from == to)
- loc += TQString(" (0x%1)").tqarg(to, 0, 16);
+ loc += TQString(" (0x%1)").arg(to, 0, 16);
else
- loc += TQString(" (0x%1-0x%2)").tqarg(from, 0, 16).tqarg(to, 0, 16);
+ loc += TQString(" (0x%1-0x%2)").arg(from, 0, 16).arg(to, 0, 16);
}
#endif
}
@@ -3310,9 +3310,9 @@ TQString TraceFunction::location(int maxFiles) const
to = sourceFile->lastLineno();
if (from != 0 && to != 0) {
if (from == to)
- loc += TQString(" (%1)").tqarg(to);
+ loc += TQString(" (%1)").arg(to);
else
- loc += TQString(" (%1-%2)").tqarg(from).tqarg(to);
+ loc += TQString(" (%1-%2)").arg(from).arg(to);
}
#endif
}
@@ -3334,7 +3334,7 @@ void TraceFunction::addPrettyLocation(TQString& s, int maxFiles) const
TQString l = location(maxFiles);
if (l.isEmpty()) return;
- s += TQString(" (%1)").tqarg(l);
+ s += TQString(" (%1)").arg(l);
}
TQString TraceFunction::prettyNameWithLocation(int maxFiles) const
@@ -3342,17 +3342,17 @@ TQString TraceFunction::prettyNameWithLocation(int maxFiles) const
TQString l = location(maxFiles);
if (l.isEmpty()) return prettyName();
- return TQString("%1 (%2)").tqarg(prettyName()).tqarg(l);
+ return TQString("%1 (%2)").arg(prettyName()).arg(l);
}
TQString TraceFunction::info() const
{
TQString l = location();
if (l.isEmpty())
- return TQString("Function %1").tqarg(name());
+ return TQString("Function %1").arg(name());
return TQString("Function %1 (location %2)")
- .tqarg(name()).tqarg(l);
+ .arg(name()).arg(l);
}
@@ -3414,7 +3414,7 @@ void TraceFunction::addCaller(TraceCall* caller)
#endif
_callers.append(caller);
- tqinvalidate();
+ invalidate();
#if TRACE_DEBUG
qDebug("%s added Caller\n %s (now %d)",
@@ -3435,8 +3435,8 @@ TraceCall* TraceFunction::calling(TraceFunction* called)
_callingMap.insert(called, calling);
_callings.append(calling);
- // we have to tqinvalidate ourself so invalidations from item propagate up
- tqinvalidate();
+ // we have to invalidate ourself so invalidations from item propagate up
+ invalidate();
#if TRACE_DEBUG
qDebug("Created %s [TraceFunction::calling]", calling->fullName().ascii());
@@ -3460,8 +3460,8 @@ TraceFunctionSource* TraceFunction::sourceFile(TraceFile* file,
_sourceFiles.append(sourceFile);
- // we have to tqinvalidate ourself so invalidations from item propagate up
- tqinvalidate();
+ // we have to invalidate ourself so invalidations from item propagate up
+ invalidate();
#if TRACE_DEBUG
qDebug("Created SourceFile %s [TraceFunction::line]",
@@ -3601,10 +3601,10 @@ void TraceFunction::invalidateDynamicCost()
TraceInstrMap::Iterator iit;
for ( iit = _instrMap->begin();
iit != _instrMap->end(); ++iit )
- (*iit).tqinvalidate();
+ (*iit).invalidate();
}
- tqinvalidate();
+ invalidate();
}
void TraceFunction::update()
@@ -3951,7 +3951,7 @@ TraceFunctionCycle::TraceFunctionCycle(TraceFunction* f, int n)
_cycle = this;
setPosition(f->data());
- setName(TQString("<cycle %1>").tqarg(n));
+ setName(TQString("<cycle %1>").arg(n));
// reset to attributes of base function
setFile(_base->file());
@@ -3967,7 +3967,7 @@ void TraceFunctionCycle::init()
// this deletes all TraceCall's to members
_callings.clear();
- tqinvalidate();
+ invalidate();
}
void TraceFunctionCycle::add(TraceFunction* f)
@@ -3993,13 +3993,13 @@ void TraceFunctionCycle::setup()
// the cycle has a call to each member
call = new TraceCall(this, f);
- call->tqinvalidate();
+ call->invalidate();
_callings.append(call);
// now do some faking...
f->setCycle(this);
}
- tqinvalidate();
+ invalidate();
}
@@ -4046,7 +4046,7 @@ void TraceClass::addFunction(TraceFunction* function)
_functions.append(function);
- tqinvalidate();
+ invalidate();
#if TRACE_DEBUG
qDebug("%s added\n %s (now %d)",
@@ -4093,7 +4093,7 @@ void TraceFile::addFunction(TraceFunction* function)
_functions.append(function);
- tqinvalidate();
+ invalidate();
#if TRACE_DEBUG
qDebug("%s added\n %s (now %d)",
@@ -4114,7 +4114,7 @@ void TraceFile::addSourceFile(TraceFunctionSource* sourceFile)
_sourceFiles.append(sourceFile);
// not truely needed, as we don't use the sourceFiles for cost update
- tqinvalidate();
+ invalidate();
#if TRACE_DEBUG
qDebug("%s \n added SourceFile %s (now %d)",
@@ -4211,7 +4211,7 @@ void TraceObject::addFunction(TraceFunction* function)
_functions.append(function);
- tqinvalidate();
+ invalidate();
#if TRACE_DEBUG
qDebug("%s added\n %s (now %d)",
@@ -4298,9 +4298,9 @@ TQString TracePart::shortName() const
TQString TracePart::prettyName() const
{
- TQString name = TQString("%1.%2").tqarg(_pid).tqarg(_number);
+ TQString name = TQString("%1.%2").arg(_pid).arg(_number);
if (data()->maxThreadID()>1)
- name += TQString("-%3").tqarg(_tid);
+ name += TQString("-%3").arg(_tid);
return name;
}
@@ -4498,7 +4498,7 @@ void TraceData::load(const TQString& base)
if ((str.length() > pos) && (str[pos] == '.')) {
pos++;
while(str.length()>pos) {
- if ((int)str.tqat(pos) < '0' || (int)str.tqat(pos) > '9') break;
+ if ((int)str.at(pos) < '0' || (int)str.at(pos) > '9') break;
n = 10*n + (str[pos++] - '0');
}
}
@@ -4508,7 +4508,7 @@ void TraceData::load(const TQString& base)
if ((str.length() > pos) && (str[pos] == '-')) {
pos++;
while(str.length()>pos) {
- if ((int)str.tqat(pos) < '0' || (int)str.tqat(pos) > '9') break;
+ if ((int)str.at(pos) < '0' || (int)str.at(pos) > '9') break;
t = 10*t + (str[pos++] - '0');
}
}
@@ -4536,7 +4536,7 @@ void TraceData::load(const TQString& base)
TracePart* TraceData::addPart(const TQString& dir, const TQString& name)
{
- TQString filename = TQString("%1/%2").tqarg(dir).tqarg(name);
+ TQString filename = TQString("%1/%2").arg(dir).arg(name);
#if TRACE_DEBUG
qDebug("TraceData::addPart('%s')", filename.ascii());
#endif
@@ -4632,14 +4632,14 @@ TQString TraceData::activePartRange()
else {
if (!res.isEmpty()) res += ";";
if (r1==r2) res += TQString::number(r1);
- else res += TQString("%1-%2").tqarg(r1).tqarg(r2);
+ else res += TQString("%1-%2").arg(r1).arg(r2);
r1 = r2 = count;
}
}
if (r1>=0) {
if (!res.isEmpty()) res += ";";
if (r1==r2) res += TQString::number(r1);
- else res += TQString("%1-%2").tqarg(r1).tqarg(r2);
+ else res += TQString("%1-%2").arg(r1).arg(r2);
}
return res;
@@ -4647,22 +4647,22 @@ TQString TraceData::activePartRange()
void TraceData::invalidateDynamicCost()
{
- // tqinvalidate all dynamic costs
+ // invalidate all dynamic costs
TraceObjectMap::Iterator oit;
for ( oit = _objectMap.begin();
oit != _objectMap.end(); ++oit )
- (*oit).tqinvalidate();
+ (*oit).invalidate();
TraceClassMap::Iterator cit;
for ( cit = _classMap.begin();
cit != _classMap.end(); ++cit )
- (*cit).tqinvalidate();
+ (*cit).invalidate();
TraceFileMap::Iterator fit;
for ( fit = _fileMap.begin();
fit != _fileMap.end(); ++fit )
- (*fit).tqinvalidate();
+ (*fit).invalidate();
TraceFunctionMap::Iterator it;
for ( it = _functionMap.begin();
@@ -4670,7 +4670,7 @@ void TraceData::invalidateDynamicCost()
(*it).invalidateDynamicCost();
}
- tqinvalidate();
+ invalidate();
}
@@ -5043,7 +5043,7 @@ void TraceData::updateFunctionCycles()
cycle->setup();
_inFunctionCycleUpdate = false;
- // we have to tqinvalidate costs because cycles are now taken into account
+ // we have to invalidate costs because cycles are now taken into account
invalidateDynamicCost();
#if 0
diff --git a/kcachegrind/kcachegrind/tracedata.h b/kcachegrind/kcachegrind/tracedata.h
index cb97e623..8fab2b68 100644
--- a/kcachegrind/kcachegrind/tracedata.h
+++ b/kcachegrind/kcachegrind/tracedata.h
@@ -307,7 +307,7 @@ public:
* other cost items. If only one item depends on the cost of this item,
* it can by set with setDependant() without a need for overwriting.
*/
- virtual void tqinvalidate();
+ virtual void invalidate();
/**
* Sets a dependant to be invalidated when this cost is invalidated.
@@ -388,7 +388,7 @@ public:
void maxCost(int index, SubCost value);
TraceCost diff(TraceCost* item);
- virtual void tqinvalidate();
+ virtual void invalidate();
/** Returns a sub cost. This automatically triggers
* a call to update() if needed.
@@ -1549,7 +1549,7 @@ class TraceAssoziation
bool setFunction(TraceFunction*);
TraceFunction* function() { return _function; }
- void tqinvalidate() { _valid = false; }
+ void invalidate() { _valid = false; }
bool isValid() { return _valid; }
/**
@@ -1562,7 +1562,7 @@ class TraceAssoziation
* Invalidate all assoziations in TraceFunctions of data with
* rtti runtime info. rtti = 0: Invalidate ALL assoziations.
*/
- static void tqinvalidate(TraceData* data, int rtti);
+ static void invalidate(TraceData* data, int rtti);
protected:
TraceFunction* _function;
@@ -1590,7 +1590,7 @@ class TraceFunction: public TraceCostItem
virtual CostType type() const { return Function; }
virtual void update();
- // this tqinvalidate all subcosts of function depending on
+ // this invalidate all subcosts of function depending on
// active status of parts
void invalidateDynamicCost();
@@ -1841,7 +1841,7 @@ class TraceData: public TraceCost
void load(const TQString&);
/** returns true if something changed. These do NOT
- * tqinvalidate the dynamic costs on a activation change,
+ * invalidate the dynamic costs on a activation change,
* i.e. all cost items dependend on active parts.
* This has to be done by the caller when true is returned by
* calling invalidateDynamicCost().
diff --git a/kcachegrind/kcachegrind/traceitemview.cpp b/kcachegrind/kcachegrind/traceitemview.cpp
index e2f5ee09..d11f02b6 100644
--- a/kcachegrind/kcachegrind/traceitemview.cpp
+++ b/kcachegrind/kcachegrind/traceitemview.cpp
@@ -178,7 +178,7 @@ void TraceItemView::setData(TraceData* d)
{
_newData = d;
- // tqinvalidate all pointers to old data
+ // invalidate all pointers to old data
_activeItem = _newActiveItem = 0;
_selectedItem = _newSelectedItem = 0;
_costType = _newCostType = 0;
diff --git a/kcachegrind/kcachegrind/treemap.cpp b/kcachegrind/kcachegrind/treemap.cpp
index 52e1a83f..797e3a5f 100644
--- a/kcachegrind/kcachegrind/treemap.cpp
+++ b/kcachegrind/kcachegrind/treemap.cpp
@@ -759,7 +759,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value)
_parent = parent;
_sum = 0;
- _tqchildren = 0;
+ _children = 0;
_widget = 0;
_index = -1;
_depth = -1; // not set
@@ -792,7 +792,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value,
setText(0, text1);
_sum = 0;
- _tqchildren = 0;
+ _children = 0;
_widget = 0;
_index = -1;
_depth = -1; // not set
@@ -804,7 +804,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value,
TreeMapItem::~TreeMapItem()
{
- if (_tqchildren) delete _tqchildren;
+ if (_children) delete _children;
if (_freeRects) delete _freeRects;
// finally, notify widget about deletion
@@ -845,18 +845,18 @@ void TreeMapItem::redraw()
void TreeMapItem::clear()
{
- if (_tqchildren) {
+ if (_children) {
// delete selected items below this item from selection
if (_widget) _widget->clearSelection(this);
- delete _tqchildren;
- _tqchildren = 0;
+ delete _children;
+ _children = 0;
}
}
-// invalidates current tqchildren and forces redraw
-// this is only usefull when tqchildren are created on demand in items()
+// invalidates current children and forces redraw
+// this is only usefull when children are created on demand in items()
void TreeMapItem::refresh()
{
clear();
@@ -890,9 +890,9 @@ int TreeMapItem::depth() const
bool TreeMapItem::initialized()
{
- if (!_tqchildren) {
- _tqchildren = new TreeMapItemList;
- _tqchildren->setAutoDelete(true);
+ if (!_children) {
+ _children = new TreeMapItemList;
+ _children->setAutoDelete(true);
return false;
}
return true;
@@ -902,16 +902,16 @@ void TreeMapItem::addItem(TreeMapItem* i)
{
if (!i) return;
- if (!_tqchildren) {
- _tqchildren = new TreeMapItemList;
- _tqchildren->setAutoDelete(true);
+ if (!_children) {
+ _children = new TreeMapItemList;
+ _children->setAutoDelete(true);
}
i->setParent(this);
if (sorting(0) == -1)
- _tqchildren->append(i); // preserve insertion order
+ _children->append(i); // preserve insertion order
else
- _tqchildren->inSort(i);
+ _children->inSort(i);
}
@@ -977,17 +977,17 @@ void TreeMapItem::setSorting(int textNo, bool ascending)
_sortAscending = ascending;
_sortTextNo = textNo;
- if (_tqchildren && _sortTextNo != -1) _tqchildren->sort();
+ if (_children && _sortTextNo != -1) _children->sort();
}
void TreeMapItem::resort(bool recursive)
{
- if (!_tqchildren) return;
+ if (!_children) return;
- if (_sortTextNo != -1) _tqchildren->sort();
+ if (_sortTextNo != -1) _children->sort();
if (recursive)
- for (TreeMapItem* i=_tqchildren->first(); i; i=_tqchildren->next())
+ for (TreeMapItem* i=_children->first(); i; i=_children->next())
i->resort(recursive);
}
@@ -1005,13 +1005,13 @@ int TreeMapItem::rtti() const
return 0;
}
-TreeMapItemList* TreeMapItem::tqchildren()
+TreeMapItemList* TreeMapItem::children()
{
- if (!_tqchildren) {
- _tqchildren = new TreeMapItemList;
- _tqchildren->setAutoDelete(true);
+ if (!_children) {
+ _children = new TreeMapItemList;
+ _children->setAutoDelete(true);
}
- return _tqchildren;
+ return _children;
}
void TreeMapItem::clearItemRect()
@@ -1278,7 +1278,7 @@ void TreeMapWidget::setMaxDrawingDepth(int d)
TQString TreeMapWidget::defaultFieldType(int f) const
{
- return i18n("Text %1").tqarg(f+1);
+ return i18n("Text %1").arg(f+1);
}
TQString TreeMapWidget::defaultFieldStop(int) const
@@ -1508,7 +1508,7 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const
if (DEBUG_DRAWING) kdDebug(90100) << "item(" << x << "," << y << "):" << endl;
while (1) {
- TreeMapItemList* list = p->tqchildren();
+ TreeMapItemList* list = p->children();
if (!list)
i = 0;
else {
@@ -1572,12 +1572,12 @@ TreeMapItem* TreeMapWidget::visibleItem(TreeMapItem* i) const
(i->itemRect().height() <1))) {
TreeMapItem* p = i->parent();
if (!p) break;
- int idx = p->tqchildren()->findRef(i);
+ int idx = p->children()->findRef(i);
idx--;
if (idx<0)
i = p;
else
- i = p->tqchildren()->at(idx);
+ i = p->children()->at(idx);
}
}
return i;
@@ -1771,7 +1771,7 @@ TreeMapItem* TreeMapWidget::setTmpRangeSelection(TreeMapItem* i1,
i2 = i2->parent();
if (!i2) return changed;
- TreeMapItemList* list = commonParent->tqchildren();
+ TreeMapItemList* list = commonParent->children();
if (!list) return changed;
TreeMapItem* i = list->first();
@@ -1794,7 +1794,7 @@ void TreeMapWidget::contextMenuEvent( TQContextMenuEvent* e )
{
//kdDebug(90100) << "TreeMapWidget::contextMenuEvent" << endl;
- if ( tqreceivers( TQT_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) )
+ if ( receivers( TQT_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) )
e->accept();
if ( e->reason() == TQContextMenuEvent::Keyboard ) {
@@ -1964,12 +1964,12 @@ int nextVisible(TreeMapItem* i)
TreeMapItem* p = i->parent();
if (!p || p->itemRect().isEmpty()) return -1;
- int idx = p->tqchildren()->findRef(i);
+ int idx = p->children()->findRef(i);
if (idx<0) return -1;
- while (idx < (int)p->tqchildren()->count()-1) {
+ while (idx < (int)p->children()->count()-1) {
idx++;
- TQRect r = p->tqchildren()->at(idx)->itemRect();
+ TQRect r = p->children()->at(idx)->itemRect();
if (r.width()>1 && r.height()>1)
return idx;
}
@@ -1982,12 +1982,12 @@ int prevVisible(TreeMapItem* i)
TreeMapItem* p = i->parent();
if (!p || p->itemRect().isEmpty()) return -1;
- int idx = p->tqchildren()->findRef(i);
+ int idx = p->children()->findRef(i);
if (idx<0) return -1;
while (idx > 0) {
idx--;
- TQRect r = p->tqchildren()->at(idx)->itemRect();
+ TQRect r = p->children()->at(idx)->itemRect();
if (r.width()>1 && r.height()>1)
return idx;
}
@@ -2068,24 +2068,24 @@ void TreeMapWidget::keyPressEvent( TQKeyEvent* e )
int newIdx = goBack ? nextVisible(_current) : prevVisible(_current);
if (p && newIdx>=0) {
p->setIndex(newIdx);
- setCurrent(p->tqchildren()->at(newIdx), true);
+ setCurrent(p->children()->at(newIdx), true);
}
}
else if (e->key() == Key_Right) {
int newIdx = goBack ? prevVisible(_current) : nextVisible(_current);
if (p && newIdx>=0) {
p->setIndex(newIdx);
- setCurrent(p->tqchildren()->at(newIdx), true);
+ setCurrent(p->children()->at(newIdx), true);
}
}
else if (e->key() == Key_Down) {
- if (_current->tqchildren() && _current->tqchildren()->count()>0) {
+ if (_current->children() && _current->children()->count()>0) {
int newIdx = _current->index();
if (newIdx<0)
- newIdx = goBack ? (_current->tqchildren()->count()-1) : 0;
- if (newIdx>=(int)_current->tqchildren()->count())
- newIdx = _current->tqchildren()->count()-1;
- newItem = visibleItem(_current->tqchildren()->at(newIdx));
+ newIdx = goBack ? (_current->children()->count()-1) : 0;
+ if (newIdx>=(int)_current->children()->count())
+ newIdx = _current->children()->count()-1;
+ newItem = visibleItem(_current->children()->at(newIdx));
setCurrent(newItem, true);
}
}
@@ -2274,12 +2274,12 @@ void TreeMapWidget::drawItems(TQPainter* p,
TQRect r = TQRect(origRect.x()+bw, origRect.y()+bw,
origRect.width()-2*bw, origRect.height()-2*bw);
- TreeMapItemList* list = item->tqchildren();
+ TreeMapItemList* list = item->children();
TreeMapItem* i;
bool stopDrawing = false;
- // only subdivide if there are tqchildren
+ // only subdivide if there are children
if (!list || list->count()==0)
stopDrawing = true;
@@ -2312,7 +2312,7 @@ void TreeMapWidget::drawItems(TQPainter* p,
if (stopDrawing) {
if (list) {
- // tqinvalidate rects
+ // invalidate rects
for (i=list->first();i;i=list->next())
i->clearItemRect();
}
@@ -2428,7 +2428,7 @@ void TreeMapWidget::drawItems(TQPainter* p,
r.setRect(r.x(), r.y()+sr.height(), r.width(), r.height()-sr.height());
}
- // set selfRect (not occupied by tqchildren) for tooltip
+ // set selfRect (not occupied by children) for tooltip
item->addFreeRect(sr);
if (0) kdDebug(90100) << "Item " << item->path(0).join("/") << ": SelfR "
@@ -2566,7 +2566,7 @@ void TreeMapWidget::drawItems(TQPainter* p,
kdDebug(90100) << "-drawItems(" << item->path(0).join("/") << ")" << endl;
}
-// fills area with a pattern if to small to draw tqchildren
+// fills area with a pattern if to small to draw children
void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r)
{
p->setBrush(TQt::Dense4Pattern);
@@ -2575,7 +2575,7 @@ void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r)
i->addFreeRect(r);
}
-// fills area with a pattern if to small to draw tqchildren
+// fills area with a pattern if to small to draw children
void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r,
TreeMapItemListIterator it, int len, bool goBack)
{
@@ -2874,10 +2874,10 @@ void TreeMapWidget::addVisualizationItems(TQPopupMenu* popup, int id)
popup->insertItem(i18n("Border"), bpopup, id+1);
bpopup->insertItem(i18n("Correct Borders Only"), id+2);
bpopup->insertSeparator();
- bpopup->insertItem(i18n("Width %1").tqarg(0), id+3);
- bpopup->insertItem(i18n("Width %1").tqarg(1), id+4);
- bpopup->insertItem(i18n("Width %1").tqarg(2), id+5);
- bpopup->insertItem(i18n("Width %1").tqarg(3), id+6);
+ bpopup->insertItem(i18n("Width %1").arg(0), id+3);
+ bpopup->insertItem(i18n("Width %1").arg(1), id+4);
+ bpopup->insertItem(i18n("Width %1").arg(2), id+5);
+ bpopup->insertItem(i18n("Width %1").arg(3), id+6);
bpopup->setItemChecked(id+2, skipIncorrectBorder());
bpopup->setItemChecked(id+3, borderWidth()==0);
bpopup->setItemChecked(id+4, borderWidth()==1);
@@ -2984,7 +2984,7 @@ void TreeMapWidget::addFieldStopItems(TQPopupMenu* popup,
connect(popup, TQT_SIGNAL(activated(int)),
this, TQT_SLOT(fieldStopActivated(int)));
- popup->insertItem(i18n("No %1 Limit").tqarg(fieldType(0)), id);
+ popup->insertItem(i18n("No %1 Limit").arg(fieldType(0)), id);
popup->setItemChecked(id, fieldStop(0).isEmpty());
_menuItem = i;
bool foundFieldStop = false;
@@ -3043,7 +3043,7 @@ void TreeMapWidget::addAreaStopItems(TQPopupMenu* popup,
int area = i->width() * i->height();
popup->insertSeparator();
popup->insertItem(i18n("Area of '%1' (%2)")
- .tqarg(i->text(0)).tqarg(area), id+1);
+ .arg(i->text(0)).arg(area), id+1);
if (area == minimalArea()) {
popup->setItemChecked(id+1, true);
foundArea = true;
@@ -3069,9 +3069,9 @@ void TreeMapWidget::addAreaStopItems(TQPopupMenu* popup,
}
popup->insertItem(i18n("Double Area Limit (to %1)")
- .tqarg(minimalArea()*2), id+5);
+ .arg(minimalArea()*2), id+5);
popup->insertItem(i18n("Halve Area Limit (to %1)")
- .tqarg(minimalArea()/2), id+6);
+ .arg(minimalArea()/2), id+6);
}
}
@@ -3105,7 +3105,7 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup,
int d = i->depth();
popup->insertSeparator();
popup->insertItem(i18n("Depth of '%1' (%2)")
- .tqarg(i->text(0)).tqarg(d), id+1);
+ .arg(i->text(0)).arg(d), id+1);
if (d == maxDrawingDepth()) {
popup->setItemChecked(id+1, true);
foundDepth = true;
@@ -3115,14 +3115,14 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup,
if (maxDrawingDepth()>1) {
popup->insertSeparator();
if (!foundDepth) {
- popup->insertItem(i18n("Depth %1").tqarg(maxDrawingDepth()), id+10);
+ popup->insertItem(i18n("Depth %1").arg(maxDrawingDepth()), id+10);
popup->setItemChecked(id+10, true);
}
popup->insertItem(i18n("Decrement (to %1)")
- .tqarg(maxDrawingDepth()-1), id+2);
+ .arg(maxDrawingDepth()-1), id+2);
popup->insertItem(i18n("Increment (to %1)")
- .tqarg(maxDrawingDepth()+1), id+3);
+ .arg(maxDrawingDepth()+1), id+3);
}
}
@@ -3145,13 +3145,13 @@ void TreeMapWidget::saveOptions(KConfigGroup* config, TQString prefix)
int f, fCount = _attr.size();
config->writeEntry(prefix+"FieldCount", fCount);
for (f=0;f<fCount;f++) {
- config->writeEntry(TQString(prefix+"FieldVisible%1").tqarg(f),
+ config->writeEntry(TQString(prefix+"FieldVisible%1").arg(f),
_attr[f].visible);
- config->writeEntry(TQString(prefix+"FieldForced%1").tqarg(f),
+ config->writeEntry(TQString(prefix+"FieldForced%1").arg(f),
_attr[f].forced);
- config->writeEntry(TQString(prefix+"FieldStop%1").tqarg(f),
+ config->writeEntry(TQString(prefix+"FieldStop%1").arg(f),
_attr[f].stop);
- config->writeEntry(TQString(prefix+"FieldPosition%1").tqarg(f),
+ config->writeEntry(TQString(prefix+"FieldPosition%1").arg(f),
fieldPositionString(f));
}
}
@@ -3195,18 +3195,18 @@ void TreeMapWidget::restoreOptions(KConfigGroup* config, TQString prefix)
int f;
for (f=0;f<num;f++) {
- str = TQString(prefix+"FieldVisible%1").tqarg(f);
+ str = TQString(prefix+"FieldVisible%1").arg(f);
if (config->hasKey(str))
setFieldVisible(f, config->readBoolEntry(str));
- str = TQString(prefix+"FieldForced%1").tqarg(f);
+ str = TQString(prefix+"FieldForced%1").arg(f);
if (config->hasKey(str))
setFieldForced(f, config->readBoolEntry(str));
- str = config->readEntry(TQString(prefix+"FieldStop%1").tqarg(f));
+ str = config->readEntry(TQString(prefix+"FieldStop%1").arg(f));
setFieldStop(f, str);
- str = config->readEntry(TQString(prefix+"FieldPosition%1").tqarg(f));
+ str = config->readEntry(TQString(prefix+"FieldPosition%1").arg(f));
if (!str.isEmpty()) setFieldPosition(f, str);
}
}
diff --git a/kcachegrind/kcachegrind/treemap.h b/kcachegrind/kcachegrind/treemap.h
index a70f5bd4..356c493b 100644
--- a/kcachegrind/kcachegrind/treemap.h
+++ b/kcachegrind/kcachegrind/treemap.h
@@ -222,7 +222,7 @@ typedef TQPtrListIterator<TreeMapItem> TreeMapItemListIterator;
*
* If you want more flexibility, reimplement TreeMapItem and
* override the corresponding methods. For dynamic creation of child
- * items on demand, reimplement tqchildren().
+ * items on demand, reimplement children().
*/
class TreeMapItem: public StoredDrawParams
{
@@ -257,7 +257,7 @@ public:
// force a redraw of this item
void redraw();
- // delete all tqchildren
+ // delete all children
void clear();
// force new child generation & refresh
@@ -350,7 +350,7 @@ public:
* For value() sorting, use <textNo> = -2
*
* For fast sorting, set this to -1 before child insertions and call
- * again after inserting all tqchildren.
+ * again after inserting all children.
*/
void setSorting(int textNo, bool ascending = true);
@@ -358,18 +358,18 @@ public:
* Resort according to the already set sorting.
*
* This has to be done if the sorting base changes (e.g. text or values
- * change). If this is only true for the tqchildren of this item, you can
+ * change). If this is only true for the children of this item, you can
* set the recursive parameter to false.
*/
void resort(bool recursive = true);
virtual SplitMode splitMode() const;
virtual int rtti() const;
- // not const as this can create tqchildren on demand
- virtual TreeMapItemList* tqchildren();
+ // not const as this can create children on demand
+ virtual TreeMapItemList* children();
protected:
- TreeMapItemList* _tqchildren;
+ TreeMapItemList* _children;
double _sum, _value;
private:
@@ -444,7 +444,7 @@ public:
/**
* Selects or unselects an item.
* In multiselection mode, the constrain that a selected item
- * has no selected tqchildren or parents stays true.
+ * has no selected children or parents stays true.
*/
void setSelected(TreeMapItem*, bool selected = true);
@@ -460,7 +460,7 @@ public:
void setMarked(int markNo = 1, bool redraw = true);
/**
- * Clear selection of all selected items which are tqchildren of
+ * Clear selection of all selected items which are children of
* parent. When parent == 0, clears whole selection
* Returns true if selection changed.
*/
@@ -472,7 +472,7 @@ public:
* Range means for a hierarchical widget:
* - select/unselect i1 and i2 according selected
* - search common parent of i1 and i2, and select/unselect the
- * range of direct tqchildren between but excluding the child
+ * range of direct children between but excluding the child
* leading to i1 and the child leading to i2.
*/
void setRangeSelection(TreeMapItem* i1,
@@ -532,7 +532,7 @@ public:
void setVisibleWidth(int width, bool reuseSpace = false);
/**
- * If a tqchildren value() is almost the parents sum(),
+ * If a children value() is almost the parents sum(),
* it can happen that the border to be drawn for visibilty of
* nesting relations takes to much space, and the
* parent/child size relation can not be mapped to a correct
@@ -644,7 +644,7 @@ public:
virtual TQString tipString(TreeMapItem* i) const;
/**
- * Redraws an item with all tqchildren.
+ * Redraws an item with all children.
* This takes changed values(), sums(), colors() and text() into account.
*/
void redraw(TreeMapItem*);