From 7c71ab86d1f7e387fc3df63b48df07231f111862 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: Remove the tq in front of these incorrectly TQt4-converted methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- lib/kofficecore/KoOasisLoadingContext.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'lib/kofficecore/KoOasisLoadingContext.cpp') diff --git a/lib/kofficecore/KoOasisLoadingContext.cpp b/lib/kofficecore/KoOasisLoadingContext.cpp index e5082dc83..3db850e4a 100644 --- a/lib/kofficecore/KoOasisLoadingContext.cpp +++ b/lib/kofficecore/KoOasisLoadingContext.cpp @@ -68,21 +68,21 @@ void KoOasisLoadingContext::addStyles( const TQDomElement* style, const char* fa { Q_ASSERT( style ); if ( !style ) return; - // this recursive function is necessary as tqparent styles can have tqparents themselves + // this recursive function is necessary as tqparent styles can have parents themselves if ( style->hasAttributeNS( KoXmlNS::style, "tqparent-style-name" ) ) { - const TQString tqparentStyleName = style->attributeNS( KoXmlNS::style, "tqparent-style-name", TQString() ); - const TQDomElement* tqparentStyle = 0; + const TQString parentStyleName = style->attributeNS( KoXmlNS::style, "tqparent-style-name", TQString() ); + const TQDomElement* parentStyle = 0; if ( usingStylesAutoStyles ) { // When loading something from styles.xml, look into the styles.xml auto styles first - tqparentStyle = m_styles.findStyleAutoStyle( tqparentStyleName, family ); + parentStyle = m_styles.findStyleAutoStyle( parentStyleName, family ); // and fallback to looking at styles(), which includes the user styles from styles.xml } - if ( !tqparentStyle ) - tqparentStyle = m_styles.findStyle( tqparentStyleName, family ); - if ( tqparentStyle ) - addStyles( tqparentStyle, family, usingStylesAutoStyles ); + if ( !parentStyle ) + parentStyle = m_styles.findStyle( parentStyleName, family ); + if ( parentStyle ) + addStyles( parentStyle, family, usingStylesAutoStyles ); else - kdWarning(32500) << "Parent style not found: " << tqparentStyleName << endl; + kdWarning(32500) << "Parent style not found: " << parentStyleName << endl; } else if ( family ) { const TQDomElement* def = m_styles.defaultStyle( family ); -- cgit v1.2.3