summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-07 21:14:06 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-07 21:14:06 +0000
commit9c49a74a165b8535c28ccbb2fad37334989b2fc7 (patch)
treef1d72ed61fc64441880b26359d03c58f78b95ada
parent42037fa1562f00d75f02d019c039d51b2c27cc6f (diff)
downloadtdelibs-9c49a74a165b8535c28ccbb2fad37334989b2fc7.tar.gz
tdelibs-9c49a74a165b8535c28ccbb2fad37334989b2fc7.zip
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
-rw-r--r--interfaces/khexedit/byteseditinterface.h2
-rw-r--r--kate/part/katedocument.cpp12
-rw-r--r--kate/part/katedocument.h2
-rw-r--r--kate/part/kateschema.cpp2
-rw-r--r--kate/part/katesearch.cpp2
-rw-r--r--kate/part/kateview.cpp6
-rw-r--r--kate/part/kateview.h2
-rw-r--r--kdefx/kstyle.h2
-rw-r--r--kdeui/kanimwidget.cpp2
-rw-r--r--kdeui/kcharselect.cpp34
-rw-r--r--kdeui/kdatetbl.cpp8
-rw-r--r--kdeui/keditcl.h2
-rw-r--r--kdeui/kiconview.cpp2
-rw-r--r--kdeui/kkeydialog.cpp2
-rw-r--r--kdeui/kled.h4
-rw-r--r--kdeui/klistview.cpp34
-rw-r--r--kdeui/ktoolbar.cpp10
-rw-r--r--khtml/css/cssstyleselector.cpp2
-rw-r--r--khtml/khtmlview.cpp62
-rw-r--r--khtml/khtmlview.h2
-rw-r--r--khtml/rendering/bidi.cpp2
-rw-r--r--khtml/rendering/render_block.cpp4
-rw-r--r--khtml/rendering/render_box.cpp10
-rw-r--r--khtml/rendering/render_box.h2
-rw-r--r--khtml/rendering/render_canvas.cpp10
-rw-r--r--khtml/rendering/render_canvas.h4
-rw-r--r--khtml/rendering/render_container.cpp2
-rw-r--r--khtml/rendering/render_flow.cpp4
-rw-r--r--khtml/rendering/render_form.cpp2
-rw-r--r--khtml/rendering/render_image.cpp4
-rw-r--r--khtml/rendering/render_layer.cpp6
-rw-r--r--khtml/rendering/render_list.cpp2
-rw-r--r--khtml/rendering/render_object.cpp6
-rw-r--r--khtml/rendering/render_object.h4
-rw-r--r--khtml/rendering/render_table.cpp8
-rw-r--r--khtml/rendering/render_table.h2
-rw-r--r--kio/kfile/kdirselectdialog.cpp2
-rw-r--r--kio/kfile/kfiledetailview.cpp2
-rw-r--r--kio/kfile/kicondialog.cpp2
-rw-r--r--kstyles/plastik/plastik.cpp2
40 files changed, 137 insertions, 137 deletions
diff --git a/interfaces/khexedit/byteseditinterface.h b/interfaces/khexedit/byteseditinterface.h
index d062f5c62..fd2bce54f 100644
--- a/interfaces/khexedit/byteseditinterface.h
+++ b/interfaces/khexedit/byteseditinterface.h
@@ -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;
};
diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp
index 3f26d2bb5..dbab1ef08 100644
--- a/kate/part/katedocument.cpp
+++ b/kate/part/katedocument.cpp
@@ -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()
diff --git a/kate/part/katedocument.h b/kate/part/katedocument.h
index 37d9b24e9..5c426761b 100644
--- a/kate/part/katedocument.h
+++ b/kate/part/katedocument.h
@@ -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(); }
diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp
index 5adb89b9c..2b5e2342e 100644
--- a/kate/part/kateschema.cpp
+++ b/kate/part/kateschema.cpp
@@ -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 );
diff --git a/kate/part/katesearch.cpp b/kate/part/katesearch.cpp
index 6ef973030..951316671 100644
--- a/kate/part/katesearch.cpp
+++ b/kate/part/katesearch.cpp
@@ -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 )
diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp
index bdc11f7cf..cfe6288a7 100644
--- a/kate/part/kateview.cpp
+++ b/kate/part/kateview.cpp
@@ -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)
{
diff --git a/kate/part/kateview.h b/kate/part/kateview.h
index 0f62fe440..aa428096d 100644
--- a/kate/part/kateview.h
+++ b/kate/part/kateview.h
@@ -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
diff --git a/kdefx/kstyle.h b/kdefx/kstyle.h
index 93a3419d0..42bd1a231 100644
--- a/kdefx/kstyle.h
+++ b/kdefx/kstyle.h
@@ -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
diff --git a/kdeui/kanimwidget.cpp b/kdeui/kanimwidget.cpp
index 7b723a1f0..d538bea20 100644
--- a/kdeui/kanimwidget.cpp
+++ b/kdeui/kanimwidget.cpp
@@ -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);
diff --git a/kdeui/kcharselect.cpp b/kdeui/kcharselect.cpp
index 9f3d76dd2..2ae916efe 100644
--- a/kdeui/kcharselect.cpp
+++ b/kdeui/kcharselect.cpp
@@ -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();
diff --git a/kdeui/kdatetbl.cpp b/kdeui/kdatetbl.cpp
index 416bd66b1..e4f1ae988 100644
--- a/kdeui/kdatetbl.cpp
+++ b/kdeui/kdatetbl.cpp
@@ -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 );
}
diff --git a/kdeui/keditcl.h b/kdeui/keditcl.h
index 289919b3e..35316027c 100644
--- a/kdeui/keditcl.h
+++ b/kdeui/keditcl.h
@@ -401,7 +401,7 @@ protected:
void contentsDropEvent(TQDropEvent* e);
private:
- TQTimer* tqrepaintTimer;
+ TQTimer* repaintTimer;
QString killbufferstring;
TQWidget *parent;
diff --git a/kdeui/kiconview.cpp b/kdeui/kiconview.cpp
index 6c4c5ff4b..ce1aec637 100644
--- a/kdeui/kiconview.cpp
+++ b/kdeui/kiconview.cpp
@@ -217,7 +217,7 @@ void KIconView::slotAutoSelect()
blockSignals( block );
viewport()->tqsetUpdatesEnabled( update );
- tqrepaintContents( redraw, false );
+ repaintContents( redraw, false );
emit selectionChanged();
diff --git a/kdeui/kkeydialog.cpp b/kdeui/kkeydialog.cpp
index 775f00661..489f453ba 100644
--- a/kdeui/kkeydialog.cpp
+++ b/kdeui/kkeydialog.cpp
@@ -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()
diff --git a/kdeui/kled.h b/kdeui/kled.h
index 06683bbaa..4e95705e0 100644
--- a/kdeui/kled.h
+++ b/kdeui/kled.h
@@ -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();
diff --git a/kdeui/klistview.cpp b/kdeui/klistview.cpp
index b65cab53b..97cef2627 100644
--- a/kdeui/klistview.cpp
+++ b/kdeui/klistview.cpp
@@ -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();
diff --git a/kdeui/ktoolbar.cpp b/kdeui/ktoolbar.cpp
index 90a17a486..6a5995b69 100644
--- a/kdeui/ktoolbar.cpp
+++ b/kdeui/ktoolbar.cpp
@@ -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 )
{
diff --git a/khtml/css/cssstyleselector.cpp b/khtml/css/cssstyleselector.cpp
index e970f5ecd..08b47da4b 100644
--- a/khtml/css/cssstyleselector.cpp
+++ b/khtml/css/cssstyleselector.cpp
@@ -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)
diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp
index 10e690dc6..6502ade52 100644
--- a/khtml/khtmlview.cpp
+++ b/khtml/khtmlview.cpp
@@ -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;
diff --git a/khtml/khtmlview.h b/khtml/khtmlview.h
index b9bf47222..6c9dc8808 100644
--- a/khtml/khtmlview.h
+++ b/khtml/khtmlview.h
@@ -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
diff --git a/khtml/rendering/bidi.cpp b/khtml/rendering/bidi.cpp
index cc60c5588..f2e64b5f8 100644
--- a/khtml/rendering/bidi.cpp
+++ b/khtml/rendering/bidi.cpp
@@ -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()) {
diff --git a/khtml/rendering/render_block.cpp b/khtml/rendering/render_block.cpp
index 764eecb55..5b30e2a58 100644
--- a/khtml/rendering/render_block.cpp
+++ b/khtml/rendering/render_block.cpp
@@ -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 ||
diff --git a/khtml/rendering/render_box.cpp b/khtml/rendering/render_box.cpp
index e558352af..e63115361 100644
--- a/khtml/rendering/render_box.cpp
+++ b/khtml/rendering/render_box.cpp
@@ -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);
}
}
diff --git a/khtml/rendering/render_box.h b/khtml/rendering/render_box.h
index 8158d6037..78b85b5f4 100644
--- a/khtml/rendering/render_box.h
+++ b/khtml/rendering/render_box.h
@@ -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;
diff --git a/khtml/rendering/render_canvas.cpp b/khtml/rendering/render_canvas.cpp
index c06f9f15d..3980c8eee 100644
--- a/khtml/rendering/render_canvas.cpp
+++ b/khtml/rendering/render_canvas.cpp
@@ -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*/);
}
diff --git a/khtml/rendering/render_canvas.h b/khtml/rendering/render_canvas.h
index 82b59705b..f2822bc94 100644
--- a/khtml/rendering/render_canvas.h
+++ b/khtml/rendering/render_canvas.h
@@ -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();
diff --git a/khtml/rendering/render_container.cpp b/khtml/rendering/render_container.cpp
index 45cfc5729..13f17c08d 100644
--- a/khtml/rendering/render_container.cpp
+++ b/khtml/rendering/render_container.cpp
@@ -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();
diff --git a/khtml/rendering/render_flow.cpp b/khtml/rendering/render_flow.cpp
index 2d56e8f40..97dd40468 100644
--- a/khtml/rendering/render_flow.cpp
+++ b/khtml/rendering/render_flow.cpp
@@ -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
diff --git a/khtml/rendering/render_form.cpp b/khtml/rendering/render_form.cpp
index de87072d1..a83c1788e 100644
--- a/khtml/rendering/render_form.cpp
+++ b/khtml/rendering/render_form.cpp
@@ -1450,7 +1450,7 @@ void TextAreaWidget::slotReplaceNext()
if (!(m_replace->options() & KReplaceDialog::PromptOnReplace)) {
viewport()->tqsetUpdatesEnabled(true);
- tqrepaintChanged();
+ repaintChanged();
}
if (res == KFind::NoMatch) { // at end
diff --git a/khtml/rendering/render_image.cpp b/khtml/rendering/render_image.cpp
index 1cd79eb55..b5357bba1 100644
--- a/khtml/rendering/render_image.cpp
+++ b/khtml/rendering/render_image.cpp
@@ -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());
}
}
diff --git a/khtml/rendering/render_layer.cpp b/khtml/rendering/render_layer.cpp
index 6c04079d9..3427bf1dc 100644
--- a/khtml/rendering/render_layer.cpp
+++ b/khtml/rendering/render_layer.cpp
@@ -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;
}
}
diff --git a/khtml/rendering/render_list.cpp b/khtml/rendering/render_list.cpp
index 515283f8b..c88f103d3 100644
--- a/khtml/rendering/render_list.cpp
+++ b/khtml/rendering/render_list.cpp
@@ -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()
diff --git a/khtml/rendering/render_object.cpp b/khtml/rendering/render_object.cpp
index 999bded25..89adbf548 100644
--- a/khtml/rendering/render_object.cpp
+++ b/khtml/rendering/render_object.cpp
@@ -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;
diff --git a/khtml/rendering/render_object.h b/khtml/rendering/render_object.h
index 2e67807c3..49e9065e4 100644
--- a/khtml/rendering/render_object.h
+++ b/khtml/rendering/render_object.h
@@ -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; }
diff --git a/khtml/rendering/render_table.cpp b/khtml/rendering/render_table.cpp
index 1910a90e4..337e9399d 100644
--- a/khtml/rendering/render_table.cpp
+++ b/khtml/rendering/render_table.cpp
@@ -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
diff --git a/khtml/rendering/render_table.h b/khtml/rendering/render_table.h
index b620b512c..a6de6cfaf 100644
--- a/khtml/rendering/render_table.h
+++ b/khtml/rendering/render_table.h
@@ -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;
diff --git a/kio/kfile/kdirselectdialog.cpp b/kio/kfile/kdirselectdialog.cpp
index 1b546148e..d33f7fadf 100644
--- a/kio/kfile/kdirselectdialog.cpp
+++ b/kio/kfile/kdirselectdialog.cpp
@@ -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();
}
}
diff --git a/kio/kfile/kfiledetailview.cpp b/kio/kfile/kfiledetailview.cpp
index 6643d5a4c..a68aec53b 100644
--- a/kio/kfile/kfiledetailview.cpp
+++ b/kio/kfile/kfiledetailview.cpp
@@ -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,
diff --git a/kio/kfile/kicondialog.cpp b/kio/kfile/kicondialog.cpp
index fe2fff202..ae83e880a 100644
--- a/kio/kfile/kicondialog.cpp
+++ b/kio/kfile/kicondialog.cpp
@@ -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)
diff --git a/kstyles/plastik/plastik.cpp b/kstyles/plastik/plastik.cpp
index 72ecdc8de..e1685d2cc 100644
--- a/kstyles/plastik/plastik.cpp
+++ b/kstyles/plastik/plastik.cpp
@@ -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;