diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:52:34 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:52:34 -0600 |
commit | 75112ed8e227f656f98523b7ffdad5422d9a6f11 (patch) | |
tree | 23041ac1bbe364dcc39dbbd0e86ff6930494e036 /konq-plugins/fsview | |
parent | b88830e9111dc4375bc1461c3f7b3e7b3e73f733 (diff) | |
download | tdeaddons-75112ed8e227f656f98523b7ffdad5422d9a6f11.tar.gz tdeaddons-75112ed8e227f656f98523b7ffdad5422d9a6f11.zip |
Remove additional unneeded tq method conversions
Diffstat (limited to 'konq-plugins/fsview')
-rw-r--r-- | konq-plugins/fsview/fsview.cpp | 20 | ||||
-rw-r--r-- | konq-plugins/fsview/fsview_part.cpp | 2 | ||||
-rw-r--r-- | konq-plugins/fsview/inode.cpp | 32 | ||||
-rw-r--r-- | konq-plugins/fsview/inode.h | 2 | ||||
-rw-r--r-- | konq-plugins/fsview/treemap.cpp | 140 | ||||
-rw-r--r-- | konq-plugins/fsview/treemap.h | 24 |
6 files changed, 110 insertions, 110 deletions
diff --git a/konq-plugins/fsview/fsview.cpp b/konq-plugins/fsview/fsview.cpp index 830bb3d..931c43f 100644 --- a/konq-plugins/fsview/fsview.cpp +++ b/konq-plugins/fsview/fsview.cpp @@ -94,12 +94,12 @@ FSView::FSView(Inode* base, TQWidget* parent, const char* name) double s; TQString str; for (i=1;i<=ccount;i++) { - str = TQString("Dir%1").tqarg(i); + str = TQString("Dir%1").arg(i); if (!cconfig.hasKey(str)) continue; str = cconfig.readPathEntry(str); - s = cconfig.readDoubleNumEntry(TQString("Size%1").tqarg(i), 0.0); - f = cconfig.readNumEntry(TQString("Files%1").tqarg(i), 0); - d = cconfig.readNumEntry(TQString("Dirs%1").tqarg(i), 0); + s = cconfig.readDoubleNumEntry(TQString("Size%1").arg(i), 0.0); + f = cconfig.readNumEntry(TQString("Files%1").arg(i), 0); + d = cconfig.readNumEntry(TQString("Dirs%1").arg(i), 0); if (s==0.0 || f==0 || d==0) continue; setDirMetric(str, s, f, d); } @@ -147,7 +147,7 @@ void FSView::setPath(TQString p) b->setPeer(d); - setCaption(TQString("%1 - FSView").tqarg(_path)); + setCaption(TQString("%1 - FSView").arg(_path)); requestUpdate(b); } @@ -286,7 +286,7 @@ void FSView::contextMenu(TreeMapItem* i, const TQPoint& p) popup.insertItem(i18n("Refresh"), 5); popup.setItemEnabled(5, !_sm.scanRunning()); - if (i) popup.insertItem(i18n("Refresh '%1'").tqarg(i->text(0)), 4); + if (i) popup.insertItem(i18n("Refresh '%1'").arg(i->text(0)), 4); popup.insertSeparator(); addDepthStopItems(dpopup, 1001, i); popup.insertItem(i18n("Stop at Depth"), dpopup, 1000); @@ -331,10 +331,10 @@ void FSView::saveMetric(KConfigGroup* g) TQMap<TQString, MetricEntry>::iterator it; int c = 1; for (it=_dirMetric.begin();it!=_dirMetric.end();++it) { - g->writePathEntry(TQString("Dir%1").tqarg(c), it.key()); - g->writeEntry(TQString("Size%1").tqarg(c), (*it).size); - g->writeEntry(TQString("Files%1").tqarg(c), (*it).fileCount); - g->writeEntry(TQString("Dirs%1").tqarg(c), (*it).dirCount); + g->writePathEntry(TQString("Dir%1").arg(c), it.key()); + g->writeEntry(TQString("Size%1").arg(c), (*it).size); + g->writeEntry(TQString("Files%1").arg(c), (*it).fileCount); + g->writeEntry(TQString("Dirs%1").arg(c), (*it).dirCount); c++; } g->writeEntry("Count", c-1); diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp index 547335b..afbf675 100644 --- a/konq-plugins/fsview/fsview_part.cpp +++ b/konq-plugins/fsview/fsview_part.cpp @@ -74,7 +74,7 @@ void FSJob::progressSlot(int percent, int dirs, const TQString& cDir) emitPercent(percent, 100); slotInfoMessage(this, i18n("Read 1 folder, in %1", "Read %n folders, in %1", - dirs ).tqarg(cDir)); + dirs ).arg(cDir)); } else slotInfoMessage(this, i18n("1 folder", "%n folders", dirs)); diff --git a/konq-plugins/fsview/inode.cpp b/konq-plugins/fsview/inode.cpp index c84f5d5..6f5073c 100644 --- a/konq-plugins/fsview/inode.cpp +++ b/konq-plugins/fsview/inode.cpp @@ -168,7 +168,7 @@ void Inode::destroyed(ScanDir* d) { if (_dirPeer == d) _dirPeer = 0; - // remove tqchildren + // remove children clear(); } @@ -179,15 +179,15 @@ void Inode::destroyed(ScanFile* f) -TreeMapItemList* Inode::tqchildren() +TreeMapItemList* Inode::children() { if (!_dirPeer) return 0; - if (!_tqchildren) { + if (!_children) { if (!_dirPeer->scanStarted()) return 0; - _tqchildren = new TreeMapItemList; - _tqchildren->setAutoDelete(true); + _children = new TreeMapItemList; + _children->setAutoDelete(true); setSorting(-1); @@ -215,7 +215,7 @@ TreeMapItemList* Inode::tqchildren() _resortNeeded = false; } - return _tqchildren; + return _children; } @@ -325,21 +325,21 @@ TQString Inode::text(int i) const double s = size(); if (s < 1000) - text = TQString("%1 B").tqarg((int)(s+.5)); + text = TQString("%1 B").arg((int)(s+.5)); else if (s < 10 * 1024) - text = TQString("%1 kB").tqarg(KGlobal::locale()->formatNumber(s/1024+.005,2)); + text = TQString("%1 kB").arg(KGlobal::locale()->formatNumber(s/1024+.005,2)); else if (s < 100 * 1024) - text = TQString("%1 kB").tqarg(KGlobal::locale()->formatNumber(s/1024+.05,1)); + text = TQString("%1 kB").arg(KGlobal::locale()->formatNumber(s/1024+.05,1)); else if (s < 1000 * 1024) - text = TQString("%1 kB").tqarg((int)(s/1024+.5)); + text = TQString("%1 kB").arg((int)(s/1024+.5)); else if (s < 10 * 1024 * 1024) - text = TQString("%1 MB").tqarg(KGlobal::locale()->formatNumber(s/1024/1024+.005,2)); + text = TQString("%1 MB").arg(KGlobal::locale()->formatNumber(s/1024/1024+.005,2)); else if (s < 100 * 1024 * 1024) - text = TQString("%1 MB").tqarg(KGlobal::locale()->formatNumber(s/1024/1024+.05,1)); + text = TQString("%1 MB").arg(KGlobal::locale()->formatNumber(s/1024/1024+.05,1)); else if (s < 1000 * 1024 * 1024) - text = TQString("%1 MB").tqarg((int)(s/1024/1024+.5)); + text = TQString("%1 MB").arg((int)(s/1024/1024+.5)); else - text = TQString("%1 GB").tqarg(KGlobal::locale()->formatNumber(s/1024/1024/1024+.005,2)); + text = TQString("%1 GB").arg(KGlobal::locale()->formatNumber(s/1024/1024/1024+.005,2)); if (_sizeEstimation>0) text += "+"; return text; @@ -354,10 +354,10 @@ TQString Inode::text(int i) const if (f>0) { while (f>1000) { - text = TQString("%1 %2").tqarg(TQString::number(f).right(3)).tqarg(text); + text = TQString("%1 %2").arg(TQString::number(f).right(3)).arg(text); f /= 1000; } - text = TQString("%1 %2").tqarg(TQString::number(f)).tqarg(text); + text = TQString("%1 %2").arg(TQString::number(f)).arg(text); if (_fileCountEstimation>0) text += "+"; } return text; diff --git a/konq-plugins/fsview/inode.h b/konq-plugins/fsview/inode.h index d21a689..eb1e3dd 100644 --- a/konq-plugins/fsview/inode.h +++ b/konq-plugins/fsview/inode.h @@ -53,7 +53,7 @@ public: void setPeer(ScanDir*); - TreeMapItemList* tqchildren(); + TreeMapItemList* children(); double value() const; double size() const; diff --git a/konq-plugins/fsview/treemap.cpp b/konq-plugins/fsview/treemap.cpp index bcc5b3e..cab9809 100644 --- a/konq-plugins/fsview/treemap.cpp +++ b/konq-plugins/fsview/treemap.cpp @@ -756,7 +756,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value) _parent = parent; _sum = 0; - _tqchildren = 0; + _children = 0; _widget = 0; _index = -1; _depth = -1; // not set @@ -789,7 +789,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value, setText(0, text1); _sum = 0; - _tqchildren = 0; + _children = 0; _widget = 0; _index = -1; _depth = -1; // not set @@ -801,7 +801,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 @@ -842,18 +842,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(); @@ -887,9 +887,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; @@ -899,16 +899,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); } @@ -974,17 +974,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); } @@ -1002,13 +1002,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() @@ -1252,7 +1252,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 @@ -1482,7 +1482,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 { @@ -1546,12 +1546,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; @@ -1745,7 +1745,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(); @@ -1768,7 +1768,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 ) { @@ -1938,12 +1938,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; } @@ -1956,12 +1956,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; } @@ -2042,24 +2042,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); } } @@ -2245,12 +2245,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; @@ -2283,7 +2283,7 @@ void TreeMapWidget::drawItems(TQPainter* p, if (stopDrawing) { if (list) { - // tqinvalidate rects + // invalidate rects for (i=list->first();i;i=list->next()) i->clearItemRect(); } @@ -2399,7 +2399,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 " @@ -2537,7 +2537,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); @@ -2546,7 +2546,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) { @@ -2845,10 +2845,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); @@ -2955,7 +2955,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; @@ -3014,7 +3014,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; @@ -3040,9 +3040,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); } } @@ -3079,7 +3079,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; @@ -3089,7 +3089,7 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup, popup->insertSeparator(); int depth = 2, count; for (count=0;count<3;count++) { - popup->insertItem(i18n("Depth %1").tqarg(depth), id+4+count); + popup->insertItem(i18n("Depth %1").arg(depth), id+4+count); if (depth == maxDrawingDepth()) { popup->setItemChecked(id+4+count, true); foundDepth = true; @@ -3100,14 +3100,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); } } @@ -3130,13 +3130,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)); } } @@ -3180,18 +3180,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/konq-plugins/fsview/treemap.h b/konq-plugins/fsview/treemap.h index 6cb5edd..31ac9d3 100644 --- a/konq-plugins/fsview/treemap.h +++ b/konq-plugins/fsview/treemap.h @@ -215,7 +215,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 { @@ -250,7 +250,7 @@ public: // force a redraw of this item void redraw(); - // delete all tqchildren + // delete all children void clear(); // force new child generation & refresh @@ -343,7 +343,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); @@ -351,18 +351,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: @@ -436,7 +436,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); @@ -452,7 +452,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. */ @@ -464,7 +464,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, @@ -517,7 +517,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 @@ -629,7 +629,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*); |