diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 04:12:51 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 04:12:51 +0000 |
commit | 560378aaca1784ba19806a0414a32b20c744de39 (patch) | |
tree | ce0dfd7c3febf2a1adc7603d1019a8be2083c415 /khtml/rendering/render_generated.cpp | |
parent | d4d5af1cdbd3cc65d095e0afc5b1f4260091cf5d (diff) | |
download | tdelibs-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_generated.cpp')
-rw-r--r-- | khtml/rendering/render_generated.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/khtml/rendering/render_generated.cpp b/khtml/rendering/render_generated.cpp index 17c65fc9c..b067d5b9d 100644 --- a/khtml/rendering/render_generated.cpp +++ b/khtml/rendering/render_generated.cpp @@ -36,14 +36,14 @@ RenderCounterBase::RenderCounterBase(DOM::NodeImpl* node) { } -void RenderCounterBase::layout() +void RenderCounterBase::tqlayout() { KHTMLAssert( needsLayout() ); if ( !minMaxKnown() ) calcMinMaxWidth(); - RenderText::layout(); + RenderText::tqlayout(); } void RenderCounterBase::calcMinMaxWidth() @@ -53,7 +53,7 @@ void RenderCounterBase::calcMinMaxWidth() generateContent(); if (str) str->deref(); - str = new DOM::DOMStringImpl(m_item.unicode(), m_item.length()); + str = new DOM::DOMStringImpl(m_item.tqunicode(), m_item.length()); str->ref(); RenderText::calcMinMaxWidth(); |