summaryrefslogtreecommitdiffstats
path: root/karbon/core/vobject.cc
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
commit04766b207afba7961d4d802313e426f5a2fbef63 (patch)
treec888ea1027c793e2d0386a7e5a1a0cd077b03cb3 /karbon/core/vobject.cc
parentb6edfe41c9395f2e20784cbf0e630af6426950a3 (diff)
downloadkoffice-04766b207afba7961d4d802313e426f5a2fbef63.tar.gz
koffice-04766b207afba7961d4d802313e426f5a2fbef63.zip
rename the following methods:
tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'karbon/core/vobject.cc')
-rw-r--r--karbon/core/vobject.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/karbon/core/vobject.cc b/karbon/core/vobject.cc
index 5e9f74b6..897652c3 100644
--- a/karbon/core/vobject.cc
+++ b/karbon/core/vobject.cc
@@ -33,12 +33,12 @@
#include <KoOasisLoadingContext.h>
#include <KoOasisStyles.h>
-VObject::VObject( VObject* tqparent, VState state ) : m_dcop( 0L )
+VObject::VObject( VObject* parent, VState state ) : m_dcop( 0L )
{
m_stroke = 0L;
m_fill = 0L;
- m_parent = tqparent;
+ m_parent = parent;
m_state = state;
invalidateBoundingBox();
@@ -205,9 +205,9 @@ VObject::addStyles( const TQDomElement* style, KoOasisLoadingContext & context )
{
if(style)
{
- // this function is necessary as tqparent styles can have parents themself
- if( style->hasAttributeNS( KoXmlNS::style, "tqparent-style-name" ) )
- addStyles( context.oasisStyles().findStyle( style->attributeNS( KoXmlNS::style, "tqparent-style-name", TQString() ) ), context );
+ // this function is necessary as parent styles can have parents themself
+ if( style->hasAttributeNS( KoXmlNS::style, "parent-style-name" ) )
+ addStyles( context.oasisStyles().findStyle( style->attributeNS( KoXmlNS::style, "parent-style-name", TQString() ) ), context );
context.addStyles( style, "style-name" );
}
}
@@ -216,8 +216,8 @@ VDocument *
VObject::document() const
{
VObject *obj = (VObject *)this;
- while( obj->tqparent() )
- obj = obj->tqparent();
+ while( obj->parent() )
+ obj = obj->parent();
return dynamic_cast<VDocument *>( obj );
}