summaryrefslogtreecommitdiffstats
path: root/khtml/rendering/render_image.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 /khtml/rendering/render_image.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 'khtml/rendering/render_image.cpp')
-rw-r--r--khtml/rendering/render_image.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/khtml/rendering/render_image.cpp b/khtml/rendering/render_image.cpp
index 5b438184c..120e75361 100644
--- a/khtml/rendering/render_image.cpp
+++ b/khtml/rendering/render_image.cpp
@@ -137,7 +137,7 @@ void RenderImage::setPixmap( const TQPixmap &p, const TQRect& r, CachedImage *o)
}
berrorPic = o->isErrorImage();
- bool needtqlayout = false;
+ bool needlayout = false;
// Image dimensions have been changed, see what needs to be done
if( o->pixmap_size().width() != intrinsicWidth() ||
@@ -152,7 +152,7 @@ void RenderImage::setPixmap( const TQPixmap &p, const TQRect& r, CachedImage *o)
setIntrinsicHeight( o->pixmap_size().height() );
}
- // lets see if we need to retqlayout at all..
+ // lets see if we need to relayout at all..
int oldwidth = m_width;
int oldheight = m_height;
int oldminwidth = m_minWidth;
@@ -164,7 +164,7 @@ void RenderImage::setPixmap( const TQPixmap &p, const TQRect& r, CachedImage *o)
}
if(iwchanged || m_width != oldwidth || m_height != oldheight)
- needtqlayout = true;
+ needlayout = true;
m_minWidth = oldminwidth;
m_width = oldwidth;
@@ -175,7 +175,7 @@ void RenderImage::setPixmap( const TQPixmap &p, const TQRect& r, CachedImage *o)
if ( !parent() )
return;
- if(needtqlayout)
+ if(needlayout)
{
if (!selfNeedsLayout())
setNeedsLayout(true);
@@ -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());
}
}
@@ -213,7 +213,7 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
if (paintInfo.phase != PaintActionForeground && paintInfo.phase != PaintActionSelection)
return;
- // not visible or not even once tqlayouted?
+ // not visible or not even once layouted?
if (style()->visibility() != VISIBLE || m_y <= -500000) return;
_tx += m_x;
@@ -376,7 +376,7 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
}
}
-void RenderImage::tqlayout()
+void RenderImage::layout()
{
KHTMLAssert( needsLayout());
KHTMLAssert( minMaxKnown() );
@@ -416,7 +416,7 @@ void RenderImage::notifyFinished(CachedObject *finishedObj)
if ( ( m_cachedImage == finishedObj || m_oldImage == finishedObj ) && m_oldImage ) {
m_oldImage->deref( this );
m_oldImage = 0;
- tqrepaint();
+ repaint();
}
RenderReplaced::notifyFinished(finishedObj);