summaryrefslogtreecommitdiffstats
path: root/khtml/rendering/render_container.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 04:12:51 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 04:12:51 +0000
commit560378aaca1784ba19806a0414a32b20c744de39 (patch)
treece0dfd7c3febf2a1adc7603d1019a8be2083c415 /khtml/rendering/render_container.h
parentd4d5af1cdbd3cc65d095e0afc5b1f4260091cf5d (diff)
downloadtdelibs-560378aaca1784ba19806a0414a32b20c744de39.tar.gz
tdelibs-560378aaca1784ba19806a0414a32b20c744de39.zip
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
NOTE: This will not compile with Qt4 (yet), however it does compile with Qt3 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211081 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'khtml/rendering/render_container.h')
-rw-r--r--khtml/rendering/render_container.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/khtml/rendering/render_container.h b/khtml/rendering/render_container.h
index 4cf386140..fb80bfc55 100644
--- a/khtml/rendering/render_container.h
+++ b/khtml/rendering/render_container.h
@@ -42,7 +42,7 @@ public:
RenderObject *lastChild() const { return m_last; }
virtual bool childAllowed() const {
- // Prevent normal children when we are replaced by generated content
+ // Prevent normal children when we are tqreplaced by generated content
if (style()) return style()->useNormalContent();
return true;
}
@@ -53,7 +53,7 @@ public:
virtual void appendChildNode(RenderObject* child);
virtual void insertChildNode(RenderObject* child, RenderObject* before);
- virtual void layout();
+ virtual void tqlayout();
virtual void calcMinMaxWidth() { setMinMaxKnown( true ); }
virtual void removeLeftoverAnonymousBoxes();