summaryrefslogtreecommitdiffstats
path: root/kdeui/klistview.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
commit10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch)
tree4bc444c00a79e88105f2cfce5b6209994c413ca0 /kdeui/klistview.cpp
parent307136d8eef0ba133b78ceee8e901138d4c996a1 (diff)
downloadtdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz
tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdeui/klistview.cpp')
-rw-r--r--kdeui/klistview.cpp90
1 files changed, 45 insertions, 45 deletions
diff --git a/kdeui/klistview.cpp b/kdeui/klistview.cpp
index 657aa2870..332bc4e8c 100644
--- a/kdeui/klistview.cpp
+++ b/kdeui/klistview.cpp
@@ -197,7 +197,7 @@ void KListViewLineEdit::load(TQListViewItem *i, int c)
item=i;
col=c;
- TQRect rect(p->tqitemRect(i));
+ TQRect rect(p->itemRect(i));
setText(item->text(c));
home( true );
@@ -263,7 +263,7 @@ static TQListViewItem *lastQChild (TQListViewItem *pi)
if (pi)
{
/* Since there's no TQListViewItem::lastChild().
- * This tqfinds the last sibling for the given
+ * This finds the last sibling for the given
* item.
*/
for (TQListViewItem *pt = pi->nextSibling(); pt; pt = pt->nextSibling())
@@ -716,7 +716,7 @@ void KListView::focusInEvent( TQFocusEvent *fe )
&& (currentItem()))
{
currentItem()->setSelected(true);
- currentItem()->tqrepaint();
+ currentItem()->repaint();
emit selectionChanged();
};
}
@@ -736,7 +736,7 @@ void KListView::focusOutEvent( TQFocusEvent *fe )
&& (!d->editor->isVisible()))
{
currentItem()->setSelected(false);
- currentItem()->tqrepaint();
+ currentItem()->repaint();
emit selectionChanged();
};
@@ -776,7 +776,7 @@ void KListView::contentsMousePressEvent( TQMouseEvent *e )
if (currentItem())
{
currentItem()->setSelected(false);
- currentItem()->tqrepaint();
+ currentItem()->repaint();
// emit selectionChanged();
}
}
@@ -865,7 +865,7 @@ void KListView::contentsMouseReleaseEvent( TQMouseEvent *e )
if (!rootDecoClicked)
{
int col = header()->mapToLogical( header()->cellAt( p.x() ) );
- if ( d->renameable.tqcontains(col) )
+ if ( d->renameable.contains(col) )
rename(at, col);
}
}
@@ -1008,7 +1008,7 @@ void KListView::contentsDragMoveEvent(TQDragMoveEvent *event)
{
cleanDropVisualizer();
d->mOldDropVisualizer=tmpRect;
- viewport()->tqrepaint(tmpRect);
+ viewport()->repaint(tmpRect);
}
}
if (dropHighlighter())
@@ -1018,7 +1018,7 @@ void KListView::contentsDragMoveEvent(TQDragMoveEvent *event)
{
cleanItemHighlighter();
d->mOldDropHighlighter=tmpRect;
- viewport()->tqrepaint(tmpRect);
+ viewport()->repaint(tmpRect);
}
}
}
@@ -1045,7 +1045,7 @@ void KListView::cleanDropVisualizer()
{
TQRect rect=d->mOldDropVisualizer;
d->mOldDropVisualizer = TQRect();
- viewport()->tqrepaint(rect, true);
+ viewport()->repaint(rect, true);
}
}
@@ -1067,7 +1067,7 @@ void KListView::findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListView
else
{
// Get the closest item before us ('atpos' or the one above, if any)
- if (p.y() - tqitemRect(atpos).topLeft().y() < (atpos->height()/2))
+ if (p.y() - itemRect(atpos).topLeft().y() < (atpos->height()/2))
above = atpos->itemAbove();
else
above = atpos;
@@ -1327,12 +1327,12 @@ TQRect KListView::drawDropVisualizer(TQPainter *p, TQListViewItem *parent,
it = it->firstChild();
}
- insertmarker = tqitemRect (it ? it : after);
+ insertmarker = itemRect (it ? it : after);
level = after->depth();
}
else if (parent)
{
- insertmarker = tqitemRect (parent);
+ insertmarker = itemRect (parent);
level = parent->depth() + 1;
}
insertmarker.setLeft( treeStepSize() * ( level + (rootIsDecorated() ? 1 : 0) ) + itemMargin() );
@@ -1355,11 +1355,11 @@ TQRect KListView::drawItemHighlighter(TQPainter *painter, TQListViewItem *item)
if (item)
{
- r = tqitemRect(item);
+ r = itemRect(item);
r.setLeft(r.left()+(item->depth()+(rootIsDecorated() ? 1 : 0))*treeStepSize());
if (painter)
- style().drawPrimitive(TQStyle::PE_FocusRect, painter, r, tqcolorGroup(),
- TQStyle::Style_FocusAtBorder, tqcolorGroup().highlight());
+ style().drawPrimitive(TQStyle::PE_FocusRect, painter, r, colorGroup(),
+ TQStyle::Style_FocusAtBorder, colorGroup().highlight());
}
return r;
@@ -1371,13 +1371,13 @@ void KListView::cleanItemHighlighter ()
{
TQRect rect=d->mOldDropHighlighter;
d->mOldDropHighlighter = TQRect();
- viewport()->tqrepaint(rect, true);
+ viewport()->repaint(rect, true);
}
}
void KListView::rename(TQListViewItem *item, int c)
{
- if (d->renameable.tqcontains(c))
+ if (d->renameable.contains(c))
{
ensureItemVisible(item);
d->editor->load(item,c);
@@ -1386,7 +1386,7 @@ void KListView::rename(TQListViewItem *item, int c)
bool KListView::isRenameable (int col) const
{
- return d->renameable.tqcontains(col);
+ return d->renameable.contains(col);
}
void KListView::setRenameable (int col, bool renameable)
@@ -1482,7 +1482,7 @@ void KListView::activateAutomaticSelection()
if (currentItem())
{
currentItem()->setSelected(true);
- currentItem()->tqrepaint();
+ currentItem()->repaint();
emit selectionChanged();
};
}
@@ -1519,8 +1519,8 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e)
TQListViewItem* item = currentItem();
if (!item) return;
- TQListViewItem* tqrepaintItem1 = item;
- TQListViewItem* tqrepaintItem2 = 0L;
+ TQListViewItem* repaintItem1 = item;
+ TQListViewItem* repaintItem2 = 0L;
TQListViewItem* visItem = 0L;
TQListViewItem* nextItem = 0L;
@@ -1579,7 +1579,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e)
if (nextItem)
{
- tqrepaintItem2=nextItem;
+ repaintItem2=nextItem;
visItem=nextItem;
setCurrentItem(nextItem);
};
@@ -1614,7 +1614,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e)
{
if (d->selectedBySimpleMove)
nextItem->setSelected(true);
- tqrepaintItem2=nextItem;
+ repaintItem2=nextItem;
visItem=nextItem;
setCurrentItem(nextItem);
};
@@ -1649,7 +1649,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e)
{
if (d->selectedBySimpleMove)
nextItem->setSelected(true);
- tqrepaintItem2=nextItem;
+ repaintItem2=nextItem;
visItem=nextItem;
setCurrentItem(nextItem);
};
@@ -1671,7 +1671,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e)
{
if (d->selectedBySimpleMove)
nextItem->setSelected(true);
- tqrepaintItem2=nextItem;
+ repaintItem2=nextItem;
visItem=nextItem;
setCurrentItem(nextItem);
}
@@ -1684,7 +1684,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e)
// move to the first item and toggle selection of all items inbetween
nextItem = firstChild();
visItem = nextItem;
- tqrepaintItem2 = visItem;
+ repaintItem2 = visItem;
if (d->selectedBySimpleMove)
item->setSelected(false);
if (shiftOrCtrl)
@@ -1797,7 +1797,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e)
currentItem()->setSelected(true);
emitSelectionChanged=true;
}
- tqrepaintItem2=currentItem();
+ repaintItem2=currentItem();
if (realKey)
visItem=currentItem();
break;
@@ -1807,21 +1807,21 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e)
ensureItemVisible(visItem);
TQRect ir;
- if (tqrepaintItem1)
- ir = ir.unite( tqitemRect(tqrepaintItem1) );
- if (tqrepaintItem2)
- ir = ir.unite( tqitemRect(tqrepaintItem2) );
+ if (repaintItem1)
+ ir = ir.unite( itemRect(repaintItem1) );
+ if (repaintItem2)
+ ir = ir.unite( itemRect(repaintItem2) );
if ( !ir.isEmpty() )
- { // rectangle to be tqrepainted
+ { // rectangle to be repainted
if ( ir.x() < 0 )
ir.moveBy( -ir.x(), 0 );
- viewport()->tqrepaint( ir, false );
+ viewport()->repaint( ir, false );
}
- /*if (tqrepaintItem1)
- tqrepaintItem1->tqrepaint();
- if (tqrepaintItem2)
- tqrepaintItem2->tqrepaint();*/
+ /*if (repaintItem1)
+ repaintItem1->repaint();
+ if (repaintItem2)
+ repaintItem2->repaint();*/
update();
if (emitSelectionChanged)
emit selectionChanged();
@@ -1895,7 +1895,7 @@ void KListView::emitContextMenu (KListView*, TQListViewItem* i)
TQPoint p;
if (i)
- p = viewport()->mapToGlobal(tqitemRect(i).center());
+ p = viewport()->mapToGlobal(itemRect(i).center());
else
p = mapToGlobal(rect().center());
@@ -1940,7 +1940,7 @@ void KListView::viewportPaintEvent(TQPaintEvent *e)
TQPainter painter(viewport());
// This is where we actually draw the drop-highlighter
- style().drawPrimitive(TQStyle::PE_FocusRect, &painter, d->mOldDropHighlighter, tqcolorGroup(),
+ style().drawPrimitive(TQStyle::PE_FocusRect, &painter, d->mOldDropHighlighter, colorGroup(),
TQStyle::Style_FocusAtBorder);
}
d->painting = false;
@@ -2001,13 +2001,13 @@ const TQColor &KListView::alternateBackground() const
void KListView::setAlternateBackground(const TQColor &c)
{
d->alternateBackground = c;
- tqrepaint();
+ repaint();
}
void KListView::setShadeSortColumn(bool shadeSortColumn)
{
d->shadeSortColumn = shadeSortColumn;
- tqrepaint();
+ repaint();
}
bool KListView::shadeSortColumn() const
@@ -2231,7 +2231,7 @@ const TQColor &KListViewItem::backgroundColor()
{
if (isAlternate())
return static_cast< KListView* >(listView())->alternateBackground();
- return listView()->viewport()->tqcolorGroup().base();
+ return listView()->viewport()->colorGroup().base();
}
TQColor KListViewItem::backgroundColor(int column)
@@ -2239,7 +2239,7 @@ TQColor KListViewItem::backgroundColor(int column)
KListView* view = static_cast< KListView* >(listView());
TQColor color = isAlternate() ?
view->alternateBackground() :
- view->viewport()->tqcolorGroup().base();
+ view->viewport()->colorGroup().base();
// calculate a different color if the current column is sorted (only if more than 1 column)
if ( (view->columns() > 1) && view->shadeSortColumn() && (column == view->columnSorted()) )
@@ -2335,7 +2335,7 @@ bool KListViewItem::isAlternate()
return false;
}
-void KListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
+void KListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
{
TQColorGroup _cg = cg;
TQListView* lv = listView();
@@ -2353,7 +2353,7 @@ void KListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column,
TQColorGroup::Background : TQColorGroup::Base,
backgroundColor(column));
}
- TQListViewItem::paintCell(p, _cg, column, width, tqalignment);
+ TQListViewItem::paintCell(p, _cg, column, width, alignment);
}
void KListView::virtual_hook( int, void* )