summaryrefslogtreecommitdiffstats
path: root/khtml/rendering/render_generated.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_generated.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_generated.cpp')
-rw-r--r--khtml/rendering/render_generated.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/khtml/rendering/render_generated.cpp b/khtml/rendering/render_generated.cpp
index b067d5b9d..17c65fc9c 100644
--- a/khtml/rendering/render_generated.cpp
+++ b/khtml/rendering/render_generated.cpp
@@ -36,14 +36,14 @@ RenderCounterBase::RenderCounterBase(DOM::NodeImpl* node)
{
}
-void RenderCounterBase::tqlayout()
+void RenderCounterBase::layout()
{
KHTMLAssert( needsLayout() );
if ( !minMaxKnown() )
calcMinMaxWidth();
- RenderText::tqlayout();
+ RenderText::layout();
}
void RenderCounterBase::calcMinMaxWidth()
@@ -53,7 +53,7 @@ void RenderCounterBase::calcMinMaxWidth()
generateContent();
if (str) str->deref();
- str = new DOM::DOMStringImpl(m_item.tqunicode(), m_item.length());
+ str = new DOM::DOMStringImpl(m_item.unicode(), m_item.length());
str->ref();
RenderText::calcMinMaxWidth();