diff options
Diffstat (limited to 'kcachegrind')
-rw-r--r-- | kcachegrind/kcachegrind.spec.in | 6 | ||||
-rw-r--r-- | kcachegrind/kcachegrind/cachegrindloader.cpp | 12 | ||||
-rw-r--r-- | kcachegrind/kcachegrind/callgraphview.cpp | 14 | ||||
-rw-r--r-- | kcachegrind/kcachegrind/configdlg.cpp | 8 | ||||
-rw-r--r-- | kcachegrind/kcachegrind/functionselection.cpp | 10 | ||||
-rw-r--r-- | kcachegrind/kcachegrind/instrview.cpp | 2 | ||||
-rw-r--r-- | kcachegrind/kcachegrind/multiview.cpp | 2 | ||||
-rw-r--r-- | kcachegrind/kcachegrind/partgraph.cpp | 2 | ||||
-rw-r--r-- | kcachegrind/kcachegrind/partselection.cpp | 4 | ||||
-rw-r--r-- | kcachegrind/kcachegrind/partview.cpp | 4 | ||||
-rw-r--r-- | kcachegrind/kcachegrind/sourceitem.cpp | 2 | ||||
-rw-r--r-- | kcachegrind/kcachegrind/stackbrowser.cpp | 4 | ||||
-rw-r--r-- | kcachegrind/kcachegrind/stackbrowser.h | 2 | ||||
-rw-r--r-- | kcachegrind/kcachegrind/tabview.cpp | 8 | ||||
-rw-r--r-- | kcachegrind/kcachegrind/toplevel.cpp | 6 | ||||
-rw-r--r-- | kcachegrind/kcachegrind/tracedata.cpp | 62 | ||||
-rw-r--r-- | kcachegrind/kcachegrind/traceitemview.cpp | 2 | ||||
-rw-r--r-- | kcachegrind/kcachegrind/treemap.cpp | 24 | ||||
-rw-r--r-- | kcachegrind/kcachegrind/treemap.h | 2 |
19 files changed, 88 insertions, 88 deletions
diff --git a/kcachegrind/kcachegrind.spec.in b/kcachegrind/kcachegrind.spec.in index 5c786a47..060dd28e 100644 --- a/kcachegrind/kcachegrind.spec.in +++ b/kcachegrind/kcachegrind.spec.in @@ -42,9 +42,9 @@ make -j$numprocs make install-strip DESTDIR=$RPM_BUILD_ROOT cd $RPM_BUILD_ROOT -tqfind . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/file.list.kcachegrind -tqfind . -type f | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.kcachegrind -tqfind . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.kcachegrind +find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/file.list.kcachegrind +find . -type f | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.kcachegrind +find . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.kcachegrind %clean rm -rf $RPM_BUILD_ROOT/* diff --git a/kcachegrind/kcachegrind/cachegrindloader.cpp b/kcachegrind/kcachegrind/cachegrindloader.cpp index 41bfa89e..761830fc 100644 --- a/kcachegrind/kcachegrind/cachegrindloader.cpp +++ b/kcachegrind/kcachegrind/cachegrindloader.cpp @@ -167,7 +167,7 @@ bool CachegrindLoader::canLoadTrace(TQFile* file) TQCString s; s.setRawData(buf, read+1); - int pos = s.tqfind("events:"); + int pos = s.find("events:"); if (pos>0 && buf[pos-1] != '\n') pos = -1; s.resetRawData(buf, read+1); return (pos>=0); @@ -346,7 +346,7 @@ TraceObject* CachegrindLoader::compressedObject(const TQString& name) if ((name[0] != '(') || !name[1].isDigit()) return _data->object(checkUnknown(name)); // compressed format using _objectVector - int p = name.tqfind(')'); + int p = name.find(')'); if (p<2) { kdError() << _filename << ":" << _lineNo << " - Invalid compressed ELF object ('" @@ -400,7 +400,7 @@ TraceFile* CachegrindLoader::compressedFile(const TQString& name) if ((name[0] != '(') || !name[1].isDigit()) return _data->file(checkUnknown(name)); // compressed format using _fileVector - int p = name.tqfind(')'); + int p = name.find(')'); if (p<2) { kdError() << _filename << ":" << _lineNo << " - Invalid compressed file ('" @@ -457,7 +457,7 @@ TraceFunction* CachegrindLoader::compressedFunction(const TQString& name, return _data->function(checkUnknown(name), file, object); // compressed format using _functionVector - int p = name.tqfind(')'); + int p = name.find(')'); if (p<2) { kdError() << _filename << ":" << _lineNo << " - Invalid compressed function ('" @@ -1030,8 +1030,8 @@ bool CachegrindLoader::loadTraceInternal(TracePart* part) // positions: if (line.stripPrefix("ositions:")) { TQString positions(line); - hasLineInfo = (positions.tqfind("line")>=0); - hasAddrInfo = (positions.tqfind("instr")>=0); + hasLineInfo = (positions.find("line")>=0); + hasAddrInfo = (positions.find("instr")>=0); continue; } break; diff --git a/kcachegrind/kcachegrind/callgraphview.cpp b/kcachegrind/kcachegrind/callgraphview.cpp index 99613171..4135f6b4 100644 --- a/kcachegrind/kcachegrind/callgraphview.cpp +++ b/kcachegrind/kcachegrind/callgraphview.cpp @@ -174,13 +174,13 @@ TraceCall* GraphNode::visibleCalling() void GraphNode::setCalling(GraphEdge* e) { - _lastCallingIndex = callings.tqfindRef(e); + _lastCallingIndex = callings.findRef(e); _lastFromCaller = false; } void GraphNode::setCaller(GraphEdge* e) { - _lastCallerIndex = callers.tqfindRef(e); + _lastCallerIndex = callers.findRef(e); _lastFromCaller = true; } @@ -797,7 +797,7 @@ GraphNode* GraphExporter::node(TraceFunction* f) { if (!f) return 0; - GraphNodeMap::Iterator it = _nodeMap.tqfind(f); + GraphNodeMap::Iterator it = _nodeMap.find(f); if (it == _nodeMap.end()) return 0; return &(*it); @@ -805,7 +805,7 @@ GraphNode* GraphExporter::node(TraceFunction* f) GraphEdge* GraphExporter::edge(TraceFunction* f1, TraceFunction* f2) { - GraphEdgeMap::Iterator it = _edgeMap.tqfind(tqMakePair(f1, f2)); + GraphEdgeMap::Iterator it = _edgeMap.find(tqMakePair(f1, f2)); if (it == _edgeMap.end()) return 0; return &(*it); @@ -927,14 +927,14 @@ void GraphExporter::buildGraph(TraceFunction* f, int d, if (call->isRecursion()) continue; if (toCallings) { - GraphEdgeSet::Iterator it = n.callingSet.tqfind(&e); + GraphEdgeSet::Iterator it = n.callingSet.find(&e); if (it == n.callingSet.end()) { n.callings.append(&e); n.callingSet.insert(&e, 1 ); } } else { - GraphEdgeSet::Iterator it = n.callerSet.tqfind(&e); + GraphEdgeSet::Iterator it = n.callerSet.find(&e); if (it == n.callerSet.end()) { n.callers.append(&e); n.callerSet.insert(&e, 1 ); @@ -1000,7 +1000,7 @@ void PannerView::drawContents(TQPainter * p, int clipx, int clipy, int clipw, in void PannerView::contentsMousePressEvent(TQMouseEvent* e) { if (_zoomRect.isValid()) { - if (!_zoomRect.tqcontains(e->pos())) + if (!_zoomRect.contains(e->pos())) emit zoomRectMoved(e->pos().x() - _zoomRect.center().x(), e->pos().y() - _zoomRect.center().y()); diff --git a/kcachegrind/kcachegrind/configdlg.cpp b/kcachegrind/kcachegrind/configdlg.cpp index b401c8be..4fa94f3a 100644 --- a/kcachegrind/kcachegrind/configdlg.cpp +++ b/kcachegrind/kcachegrind/configdlg.cpp @@ -127,15 +127,15 @@ ConfigDlg::ConfigDlg(Configuration* c, TraceData* data, TQString n = it.currentKey(); if (n.startsWith(objectPrefix)) { n = n.remove(0, objectPrefix.length()+1); - if (oList.tqfindIndex(n) == -1) oList.append(n); + if (oList.findIndex(n) == -1) oList.append(n); } else if (n.startsWith(classPrefix)) { n = n.remove(0, classPrefix.length()+1); - if (cList.tqfindIndex(n) == -1) cList.append(n); + if (cList.findIndex(n) == -1) cList.append(n); } else if (n.startsWith(filePrefix)) { n = n.remove(0, filePrefix.length()+1); - if (fList.tqfindIndex(n) == -1) fList.append(n); + if (fList.findIndex(n) == -1) fList.append(n); } } @@ -388,7 +388,7 @@ void ConfigDlg::dirsAddPressed() if (newDir.endsWith("/")) newDir = newDir.left(newDir.length()-1); - if (dirs->tqfindIndex(newDir)>=0) return; + if (dirs->findIndex(newDir)>=0) return; dirs->append(newDir); if (newDir.isEmpty()) newDir = TQString("/"); diff --git a/kcachegrind/kcachegrind/functionselection.cpp b/kcachegrind/kcachegrind/functionselection.cpp index 41390248..0ea7e72c 100644 --- a/kcachegrind/kcachegrind/functionselection.cpp +++ b/kcachegrind/kcachegrind/functionselection.cpp @@ -738,7 +738,7 @@ void FunctionSelection::updateGroupSizes(bool hideEmpty) TQListViewItem* item = groupList->firstChild(); for (;item;item = item->nextSibling()) { CostListItem* i = (CostListItem*)item; - int size = (_groupSize.tqcontains(i->costItem())) ? + int size = (_groupSize.contains(i->costItem())) ? _groupSize[i->costItem()] : -1; i->setSize(size); i->setVisible(!hideEmpty || (size>0)); @@ -774,28 +774,28 @@ void FunctionSelection::query(TQString query) if (re.search(f->prettyName())>=0) { if (_group) { if (_groupType==TraceItem::Object) { - if (_groupSize.tqcontains(f->object())) + if (_groupSize.contains(f->object())) _groupSize[f->object()]++; else _groupSize[f->object()] = 1; if (f->object() != _group) continue; } else if (_groupType==TraceItem::Class) { - if (_groupSize.tqcontains(f->cls())) + if (_groupSize.contains(f->cls())) _groupSize[f->cls()]++; else _groupSize[f->cls()] = 1; if (f->cls() != _group) continue; } else if (_groupType==TraceItem::File) { - if (_groupSize.tqcontains(f->file())) + if (_groupSize.contains(f->file())) _groupSize[f->file()]++; else _groupSize[f->file()] = 1; if (f->file() != _group) continue; } else if (_groupType==TraceItem::FunctionCycle) { - if (_groupSize.tqcontains(f->cycle())) + if (_groupSize.contains(f->cycle())) _groupSize[f->cycle()]++; else _groupSize[f->cycle()] = 1; diff --git a/kcachegrind/kcachegrind/instrview.cpp b/kcachegrind/kcachegrind/instrview.cpp index aea8c0f5..d578b4f8 100644 --- a/kcachegrind/kcachegrind/instrview.cpp +++ b/kcachegrind/kcachegrind/instrview.cpp @@ -615,7 +615,7 @@ bool InstrView::fillInstrRange(TraceFunction* function, // generate command TQString popencmd, objfile; objfile = function->object()->name(); - objfile = objfile.tqreplace(TQRegExp("[\"']"), ""); // security... + 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()) diff --git a/kcachegrind/kcachegrind/multiview.cpp b/kcachegrind/kcachegrind/multiview.cpp index 4fb7eace..d3ad670c 100644 --- a/kcachegrind/kcachegrind/multiview.cpp +++ b/kcachegrind/kcachegrind/multiview.cpp @@ -128,7 +128,7 @@ void MultiView::selected(TraceItemView* sender, TraceItem* i) // we react only on selection changes of the active TabView if (sender != (TraceItemView*)_active) return; - _views.tqfindRef(_active); + _views.findRef(_active); TabView* next = _views.next(); if (!next) next = _views.first(); diff --git a/kcachegrind/kcachegrind/partgraph.cpp b/kcachegrind/kcachegrind/partgraph.cpp index a7fd746a..44d54984 100644 --- a/kcachegrind/kcachegrind/partgraph.cpp +++ b/kcachegrind/kcachegrind/partgraph.cpp @@ -125,7 +125,7 @@ void PartAreaWidget::setGroupType(TraceCost::CostType gt) bool PartAreaWidget::isHidden(TracePart* part) const { - return (_hiddenParts.tqcontainsRef(part)>0); + return (_hiddenParts.containsRef(part)>0); } TQColor PartAreaWidget::groupColor(TraceFunction* f) const diff --git a/kcachegrind/kcachegrind/partselection.cpp b/kcachegrind/kcachegrind/partselection.cpp index 3b1e6063..b4eb29be 100644 --- a/kcachegrind/kcachegrind/partselection.cpp +++ b/kcachegrind/kcachegrind/partselection.cpp @@ -239,7 +239,7 @@ void PartSelection::activePartsChangedSlot(const TracePartList& list) // first deselect inactive, then select active (makes current active) for (i=l.first();i;i=l.next()) { TracePart* part = ((PartItem*)i)->part(); - bool active = (list.tqcontainsRef(part)>0); + bool active = (list.containsRef(part)>0); if (!active && partAreaWidget->isSelected(i)) { #if 0 qDebug("PartSelection::partsChangedSlot: Part %s changed to unselected.", @@ -251,7 +251,7 @@ void PartSelection::activePartsChangedSlot(const TracePartList& list) } for (i=l.first();i;i=l.next()) { TracePart* part = ((PartItem*)i)->part(); - bool active = (list.tqcontainsRef(part)>0); + bool active = (list.containsRef(part)>0); if (active && !partAreaWidget->isSelected(i)) { #if 0 qDebug("PartSelection::partsChangedSlot: Part %s changed to selected.", diff --git a/kcachegrind/kcachegrind/partview.cpp b/kcachegrind/kcachegrind/partview.cpp index 60a96bac..039b708c 100644 --- a/kcachegrind/kcachegrind/partview.cpp +++ b/kcachegrind/kcachegrind/partview.cpp @@ -175,7 +175,7 @@ void PartView::doUpdate(int changeType) for(;item;item = item->nextSibling()) { part = ((PartListItem*)item)->part(); - if (_partList.tqcontainsRef(part)>0) { + if (_partList.containsRef(part)>0) { setSelected(item, true); ensureItemVisible(item); } @@ -214,7 +214,7 @@ void PartView::refresh() TQListViewItem* item = 0; for (part = allParts.first(); part; part = allParts.next()) { - if (hidden.tqfindRef(part)>=0) continue; + if (hidden.findRef(part)>=0) continue; item = new PartListItem(this, f, _costType, _groupType, part); if (part->isActive()) { diff --git a/kcachegrind/kcachegrind/sourceitem.cpp b/kcachegrind/kcachegrind/sourceitem.cpp index 1da4dafb..db1ee04b 100644 --- a/kcachegrind/kcachegrind/sourceitem.cpp +++ b/kcachegrind/kcachegrind/sourceitem.cpp @@ -57,7 +57,7 @@ SourceItem::SourceItem(SourceView* sv, TQListView* tqparent, setText(0, TQString::number(lineno)); TQString s = src; - setText(4, s.tqreplace( TQRegExp("\t"), " " )); + setText(4, s.replace( TQRegExp("\t"), " " )); updateGroup(); updateCost(); diff --git a/kcachegrind/kcachegrind/stackbrowser.cpp b/kcachegrind/kcachegrind/stackbrowser.cpp index 843714a9..78095eb2 100644 --- a/kcachegrind/kcachegrind/stackbrowser.cpp +++ b/kcachegrind/kcachegrind/stackbrowser.cpp @@ -172,7 +172,7 @@ TraceFunction* Stack::called(TraceFunction* fn, bool extend) return 0; } -bool Stack::tqcontains(TraceFunction* fn) +bool Stack::contains(TraceFunction* fn) { // cycles are listed on there own if (fn->cycle() == fn) return false; @@ -337,7 +337,7 @@ HistoryItem* StackBrowser::select(TraceFunction* f) } Stack* s = _current->stack(); - if (!s->tqcontains(f)) { + if (!s->contains(f)) { s = s->split(f); if (!s) s = new Stack(f); diff --git a/kcachegrind/kcachegrind/stackbrowser.h b/kcachegrind/kcachegrind/stackbrowser.h index 7e7677fe..e7d6b802 100644 --- a/kcachegrind/kcachegrind/stackbrowser.h +++ b/kcachegrind/kcachegrind/stackbrowser.h @@ -29,7 +29,7 @@ public: Stack(TraceFunction*); // extend the stack at top/bottom if possible - bool tqcontains(TraceFunction*); + bool contains(TraceFunction*); void extendBottom(); void extendTop(); diff --git a/kcachegrind/kcachegrind/tabview.cpp b/kcachegrind/kcachegrind/tabview.cpp index 41accc9c..bb5e340c 100644 --- a/kcachegrind/kcachegrind/tabview.cpp +++ b/kcachegrind/kcachegrind/tabview.cpp @@ -751,19 +751,19 @@ void TabView::readViewConfig(KConfig* c, ++it; TQString n = TQString(v->widget()->name()); - if (topTabs.tqcontains(n)) { + if (topTabs.contains(n)) { moveTab(v->widget(), TraceItemView::Top); if (n == activeT) activeTop = v; } - else if (bottomTabs.tqcontains(n)) { + else if (bottomTabs.contains(n)) { moveTab(v->widget(), TraceItemView::Bottom); if (n == activeB) activeBottom = v; } - else if (leftTabs.tqcontains(n)) { + else if (leftTabs.contains(n)) { moveTab(v->widget(), TraceItemView::Left); if (n == activeL) activeLeft = v; } - else if (rightTabs.tqcontains(n)) { + else if (rightTabs.contains(n)) { moveTab(v->widget(), TraceItemView::Right); if (n == activeR) activeRight = v; } diff --git a/kcachegrind/kcachegrind/toplevel.cpp b/kcachegrind/kcachegrind/toplevel.cpp index ad5344b5..e625e42d 100644 --- a/kcachegrind/kcachegrind/toplevel.cpp +++ b/kcachegrind/kcachegrind/toplevel.cpp @@ -259,7 +259,7 @@ void TopLevel::restoreCurrentState(TQString postfix) // dock properties (not position, this should be have done before) TQCString group = TQCString("PartOverview"); - if (gList.tqcontains(group+pf)) group += pf; + if (gList.contains(group+pf)) group += pf; KConfigGroup psConfig(kconfig, group); _partSelection->readVisualisationConfig(&psConfig); @@ -2111,8 +2111,8 @@ void TopLevel::partsHideSelectedSlot() TracePartList newHidden, newActive; TracePartList l = _data->parts(); for (part=l.first();part;part=l.next()) { - if ((_activeParts.tqfindRef(part)>=0) || - (_hiddenParts.tqfindRef(part)>=0)) + if ((_activeParts.findRef(part)>=0) || + (_hiddenParts.findRef(part)>=0)) newHidden.append(part); else newActive.append(part); diff --git a/kcachegrind/kcachegrind/tracedata.cpp b/kcachegrind/kcachegrind/tracedata.cpp index 50de3e3a..c277cde5 100644 --- a/kcachegrind/kcachegrind/tracedata.cpp +++ b/kcachegrind/kcachegrind/tracedata.cpp @@ -1443,7 +1443,7 @@ TraceListCost::~TraceListCost() void TraceListCost::addDep(TraceCost* dep) { #if TRACE_ASSERTIONS - if (_deps.tqfindRef(dep)>=0) { + if (_deps.findRef(dep)>=0) { qDebug("addDep: %s already in list!", dep->fullName().ascii()); return; @@ -1517,7 +1517,7 @@ TraceJumpListCost::~TraceJumpListCost() void TraceJumpListCost::addDep(TraceJumpCost* dep) { #if TRACE_ASSERTIONS - if (_deps.tqfindRef(dep)>=0) { + if (_deps.findRef(dep)>=0) { qDebug("addDep: %s already in list!", dep->fullName().ascii()); return; @@ -1591,7 +1591,7 @@ TraceCallListCost::~TraceCallListCost() void TraceCallListCost::addDep(TraceCallCost* dep) { #if TRACE_ASSERTIONS - if (_deps.tqfindRef(dep)>=0) { + if (_deps.findRef(dep)>=0) { qDebug("addDep: %s already in list!", dep->fullName().ascii()); return; @@ -1670,7 +1670,7 @@ TraceInclusiveListCost::~TraceInclusiveListCost() void TraceInclusiveListCost::addDep(TraceInclusiveCost* dep) { #if TRACE_ASSERTIONS - if (_deps.tqfindRef(dep)>=0) { + if (_deps.findRef(dep)>=0) { qDebug("addDep: %s already in list!", dep->fullName().ascii()); return; @@ -1908,7 +1908,7 @@ TQString TracePartFunction::costString(TraceCostMapping* m) void TracePartFunction::addPartInstr(TracePartInstr* ref) { #if TRACE_ASSERTIONS - if (_partInstr.tqfindRef(ref)>=0) { + if (_partInstr.findRef(ref)>=0) { qDebug("TracePartFunction::addPartInstr: %s already in list!", ref->name().ascii()); return; @@ -1929,7 +1929,7 @@ void TracePartFunction::addPartInstr(TracePartInstr* ref) void TracePartFunction::addPartLine(TracePartLine* ref) { #if TRACE_ASSERTIONS - if (_partLines.tqfindRef(ref)>=0) { + if (_partLines.findRef(ref)>=0) { qDebug("TracePartFunction::addPartLine: %s already in list!", ref->name().ascii()); return; @@ -1950,7 +1950,7 @@ void TracePartFunction::addPartLine(TracePartLine* ref) void TracePartFunction::addPartCaller(TracePartCall* ref) { #if TRACE_ASSERTIONS - if (_partCallers.tqfindRef(ref)>=0) { + if (_partCallers.findRef(ref)>=0) { qDebug("TracePartFunction::addPartCaller: %s already in list!", ref->name().ascii()); return; @@ -1971,7 +1971,7 @@ void TracePartFunction::addPartCaller(TracePartCall* ref) void TracePartFunction::addPartCalling(TracePartCall* ref) { #if TRACE_ASSERTIONS - if (_partCallings.tqfindRef(ref)>=0) { + if (_partCallings.findRef(ref)>=0) { qDebug("TracePartFunction::addPartCalling: %s already in list!", ref->name().ascii()); return; @@ -2683,7 +2683,7 @@ TraceInstrJump* TraceInstr::instrJump(TraceInstr* to, bool isJmpCond) void TraceInstr::addInstrCall(TraceInstrCall* instrCall) { #if TRACE_ASSERTIONS - if (_instrCalls.tqfindRef(instrCall)>=0) return; + if (_instrCalls.findRef(instrCall)>=0) return; if (instrCall->instr() != this) { qDebug("Can't add instruction call to another instruction!"); @@ -2783,7 +2783,7 @@ TraceLineJump* TraceLine::lineJump(TraceLine* to, bool isJmpCond) void TraceLine::addLineCall(TraceLineCall* lineCall) { #if TRACE_ASSERTIONS - if (_lineCalls.tqfindRef(lineCall)>=0) return; + if (_lineCalls.findRef(lineCall)>=0) return; if (lineCall->line() != this) { qDebug("Can't add line call to another line!"); @@ -2908,7 +2908,7 @@ TraceLine* TraceFunctionSource::line(uint lineno, bool createNew) if (!createNew) { if (!_lineMap) return 0; - TraceLineMap::Iterator it = _lineMap->tqfind(lineno); + TraceLineMap::Iterator it = _lineMap->find(lineno); if (it == _lineMap->end()) return 0; return &(it.data()); } @@ -3240,7 +3240,7 @@ TQString TraceFunction::prettyName() const if (_name.isEmpty()) return i18n("(unknown)"); - int p = _name.tqfind('('); + int p = _name.find('('); if (p>0) { // handle C++ "operator()" correct if ((_name[p+1] == ')') && (_name[p+2] == '(')) p+=2; @@ -3381,7 +3381,7 @@ TraceInstr* TraceFunction::instr(Addr addr, bool createNew) if (!createNew) { if (!_instrMap) return 0; - TraceInstrMap::Iterator it = _instrMap->tqfind(addr); + TraceInstrMap::Iterator it = _instrMap->find(addr); if (it == _instrMap->end()) return 0; return &(it.data()); @@ -3410,7 +3410,7 @@ void TraceFunction::addCaller(TraceCall* caller) return; } - if (_callers.tqfindRef(caller)>=0) return; + if (_callers.findRef(caller)>=0) return; #endif _callers.append(caller); @@ -3426,7 +3426,7 @@ void TraceFunction::addCaller(TraceCall* caller) TraceCall* TraceFunction::calling(TraceFunction* called) { - TraceCallMap::Iterator it = _callingMap.tqfind(called); + TraceCallMap::Iterator it = _callingMap.find(called); TraceCall* calling = (it == _callingMap.end()) ? 0 : it.data(); if (!calling) { @@ -3987,7 +3987,7 @@ void TraceFunctionCycle::setup() TraceCall *call; TraceCallList l = f->callers(); for (call=l.first();call;call=l.next()) { - if ( _memberSet.tqcontains(call->caller()) ) continue; + if ( _memberSet.contains(call->caller()) ) continue; _callers.append(call); } @@ -4041,7 +4041,7 @@ void TraceClass::addFunction(TraceFunction* function) return; } - if (_functions.tqfindRef(function)>=0) return; + if (_functions.findRef(function)>=0) return; #endif _functions.append(function); @@ -4088,7 +4088,7 @@ void TraceFile::addFunction(TraceFunction* function) return; } - if (_functions.tqfindRef(function)>=0) return; + if (_functions.findRef(function)>=0) return; #endif _functions.append(function); @@ -4138,7 +4138,7 @@ TQString TraceFile::directory() if (!_dir.isEmpty()) return _dir; int lastIndex = 0, index; - while ( (index=_name.tqfind("/", lastIndex)) >=0) + while ( (index=_name.find("/", lastIndex)) >=0) lastIndex = index+1; if (lastIndex==0) return TQString(); @@ -4151,7 +4151,7 @@ TQString TraceFile::directory() TQString TraceFile::shortName() const { int lastIndex = 0, index; - while ( (index=_name.tqfind("/", lastIndex)) >=0) + while ( (index=_name.find("/", lastIndex)) >=0) lastIndex = index+1; return _name.mid(lastIndex); @@ -4206,7 +4206,7 @@ void TraceObject::addFunction(TraceFunction* function) return; } - if (_functions.tqfindRef(function)>=0) return; + if (_functions.findRef(function)>=0) return; #endif _functions.append(function); @@ -4226,7 +4226,7 @@ void TraceObject::setName(const TQString& name) _name = name; int lastIndex = 0, index; - while ( (index=_name.tqfind("/", lastIndex)) >=0) + while ( (index=_name.find("/", lastIndex)) >=0) lastIndex = index+1; _shortName = _name.mid(lastIndex); @@ -4290,7 +4290,7 @@ void TracePart::setProcessID(int pid) TQString TracePart::shortName() const { int lastIndex = 0, index; - while ( (index=_name.tqfind("/", lastIndex)) >=0) + while ( (index=_name.find("/", lastIndex)) >=0) lastIndex = index+1; return _name.mid(lastIndex); @@ -4389,7 +4389,7 @@ TraceData::~TraceData() TQString TraceData::shortTraceName() const { int lastIndex = 0, index; - while ( (index=_traceName.tqfind("/", lastIndex)) >=0) + while ( (index=_traceName.find("/", lastIndex)) >=0) lastIndex = index+1; return _traceName.mid(lastIndex); @@ -4568,7 +4568,7 @@ bool TraceData::activateParts(const TracePartList& l) TracePart* part; for (part=_parts.first();part;part=_parts.next()) - if (part->activate(l.tqcontainsRef(part)>0)) + if (part->activate(l.containsRef(part)>0)) changed = true; if (changed) { @@ -4588,7 +4588,7 @@ bool TraceData::activateParts(TracePartList l, bool active) TracePart* part; for (part=l.first();part;part=l.next()) - if (_parts.tqfindRef(part)>=0) + if (_parts.findRef(part)>=0) if (part->activate(active)) changed = true; @@ -4715,16 +4715,16 @@ TraceClass* TraceData::cls(const TQString& fnName, TQString& shortName) int lastIndex = 0, index, pIndex; // we ignore any "::" after a '(' or a space - pIndex=fnName.tqfind("(", 0); + pIndex=fnName.find("(", 0); #if 0 - int sIndex=fnName.tqfind(" ", 0); + int sIndex=fnName.find(" ", 0); if (sIndex>=0) if ((pIndex == -1) || (sIndex < pIndex)) pIndex = sIndex; #endif - while ((index=fnName.tqfind("::", lastIndex)) >=0) { + while ((index=fnName.find("::", lastIndex)) >=0) { if (pIndex>=0 && pIndex<index) break; lastIndex = index+2; } @@ -4766,7 +4766,7 @@ TraceFunction* TraceData::function(const TQString& name, TQString key = name + object->shortName(); TraceFunctionMap::Iterator it; - it = _functionMap.tqfind(key); + it = _functionMap.find(key); if (it == _functionMap.end()) { it = _functionMap.insert(key, TraceFunction()); TraceFunction& f = it.data(); @@ -4803,7 +4803,7 @@ TraceFunctionMap::Iterator TraceData::functionIterator(TraceFunction* f) key += f->name(); key += f->object()->shortName(); - return _functionMap.tqfind(key); + return _functionMap.find(key); } TraceFunctionMap::ConstIterator TraceData::functionBeginIterator() const diff --git a/kcachegrind/kcachegrind/traceitemview.cpp b/kcachegrind/kcachegrind/traceitemview.cpp index 8323ea61..e2f5ee09 100644 --- a/kcachegrind/kcachegrind/traceitemview.cpp +++ b/kcachegrind/kcachegrind/traceitemview.cpp @@ -62,7 +62,7 @@ KConfigGroup* TraceItemView::configGroup(KConfig* c, TQString group, TQString post) { TQStringList gList = c->groupList(); - if (gList.tqcontains((group+post).ascii()) ) group += post; + if (gList.contains((group+post).ascii()) ) group += post; return new KConfigGroup(c, group); } diff --git a/kcachegrind/kcachegrind/treemap.cpp b/kcachegrind/kcachegrind/treemap.cpp index 39207fd2..66c73ad4 100644 --- a/kcachegrind/kcachegrind/treemap.cpp +++ b/kcachegrind/kcachegrind/treemap.cpp @@ -1096,7 +1096,7 @@ void TreeMapTip::maybeTip( const TQPoint& pos ) if (rList) { TQRect* r; for(r=rList->first();r;r=rList->next()) - if (r->tqcontains(pos)) + if (r->contains(pos)) tip(*r, p->tipString(i)); } } @@ -1459,10 +1459,10 @@ void TreeMapWidget::setMinimalArea(int area) void TreeMapWidget::deletingItem(TreeMapItem* i) { // remove any references to the item to be deleted - while(_selection.tqfindRef(i) > -1) + while(_selection.findRef(i) > -1) _selection.remove(); - while(_tmpSelection.tqfindRef(i) > -1) + while(_tmpSelection.findRef(i) > -1) _tmpSelection.remove(); if (_current == i) _current = 0; @@ -1504,7 +1504,7 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const TreeMapItem* p = _base; TreeMapItem* i; - if (!TQT_TQRECT_OBJECT(rect()).tqcontains(x, y)) return 0; + if (!TQT_TQRECT_OBJECT(rect()).contains(x, y)) return 0; if (DEBUG_DRAWING) kdDebug(90100) << "item(" << x << "," << y << "):" << endl; while (1) { @@ -1521,7 +1521,7 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const << "-" << i->tqitemRect().width() << "x" << i->tqitemRect().height() << ")" << endl; - if (i->tqitemRect().tqcontains(x, y)) { + if (i->tqitemRect().contains(x, y)) { if (DEBUG_DRAWING) kdDebug(90100) << " .. Got. Index " << idx << endl; @@ -1572,7 +1572,7 @@ TreeMapItem* TreeMapWidget::visibleItem(TreeMapItem* i) const (i->tqitemRect().height() <1))) { TreeMapItem* p = i->tqparent(); if (!p) break; - int idx = p->tqchildren()->tqfindRef(i); + int idx = p->tqchildren()->findRef(i); idx--; if (idx<0) i = p; @@ -1622,12 +1622,12 @@ TreeMapItemList TreeMapWidget::diff(TreeMapItemList& l1, TreeMapItem* item; while ( (item = it1.current()) != 0 ) { ++it1; - if (l2.tqcontainsRef(item) > 0) continue; + if (l2.containsRef(item) > 0) continue; l.append(item); } while ( (item = it2.current()) != 0 ) { ++it2; - if (l1.tqcontainsRef(item) > 0) continue; + if (l1.containsRef(item) > 0) continue; l.append(item); } @@ -1694,12 +1694,12 @@ bool TreeMapWidget::clearSelection(TreeMapItem* tqparent) bool TreeMapWidget::isSelected(TreeMapItem* i) const { - return _selection.tqcontainsRef(i)>0; + return _selection.containsRef(i)>0; } bool TreeMapWidget::isTmpSelected(TreeMapItem* i) { - return _tmpSelection.tqcontainsRef(i)>0; + return _tmpSelection.containsRef(i)>0; } @@ -1964,7 +1964,7 @@ int nextVisible(TreeMapItem* i) TreeMapItem* p = i->tqparent(); if (!p || p->tqitemRect().isEmpty()) return -1; - int idx = p->tqchildren()->tqfindRef(i); + int idx = p->tqchildren()->findRef(i); if (idx<0) return -1; while (idx < (int)p->tqchildren()->count()-1) { @@ -1982,7 +1982,7 @@ int prevVisible(TreeMapItem* i) TreeMapItem* p = i->tqparent(); if (!p || p->tqitemRect().isEmpty()) return -1; - int idx = p->tqchildren()->tqfindRef(i); + int idx = p->tqchildren()->findRef(i); if (idx<0) return -1; while (idx > 0) { diff --git a/kcachegrind/kcachegrind/treemap.h b/kcachegrind/kcachegrind/treemap.h index 17cba09d..de60f40f 100644 --- a/kcachegrind/kcachegrind/treemap.h +++ b/kcachegrind/kcachegrind/treemap.h @@ -328,7 +328,7 @@ public: virtual double sum() const; virtual double value() const; - // tqreplace "Default" position with setting from TreeMapWidget + // replace "Default" position with setting from TreeMapWidget virtual Position position(int) const; virtual const TQFont& font() const; virtual bool isMarked(int) const; |