summaryrefslogtreecommitdiffstats
path: root/khtml/rendering
diff options
context:
space:
mode:
Diffstat (limited to 'khtml/rendering')
-rw-r--r--khtml/rendering/bidi.cpp2
-rw-r--r--khtml/rendering/render_canvas.h2
-rw-r--r--khtml/rendering/render_object.cpp4
-rw-r--r--khtml/rendering/render_object.h4
-rw-r--r--khtml/rendering/render_replaced.cpp2
5 files changed, 7 insertions, 7 deletions
diff --git a/khtml/rendering/bidi.cpp b/khtml/rendering/bidi.cpp
index f2e64b5f8..30beadd7c 100644
--- a/khtml/rendering/bidi.cpp
+++ b/khtml/rendering/bidi.cpp
@@ -1329,7 +1329,7 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int breakBeforeLin
m_overflowHeight = 0;
- tqinvalidateVerticalPositions();
+ invalidateVerticalPositions();
#ifdef DEBUG_LAYOUT
TQTime qt;
qt.start();
diff --git a/khtml/rendering/render_canvas.h b/khtml/rendering/render_canvas.h
index f2822bc94..cd4ef30ca 100644
--- a/khtml/rendering/render_canvas.h
+++ b/khtml/rendering/render_canvas.h
@@ -137,7 +137,7 @@ protected:
void updateDocumentSize();
// internal setters for cached values of document width/height
- // Setting to -1/-1 tqinvalidates the cache.
+ // Setting to -1/-1 invalidates the cache.
void setCachedDocWidth(int w ) { m_cachedDocWidth = w; }
void setCachedDocHeight(int h) { m_cachedDocHeight = h; }
diff --git a/khtml/rendering/render_object.cpp b/khtml/rendering/render_object.cpp
index 89adbf548..8c4c8ab56 100644
--- a/khtml/rendering/render_object.cpp
+++ b/khtml/rendering/render_object.cpp
@@ -1923,12 +1923,12 @@ short RenderObject::baselinePosition( bool firstLine ) const
return fm.ascent() + ( lineHeight( firstLine) - fm.height() ) / 2;
}
-void RenderObject::tqinvalidateVerticalPositions()
+void RenderObject::invalidateVerticalPositions()
{
m_verticalPosition = PositionUndefined;
RenderObject *child = firstChild();
while( child ) {
- child->tqinvalidateVerticalPositions();
+ child->invalidateVerticalPositions();
child = child->nextSibling();
}
}
diff --git a/khtml/rendering/render_object.h b/khtml/rendering/render_object.h
index 49e9065e4..e403601d3 100644
--- a/khtml/rendering/render_object.h
+++ b/khtml/rendering/render_object.h
@@ -748,7 +748,7 @@ public:
virtual int highestPosition(bool /*includeOverflowInterior*/=true, bool /*includeSelf*/=true) const { return 0; }
// recursively tqinvalidate current layout
- // unused: void tqinvalidateLayout();
+ // unused: void invalidateLayout();
virtual void calcVerticalMargins() {}
void removeFromObjectLists();
@@ -790,7 +790,7 @@ protected:
virtual TQRect viewRect() const;
void remove();
- void tqinvalidateVerticalPositions();
+ void invalidateVerticalPositions();
bool attemptDirectLayerTranslation();
void updateWidgetMasks();
diff --git a/khtml/rendering/render_replaced.cpp b/khtml/rendering/render_replaced.cpp
index 49c5097f6..80632cc81 100644
--- a/khtml/rendering/render_replaced.cpp
+++ b/khtml/rendering/render_replaced.cpp
@@ -667,7 +667,7 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e)
break;
case TQEvent::Wheel:
- if (widget()->tqparentWidget() == view()->viewport()) {
+ if (widget()->parentWidget() == view()->viewport()) {
// don't allow the widget to react to wheel event unless its
// currently focused. this avoids accidentally changing a select box
// or something while wheeling a webpage.