diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-19 19:03:33 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-19 19:03:33 +0000 |
| commit | e69e8b1d09fb579316595b4e6a850e717358a8b1 (patch) | |
| tree | a24fc20865f65772f530d16177520190594ffdd2 /ksvg/impl/SVGLengthImpl.cc | |
| parent | eecec9afb81fdebb0f22e9da22635874c403f854 (diff) | |
| download | tdegraphics-e69e8b1d09fb579316595b4e6a850e717358a8b1.tar.gz tdegraphics-e69e8b1d09fb579316595b4e6a850e717358a8b1.zip | |
TQt4 port kdegraphics
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237557 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'ksvg/impl/SVGLengthImpl.cc')
| -rw-r--r-- | ksvg/impl/SVGLengthImpl.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ksvg/impl/SVGLengthImpl.cc b/ksvg/impl/SVGLengthImpl.cc index a8c9080c..da094837 100644 --- a/ksvg/impl/SVGLengthImpl.cc +++ b/ksvg/impl/SVGLengthImpl.cc @@ -282,9 +282,9 @@ void SVGLengthImpl::convertNumToPx() bool sizeLocal = (style->getFontSize() != -1); bool familyLocal = (style->getFontFamily() && style->getFontFamily()->getFirst()); - SVGStylableImpl *parentStyle = 0; + SVGStylableImpl *tqparentStyle = 0; if((!sizeLocal || !familyLocal) && m_context) - parentStyle = dynamic_cast<SVGStylableImpl *>(m_context->ownerDoc()->getElementFromHandle(m_context->parentNode().handle())); + tqparentStyle = dynamic_cast<SVGStylableImpl *>(m_context->ownerDoc()->getElementFromHandle(m_context->parentNode().handle())); // Look up font-size in a SAFE way, because at this place // processStyle() has NOT yet been called, so we need @@ -294,13 +294,13 @@ void SVGLengthImpl::convertNumToPx() if(sizeLocal) useSize = style->getFontSize(); - else if(parentStyle && parentStyle->getFontSize() != -1) - useSize = parentStyle->getFontSize(); + else if(tqparentStyle && tqparentStyle->getFontSize() != -1) + useSize = tqparentStyle->getFontSize(); if(familyLocal) useFont = style->getFontFamily()->getFirst()->string(); - else if(parentStyle && parentStyle->getFontFamily() && parentStyle->getFontFamily()->getFirst()) - useFont = parentStyle->getFontFamily()->getFirst()->string(); + else if(tqparentStyle && tqparentStyle->getFontFamily() && tqparentStyle->getFontFamily()->getFirst()) + useFont = tqparentStyle->getFontFamily()->getFirst()->string(); if(m_unitType == SVG_LENGTHTYPE_EMS) m_value = m_valueInSpecifiedUnits * useSize; |