diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:28:11 -0600 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-04 03:25:46 +0200 |
commit | 0669339d48f65fc18388faefe54b239591d4705f (patch) | |
tree | 6ef46442916496544051ff920549b71024548581 /konq-plugins/fsview | |
parent | be503a6af9e8a650410f5e3446c1c4ee338adaf4 (diff) | |
download | tdeaddons-0669339d48f65fc18388faefe54b239591d4705f.tar.gz tdeaddons-0669339d48f65fc18388faefe54b239591d4705f.zip |
Rename old tq methods that no longer need a unique name
(cherry picked from commit b88830e9111dc4375bc1461c3f7b3e7b3e73f733)
Diffstat (limited to 'konq-plugins/fsview')
-rw-r--r-- | konq-plugins/fsview/inode.cpp | 2 | ||||
-rw-r--r-- | konq-plugins/fsview/treemap.cpp | 40 | ||||
-rw-r--r-- | konq-plugins/fsview/treemap.h | 2 |
3 files changed, 22 insertions, 22 deletions
diff --git a/konq-plugins/fsview/inode.cpp b/konq-plugins/fsview/inode.cpp index d4875c2..c84f5d5 100644 --- a/konq-plugins/fsview/inode.cpp +++ b/konq-plugins/fsview/inode.cpp @@ -284,7 +284,7 @@ TQColor Inode::backColor() const if (id>0) n = TQString::number(id); if (n.isEmpty()) - return widget()->tqcolorGroup().button(); + return widget()->colorGroup().button(); const char* str = n.ascii(); int h = 0, s = 100; diff --git a/konq-plugins/fsview/treemap.cpp b/konq-plugins/fsview/treemap.cpp index fc83601..bcc5b3e 100644 --- a/konq-plugins/fsview/treemap.cpp +++ b/konq-plugins/fsview/treemap.cpp @@ -1491,11 +1491,11 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const if (DEBUG_DRAWING) kdDebug(90100) << " Checking " << i->path(0).join("/") << " (" - << i->tqitemRect().x() << "/" << i->tqitemRect().y() - << "-" << i->tqitemRect().width() - << "x" << i->tqitemRect().height() << ")" << endl; + << i->itemRect().x() << "/" << i->itemRect().y() + << "-" << i->itemRect().width() + << "x" << i->itemRect().height() << ")" << endl; - if (i->tqitemRect().contains(x, y)) { + if (i->itemRect().contains(x, y)) { if (DEBUG_DRAWING) kdDebug(90100) << " .. Got. Index " << idx << endl; @@ -1513,7 +1513,7 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const if (DEBUG_DRAWING) kdDebug(90100) << "item(" << x << "," << y << "): Got " << p->path(0).join("/") << " (Size " - << p->tqitemRect().width() << "x" << p->tqitemRect().height() + << p->itemRect().width() << "x" << p->itemRect().height() << ", Val " << p->value() << ")" << endl; } @@ -1542,8 +1542,8 @@ TreeMapItem* TreeMapWidget::visibleItem(TreeMapItem* i) const { if (i) { /* Must have a visible area */ - while(i && ((i->tqitemRect().width() <1) || - (i->tqitemRect().height() <1))) { + while(i && ((i->itemRect().width() <1) || + (i->itemRect().height() <1))) { TreeMapItem* p = i->parent(); if (!p) break; int idx = p->tqchildren()->findRef(i); @@ -1772,7 +1772,7 @@ void TreeMapWidget::contextMenuEvent( TQContextMenuEvent* e ) e->accept(); if ( e->reason() == TQContextMenuEvent::Keyboard ) { - TQRect r = (_current) ? _current->tqitemRect() : _base->tqitemRect(); + TQRect r = (_current) ? _current->itemRect() : _base->itemRect(); TQPoint p = TQPoint(r.left() + r.width()/2, r.top() + r.height()/2); emit contextMenuRequested(_current, p); } @@ -1936,14 +1936,14 @@ void TreeMapWidget::mouseDoubleClickEvent( TQMouseEvent* e ) int nextVisible(TreeMapItem* i) { TreeMapItem* p = i->parent(); - if (!p || p->tqitemRect().isEmpty()) return -1; + if (!p || p->itemRect().isEmpty()) return -1; int idx = p->tqchildren()->findRef(i); if (idx<0) return -1; while (idx < (int)p->tqchildren()->count()-1) { idx++; - TQRect r = p->tqchildren()->at(idx)->tqitemRect(); + TQRect r = p->tqchildren()->at(idx)->itemRect(); if (r.width()>1 && r.height()>1) return idx; } @@ -1954,14 +1954,14 @@ int nextVisible(TreeMapItem* i) int prevVisible(TreeMapItem* i) { TreeMapItem* p = i->parent(); - if (!p || p->tqitemRect().isEmpty()) return -1; + if (!p || p->itemRect().isEmpty()) return -1; int idx = p->tqchildren()->findRef(i); if (idx<0) return -1; while (idx > 0) { idx--; - TQRect r = p->tqchildren()->at(idx)->tqitemRect(); + TQRect r = p->tqchildren()->at(idx)->itemRect(); if (r.width()>1 && r.height()>1) return idx; } @@ -2136,7 +2136,7 @@ void TreeMapWidget::drawTreeMap() } else { // only subitem - if (!_needsRefresh->tqitemRect().isValid()) return; + if (!_needsRefresh->itemRect().isValid()) return; } // reset cached font object; it could have been changed @@ -2154,7 +2154,7 @@ void TreeMapWidget::drawTreeMap() TQPainter p(this); tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, TQRect(0, 0, TQWidget::width(), TQWidget::height()), - tqcolorGroup() ); + colorGroup() ); } } @@ -2198,7 +2198,7 @@ void TreeMapWidget::drawItem(TQPainter* p, bool isCurrent = _current && item->isChildOf(_current); - RectDrawing d(item->tqitemRect()); + RectDrawing d(item->itemRect()); item->setSelected(isSelected); item->setCurrent(isCurrent); item->setShaded(_shading); @@ -2232,15 +2232,15 @@ void TreeMapWidget::drawItems(TQPainter* p, { if (DEBUG_DRAWING) kdDebug(90100) << "+drawItems(" << item->path(0).join("/") << ", " - << item->tqitemRect().x() << "/" << item->tqitemRect().y() - << "-" << item->tqitemRect().width() << "x" - << item->tqitemRect().height() << "), Val " << item->value() + << item->itemRect().x() << "/" << item->itemRect().y() + << "-" << item->itemRect().width() << "x" + << item->itemRect().height() << "), Val " << item->value() << ", Sum " << item->sum() << endl; drawItem(p, item); item->clearFreeRects(); - TQRect origRect = item->tqitemRect(); + TQRect origRect = item->itemRect(); int bw = item->borderWidth(); TQRect r = TQRect(origRect.x()+bw, origRect.y()+bw, origRect.width()-2*bw, origRect.height()-2*bw); @@ -2288,7 +2288,7 @@ void TreeMapWidget::drawItems(TQPainter* p, i->clearItemRect(); } // tooltip apears on whole item rect - item->addFreeRect(item->tqitemRect()); + item->addFreeRect(item->itemRect()); // if we have space for text... if ((r.height() < _fontHeight) || (r.width() < _fontHeight)) return; diff --git a/konq-plugins/fsview/treemap.h b/konq-plugins/fsview/treemap.h index 0aa5a9d..6cb5edd 100644 --- a/konq-plugins/fsview/treemap.h +++ b/konq-plugins/fsview/treemap.h @@ -290,7 +290,7 @@ public: */ void setItemRect(const TQRect& r) { _rect = r; } void clearItemRect(); - const TQRect& tqitemRect() const { return _rect; } + const TQRect& itemRect() const { return _rect; } int width() const { return _rect.width(); } int height() const { return _rect.height(); } |