Browse Source

Rename incorrect instances of tqrepaint[...] to repaint[...]

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1240369 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
tags/v3.5.13
tpearson 9 years ago
parent
commit
9c49a74a16
40 changed files with 137 additions and 137 deletions
  1. +1
    -1
      interfaces/khexedit/byteseditinterface.h
  2. +6
    -6
      kate/part/katedocument.cpp
  3. +1
    -1
      kate/part/katedocument.h
  4. +1
    -1
      kate/part/kateschema.cpp
  5. +1
    -1
      kate/part/katesearch.cpp
  6. +3
    -3
      kate/part/kateview.cpp
  7. +1
    -1
      kate/part/kateview.h
  8. +1
    -1
      kdefx/kstyle.h
  9. +1
    -1
      kdeui/kanimwidget.cpp
  10. +17
    -17
      kdeui/kcharselect.cpp
  11. +4
    -4
      kdeui/kdatetbl.cpp
  12. +1
    -1
      kdeui/keditcl.h
  13. +1
    -1
      kdeui/kiconview.cpp
  14. +1
    -1
      kdeui/kkeydialog.cpp
  15. +2
    -2
      kdeui/kled.h
  16. +17
    -17
      kdeui/klistview.cpp
  17. +5
    -5
      kdeui/ktoolbar.cpp
  18. +1
    -1
      khtml/css/cssstyleselector.cpp
  19. +31
    -31
      khtml/khtmlview.cpp
  20. +1
    -1
      khtml/khtmlview.h
  21. +1
    -1
      khtml/rendering/bidi.cpp
  22. +2
    -2
      khtml/rendering/render_block.cpp
  23. +5
    -5
      khtml/rendering/render_box.cpp
  24. +1
    -1
      khtml/rendering/render_box.h
  25. +5
    -5
      khtml/rendering/render_canvas.cpp
  26. +2
    -2
      khtml/rendering/render_canvas.h
  27. +1
    -1
      khtml/rendering/render_container.cpp
  28. +2
    -2
      khtml/rendering/render_flow.cpp
  29. +1
    -1
      khtml/rendering/render_form.cpp
  30. +2
    -2
      khtml/rendering/render_image.cpp
  31. +3
    -3
      khtml/rendering/render_layer.cpp
  32. +1
    -1
      khtml/rendering/render_list.cpp
  33. +3
    -3
      khtml/rendering/render_object.cpp
  34. +2
    -2
      khtml/rendering/render_object.h
  35. +4
    -4
      khtml/rendering/render_table.cpp
  36. +1
    -1
      khtml/rendering/render_table.h
  37. +1
    -1
      kio/kfile/kdirselectdialog.cpp
  38. +1
    -1
      kio/kfile/kfiledetailview.cpp
  39. +1
    -1
      kio/kfile/kicondialog.cpp
  40. +1
    -1
      kstyles/plastik/plastik.cpp

+ 1
- 1
interfaces/khexedit/byteseditinterface.h View File

@@ -144,7 +144,7 @@ class BytesEditInterface

public: // call for action
/** tqrepaint the indizes from i1 to i2 */
virtual void tqrepaintRange( int i1, int i2 ) = 0;
virtual void repaintRange( int i1, int i2 ) = 0;
};




+ 6
- 6
kate/part/katedocument.cpp View File

@@ -2050,7 +2050,7 @@ void KateDocument::clearMark( uint line )
emit marksChanged();
delete mark;
tagLines( line, line );
tqrepaintViews(true);
repaintViews(true);
}

void KateDocument::addMark( uint line, uint markType )
@@ -2087,7 +2087,7 @@ void KateDocument::addMark( uint line, uint markType )

emit marksChanged();
tagLines( line, line );
tqrepaintViews(true);
repaintViews(true);
}

void KateDocument::removeMark( uint line, uint markType )
@@ -2119,7 +2119,7 @@ void KateDocument::removeMark( uint line, uint markType )

emit marksChanged();
tagLines( line, line );
tqrepaintViews(true);
repaintViews(true);
}

TQPtrList<KTextEditor::Mark> KateDocument::marks()
@@ -2146,7 +2146,7 @@ void KateDocument::clearMarks()
m_marks.clear();

emit marksChanged();
tqrepaintViews(true);
repaintViews(true);
}

void KateDocument::setPixmap( MarkInterface::MarkTypes type, const TQPixmap& pixmap )
@@ -4112,10 +4112,10 @@ void KateDocument::tagLines(KateTextCursor start, KateTextCursor end)
m_views.tqat(z)->tagLines(start, end, true);
}

void KateDocument::tqrepaintViews(bool paintOnlyDirty)
void KateDocument::repaintViews(bool paintOnlyDirty)
{
for (uint z = 0; z < m_views.count(); z++)
m_views.tqat(z)->tqrepaintText(paintOnlyDirty);
m_views.tqat(z)->repaintText(paintOnlyDirty);
}

void KateDocument::tagAll()


+ 1
- 1
kate/part/katedocument.h View File

@@ -608,7 +608,7 @@ class KateDocument : public Kate::Document,
void setConfigFlags (uint flags);

// Repaint all of all of the views
void tqrepaintViews(bool paintOnlyDirty = true);
void repaintViews(bool paintOnlyDirty = true);

inline KateHighlighting *highlight () { return m_buffer->highlight(); }



+ 1
- 1
kate/part/kateschema.cpp View File

@@ -1492,7 +1492,7 @@ void KateStyleListItem::paintCell( TQPainter *p, const TQColorGroup& /*cg*/, int
}
TQFont f ( ((KateStyleListView*)lv)->docfont );
p->setFont( is->font(f) );
// FIXME - tqrepainting when text is cropped, and the column is enlarged is buggy.
// FIXME - repainting when text is cropped, and the column is enlarged is buggy.
// Maybe I need painting the string myself :(
// (wilbert) it depends on the font used
TQListViewItem::paintCell( p, mcg, col, width, align );


+ 1
- 1
kate/part/katesearch.cpp View File

@@ -110,7 +110,7 @@ void KateSearch::find()
}

delete findDialog;
m_view->tqrepaintText ();
m_view->repaintText ();
}

void KateSearch::find( const TQString &pattern, long flags, bool add, bool shownotfound )


+ 3
- 3
kate/part/kateview.cpp View File

@@ -1305,7 +1305,7 @@ void KateView::clear ()
m_viewInternal->clear ();
}

void KateView::tqrepaintText (bool paintOnlyDirty)
void KateView::repaintText (bool paintOnlyDirty)
{
m_viewInternal->paintText(0,0,m_viewInternal->width(),m_viewInternal->height(), paintOnlyDirty);
}
@@ -1360,7 +1360,7 @@ bool KateView::setSelection( const KateTextCursor& start, const KateTextCursor&

tagSelection(oldSelectStart, oldSelectEnd);

tqrepaintText(true);
repaintText(true);

emit selectionChanged ();
emit m_doc->selectionChanged ();
@@ -1405,7 +1405,7 @@ bool KateView::clearSelection(bool redraw, bool finishedChangingSelection)
oldSelectEnd = selectEnd;

if (redraw)
tqrepaintText(true);
repaintText(true);

if (finishedChangingSelection)
{


+ 1
- 1
kate/part/kateview.h View File

@@ -270,7 +270,7 @@ class KateView : public Kate::View,

void clear ();

void tqrepaintText (bool paintOnlyDirty = false);
void repaintText (bool paintOnlyDirty = false);

void updateView (bool changed = false);
//END


+ 1
- 1
kdefx/kstyle.h View File

@@ -71,7 +71,7 @@ class KDEFX_EXPORT KStyle: public TQCommonStyle
* internal menu transparency engine.
*
* @li FilledFrameWorkaround - Enable this flag to facilitate
* proper tqrepaints of QMenuBars and QToolBars when the style chooses
* proper repaints of QMenuBars and QToolBars when the style chooses
* to paint the interior of a TQFrame. The style primitives in question
* are PE_PanelMenuBar and PE_PanelDockWindow. The HighColor style uses
* this workaround to enable painting of gradients in menubars and


+ 1
- 1
kdeui/kanimwidget.cpp View File

@@ -159,7 +159,7 @@ void KAnimWidget::slotTimerUpdate()
d->current_frame = 0;

// TODO
// We have to clear the widget when tqrepainting a transparent image
// We have to clear the widget when repainting a transparent image
// By doing it like this we get a bit of flicker though. A better
// way might be to merge it with the background in drawContents.
tqrepaint(d->transparent);


+ 17
- 17
kdeui/kcharselect.cpp View File

@@ -74,7 +74,7 @@ KCharSelectTable::KCharSelectTable( TQWidget *parent, const char *name, const TQ
setNumCols( 32 );
setNumRows( 8 );

tqrepaintContents( false );
repaintContents( false );
setToolTips();

@@ -86,7 +86,7 @@ KCharSelectTable::KCharSelectTable( TQWidget *parent, const char *name, const TQ
void KCharSelectTable::setFont( const TQString &_font )
{
vFont = _font;
tqrepaintContents( false );
repaintContents( false );

setToolTips();
}
@@ -95,7 +95,7 @@ void KCharSelectTable::setFont( const TQString &_font )
void KCharSelectTable::setChar( const TQChar &_chr )
{
vChr = _chr;
tqrepaintContents( false );
repaintContents( false );
}

//==================================================================
@@ -104,7 +104,7 @@ void KCharSelectTable::setTableNum( int _tableNum )
focusItem = TQChar( _tableNum * 256 );

vTableNum = _tableNum;
tqrepaintContents( false );
repaintContents( false );

setToolTips();
}
@@ -210,9 +210,9 @@ void KCharSelectTable::mouseMoveEvent( TQMouseEvent *e )
focusPos = vPos;
focusItem = vChr;

tqrepaintCell( oldFocus.y(), oldFocus.x(), true );
tqrepaintCell( oldPos.y(), oldPos.x(), true );
tqrepaintCell( vPos.y(), vPos.x(), true );
repaintCell( oldFocus.y(), oldFocus.x(), true );
repaintCell( oldPos.y(), oldPos.x(), true );
repaintCell( vPos.y(), vPos.x(), true );

emit highlighted( vChr );
emit highlighted();
@@ -256,8 +256,8 @@ void KCharSelectTable::keyPressEvent( TQKeyEvent *e )
vPos = focusPos;
vChr = focusItem;

tqrepaintCell( oldPos.y(), oldPos.x(), true );
tqrepaintCell( vPos.y(), vPos.x(), true );
repaintCell( oldPos.y(), oldPos.x(), true );
repaintCell( vPos.y(), vPos.x(), true );

emit activated( vChr );
emit activated();
@@ -277,8 +277,8 @@ void KCharSelectTable::gotoLeft()

focusItem = TQChar( vTableNum * 256 + numCols() * focusPos.y() + focusPos.x() );

tqrepaintCell( oldPos.y(), oldPos.x(), true );
tqrepaintCell( focusPos.y(), focusPos.x(), true );
repaintCell( oldPos.y(), oldPos.x(), true );
repaintCell( focusPos.y(), focusPos.x(), true );

emit focusItemChanged( vChr );
emit focusItemChanged();
@@ -295,8 +295,8 @@ void KCharSelectTable::gotoRight()

focusItem = TQChar( vTableNum * 256 + numCols() * focusPos.y() + focusPos.x() );

tqrepaintCell( oldPos.y(), oldPos.x(), true );
tqrepaintCell( focusPos.y(), focusPos.x(), true );
repaintCell( oldPos.y(), oldPos.x(), true );
repaintCell( focusPos.y(), focusPos.x(), true );

emit focusItemChanged( vChr );
emit focusItemChanged();
@@ -313,8 +313,8 @@ void KCharSelectTable::gotoUp()

focusItem = TQChar( vTableNum * 256 + numCols() * focusPos.y() + focusPos.x() );

tqrepaintCell( oldPos.y(), oldPos.x(), true );
tqrepaintCell( focusPos.y(), focusPos.x(), true );
repaintCell( oldPos.y(), oldPos.x(), true );
repaintCell( focusPos.y(), focusPos.x(), true );

emit focusItemChanged( vChr );
emit focusItemChanged();
@@ -331,8 +331,8 @@ void KCharSelectTable::gotoDown()

focusItem = TQChar( vTableNum * 256 + numCols() * focusPos.y() + focusPos.x() );

tqrepaintCell( oldPos.y(), oldPos.x(), true );
tqrepaintCell( focusPos.y(), focusPos.x(), true );
repaintCell( oldPos.y(), oldPos.x(), true );
repaintCell( focusPos.y(), focusPos.x(), true );

emit focusItemChanged( vChr );
emit focusItemChanged();


+ 4
- 4
kdeui/kdatetbl.cpp View File

@@ -536,7 +536,7 @@ KDateTable::setDate(const TQDate& date_)
numDaysPrevMonth=calendar->daysInMonth(temp);
if(changed)
{
tqrepaintContents(false);
repaintContents(false);
}
return true;
}
@@ -547,16 +547,16 @@ KDateTable::getDate() const
return date;
}

// what are those tqrepaintContents() good for? (pfeiffer)
// what are those repaintContents() good for? (pfeiffer)
void KDateTable::focusInEvent( TQFocusEvent *e )
{
// tqrepaintContents(false);
// repaintContents(false);
TQGridView::focusInEvent( e );
}

void KDateTable::focusOutEvent( TQFocusEvent *e )
{
// tqrepaintContents(false);
// repaintContents(false);
TQGridView::focusOutEvent( e );
}



+ 1
- 1
kdeui/keditcl.h View File

@@ -401,7 +401,7 @@ protected:
void contentsDropEvent(TQDropEvent* e);

private:
TQTimer* tqrepaintTimer;
TQTimer* repaintTimer;

QString killbufferstring;
TQWidget *parent;


+ 1
- 1
kdeui/kiconview.cpp View File

@@ -217,7 +217,7 @@ void KIconView::slotAutoSelect()

blockSignals( block );
viewport()->tqsetUpdatesEnabled( update );
tqrepaintContents( redraw, false );
repaintContents( redraw, false );

emit selectionChanged();



+ 1
- 1
kdeui/kkeydialog.cpp View File

@@ -1010,7 +1010,7 @@ void KKeyChooserItem::setShortcut( const KShortcut& cut )
{
m_cut = cut;
m_bModified = (m_cut != m_pList->shortcut(m_iAction));
listView()->tqrepaintItem( this );
listView()->repaintItem( this );
}

void KKeyChooserItem::commitChanges()


+ 2
- 2
kdeui/kled.h View File

@@ -181,7 +181,7 @@ public:
/**
* Toggle the state of the LED from Off to On and vice versa.
*
* The widget will be tqrepainted when returning to the main
* The widget will be repainted when returning to the main
* event loop.
* @short Toggles LED on->off / off->on.
* @deprecated, use #toggle() instead.
@@ -257,7 +257,7 @@ public slots:
/**
* Toggles the state of the led from Off to On or vice versa.
*
* The widget tqrepaints itself immediately.
* The widget repaints itself immediately.
*/
void toggle();



+ 17
- 17
kdeui/klistview.cpp View File

@@ -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( tqitemRect(repaintItem1) );
if (repaintItem2)
ir = ir.unite( tqitemRect(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 );
}
/*if (tqrepaintItem1)
tqrepaintItem1->tqrepaint();
if (tqrepaintItem2)
tqrepaintItem2->tqrepaint();*/
/*if (repaintItem1)
repaintItem1->tqrepaint();
if (repaintItem2)
repaintItem2->tqrepaint();*/
update();
if (emitSelectionChanged)
emit selectionChanged();


+ 5
- 5
kdeui/ktoolbar.cpp View File

@@ -131,7 +131,7 @@ public:

ToolBarInfo toolBarInfo;
TQValueList<int> iconSizes;
TQTimer tqrepaintTimer;
TQTimer repaintTimer;

// Default Values.
bool HiddenDefault;
@@ -232,7 +232,7 @@ void KToolBar::init( bool readConfig, bool honorStyle )
layoutTimer = new TQTimer( this );
connect( layoutTimer, TQT_SIGNAL( timeout() ),
this, TQT_SLOT( rebuildLayout() ) );
connect( &(d->tqrepaintTimer), TQT_SIGNAL( timeout() ),
connect( &(d->repaintTimer), TQT_SIGNAL( timeout() ),
this, TQT_SLOT( slotRepaint() ) );

if ( kapp ) { // may be null when started inside designer
@@ -1435,8 +1435,8 @@ void KToolBar::resizeEvent( TQResizeEvent *e )
{
if (layoutTimer->isActive())
{
// Wait with tqrepainting till layout is complete.
d->tqrepaintTimer.start( 100, true );
// Wait with repainting till layout is complete.
d->repaintTimer.start( 100, true );
}
else
{
@@ -1716,7 +1716,7 @@ void KToolBar::applySettings(KConfig *config, const TQString &_configGroup, bool
bool KToolBar::event( TQEvent *e )
{
if ( (e->type() == TQEvent::LayoutHint) && isUpdatesEnabled() )
d->tqrepaintTimer.start( 100, true );
d->repaintTimer.start( 100, true );

if (e->type() == TQEvent::ChildInserted )
{


+ 1
- 1
khtml/css/cssstyleselector.cpp View File

@@ -741,7 +741,7 @@ void CSSStyleSelector::adjustRenderStyle(RenderStyle* style, DOM::ElementImpl *e
// Cull out any useless layers and also repeat patterns into additional layers.
style->adjustBackgroundLayers();

// Only use slow tqrepaints if we actually have a background image.
// Only use slow repaints if we actually have a background image.
// FIXME: We only need to tqinvalidate the fixed regions when scrolling. It's total overkill to
// prevent the entire view from blitting on a scroll.
if (style->hasFixedBackgroundImage() && view)


+ 31
- 31
khtml/khtmlview.cpp View File

@@ -220,7 +220,7 @@ public:
#ifdef DEBUG_PIXEL
timer.start();
pixelbooth = 0;
tqrepaintbooth = 0;
repaintbooth = 0;
#endif
scrollBarMoved = false;
contentsMoving = false;
@@ -238,7 +238,7 @@ public:
delete postponed_autorepeat;
postponed_autorepeat = NULL;
layoutTimerId = 0;
tqrepaintTimerId = 0;
repaintTimerId = 0;
scrollTimerId = 0;
scrollSuspended = false;
scrollSuspendPreActivate = false;
@@ -324,7 +324,7 @@ public:
#ifdef DEBUG_PIXEL
TQTime timer;
unsigned int pixelbooth;
unsigned int tqrepaintbooth;
unsigned int repaintbooth;
#endif

TQPainter *tp;
@@ -359,7 +359,7 @@ public:
int layoutTimerId;
TQKeyEvent* postponed_autorepeat;

int tqrepaintTimerId;
int repaintTimerId;
int scrollTimerId;
int scrollTiming;
int scrollBy;
@@ -650,14 +650,14 @@ void KHTMLView::drawContents( TQPainter *p, int ex, int ey, int ew, int eh )
#ifdef DEBUG_PIXEL

if ( d->timer.elapsed() > 5000 ) {
qDebug( "drawed %d pixels in %d tqrepaints the last %d milliseconds",
d->pixelbooth, d->tqrepaintbooth, d->timer.elapsed() );
qDebug( "drawed %d pixels in %d repaints the last %d milliseconds",
d->pixelbooth, d->repaintbooth, d->timer.elapsed() );
d->timer.restart();
d->pixelbooth = 0;
d->tqrepaintbooth = 0;
d->repaintbooth = 0;
}
d->pixelbooth += ew*eh;
d->tqrepaintbooth++;
d->repaintbooth++;
#endif

//kdDebug( 6000 ) << "drawContents this="<< this <<" x=" << ex << ",y=" << ey << ",w=" << ew << ",h=" << eh << endl;
@@ -1941,7 +1941,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e)
case TQEvent::Paint:
if (!allowWidgetPaintEvents) {
// eat the event. Like this we can control exactly when the widget
// get's tqrepainted.
// get's repainted.
block = true;
int x = 0, y = 0;
TQWidget *v = w;
@@ -1954,10 +1954,10 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e)
TQPaintEvent *pe = TQT_TQPAINTEVENT(e);
bool asap = !d->contentsMoving && ::tqqt_cast<TQScrollView *>(c);

// TQScrollView needs fast tqrepaints
// TQScrollView needs fast repaints
if ( asap && !d->painting && m_part->xmlDocImpl() && m_part->xmlDocImpl()->renderer() &&
!static_cast<khtml::RenderCanvas *>(m_part->xmlDocImpl()->renderer())->needsLayout() ) {
tqrepaintContents(x + pe->rect().x(), y + pe->rect().y(),
repaintContents(x + pe->rect().x(), y + pe->rect().y(),
pe->rect().width(), pe->rect().height(), true);
} else {
scheduleRepaint(x + pe->rect().x(), y + pe->rect().y(),
@@ -2284,7 +2284,7 @@ void KHTMLView::displayAccessKeys( KHTMLView* caller, KHTMLView* origview, TQVal
TQRect rec=en->getRect();
TQLabel *lab=new TQLabel(accesskey,viewport(),0,(WFlags)WDestructiveClose);
connect( origview, TQT_SIGNAL(hideAccessKeys()), lab, TQT_SLOT(close()) );
connect( this, TQT_SIGNAL(tqrepaintAccessKeys()), lab, TQT_SLOT(tqrepaint()));
connect( this, TQT_SIGNAL(repaintAccessKeys()), lab, TQT_SLOT(tqrepaint()));
lab->setPalette(TQToolTip::palette());
lab->setLineWidth(2);
lab->setFrameStyle(TQFrame::Box | TQFrame::Plain);
@@ -3501,8 +3501,8 @@ void KHTMLView::timerEvent ( TQTimerEvent *e )
khtml::RenderCanvas* root = static_cast<khtml::RenderCanvas *>(document->renderer());

if ( root && root->needsLayout() ) {
killTimer(d->tqrepaintTimerId);
d->tqrepaintTimerId = 0;
killTimer(d->repaintTimerId);
d->repaintTimerId = 0;
scheduleRelayout();
return;
}
@@ -3510,9 +3510,9 @@ void KHTMLView::timerEvent ( TQTimerEvent *e )

setStaticBackground(d->useSlowRepaints);

// kdDebug() << "scheduled tqrepaint "<< d->tqrepaintTimerId << endl;
killTimer(d->tqrepaintTimerId);
d->tqrepaintTimerId = 0;
// kdDebug() << "scheduled tqrepaint "<< d->repaintTimerId << endl;
killTimer(d->repaintTimerId);
d->repaintTimerId = 0;

TQRect updateRegion;
TQMemArray<TQRect> rects = d->updateRegion.tqrects();
@@ -3526,7 +3526,7 @@ void KHTMLView::timerEvent ( TQTimerEvent *e )
TQRect newRegion = updateRegion.unite(rects[i]);
if (2*newRegion.height() > 3*updateRegion.height() )
{
tqrepaintContents( updateRegion );
repaintContents( updateRegion );
updateRegion = rects[i];
}
else
@@ -3534,11 +3534,11 @@ void KHTMLView::timerEvent ( TQTimerEvent *e )
}

if ( !updateRegion.isNull() )
tqrepaintContents( updateRegion );
repaintContents( updateRegion );

// As widgets can only be accurately positioned during painting, every layout might
// dissociate a widget from its RenderWidget. E.g: if a RenderWidget was visible before layout, but the layout
// pushed it out of the viewport, it will not be tqrepainted, and consequently it's assocoated widget won't be repositioned!
// pushed it out of the viewport, it will not be repainted, and consequently it's assocoated widget won't be repositioned!
// Thus we need to check each supposedly 'visible' widget at the end of each layout, and remove it in case it's no more in sight.

if (d->dirtyLayout && !d->visibleWidgets.isEmpty()) {
@@ -3560,7 +3560,7 @@ void KHTMLView::timerEvent ( TQTimerEvent *e )
addChild(w, 0, -500000);
}

emit tqrepaintAccessKeys();
emit repaintAccessKeys();
if (d->emitCompletedAfterRepaint) {
bool full = d->emitCompletedAfterRepaint == KHTMLViewPrivate::CSFull;
d->emitCompletedAfterRepaint = KHTMLViewPrivate::CSNone;
@@ -3591,11 +3591,11 @@ void KHTMLView::unscheduleRelayout()

void KHTMLView::unscheduleRepaint()
{
if (!d->tqrepaintTimerId)
if (!d->repaintTimerId)
return;

killTimer(d->tqrepaintTimerId);
d->tqrepaintTimerId = 0;
killTimer(d->repaintTimerId);
d->repaintTimerId = 0;
}

void KHTMLView::scheduleRepaint(int x, int y, int w, int h, bool asap)
@@ -3622,8 +3622,8 @@ void KHTMLView::scheduleRepaint(int x, int y, int w, int h, bool asap)
if (asap && !parsing)
unscheduleRepaint();

if ( !d->tqrepaintTimerId )
d->tqrepaintTimerId = startTimer( time );
if ( !d->repaintTimerId )
d->repaintTimerId = startTimer( time );

// kdDebug() << "starting timer " << time << endl;
}
@@ -3646,12 +3646,12 @@ void KHTMLView::complete( bool pendingAction )
}

// is there a tqrepaint pending?
if (d->tqrepaintTimerId)
if (d->repaintTimerId)
{
// kdDebug() << "requesting tqrepaint now" << endl;
// do it now
killTimer(d->tqrepaintTimerId);
d->tqrepaintTimerId = startTimer( 20 );
killTimer(d->repaintTimerId);
d->repaintTimerId = startTimer( 20 );
d->emitCompletedAfterRepaint = pendingAction ?
KHTMLViewPrivate::CSActionPending : KHTMLViewPrivate::CSFull;
}
@@ -3845,7 +3845,7 @@ void KHTMLView::showCaret(bool forceRepaint)
d->m_caretViewContext->width,
d->m_caretViewContext->height);
} else {
tqrepaintContents(d->m_caretViewContext->x, d->m_caretViewContext->y,
repaintContents(d->m_caretViewContext->x, d->m_caretViewContext->y,
d->m_caretViewContext->width,
d->m_caretViewContext->height);
}/*end if*/
@@ -3879,7 +3879,7 @@ void KHTMLView::hideCaret()
d->m_caretViewContext->visible = false;
// force tqrepaint, otherwise the event won't be handled
// before the focus leaves the window
tqrepaintContents(d->m_caretViewContext->x, d->m_caretViewContext->y,
repaintContents(d->m_caretViewContext->x, d->m_caretViewContext->y,
d->m_caretViewContext->width,
d->m_caretViewContext->height);
d->m_caretViewContext->visible = true;


+ 1
- 1
khtml/khtmlview.h View File

@@ -179,7 +179,7 @@ signals:
void cleared();
void zoomView( int );
void hideAccessKeys();
void tqrepaintAccessKeys();
void repaintAccessKeys();
void findAheadActive( bool );
//#define NO_SMOOTH_SCROLL_HACK
#ifndef NO_SMOOTH_SCROLL_HACK


+ 1
- 1
khtml/rendering/bidi.cpp View File

@@ -1360,7 +1360,7 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int breakBeforeLin
RenderObject *o = first( this, bidi, false );
while ( o ) {
if (o->markedForRepaint()) {
o->tqrepaintDuringLayout();
o->repaintDuringLayout();
o->setMarkedForRepaint(false);
}
if (o->isReplaced() || o->isFloating() || o->isPositioned()) {


+ 2
- 2
khtml/rendering/render_block.cpp View File

@@ -635,7 +635,7 @@ void RenderBlock::layoutBlock(bool relayoutChildren)
}

if (markedForRepaint()) {
tqrepaintDuringLayout();
repaintDuringLayout();
setMarkedForRepaint(false);
}

@@ -1581,7 +1581,7 @@ void RenderBlock::layoutPositionedObjects(bool relayoutChildren)
for ( ; (r = it.current()); ++it ) {
//kdDebug(6040) << " have a positioned object" << endl;
if (r->markedForRepaint()) {
r->tqrepaintDuringLayout();
r->repaintDuringLayout();
r->setMarkedForRepaint(false);
}
if ( relayoutChildren || r->style()->position() == FIXED ||


+ 5
- 5
khtml/rendering/render_box.cpp View File

@@ -806,17 +806,17 @@ void RenderBox::tqrepaint(Priority prior)
p = p->parent();
int xoff = p->hasOverflowClip() ? 0 : p->overflowLeft();
int yoff = p->hasOverflowClip() ? 0 : p->overflowTop();
p->tqrepaintRectangle( -ow + xoff, -ow + yoff, p->effectiveWidth()+ow*2, p->effectiveHeight()+ow*2, prior);
p->repaintRectangle( -ow + xoff, -ow + yoff, p->effectiveWidth()+ow*2, p->effectiveHeight()+ow*2, prior);
}
else
{
int xoff = hasOverflowClip() ? 0 : overflowLeft();
int yoff = hasOverflowClip() ? 0 : overflowTop();
tqrepaintRectangle( -ow + xoff, -ow + yoff, effectiveWidth()+ow*2, effectiveHeight()+ow*2, prior);
repaintRectangle( -ow + xoff, -ow + yoff, effectiveWidth()+ow*2, effectiveHeight()+ow*2, prior);
}
}

void RenderBox::tqrepaintRectangle(int x, int y, int w, int h, Priority p, bool f)
void RenderBox::repaintRectangle(int x, int y, int w, int h, Priority p, bool f)
{
x += m_x;
y += m_y;
@@ -830,7 +830,7 @@ void RenderBox::tqrepaintRectangle(int x, int y, int w, int h, Priority p, bool

if (style()->position() == FIXED) f=true;

// kdDebug( 6040 ) << "RenderBox(" <<this << ", " << renderName() << ")::tqrepaintRectangle (" << x << "/" << y << ") (" << w << "/" << h << ")" << endl;
// kdDebug( 6040 ) << "RenderBox(" <<this << ", " << renderName() << ")::repaintRectangle (" << x << "/" << y << ") (" << w << "/" << h << ")" << endl;
RenderObject *o = container();
if( o ) {
if (o->layer()) {
@@ -839,7 +839,7 @@ void RenderBox::tqrepaintRectangle(int x, int y, int w, int h, Priority p, bool
if (style()->position() == ABSOLUTE)
o->layer()->checkInlineRelOffset(this,x,y);
}
o->tqrepaintRectangle(x, y, w, h, p, f);
o->repaintRectangle(x, y, w, h, p, f);
}
}



+ 1
- 1
khtml/rendering/render_box.h View File

@@ -89,7 +89,7 @@ public:

virtual void tqrepaint(Priority p=NormalPriority);

virtual void tqrepaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false);
virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false);

virtual short containingBlockWidth() const;
void relativePositionOffset(int &tx, int &ty) const;


+ 5
- 5
khtml/rendering/render_canvas.cpp View File

@@ -269,7 +269,7 @@ bool RenderCanvas::needsFullRepaint() const
return m_needsFullRepaint || m_pagedMode;
}

void RenderCanvas::tqrepaintViewRectangle(int x, int y, int w, int h, bool asap)
void RenderCanvas::repaintViewRectangle(int x, int y, int w, int h, bool asap)
{
KHTMLAssert( view() );
view()->scheduleRepaint( x, y, w, h, asap );
@@ -332,7 +332,7 @@ void RenderCanvas::paintBoxDecorations(PaintInfo& paintInfo, int /*_tx*/, int /*
paintInfo.p->fillRect(paintInfo.r, view()->tqpalette().active().color(TQColorGroup::Base));
}

void RenderCanvas::tqrepaintRectangle(int x, int y, int w, int h, Priority p, bool f)
void RenderCanvas::repaintRectangle(int x, int y, int w, int h, Priority p, bool f)
{
if (m_staticMode) return;
// kdDebug( 6040 ) << "updating views contents (" << x << "/" << y << ") (" << w << "/" << h << ")" << endl;
@@ -353,7 +353,7 @@ void RenderCanvas::tqrepaintRectangle(int x, int y, int w, int h, Priority p, bo
if (p == RealtimePriority)
// ### KWQ's updateContents has an additional parameter "now".
// It's not clear what the difference between updateContents(...,true)
// and tqrepaintContents(...) is. As Qt doesn't have this, I'm leaving it out. (LS)
// and repaintContents(...) is. As Qt doesn't have this, I'm leaving it out. (LS)
m_view->updateContents(ur/*, true*/);
else if (p == HighPriority)
m_view->scheduleRepaint(x, y, w, h, true /*asap*/);
@@ -374,7 +374,7 @@ void RenderCanvas::scheduleDeferredRepaints()
for ( it = m_dirtyChildren.begin(); it != m_dirtyChildren.end(); ++it )
(*it)->tqrepaint();
}
//kdDebug(6040) << "scheduled deferred tqrepaints: " << m_dirtyChildren.count() << " needed full tqrepaint: " << needsFullRepaint() << endl;
//kdDebug(6040) << "scheduled deferred repaints: " << m_dirtyChildren.count() << " needed full tqrepaint: " << needsFullRepaint() << endl;
m_dirtyChildren.clear();
}

@@ -388,7 +388,7 @@ void RenderCanvas::tqrepaint(Priority p)
m_view->scheduleRelayout();
return;
}
// ### same as in tqrepaintRectangle
// ### same as in repaintRectangle
m_view->updateContents(m_view->contentsX(), m_view->contentsY(),
m_view->visibleWidth(), m_view->visibleHeight()/*, true*/);
}


+ 2
- 2
khtml/rendering/render_canvas.h View File

@@ -62,8 +62,8 @@ public:
KHTMLView *view() const { return m_view; }

virtual void tqrepaint(Priority p=NormalPriority);
virtual void tqrepaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false);
void tqrepaintViewRectangle(int x, int y, int w, int h, bool asap=false);
virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false);
void repaintViewRectangle(int x, int y, int w, int h, bool asap=false);
bool needsFullRepaint() const;
void deferredRepaint( RenderObject* o );
void scheduleDeferredRepaints();


+ 1
- 1
khtml/rendering/render_container.cpp View File

@@ -171,7 +171,7 @@ RenderObject* RenderContainer::removeChildNode(RenderObject* oldChild)

// So that we'll get the appropriate dirty bit set (either that a normal flow child got yanked or
// that a positioned child got yanked). We also tqrepaint, so that the area exposed when the child
// disappears gets tqrepainted properly.
// disappears gets repainted properly.
if ( document()->renderer() ) {
oldChild->setNeedsLayoutAndMinMaxRecalc();
oldChild->tqrepaint();


+ 2
- 2
khtml/rendering/render_flow.cpp View File

@@ -295,14 +295,14 @@ void RenderFlow::tqrepaint(Priority prior)
}

RootInlineBox *lastRoot = lastLineBox() && !needsLayout() ? lastLineBox()->root() : 0;
containingBlock()->tqrepaintRectangle(-ow+left, -ow+top,
containingBlock()->repaintRectangle(-ow+left, -ow+top,
width()+ow*2,
(lastRoot ? lastRoot->bottomOverflow() - top : height())+ow*2, prior);
}
else {
if (firstLineBox() && firstLineBox()->topOverflow() < 0) {
int ow = style() ? style()->outlineSize() : 0;
tqrepaintRectangle(-ow, -ow+firstLineBox()->topOverflow(),
repaintRectangle(-ow, -ow+firstLineBox()->topOverflow(),
effectiveWidth()+ow*2, effectiveHeight()+ow*2, prior);
}
else


+ 1
- 1
khtml/rendering/render_form.cpp View File

@@ -1450,7 +1450,7 @@ void TextAreaWidget::slotReplaceNext()

if (!(m_replace->options() & KReplaceDialog::PromptOnReplace)) {
viewport()->tqsetUpdatesEnabled(true);
tqrepaintChanged();
repaintChanged();
}

if (res == KFind::NoMatch) { // at end


+ 2
- 2
khtml/rendering/render_image.cpp View File

@@ -196,10 +196,10 @@ void RenderImage::setPixmap( const TQPixmap &p, const TQRect& r, CachedImage *o)
resizeCache = TQPixmap(); // for resized animations

if(completeRepaint)
tqrepaintRectangle(borderLeft()+paddingLeft(), borderTop()+paddingTop(), contentWidth(), contentHeight());
repaintRectangle(borderLeft()+paddingLeft(), borderTop()+paddingTop(), contentWidth(), contentHeight());
else
{
tqrepaintRectangle(r.x() + borderLeft() + paddingLeft(), r.y() + borderTop() + paddingTop(),
repaintRectangle(r.x() + borderLeft() + paddingLeft(), r.y() + borderTop() + paddingTop(),
r.width(), r.height());
}
}


+ 3
- 3
khtml/rendering/render_layer.cpp View File

@@ -205,7 +205,7 @@ void RenderLayer::tqrepaint( Priority p, bool markForRepaint )
calculateRects(renderer()->canvas()->layer(), renderer()->viewRect(), layerBounds, damageRect, fgrect);
m_visibleRect = damageRect.intersect( layerBounds );
if (m_visibleRect.isValid())
renderer()->canvas()->tqrepaintViewRectangle( m_visibleRect.x(), m_visibleRect.y(), m_visibleRect.width(), m_visibleRect.height(), (p > NormalPriority) );
renderer()->canvas()->repaintViewRectangle( m_visibleRect.x(), m_visibleRect.y(), m_visibleRect.width(), m_visibleRect.height(), (p > NormalPriority) );
if (markForRepaint)
m_markedForRepaint = true;
}
@@ -233,14 +233,14 @@ void RenderLayer::updateLayerPositions(RenderLayer* rootLayer, bool doFullRepain
#ifdef APPLE_CHANGES
// FIXME: Child object could override visibility.
if (checkForRepaint && (m_object->style()->visibility() == VISIBLE))
m_object->tqrepaintAfterLayoutIfNeeded(m_tqrepaintRect, m_fullRepaintRect);
m_object->repaintAfterLayoutIfNeeded(m_repaintRect, m_fullRepaintRect);
#else
if (checkForRepaint && m_markedForRepaint) {
TQRect layerBounds, damageRect, fgrect;
calculateRects(rootLayer, renderer()->viewRect(), layerBounds, damageRect, fgrect);
TQRect vr = damageRect.intersect( layerBounds );
if (vr != m_visibleRect && vr.isValid()) {
renderer()->canvas()->tqrepaintViewRectangle( vr.x(), vr.y(), vr.width(), vr.height() );
renderer()->canvas()->repaintViewRectangle( vr.x(), vr.y(), vr.width(), vr.height() );
m_visibleRect = vr;
}
}


+ 1
- 1
khtml/rendering/render_list.cpp View File

@@ -387,7 +387,7 @@ void RenderListMarker::setPixmap( const TQPixmap &p, const TQRect& r, CachedImag
if(m_width != m_listImage->pixmap_size().width() || m_height != m_listImage->pixmap_size().height())
setNeedsLayoutAndMinMaxRecalc();
else
tqrepaintRectangle(0, 0, m_width, m_height);
repaintRectangle(0, 0, m_width, m_height);
}

void RenderListMarker::calcMinMaxWidth()


+ 3
- 3
khtml/rendering/render_object.cpp View File

@@ -1103,9 +1103,9 @@ void RenderObject::paint( PaintInfo&, int /*tx*/, int /*ty*/)
{
}

void RenderObject::tqrepaintRectangle(int x, int y, int w, int h, Priority p, bool f)
void RenderObject::repaintRectangle(int x, int y, int w, int h, Priority p, bool f)
{
if(parent()) parent()->tqrepaintRectangle(x, y, w, h, p, f);
if(parent()) parent()->repaintRectangle(x, y, w, h, p, f);
}

#ifdef ENABLE_DUMP
@@ -1423,7 +1423,7 @@ void RenderObject::dirtyFormattingContext( bool checkContainer )
m_parent->dirtyFormattingContext(false);
}

void RenderObject::tqrepaintDuringLayout()
void RenderObject::repaintDuringLayout()
{
if (canvas()->needsFullRepaint() || isText())
return;


+ 2
- 2
khtml/rendering/render_object.h View File

@@ -327,7 +327,7 @@ public:
void setOverhangingContents(bool p=true);
void markContainingBlocksForLayout();
void dirtyFormattingContext( bool checkContainer );
void tqrepaintDuringLayout();
void repaintDuringLayout();
void setNeedsLayout(bool b, bool markParents = true);
void setChildNeedsLayout(bool b, bool markParents = true);
void setMinMaxKnown(bool b=true) {
@@ -683,7 +683,7 @@ public:

// force a complete tqrepaint
virtual void tqrepaint(Priority p = NormalPriority) { if(m_parent) m_parent->tqrepaint(p); }
virtual void tqrepaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false);
virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false);

virtual unsigned int length() const { return 1; }



+ 4
- 4
khtml/rendering/render_table.cpp View File

@@ -277,7 +277,7 @@ void RenderTable::layout()
}

if (markedForRepaint()) {
tqrepaintDuringLayout();
repaintDuringLayout();
setMarkedForRepaint(false);
}

@@ -1306,7 +1306,7 @@ int RenderTableSection::layoutRows( int toAdd )
m_width = table()->contentWidth();

if (markedForRepaint()) {
tqrepaintDuringLayout();
repaintDuringLayout();
setMarkedForRepaint(false);
}

@@ -2319,9 +2319,9 @@ bool RenderTableCell::requiresLayer() const {
return /* style()->opacity() < 1.0f || */ hasOverflowClip() || isRelPositioned();
}

void RenderTableCell::tqrepaintRectangle(int x, int y, int w, int h, Priority p, bool f)
void RenderTableCell::repaintRectangle(int x, int y, int w, int h, Priority p, bool f)
{
RenderBlock::tqrepaintRectangle(x, y, w, h + _topExtra + _bottomExtra, p, f);
RenderBlock::repaintRectangle(x, y, w, h + _topExtra + _bottomExtra, p, f);
}

bool RenderTableCell::absolutePosition(int &xPos, int &yPos, bool f) const


+ 1
- 1
khtml/rendering/render_table.h View File

@@ -396,7 +396,7 @@ public:
// lie position to outside observers
virtual int yPos() const { return m_y + _topExtra; }

virtual void tqrepaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false);
virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false);
virtual bool absolutePosition(int &xPos, int &yPos, bool f = false) const;

virtual short baselinePosition( bool = false ) const;


+ 1
- 1
kio/kfile/kdirselectdialog.cpp View File

@@ -390,7 +390,7 @@ void KDirSelectDialog::slotComboTextChanged( const TQString& text )
if ( item )
{
item->setSelected( false );
// 2002/12/27, deselected item is not tqrepainted, so force it
// 2002/12/27, deselected item is not repainted, so force it
item->tqrepaint();
}
}


+ 1
- 1
kio/kfile/kfiledetailview.cpp View File

@@ -317,7 +317,7 @@ void KFileDetailView::updateView( const KFileItem *i )
item->init();
setSortingKey( item, i );

//item->tqrepaint(); // only tqrepaints if visible
//item->tqrepaint(); // only repaints if visible
}

void KFileDetailView::setSortingKey( KFileListViewItem *item,


+ 1
- 1
kio/kfile/kicondialog.cpp View File

@@ -136,7 +136,7 @@ void KIconCanvas::slotLoadFiles()
for (it=mFiles.begin(), i=0; it!=end; ++it, i++)
{
// Calling kapp->processEvents() makes the iconview flicker like hell
// (it's being tqrepainted once for every new item), so we don't do this.
// (it's being repainted once for every new item), so we don't do this.
// Instead, we directly tqrepaint the progress bar without going through
// the event-loop. We do that just once for every 10th item so that
// the progress bar doesn't flicker in turn. (pfeiffer)


+ 1
- 1
kstyles/plastik/plastik.cpp View File

@@ -3508,7 +3508,7 @@ bool PlastikStyle::eventFilter(TQObject *obj, TQEvent *ev)
TQMouseEvent *me = dynamic_cast<TQMouseEvent*>(ev);

if (tabbar && me) {
// avoid unnecessary tqrepaints (which otherwise would occour on every
// avoid unnecessary repaints (which otherwise would occour on every
// MouseMove event causing high cpu load).

bool tqrepaint = true;


Loading…
Cancel
Save