diff options
Diffstat (limited to 'lib/kofficecore')
27 files changed, 252 insertions, 252 deletions
diff --git a/lib/kofficecore/KoChild.h b/lib/kofficecore/KoChild.h index b79f6802..4734bbd4 100644 --- a/lib/kofficecore/KoChild.h +++ b/lib/kofficecore/KoChild.h @@ -158,7 +158,7 @@ public: /** * @return true if the child part is an orthogonal rectangle relative - * to its tqparents coordinate system. + * to its parents coordinate system. */ bool isRectangle() const; diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index 695599d2..e9d985aa 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -222,7 +222,7 @@ void KoBrowserExtension::print() view->print( printer ); } -KoDocument::KoDocument( TQWidget * tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode ) +KoDocument::KoDocument( TQWidget * parentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode ) : KParts::ReadWritePart( tqparent, name ) { if(s_documentList==0L) @@ -247,7 +247,7 @@ KoDocument::KoDocument( TQWidget * tqparentWidget, const char *widgetName, TQObj if ( singleViewMode ) { - d->m_wrapperWidget = new KoViewWrapperWidget( tqparentWidget, widgetName ); + d->m_wrapperWidget = new KoViewWrapperWidget( parentWidget, widgetName ); setWidget( d->m_wrapperWidget ); kdDebug(30003) << "creating KoBrowserExtension" << endl; (void) new KoBrowserExtension( this ); // ## only if embedded into a browser? diff --git a/lib/kofficecore/KoDocument.h b/lib/kofficecore/KoDocument.h index 0499ab6c..4051cca6 100644 --- a/lib/kofficecore/KoDocument.h +++ b/lib/kofficecore/KoDocument.h @@ -71,7 +71,7 @@ public: * Constructor. * The first 4 arguments are the same as the ones passed to KParts::Factory::createPart. * - * @param tqparentWidget the tqparent widget, in case we create a wrapper widget + * @param parentWidget the tqparent widget, in case we create a wrapper widget * (in single view mode). * Usually the first argument passed by KParts::Factory::createPart. * @param widgetName name of the widget. @@ -81,12 +81,12 @@ public: * pass a meaningful name here which matches the pattern [A-Za-z_][A-Za-z_0-9]*. * @param singleViewMode determines whether the document may only have one view. In this case * the @p tqparent must be a TQWidget derived class. KoDocument will then create a wrapper widget - * (KoViewWrapperWidget) which is a child of @p tqparentWidget. + * (KoViewWrapperWidget) which is a child of @p parentWidget. * This widget can be retrieved by calling widget(). * * @todo explain what the purpose of widgetName is. */ - KoDocument( TQWidget* tqparentWidget, + KoDocument( TQWidget* parentWidget, const char* widgetName, TQObject* tqparent, const char* name, @@ -459,9 +459,9 @@ public: * Initializes an empty document (display the template dialog!). * You have to overload this method to initialize all your document variables. * @param flags see InitDocFlags - * @param tqparentWidget the widget this document belongs with + * @param parentWidget the widget this document belongs with */ - virtual bool initDoc(InitDocFlags flags, TQWidget* tqparentWidget=0) = 0; + virtual bool initDoc(InitDocFlags flags, TQWidget* parentWidget=0) = 0; /** * Creates and shows the start up widget. @@ -798,12 +798,12 @@ public: /** * Indicates that this document is currently viewed * and thus should control the title caption. - * Also resets current flag for all tqparents. + * Also resets current flag for all parents. */ void setCurrent( bool on = true ); /** - * Sets current flag for this document and all its tqparents + * Sets current flag for this document and all its parents */ void forceCurrent( bool on ); bool isCurrent() const; diff --git a/lib/kofficecore/KoDocumentChild.cpp b/lib/kofficecore/KoDocumentChild.cpp index 308493ad..27d4a673 100644 --- a/lib/kofficecore/KoDocumentChild.cpp +++ b/lib/kofficecore/KoDocumentChild.cpp @@ -102,7 +102,7 @@ KoDocument *KoDocumentChild::document() const return d->m_doc; } -KoDocument* KoDocumentChild::tqparentDocument() const +KoDocument* KoDocumentChild::parentDocument() const { return d->m_parent; } @@ -349,9 +349,9 @@ bool KoDocumentChild::loadDocumentInternal( KoStore* store, const KoDocumentEntr // see KoDocument::insertChild for an explanation what's going on // now :-) - if ( tqparentDocument() ) + if ( parentDocument() ) { - KoDocument *tqparent = tqparentDocument(); + KoDocument *tqparent = parentDocument(); if ( tqparent->manager() && tqparent->manager()->parts() ) { diff --git a/lib/kofficecore/KoDocumentChild.h b/lib/kofficecore/KoDocumentChild.h index 228122dc..491f9b2d 100644 --- a/lib/kofficecore/KoDocumentChild.h +++ b/lib/kofficecore/KoDocumentChild.h @@ -73,7 +73,7 @@ public: * * @see KoDocument */ - virtual KoDocument *tqparentDocument() const; // TODO: remove virtual, makes no sense + virtual KoDocument *parentDocument() const; // TODO: remove virtual, makes no sense virtual KoDocument* hitTest( const TQPoint& p, const TQWMatrix& _matrix = TQWMatrix() ); diff --git a/lib/kofficecore/KoFilterChain.cpp b/lib/kofficecore/KoFilterChain.cpp index ecade093..e10e624b 100644 --- a/lib/kofficecore/KoFilterChain.cpp +++ b/lib/kofficecore/KoFilterChain.cpp @@ -46,7 +46,7 @@ KoFilterChain::ChainLink::ChainLink( KoFilterChain* chain, KoFilterEntry::Ptr fi { } -KoFilter::ConversiontqStatus KoFilterChain::ChainLink::invokeFilter( const ChainLink* const tqparentChainLink ) +KoFilter::ConversiontqStatus KoFilterChain::ChainLink::invokeFilter( const ChainLink* const parentChainLink ) { if ( !m_filterEntry ) { kdError( 30500 ) << "This filter entry is null. Strange stuff going on." << endl; @@ -60,8 +60,8 @@ KoFilter::ConversiontqStatus KoFilterChain::ChainLink::invokeFilter( const Chain return KoFilter::CreationError; } - if ( tqparentChainLink ) - setupCommunication( tqparentChainLink->m_filter ); + if ( parentChainLink ) + setupCommunication( parentChainLink->m_filter ); KoFilter::ConversiontqStatus status = m_filter->convert( m_from, m_to ); delete m_filter; @@ -81,22 +81,22 @@ int KoFilterChain::ChainLink::lruPartIndex() const return -1; } -void KoFilterChain::ChainLink::setupCommunication( const KoFilter* const tqparentFilter ) const +void KoFilterChain::ChainLink::setupCommunication( const KoFilter* const parentFilter ) const { // progress information TQObject::connect( m_filter, TQT_SIGNAL( sigProgress( int ) ), m_chain->manager(), TQT_SIGNAL( sigProgress( int ) ) ); - if ( !tqparentFilter ) + if ( !parentFilter ) return; - const TQMetaObject* const tqparent = tqparentFilter->tqmetaObject(); + const TQMetaObject* const tqparent = parentFilter->tqmetaObject(); const TQMetaObject* const child = m_filter->tqmetaObject(); if ( !tqparent || !child ) return; - setupConnections( tqparentFilter, tqparent->signalNames(), m_filter, child->slotNames() ); - setupConnections( m_filter, child->signalNames(), tqparentFilter, tqparent->slotNames() ); + setupConnections( parentFilter, tqparent->signalNames(), m_filter, child->slotNames() ); + setupConnections( m_filter, child->signalNames(), parentFilter, tqparent->slotNames() ); } void KoFilterChain::ChainLink::setupConnections( const KoFilter* sender, const TQStrList& sigs, @@ -139,15 +139,15 @@ KoFilter::ConversiontqStatus KoFilterChain::invokeChain() int count = m_chainLinks.count(); // This is needed due to nasty Microsoft design - const ChainLink* tqparentChainLink = 0; + const ChainLink* parentChainLink = 0; if ( filterManagerParentChain() ) - tqparentChainLink = filterManagerParentChain()->m_chainLinks.current(); + parentChainLink = filterManagerParentChain()->m_chainLinks.current(); // No iterator here, as we need m_chainLinks.current() in outputDocument() m_chainLinks.first(); for ( ; count > 1 && m_chainLinks.current() && status == KoFilter::OK; m_chainLinks.next(), --count ) { - status = m_chainLinks.current()->invokeFilter( tqparentChainLink ); + status = m_chainLinks.current()->invokeFilter( parentChainLink ); m_state = Middle; manageIO(); } @@ -162,7 +162,7 @@ KoFilter::ConversiontqStatus KoFilterChain::invokeChain() m_state |= End; else m_state = End; - status = m_chainLinks.current()->invokeFilter( tqparentChainLink ); + status = m_chainLinks.current()->invokeFilter( parentChainLink ); manageIO(); } @@ -373,7 +373,7 @@ int KoFilterChain::filterManagerDirection() const KoFilterChain* const KoFilterChain::filterManagerParentChain() const { - return m_manager->tqparentChain(); + return m_manager->parentChain(); } void KoFilterChain::manageIO() diff --git a/lib/kofficecore/KoFilterChain.h b/lib/kofficecore/KoFilterChain.h index 2936ae40..7760a217 100644 --- a/lib/kofficecore/KoFilterChain.h +++ b/lib/kofficecore/KoFilterChain.h @@ -182,7 +182,7 @@ private: ChainLink( KoFilterChain* chain, KoFilterEntry::Ptr filterEntry, const TQCString& from, const TQCString& to ); - KoFilter::ConversiontqStatus invokeFilter( const ChainLink* const tqparentChainLink ); + KoFilter::ConversiontqStatus invokeFilter( const ChainLink* const parentChainLink ); TQCString from() const { return m_from; } TQCString to() const { return m_to; } @@ -198,7 +198,7 @@ private: ChainLink( const ChainLink& rhs ); ChainLink& operator=( const ChainLink& rhs ); - void setupCommunication( const KoFilter* const tqparentFilter ) const; + void setupCommunication( const KoFilter* const parentFilter ) const; void setupConnections( const KoFilter* sender, const TQStrList& sigs, const KoFilter* receiver, const TQStrList& sl0ts ) const; diff --git a/lib/kofficecore/KoFilterManager.cpp b/lib/kofficecore/KoFilterManager.cpp index 46c20c2f..bc4d48bc 100644 --- a/lib/kofficecore/KoFilterManager.cpp +++ b/lib/kofficecore/KoFilterManager.cpp @@ -125,8 +125,8 @@ KoFilterManager::KoFilterManager( KoDocument* document ) : KoFilterManager::KoFilterManager( const TQString& url, const TQCString& mimetypeHint, - KoFilterChain* const tqparentChain ) : - m_document( 0 ), m_parentChain( tqparentChain ), m_importUrl( url ), m_importUrlMimetypeHint( mimetypeHint ), + KoFilterChain* const parentChain ) : + m_document( 0 ), m_parentChain( parentChain ), m_importUrl( url ), m_importUrlMimetypeHint( mimetypeHint ), m_graph( "" ), d( 0 ) { d = new KoFilterManager::Private; diff --git a/lib/kofficecore/KoFilterManager.h b/lib/kofficecore/KoFilterManager.h index 8405f49b..de75bf27 100644 --- a/lib/kofficecore/KoFilterManager.h +++ b/lib/kofficecore/KoFilterManager.h @@ -66,11 +66,11 @@ public: * to specify this information only if the automatic detection will * fail because e.g. you saved an embedded stream to a *.tmp file. * Most likely you do not have to care about that. - * @param tqparentChain The tqparent filter chain of this filter manager. Used + * @param parentChain The tqparent filter chain of this filter manager. Used * to allow embedding for filters. Most likely you do not have to care. */ KoFilterManager( const TQString& url, const TQCString& mimetypeHint = "", - KoFilterChain* const tqparentChain = 0 ); + KoFilterChain* const parentChain = 0 ); virtual ~KoFilterManager(); @@ -152,7 +152,7 @@ private: friend int KoFilterChain::filterManagerDirection() const; int direction() const { return static_cast<int>( m_direction ); } friend KoFilterChain* const KoFilterChain::filterManagerParentChain() const; - KoFilterChain* const tqparentChain() const { return m_parentChain; } + KoFilterChain* const parentChain() const { return m_parentChain; } // Private API KoFilterManager( const KoFilterManager& rhs ); diff --git a/lib/kofficecore/KoFrame.cpp b/lib/kofficecore/KoFrame.cpp index b6f77b8a..e8722eaa 100644 --- a/lib/kofficecore/KoFrame.cpp +++ b/lib/kofficecore/KoFrame.cpp @@ -251,7 +251,7 @@ void KoFrame::mouseMoveEvent( TQMouseEvent* ev ) { if ( d->m_mode == 0 ) { - TQPoint p = tqparentWidget()->mapFromGlobal( ev->globalPos() ); + TQPoint p = parentWidget()->mapFromGlobal( ev->globalPos() ); move( TQPoint( p.x() + d->m_framePos.x() - d->m_mousePressPos.x(), p.y() + d->m_framePos.y() - d->m_mousePressPos.y() ) ); // The other modes change the tqgeometry so they call resizeEvent. @@ -261,7 +261,7 @@ void KoFrame::mouseMoveEvent( TQMouseEvent* ev ) } else if ( d->m_mode == 1 ) { - TQPoint p = tqparentWidget()->mapFromGlobal( ev->globalPos() ); + TQPoint p = parentWidget()->mapFromGlobal( ev->globalPos() ); int w = TQMIN( TQMAX( d->m_width + d->m_mousePressPos.x() - p.x(), minimumWidth() ), maximumWidth() ); int h = TQMIN( TQMAX( d->m_height + d->m_mousePressPos.y() - p.y(), minimumHeight() ), maximumHeight() ); setGeometry( d->m_framePos.x() - w + d->m_width, @@ -269,7 +269,7 @@ void KoFrame::mouseMoveEvent( TQMouseEvent* ev ) } else if ( d->m_mode == 2 ) { - TQPoint p = tqparentWidget()->mapFromGlobal( ev->globalPos() ); + TQPoint p = parentWidget()->mapFromGlobal( ev->globalPos() ); int w = TQMIN( TQMAX( d->m_width + d->m_mousePressPos.x() - p.x(), minimumWidth() ), maximumWidth() ); int h = TQMIN( TQMAX( d->m_height - d->m_mousePressPos.y() + p.y(), minimumHeight() ), maximumHeight() ); setGeometry( d->m_framePos.x() - w + d->m_width, @@ -277,14 +277,14 @@ void KoFrame::mouseMoveEvent( TQMouseEvent* ev ) } else if ( d->m_mode == 3 ) { - TQPoint p = tqparentWidget()->mapFromGlobal( ev->globalPos() ); + TQPoint p = parentWidget()->mapFromGlobal( ev->globalPos() ); int w = TQMIN( TQMAX( d->m_width - d->m_mousePressPos.x() + p.x(), minimumWidth() ), maximumWidth() ); int h = TQMIN( TQMAX( d->m_height - d->m_mousePressPos.y() + p.y(), minimumHeight() ), maximumHeight() ); resize( w, h ); } else if ( d->m_mode == 4 ) { - TQPoint p = tqparentWidget()->mapFromGlobal( ev->globalPos() ); + TQPoint p = parentWidget()->mapFromGlobal( ev->globalPos() ); int w = TQMIN( TQMAX( d->m_width - d->m_mousePressPos.x() + p.x(), minimumWidth() ), maximumWidth() ); int h = TQMIN( TQMAX( d->m_height + d->m_mousePressPos.y() - p.y(), minimumHeight() ), maximumHeight() ); setGeometry( d->m_framePos.x(), @@ -292,27 +292,27 @@ void KoFrame::mouseMoveEvent( TQMouseEvent* ev ) } else if ( d->m_mode == 5 ) { - TQPoint p = tqparentWidget()->mapFromGlobal( ev->globalPos() ); + TQPoint p = parentWidget()->mapFromGlobal( ev->globalPos() ); int h = TQMIN( TQMAX( d->m_height + d->m_mousePressPos.y() - p.y(), minimumHeight() ), maximumHeight() ); setGeometry( d->m_framePos.x(), d->m_framePos.y() - h + d->m_height, d->m_width, h ); } else if ( d->m_mode == 6 ) { - TQPoint p = tqparentWidget()->mapFromGlobal( ev->globalPos() ); + TQPoint p = parentWidget()->mapFromGlobal( ev->globalPos() ); int h = TQMIN( TQMAX( d->m_height - d->m_mousePressPos.y() + p.y(), minimumHeight() ), maximumHeight() ); resize( d->m_width, h ); } else if ( d->m_mode == 7 ) { - TQPoint p = tqparentWidget()->mapFromGlobal( ev->globalPos() ); + TQPoint p = parentWidget()->mapFromGlobal( ev->globalPos() ); int w = TQMIN( TQMAX( d->m_width + d->m_mousePressPos.x() - p.x(), minimumWidth() ), maximumWidth() ); setGeometry( d->m_framePos.x() - w + d->m_width, d->m_framePos.y(), w, d->m_height ); } else if ( d->m_mode == 8 ) { - TQPoint p = tqparentWidget()->mapFromGlobal( ev->globalPos() ); + TQPoint p = parentWidget()->mapFromGlobal( ev->globalPos() ); int w = TQMIN( TQMAX( d->m_width - d->m_mousePressPos.x() + p.x(), minimumWidth() ), maximumWidth() ); resize( w, d->m_height ); } diff --git a/lib/kofficecore/KoGenStyles.cpp b/lib/kofficecore/KoGenStyles.cpp index 0ee2e730..68b8477a 100644 --- a/lib/kofficecore/KoGenStyles.cpp +++ b/lib/kofficecore/KoGenStyles.cpp @@ -35,29 +35,29 @@ TQString KoGenStyles::lookup( const KoGenStyle& style, const TQString& name, int if ( it == m_styleMap.end() ) { // Not found, try if this style is in fact equal to its tqparent (the find above // wouldn't have found it, due to m_parentName being set). - if ( !style.tqparentName().isEmpty() ) { + if ( !style.parentName().isEmpty() ) { KoGenStyle testStyle( style ); - const KoGenStyle* tqparentStyle = this->style( style.tqparentName() ); // ## linear search - if( !tqparentStyle ) { - kdDebug(30003) << "KoGenStyles::lookup(" << name << "): tqparent style '" << style.tqparentName() << "' not found in collection" << endl; + const KoGenStyle* parentStyle = this->style( style.parentName() ); // ## linear search + if( !parentStyle ) { + kdDebug(30003) << "KoGenStyles::lookup(" << name << "): tqparent style '" << style.parentName() << "' not found in collection" << endl; } else { - if ( testStyle.m_familyName != tqparentStyle->m_familyName ) + if ( testStyle.m_familyName != parentStyle->m_familyName ) { - kdWarning(30003) << "KoGenStyles::lookup(" << name << ", family=" << testStyle.m_familyName << ") tqparent style '" << style.tqparentName() << "' has a different family: " << tqparentStyle->m_familyName << endl; + kdWarning(30003) << "KoGenStyles::lookup(" << name << ", family=" << testStyle.m_familyName << ") tqparent style '" << style.parentName() << "' has a different family: " << parentStyle->m_familyName << endl; } - testStyle.m_parentName = tqparentStyle->m_parentName; + testStyle.m_parentName = parentStyle->m_parentName; // Exclude the type from the comparison. It's ok for an auto style // to have a user style as tqparent; they can still be identical - testStyle.m_type = tqparentStyle->m_type; + testStyle.m_type = parentStyle->m_type; // Also it's ok to not have the display name of the tqparent style // in the auto style - TQMap<TQString, TQString>::const_iterator it = tqparentStyle->m_attributes.tqfind( "style:display-name" ); - if ( it != tqparentStyle->m_attributes.end() ) + TQMap<TQString, TQString>::const_iterator it = parentStyle->m_attributes.tqfind( "style:display-name" ); + if ( it != parentStyle->m_attributes.end() ) testStyle.addAttribute( "style:display-name", *it ); - if ( *tqparentStyle == testStyle ) - return style.tqparentName(); + if ( *parentStyle == testStyle ) + return style.parentName(); } } @@ -173,8 +173,8 @@ static int compareMap( const TQMap<TQString, TQString>& map1, const TQMap<TQStri KoGenStyle::KoGenStyle( int type, const char* familyName, - const TQString& tqparentName ) - : m_type( type ), m_familyName( familyName ), m_parentName( tqparentName ), + const TQString& parentName ) + : m_type( type ), m_familyName( familyName ), m_parentName( parentName ), m_autoStyleInStylesDotXml( false ), m_defaultStyle( false ) { } @@ -184,14 +184,14 @@ KoGenStyle::~KoGenStyle() } void KoGenStyle::writeStyleProperties( KoXmlWriter* writer, PropertyType i, - const char* elementName, const KoGenStyle* tqparentStyle ) const + const char* elementName, const KoGenStyle* parentStyle ) const { if ( !m_properties[i].isEmpty() ) { writer->startElement( elementName ); TQMap<TQString, TQString>::const_iterator it = m_properties[i].begin(); const TQMap<TQString, TQString>::const_iterator end = m_properties[i].end(); for ( ; it != end; ++it ) { - if ( !tqparentStyle || tqparentStyle->property( it.key(), i ) != it.data() ) + if ( !parentStyle || parentStyle->property( it.key(), i ) != it.data() ) writer->addAttribute( it.key().utf8(), it.data().utf8() ); } writer->endElement(); @@ -202,19 +202,19 @@ void KoGenStyle::writeStyle( KoXmlWriter* writer, KoGenStyles& styles, const cha { //kdDebug(30003) << "writing out style " << name << " display-name=" << m_attributes["style:display-name"] << " family=" << m_familyName << endl; writer->startElement( elementName ); - const KoGenStyle* tqparentStyle = 0; + const KoGenStyle* parentStyle = 0; if ( !m_defaultStyle ) { if ( !drawElement ) writer->addAttribute( "style:name", name ); else writer->addAttribute( "draw:name", name ); if ( !m_parentName.isEmpty() ) { - tqparentStyle = styles.style( m_parentName ); - if ( tqparentStyle && m_familyName.isEmpty() ) { + parentStyle = styles.style( m_parentName ); + if ( parentStyle && m_familyName.isEmpty() ) { // get family from tqparent style, just in case // Note: this is saving code, don't convert to attributeNS! const_cast<KoGenStyle *>( this )-> - m_familyName = tqparentStyle->attribute( "style:family" ).latin1(); + m_familyName = parentStyle->attribute( "style:family" ).latin1(); //kdDebug(30003) << "Got familyname " << m_familyName << " from tqparent" << endl; } writer->addAttribute( "style:tqparent-style-name", m_parentName ); @@ -234,9 +234,9 @@ void KoGenStyle::writeStyle( KoXmlWriter* writer, KoGenStyles& styles, const cha #if 0 // #ifndef NDEBUG kdDebug() << "style: " << name << endl; printDebug(); - if ( tqparentStyle ) { + if ( parentStyle ) { kdDebug() << " tqparent: " << m_parentName << endl; - tqparentStyle->printDebug(); + parentStyle->printDebug(); } #endif @@ -247,8 +247,8 @@ void KoGenStyle::writeStyle( KoXmlWriter* writer, KoGenStyles& styles, const cha TQMap<TQString, TQString>::const_iterator it = m_attributes.begin(); for ( ; it != m_attributes.end(); ++it ) { bool writeit = true; - if ( tqparentStyle && it.key() != "style:family" // always write the family out - && tqparentStyle->attribute( it.key() ) == it.data() ) + if ( parentStyle && it.key() != "style:family" // always write the family out + && parentStyle->attribute( it.key() ) == it.data() ) writeit = false; if ( writeit ) writer->addAttribute( it.key().utf8(), it.data().utf8() ); @@ -261,27 +261,27 @@ void KoGenStyle::writeStyle( KoXmlWriter* writer, KoGenStyles& styles, const cha writer->startElement( propertiesElementName ); // e.g. paragraph-properties it = m_properties[i].begin(); for ( ; it != m_properties[i].end(); ++it ) { - if ( !tqparentStyle || tqparentStyle->property( it.key(), i ) != it.data() ) + if ( !parentStyle || parentStyle->property( it.key(), i ) != it.data() ) writer->addAttribute( it.key().utf8(), it.data().utf8() ); } i = KoGenStyle::ChildElement; it = m_properties[i].begin(); for ( ; it != m_properties[i].end(); ++it ) { - if ( !tqparentStyle || tqparentStyle->property( it.key(), i ) != it.data() ) { + if ( !parentStyle || parentStyle->property( it.key(), i ) != it.data() ) { writer->addCompleteElement( it.data().utf8() ); } } if ( createPropertiesTag ) writer->endElement(); } - writeStyleProperties( writer, KoGenStyle::GraphicType, "style:graphic-properties", tqparentStyle ); - writeStyleProperties( writer, KoGenStyle::ParagraphType, "style:paragraph-properties", tqparentStyle ); - writeStyleProperties( writer, KoGenStyle::TextType, "style:text-properties", tqparentStyle ); + writeStyleProperties( writer, KoGenStyle::GraphicType, "style:graphic-properties", parentStyle ); + writeStyleProperties( writer, KoGenStyle::ParagraphType, "style:paragraph-properties", parentStyle ); + writeStyleProperties( writer, KoGenStyle::TextType, "style:text-properties", parentStyle ); // And now the style maps for ( uint i = 0; i < m_maps.count(); ++i ) { bool writeit = true; - if ( tqparentStyle && compareMap( m_maps[i], tqparentStyle->m_maps[i] ) == 0 ) + if ( parentStyle && compareMap( m_maps[i], parentStyle->m_maps[i] ) == 0 ) writeit = false; if ( writeit ) { writer->startElement( "style:map" ); diff --git a/lib/kofficecore/KoGenStyles.h b/lib/kofficecore/KoGenStyles.h index 17771c69..ad25609e 100644 --- a/lib/kofficecore/KoGenStyles.h +++ b/lib/kofficecore/KoGenStyles.h @@ -216,10 +216,10 @@ public: * @param familyName The value for style:family, e.g. text, paragraph, graphic etc. * The family is for style:style elements only; number styles and list styles don't have one. * - * @param tqparentName If set, name of the tqparent style from which this one inherits. + * @param parentName If set, name of the tqparent style from which this one inherits. */ explicit KoGenStyle( int type = 0, const char* familyName = 0, - const TQString& tqparentName = TQString() ); + const TQString& parentName = TQString() ); ~KoGenStyle(); /* @@ -250,7 +250,7 @@ public: const char* familyName() const { return m_familyName.data(); } /// Return the name of style's tqparent, if set - TQString tqparentName() const { return m_parentName; } + TQString parentName() const { return m_parentName; } /** * @brief The types of properties @@ -434,7 +434,7 @@ private: } void writeStyleProperties( KoXmlWriter* writer, PropertyType i, - const char* elementName, const KoGenStyle* tqparentStyle ) const; + const char* elementName, const KoGenStyle* parentStyle ) const; #ifndef NDEBUG void printDebug() const; diff --git a/lib/kofficecore/KoOasisLoadingContext.cpp b/lib/kofficecore/KoOasisLoadingContext.cpp index e5082dc8..3db850e4 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 ); diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp index b8c0c098..fd42bcf3 100644 --- a/lib/kofficecore/KoSpeaker.cpp +++ b/lib/kofficecore/KoSpeaker.cpp @@ -224,7 +224,7 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/) TQString text; if (w->inherits("TQViewportWidget")) { - w = w->tqparentWidget(); + w = w->parentWidget(); if (!w) return false; } diff --git a/lib/kofficecore/KoStyleStack.cpp b/lib/kofficecore/KoStyleStack.cpp index 22799209..9920c289 100644 --- a/lib/kofficecore/KoStyleStack.cpp +++ b/lib/kofficecore/KoStyleStack.cpp @@ -258,7 +258,7 @@ bool KoStyleStack::isUserStyle( const TQDomElement& e, const TQString& family ) { if ( e.attributeNS( m_styleNSURI, "family", TQString() ) != family ) return false; - const TQDomElement tqparent = e.tqparentNode().toElement(); + const TQDomElement tqparent = e.parentNode().toElement(); //kdDebug(30003) << k_funcinfo << "tagName=" << e.tagName() << " tqparent-tagName=" << tqparent.tagName() << endl; return tqparent.localName() == "styles" /*&& tqparent.namespaceURI() == KoXmlNS::office*/; } diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp index cfb508a4..cebd61be 100644 --- a/lib/kofficecore/KoView.cpp +++ b/lib/kofficecore/KoView.cpp @@ -361,7 +361,7 @@ void KoView::partActivateEvent( KParts::PartActivateEvent *event ) emit childDeactivated( child ); } else - emit tqinvalidated(); + emit invalidated(); } else emit activated( event->activated() ); @@ -390,7 +390,7 @@ void KoView::partSelectEvent( KParts::PartSelectEvent *event ) emit childUnselected( child ); } else - emit tqinvalidated(); + emit invalidated(); } else emit selected( event->selected() ); @@ -723,20 +723,20 @@ KoViewChild::KoViewChild( KoDocumentChild *child, KoView *_parentView ) m_parentView = _parentView; m_child = child; - m_frame = new KoFrame( tqparentView()->canvas() ); + m_frame = new KoFrame( parentView()->canvas() ); KoView *view = child->document()->createView( m_frame ); view->setXMLGUIBuildDocument( child->document()->viewBuildDocument( view ) ); - view->setPartManager( tqparentView()->partManager() ); + view->setPartManager( parentView()->partManager() ); // hack? (Werner) - view->setZoom( tqparentView()->zoom() * TQMAX(child->xScaling(), child->yScaling()) ); + view->setZoom( parentView()->zoom() * TQMAX(child->xScaling(), child->yScaling()) ); m_frame->setView( view ); m_frame->show(); m_frame->raise(); - tqparentView()->canvasAddChild( this ); + parentView()->canvasAddChild( this ); /* @@ -764,7 +764,7 @@ KoViewChild::KoViewChild( KoDocumentChild *child, KoView *_parentView ) // also called right after activation. connect( view, TQT_SIGNAL( activated( bool ) ), - tqparentView(), TQT_SLOT( slotChildActivated( bool ) ) ); + parentView(), TQT_SLOT( slotChildActivated( bool ) ) ); } KoViewChild::~KoViewChild() @@ -782,8 +782,8 @@ void KoViewChild::slotFrameGeometryChanged() // Set our tqgeometry from the frame tqgeometry (R2 reversed) TQRect geom = m_frame->tqgeometry(); int b = m_frame->border(); - TQRect borderRect( geom.x() + b + tqparentView()->canvasXOffset(), - geom.y() + b + tqparentView()->canvasYOffset(), + TQRect borderRect( geom.x() + b + parentView()->canvasXOffset(), + geom.y() + b + parentView()->canvasYOffset(), geom.width() - b * 2, geom.height() - b * 2 ); setGeometry( borderRect ); @@ -791,14 +791,14 @@ void KoViewChild::slotFrameGeometryChanged() if(m_child) { // Set the child tqgeometry from the frame tqgeometry (R1 reversed) - TQRect borderLessRect( geom.x() + m_frame->leftBorder() + tqparentView()->canvasXOffset(), - geom.y() + m_frame->topBorder() + tqparentView()->canvasYOffset(), + TQRect borderLessRect( geom.x() + m_frame->leftBorder() + parentView()->canvasXOffset(), + geom.y() + m_frame->topBorder() + parentView()->canvasYOffset(), geom.width() - m_frame->leftBorder() - m_frame->rightBorder(), geom.height() - m_frame->topBorder() - m_frame->bottomBorder() ); // We don't want to trigger slotDocGeometryChanged again lock(); - TQRect childGeom = tqparentView()->reverseViewTransformations( borderLessRect ); + TQRect childGeom = parentView()->reverseViewTransformations( borderLessRect ); kdDebug() << "KoChild::slotFrameGeometryChanged child tqgeometry " << ( tqgeometry() == childGeom ? "already " : "set to " ) << childGeom << endl; @@ -813,9 +813,9 @@ void KoViewChild::slotDocGeometryChanged() return; // Set frame tqgeometry from child tqgeometry (R1) // The frame's resizeEvent will call slotFrameGeometryChanged. - TQRect geom = tqparentView()->applyViewTransformations( m_child->tqgeometry() ); - TQRect borderRect( geom.x() - m_frame->leftBorder() - tqparentView()->canvasXOffset(), - geom.y() - m_frame->topBorder() - tqparentView()->canvasYOffset(), + TQRect geom = parentView()->applyViewTransformations( m_child->tqgeometry() ); + TQRect borderRect( geom.x() - m_frame->leftBorder() - parentView()->canvasXOffset(), + geom.y() - m_frame->topBorder() - parentView()->canvasYOffset(), geom.width() + m_frame->leftBorder() + m_frame->rightBorder(), geom.height() + m_frame->topBorder() + m_frame->bottomBorder() ); kdDebug() << "KoViewChild::slotDocGeometryChanged frame tqgeometry " diff --git a/lib/kofficecore/KoView.h b/lib/kofficecore/KoView.h index dcab6745..42d78fb6 100644 --- a/lib/kofficecore/KoView.h +++ b/lib/kofficecore/KoView.h @@ -438,7 +438,7 @@ signals: void regionInvalidated( const TQRegion ®ion, bool erase ); - void tqinvalidated(); + void invalidated(); // KDE invents public signals :) #undef signals @@ -479,7 +479,7 @@ public: virtual ~KoViewChild(); KoDocumentChild *documentChild() const { return m_child; } - KoView *tqparentView() const { return m_parentView; } + KoView *parentView() const { return m_parentView; } KoFrame *frame() const { return m_frame; } void setInitialFrameGeometry(); diff --git a/lib/kofficecore/KoXmlReader.cpp b/lib/kofficecore/KoXmlReader.cpp index 323d0ad6..371b4d29 100644 --- a/lib/kofficecore/KoXmlReader.cpp +++ b/lib/kofficecore/KoXmlReader.cpp @@ -305,7 +305,7 @@ KoXmlNodeData::KoXmlNodeData() fastLoading = false; // assume true, it will be set to false by XML parser when this node - // aptqparently has tqchildren AND the tqchildren are not loaded + // apparently has tqchildren AND the tqchildren are not loaded loaded = true; } @@ -1107,7 +1107,7 @@ KoXmlDocument KoXmlNode::ownerDocument() const return KoXmlDocument( node ); } -KoXmlNode KoXmlNode::tqparentNode() const +KoXmlNode KoXmlNode::parentNode() const { return d->tqparent ? KoXmlNode( d->tqparent ) : KoXmlNode(); } @@ -1519,7 +1519,7 @@ TQString* errorMsg, int* errorLine, int* errorColumn ) reader.setFeature( "http://xml.org/sax/features/namespace-prefixes", !namespaceProcessing ); reader.setFeature( "http://trolltech.com/xml/features/report-whitespace-only-CharData", false ); - // FIXME this hack is aptqparently private + // FIXME this hack is apparently private //reader.setUndefEntityInAttrHack(true); TQXmlInputSource source( device ); diff --git a/lib/kofficecore/KoXmlReader.h b/lib/kofficecore/KoXmlReader.h index 919e566b..d4505398 100644 --- a/lib/kofficecore/KoXmlReader.h +++ b/lib/kofficecore/KoXmlReader.h @@ -101,7 +101,7 @@ public: virtual TQString localName() const; KoXmlDocument ownerDocument() const; - KoXmlNode tqparentNode() const; + KoXmlNode parentNode() const; bool hasChildNodes() const; KoXmlNode firstChild() const; diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp index 39f95948..a45e1334 100644 --- a/lib/kofficecore/kkbdaccessextensions.cpp +++ b/lib/kofficecore/kkbdaccessextensions.cpp @@ -412,8 +412,8 @@ void KKbdAccessExtensions::showIcon() TQDockWindow* dockWindow = dynamic_cast<TQDockWindow *>(d->panel); p = dockWindow->pos(); if (dockWindow->area()) { - // kdDebug() << "KKbdAccessExtensions::showIcon: pos = " << p << " of window = " << dockWindow->tqparentWidget()->name() << endl; - p = dockWindow->tqparentWidget()->mapTo(dockWindow->tqtopLevelWidget(), p); + // kdDebug() << "KKbdAccessExtensions::showIcon: pos = " << p << " of window = " << dockWindow->parentWidget()->name() << endl; + p = dockWindow->parentWidget()->mapTo(dockWindow->tqtopLevelWidget(), p); // kdDebug() << "KKbdAccessExtensions::showIcon: mapTo = " << p << " of window = " << dockWindow->tqtopLevelWidget()->name() << endl; // TODO: How to get the handle width? if (d->handleNdx == 1) { diff --git a/lib/kofficecore/koDetailsPaneBase.ui b/lib/kofficecore/koDetailsPaneBase.ui index 056cd852..c29e4a46 100644 --- a/lib/kofficecore/koDetailsPaneBase.ui +++ b/lib/kofficecore/koDetailsPaneBase.ui @@ -228,8 +228,8 @@ <tabstop>m_alwaysUseCheckBox</tabstop> <tabstop>m_detailsLabel</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>klistview.h</includehint> <includehint>ktextbrowser.h</includehint> diff --git a/lib/kofficecore/koDocumentInfoAboutWidget.ui b/lib/kofficecore/koDocumentInfoAboutWidget.ui index 2581cf07..cf65eb81 100644 --- a/lib/kofficecore/koDocumentInfoAboutWidget.ui +++ b/lib/kofficecore/koDocumentInfoAboutWidget.ui @@ -339,8 +339,8 @@ <tabstop>leDocKeywords</tabstop> <tabstop>meDocAbstract</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/lib/kofficecore/koDocumentInfoAuthorWidget.ui b/lib/kofficecore/koDocumentInfoAuthorWidget.ui index cb3a6ce0..60353b91 100644 --- a/lib/kofficecore/koDocumentInfoAuthorWidget.ui +++ b/lib/kofficecore/koDocumentInfoAuthorWidget.ui @@ -289,8 +289,8 @@ <tabstop>leCountry</tabstop> <tabstop>pbLoadKABC</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui index 7edf0a92..2a8a531e 100644 --- a/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui +++ b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui @@ -216,8 +216,8 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>klistview.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/lib/kofficecore/koOpenPaneBase.ui b/lib/kofficecore/koOpenPaneBase.ui index 1537cada..a85ecb38 100644 --- a/lib/kofficecore/koOpenPaneBase.ui +++ b/lib/kofficecore/koOpenPaneBase.ui @@ -135,8 +135,8 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>klistview.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/lib/kofficecore/tests/kogenstylestest.cpp b/lib/kofficecore/tests/kogenstylestest.cpp index 1068cdc4..ef9150f6 100644 --- a/lib/kofficecore/tests/kogenstylestest.cpp +++ b/lib/kofficecore/tests/kogenstylestest.cpp @@ -68,7 +68,7 @@ int testLookup() third.addProperty( "style:margin-left", "1.249cm" ); third.addProperty( "style:page-number", "0" ); // same as tqparent third.addProperty( "style:foobar", "3", KoGenStyle::TextType ); // different from tqparent - assert( third.tqparentName() == secondName ); + assert( third.parentName() == secondName ); TQString thirdName = coll.lookup( third, "P" ); kdDebug() << "The third style got assigned the name " << thirdName << endl; diff --git a/lib/kofficecore/tests/koxmlreadertest.cpp b/lib/kofficecore/tests/koxmlreadertest.cpp index aec06fae..5056e416 100644 --- a/lib/kofficecore/tests/koxmlreadertest.cpp +++ b/lib/kofficecore/tests/koxmlreadertest.cpp @@ -111,7 +111,7 @@ void testNode() CHECK( node1.isElement(), false ); CHECK( node1.isDocument(), false ); CHECK( node1.ownerDocument().isNull(), false ); - CHECK( node1.tqparentNode().isNull(), true ); + CHECK( node1.parentNode().isNull(), true ); CHECK( node1.hasChildNodes(), false ); CHECK( node1.firstChild().isNull(), true ); CHECK( node1.lastChild().isNull(), true ); @@ -257,8 +257,8 @@ void testElement() CHECK( rootElement.isDocument(), false ); CHECK( rootElement.ownerDocument().isNull(), false ); CHECK( rootElement.ownerDocument()==doc, true ); - CHECK( rootElement.tqparentNode().isNull(), false ); - CHECK( rootElement.tqparentNode().toDocument()==doc, true ); + CHECK( rootElement.parentNode().isNull(), false ); + CHECK( rootElement.parentNode().toDocument()==doc, true ); CHECK( rootElement.hasChildNodes(), true ); CHECK( rootElement.tagName(), TQString("html") ); CHECK( rootElement.prefix().isNull(), true ); @@ -272,8 +272,8 @@ void testElement() CHECK( bodyElement.isDocument(), false ); CHECK( bodyElement.ownerDocument().isNull(), false ); CHECK( bodyElement.ownerDocument()==doc, true ); - CHECK( bodyElement.tqparentNode().isNull(), false ); - CHECK( bodyElement.tqparentNode()==rootElement, true ); + CHECK( bodyElement.parentNode().isNull(), false ); + CHECK( bodyElement.parentNode()==rootElement, true ); CHECK( bodyElement.hasChildNodes(), true ); CHECK( bodyElement.tagName(), TQString("body") ); CHECK( bodyElement.prefix().isNull(), true ); @@ -307,7 +307,7 @@ void testElement() CHECK( testElement.ownerDocument()!=doc, true ); CHECK( testElement==rootElement, false ); CHECK( testElement!=rootElement, true ); - CHECK( testElement.tqparentNode().isNull(), true ); + CHECK( testElement.parentNode().isNull(), true ); CHECK( testElement.hasChildNodes(), false ); // check assignment operator @@ -318,8 +318,8 @@ void testElement() CHECK( testElement.isDocument(), false ); CHECK( testElement==rootElement, true ); CHECK( testElement!=rootElement, false ); - CHECK( testElement.tqparentNode().isNull(), false ); - CHECK( testElement.tqparentNode().toDocument()==doc, true ); + CHECK( testElement.parentNode().isNull(), false ); + CHECK( testElement.parentNode().toDocument()==doc, true ); CHECK( testElement.tagName(), TQString("html") ); CHECK( testElement.prefix().isNull(), true ); @@ -336,7 +336,7 @@ void testElement() CHECK( testElement.ownerDocument().isNull(), false ); CHECK( testElement.ownerDocument()==doc, true ); CHECK( testElement==bodyElement, true ); - CHECK( testElement.tqparentNode().isNull(), false ); + CHECK( testElement.parentNode().isNull(), false ); CHECK( testElement.tagName(), TQString("body") ); CHECK( testElement.prefix().isNull(), true ); CHECK( testElement.hasChildNodes(), true ); @@ -349,7 +349,7 @@ void testElement() CHECK( dummyElement.ownerDocument().isNull(), false ); CHECK( dummyElement.ownerDocument()==doc, true ); CHECK( dummyElement==rootElement, true ); - CHECK( dummyElement.tqparentNode().isNull(), false ); + CHECK( dummyElement.parentNode().isNull(), false ); CHECK( dummyElement.hasChildNodes(), true ); CHECK( dummyElement.tagName(), TQString("html") ); CHECK( dummyElement.prefix().isNull(), true ); @@ -400,8 +400,8 @@ void testAttributes() rootElement = doc.documentElement(); CHECK( rootElement.isNull(), false ); CHECK( rootElement.isElement(), true ); - CHECK( rootElement.tqparentNode().isNull(), false ); - CHECK( rootElement.tqparentNode().toDocument()==doc, true ); + CHECK( rootElement.parentNode().isNull(), false ); + CHECK( rootElement.parentNode().toDocument()==doc, true ); CHECK( rootElement.tagName(), TQString("p") ); CHECK( rootElement.prefix().isNull(), true ); @@ -456,8 +456,8 @@ void testText() CHECK( parElement.isDocument(), false ); CHECK( parElement.ownerDocument().isNull(), false ); CHECK( parElement.ownerDocument()==doc, true ); - CHECK( parElement.tqparentNode().isNull(), false ); - CHECK( parElement.tqparentNode().toDocument()==doc, true ); + CHECK( parElement.parentNode().isNull(), false ); + CHECK( parElement.parentNode().toDocument()==doc, true ); CHECK( parElement.hasChildNodes(), true ); CHECK( parElement.tagName(), TQString("p") ); CHECK( parElement.prefix().isNull(), true ); @@ -500,7 +500,7 @@ void testText() CHECK( boldElement.isDocument(), false ); CHECK( boldElement.ownerDocument().isNull(), false ); CHECK( boldElement.ownerDocument()==doc, true ); - CHECK( boldElement.tqparentNode().isNull(), false ); + CHECK( boldElement.parentNode().isNull(), false ); CHECK( boldElement.hasChildNodes(), true ); CHECK( boldElement.tagName(), TQString("b") ); CHECK( boldElement.prefix().isNull(), true ); @@ -545,8 +545,8 @@ void testCDATA() CHECK( parElement.isDocument(), false ); CHECK( parElement.ownerDocument().isNull(), false ); CHECK( parElement.ownerDocument()==doc, true ); - CHECK( parElement.tqparentNode().isNull(), false ); - CHECK( parElement.tqparentNode().toDocument()==doc, true ); + CHECK( parElement.parentNode().isNull(), false ); + CHECK( parElement.parentNode().toDocument()==doc, true ); CHECK( parElement.hasChildNodes(), true ); CHECK( parElement.tagName(), TQString("p") ); CHECK( parElement.prefix().isNull(), true ); @@ -616,7 +616,7 @@ void testDocument() CHECK( doc.isNull(), false ); CHECK( doc.isElement(), false ); CHECK( doc.isDocument(), true ); - CHECK( doc.tqparentNode().isNull(), true ); + CHECK( doc.parentNode().isNull(), true ); CHECK( doc.firstChild().isNull(), true ); CHECK( doc.lastChild().isNull(), true ); CHECK( doc.previousSibling().isNull(), true ); @@ -633,7 +633,7 @@ void testDocument() CHECK( doc.isNull(), false ); CHECK( doc.isElement(), false ); CHECK( doc.isDocument(), true ); - CHECK( doc.tqparentNode().isNull(), true ); + CHECK( doc.parentNode().isNull(), true ); CHECK( doc.firstChild().isNull(), false ); CHECK( doc.lastChild().isNull(), false ); CHECK( doc.previousSibling().isNull(), true ); @@ -645,14 +645,14 @@ void testDocument() CHECK( rootElement.isNull(), false ); CHECK( rootElement.isElement(), true ); CHECK( rootElement.isDocument(), false ); - CHECK( rootElement.tqparentNode().isNull(), false ); - CHECK( rootElement.tqparentNode().toDocument()==doc, true ); + CHECK( rootElement.parentNode().isNull(), false ); + CHECK( rootElement.parentNode().toDocument()==doc, true ); rootElement = doc.lastChild().toElement(); CHECK( rootElement.isNull(), false ); CHECK( rootElement.isElement(), true ); CHECK( rootElement.isDocument(), false ); - CHECK( rootElement.tqparentNode().isNull(), false ); - CHECK( rootElement.tqparentNode().toDocument()==doc, true ); + CHECK( rootElement.parentNode().isNull(), false ); + CHECK( rootElement.parentNode().toDocument()==doc, true ); // clear() converts it into null node doc.clear(); @@ -660,7 +660,7 @@ void testDocument() CHECK( doc.isNull(), true ); CHECK( doc.isElement(), false ); CHECK( doc.isDocument(), true ); - CHECK( doc.tqparentNode().isNull(), true ); + CHECK( doc.parentNode().isNull(), true ); CHECK( doc.firstChild().isNull(), true ); CHECK( doc.lastChild().isNull(), true ); CHECK( doc.previousSibling().isNull(), true ); @@ -672,7 +672,7 @@ void testDocument() CHECK( doc.isNull(), false ); CHECK( doc.isElement(), false ); CHECK( doc.isDocument(), true ); - CHECK( doc.tqparentNode().isNull(), true ); + CHECK( doc.parentNode().isNull(), true ); } void testNamespace() @@ -877,7 +877,7 @@ void testUnload() earthElement = doc.documentElement().toElement(); CHECK( earthElement.isNull(), false ); CHECK( earthElement.isElement(), true ); - CHECK( earthElement.tqparentNode().isNull(), false ); + CHECK( earthElement.parentNode().isNull(), false ); CHECK( earthElement.hasChildNodes(), true ); CHECK( earthElement.tagName(), TQString("earth") ); CHECK( earthElement.prefix().isNull(), true ); @@ -941,7 +941,7 @@ void testSimpleXML() rootElement = doc.documentElement(); CHECK( rootElement.isNull(), false ); CHECK( rootElement.isElement(), true ); - CHECK( rootElement.tqparentNode().isNull(), false ); + CHECK( rootElement.parentNode().isNull(), false ); CHECK( rootElement.hasChildNodes(), true ); CHECK( rootElement.tagName(), TQString("solarsystem") ); CHECK( rootElement.prefix().isNull(), true ); @@ -953,9 +953,9 @@ void testSimpleXML() CHECK( firstPlanetNode.isElement(), true ); CHECK( firstPlanetNode.nextSibling().isNull(), false ); CHECK( firstPlanetNode.previousSibling().isNull(), true ); - CHECK( firstPlanetNode.tqparentNode().isNull(), false ); - CHECK( firstPlanetNode.tqparentNode()==rootElement, true ); - CHECK( firstPlanetNode.tqparentNode()!=rootElement, false ); + CHECK( firstPlanetNode.parentNode().isNull(), false ); + CHECK( firstPlanetNode.parentNode()==rootElement, true ); + CHECK( firstPlanetNode.parentNode()!=rootElement, false ); CHECK( firstPlanetNode.hasChildNodes(), false ); CHECK( firstPlanetNode.firstChild().isNull(), true ); CHECK( firstPlanetNode.lastChild().isNull(), true ); @@ -965,8 +965,8 @@ void testSimpleXML() firstPlanetElement = firstPlanetNode.toElement(); CHECK( firstPlanetElement.isNull(), false ); CHECK( firstPlanetElement.isElement(), true ); - CHECK( firstPlanetElement.tqparentNode().isNull(), false ); - CHECK( firstPlanetElement.tqparentNode()==rootElement, true ); + CHECK( firstPlanetElement.parentNode().isNull(), false ); + CHECK( firstPlanetElement.parentNode()==rootElement, true ); CHECK( firstPlanetElement.hasChildNodes(), false ); CHECK( firstPlanetElement.firstChild().isNull(), true ); CHECK( firstPlanetElement.lastChild().isNull(), true ); @@ -982,9 +982,9 @@ void testSimpleXML() CHECK( secondPlanetNode.previousSibling().isNull(), false ); CHECK( secondPlanetNode.previousSibling()==firstPlanetNode, true ); CHECK( secondPlanetNode.previousSibling()==firstPlanetElement, true ); - CHECK( secondPlanetNode.tqparentNode().isNull(), false ); - CHECK( secondPlanetNode.tqparentNode()==rootElement, true ); - CHECK( secondPlanetNode.tqparentNode()!=rootElement, false ); + CHECK( secondPlanetNode.parentNode().isNull(), false ); + CHECK( secondPlanetNode.parentNode()==rootElement, true ); + CHECK( secondPlanetNode.parentNode()!=rootElement, false ); CHECK( secondPlanetNode.hasChildNodes(), false ); CHECK( secondPlanetNode.firstChild().isNull(), true ); CHECK( secondPlanetNode.lastChild().isNull(), true ); @@ -998,9 +998,9 @@ void testSimpleXML() CHECK( secondPlanetElement.previousSibling().isNull(), false ); CHECK( secondPlanetElement.previousSibling()==firstPlanetNode, true ); CHECK( secondPlanetElement.previousSibling()==firstPlanetElement, true ); - CHECK( secondPlanetElement.tqparentNode().isNull(), false ); - CHECK( secondPlanetElement.tqparentNode()==rootElement, true ); - CHECK( secondPlanetElement.tqparentNode()!=rootElement, false ); + CHECK( secondPlanetElement.parentNode().isNull(), false ); + CHECK( secondPlanetElement.parentNode()==rootElement, true ); + CHECK( secondPlanetElement.parentNode()!=rootElement, false ); CHECK( secondPlanetElement.hasChildNodes(), false ); CHECK( secondPlanetElement.firstChild().isNull(), true ); CHECK( secondPlanetElement.lastChild().isNull(), true ); @@ -1088,8 +1088,8 @@ void testSimpleOpenDocumentText() contentElement = doc.documentElement(); CHECK( contentElement.isNull(), false ); CHECK( contentElement.isElement(), true ); - CHECK( contentElement.tqparentNode().isNull(), false ); - CHECK( contentElement.tqparentNode().toDocument()==doc, true ); + CHECK( contentElement.parentNode().isNull(), false ); + CHECK( contentElement.parentNode().toDocument()==doc, true ); CHECK( contentElement.firstChild().isNull(), false ); CHECK( contentElement.lastChild().isNull(), false ); CHECK( contentElement.previousSibling().isNull(), false ); @@ -1103,8 +1103,8 @@ void testSimpleOpenDocumentText() stylesElement = KoXml::namedItemNS( contentElement, officeNS, "automatic-styles" ); CHECK( stylesElement.isNull(), false ); CHECK( stylesElement.isElement(), true ); - CHECK( stylesElement.tqparentNode().isNull(), false ); - CHECK( stylesElement.tqparentNode()==contentElement, true ); + CHECK( stylesElement.parentNode().isNull(), false ); + CHECK( stylesElement.parentNode()==contentElement, true ); CHECK( stylesElement.firstChild().isNull(), true ); CHECK( stylesElement.lastChild().isNull(), true ); CHECK( stylesElement.previousSibling().isNull(), true ); @@ -1116,8 +1116,8 @@ void testSimpleOpenDocumentText() styles2Element = contentElement.firstChild().toElement(); CHECK( styles2Element.isNull(), false ); CHECK( styles2Element.isElement(), true ); - CHECK( styles2Element.tqparentNode().isNull(), false ); - CHECK( styles2Element.tqparentNode()==contentElement, true ); + CHECK( styles2Element.parentNode().isNull(), false ); + CHECK( styles2Element.parentNode()==contentElement, true ); CHECK( styles2Element.firstChild().isNull(), true ); CHECK( styles2Element.lastChild().isNull(), true ); CHECK( styles2Element.previousSibling().isNull(), true ); @@ -1129,8 +1129,8 @@ void testSimpleOpenDocumentText() bodyElement = KoXml::namedItemNS( contentElement, officeNS, "body" ); CHECK( bodyElement.isNull(), false ); CHECK( bodyElement.isElement(), true ); - CHECK( bodyElement.tqparentNode().isNull(), false ); - CHECK( bodyElement.tqparentNode()==contentElement, true ); + CHECK( bodyElement.parentNode().isNull(), false ); + CHECK( bodyElement.parentNode()==contentElement, true ); CHECK( bodyElement.firstChild().isNull(), false ); CHECK( bodyElement.lastChild().isNull(), false ); CHECK( bodyElement.previousSibling().isNull(), false ); @@ -1142,8 +1142,8 @@ void testSimpleOpenDocumentText() body2Element = stylesElement.nextSibling().toElement(); CHECK( body2Element.isNull(), false ); CHECK( body2Element.isElement(), true ); - CHECK( body2Element.tqparentNode().isNull(), false ); - CHECK( body2Element.tqparentNode()==contentElement, true ); + CHECK( body2Element.parentNode().isNull(), false ); + CHECK( body2Element.parentNode()==contentElement, true ); CHECK( body2Element.firstChild().isNull(), false ); CHECK( body2Element.lastChild().isNull(), false ); CHECK( body2Element.previousSibling().isNull(), false ); @@ -1155,8 +1155,8 @@ void testSimpleOpenDocumentText() textElement = KoXml::namedItemNS( bodyElement, officeNS, "text" ); CHECK( textElement.isNull(), false ); CHECK( textElement.isElement(), true ); - CHECK( textElement.tqparentNode().isNull(), false ); - CHECK( textElement.tqparentNode()==bodyElement, true ); + CHECK( textElement.parentNode().isNull(), false ); + CHECK( textElement.parentNode()==bodyElement, true ); CHECK( textElement.firstChild().isNull(), false ); CHECK( textElement.lastChild().isNull(), false ); CHECK( textElement.previousSibling().isNull(), true ); @@ -1168,8 +1168,8 @@ void testSimpleOpenDocumentText() text2Element = bodyElement.firstChild().toElement(); CHECK( text2Element.isNull(), false ); CHECK( text2Element.isElement(), true ); - CHECK( text2Element.tqparentNode().isNull(), false ); - CHECK( text2Element.tqparentNode()==bodyElement, true ); + CHECK( text2Element.parentNode().isNull(), false ); + CHECK( text2Element.parentNode()==bodyElement, true ); CHECK( text2Element.firstChild().isNull(), false ); CHECK( text2Element.lastChild().isNull(), false ); CHECK( text2Element.previousSibling().isNull(), true ); @@ -1181,8 +1181,8 @@ void testSimpleOpenDocumentText() parElement = textElement.firstChild().toElement(); CHECK( parElement.isNull(), false ); CHECK( parElement.isElement(), true ); - CHECK( parElement.tqparentNode().isNull(), false ); - CHECK( parElement.tqparentNode()==textElement, true ); + CHECK( parElement.parentNode().isNull(), false ); + CHECK( parElement.parentNode()==textElement, true ); CHECK( parElement.firstChild().isNull(), false ); CHECK( parElement.lastChild().isNull(), false ); CHECK( parElement.previousSibling().isNull(), true ); @@ -1253,8 +1253,8 @@ void testSimpleOpenDocumentSpreadsheet() contentElement = doc.documentElement(); CHECK( contentElement.isNull(), false ); CHECK( contentElement.isElement(), true ); - CHECK( contentElement.tqparentNode().isNull(), false ); - CHECK( contentElement.tqparentNode().toDocument()==doc, true ); + CHECK( contentElement.parentNode().isNull(), false ); + CHECK( contentElement.parentNode().toDocument()==doc, true ); CHECK( contentElement.firstChild().isNull(), false ); CHECK( contentElement.lastChild().isNull(), false ); CHECK( contentElement.previousSibling().isNull(), false ); @@ -1266,8 +1266,8 @@ void testSimpleOpenDocumentSpreadsheet() bodyElement = contentElement.firstChild().toElement(); CHECK( bodyElement.isNull(), false ); CHECK( bodyElement.isElement(), true ); - CHECK( bodyElement.tqparentNode().isNull(), false ); - CHECK( bodyElement.tqparentNode()==contentElement, true ); + CHECK( bodyElement.parentNode().isNull(), false ); + CHECK( bodyElement.parentNode()==contentElement, true ); CHECK( bodyElement.firstChild().isNull(), false ); CHECK( bodyElement.lastChild().isNull(), false ); CHECK( bodyElement.previousSibling().isNull(), true ); @@ -1279,8 +1279,8 @@ void testSimpleOpenDocumentSpreadsheet() spreadsheetElement = bodyElement.firstChild().toElement(); CHECK( spreadsheetElement.isNull(), false ); CHECK( spreadsheetElement.isElement(), true ); - CHECK( spreadsheetElement.tqparentNode().isNull(), false ); - CHECK( spreadsheetElement.tqparentNode()==bodyElement, true ); + CHECK( spreadsheetElement.parentNode().isNull(), false ); + CHECK( spreadsheetElement.parentNode()==bodyElement, true ); CHECK( spreadsheetElement.firstChild().isNull(), false ); CHECK( spreadsheetElement.lastChild().isNull(), false ); CHECK( spreadsheetElement.previousSibling().isNull(), true ); @@ -1292,8 +1292,8 @@ void testSimpleOpenDocumentSpreadsheet() sheet1Element = spreadsheetElement.firstChild().toElement(); CHECK( sheet1Element.isNull(), false ); CHECK( sheet1Element.isElement(), true ); - CHECK( sheet1Element.tqparentNode().isNull(), false ); - CHECK( sheet1Element.tqparentNode()==spreadsheetElement, true ); + CHECK( sheet1Element.parentNode().isNull(), false ); + CHECK( sheet1Element.parentNode()==spreadsheetElement, true ); CHECK( sheet1Element.firstChild().isNull(), false ); CHECK( sheet1Element.lastChild().isNull(), false ); CHECK( sheet1Element.previousSibling().isNull(), true ); @@ -1311,8 +1311,8 @@ void testSimpleOpenDocumentSpreadsheet() columnElement = sheet1Element.firstChild().toElement(); CHECK( columnElement.isNull(), false ); CHECK( columnElement.isElement(), true ); - CHECK( columnElement.tqparentNode().isNull(), false ); - CHECK( columnElement.tqparentNode()==sheet1Element, true ); + CHECK( columnElement.parentNode().isNull(), false ); + CHECK( columnElement.parentNode()==sheet1Element, true ); CHECK( columnElement.firstChild().isNull(), true ); CHECK( columnElement.lastChild().isNull(), true ); CHECK( columnElement.previousSibling().isNull(), true ); @@ -1326,8 +1326,8 @@ void testSimpleOpenDocumentSpreadsheet() rowElement = columnElement.nextSibling().toElement(); CHECK( rowElement.isNull(), false ); CHECK( rowElement.isElement(), true ); - CHECK( rowElement.tqparentNode().isNull(), false ); - CHECK( rowElement.tqparentNode()==sheet1Element, true ); + CHECK( rowElement.parentNode().isNull(), false ); + CHECK( rowElement.parentNode()==sheet1Element, true ); CHECK( rowElement.firstChild().isNull(), false ); CHECK( rowElement.lastChild().isNull(), false ); CHECK( rowElement.previousSibling().isNull(), false ); @@ -1340,8 +1340,8 @@ void testSimpleOpenDocumentSpreadsheet() cellElement = rowElement.firstChild().toElement(); CHECK( cellElement.isNull(), false ); CHECK( cellElement.isElement(), true ); - CHECK( cellElement.tqparentNode().isNull(), false ); - CHECK( cellElement.tqparentNode()==rowElement, true ); + CHECK( cellElement.parentNode().isNull(), false ); + CHECK( cellElement.parentNode()==rowElement, true ); CHECK( cellElement.firstChild().isNull(), false ); CHECK( cellElement.lastChild().isNull(), false ); CHECK( cellElement.previousSibling().isNull(), true ); @@ -1354,8 +1354,8 @@ void testSimpleOpenDocumentSpreadsheet() parElement = cellElement.firstChild().toElement(); CHECK( parElement.isNull(), false ); CHECK( parElement.isElement(), true ); - CHECK( parElement.tqparentNode().isNull(), false ); - CHECK( parElement.tqparentNode()==cellElement, true ); + CHECK( parElement.parentNode().isNull(), false ); + CHECK( parElement.parentNode()==cellElement, true ); CHECK( parElement.firstChild().isNull(), false ); CHECK( parElement.lastChild().isNull(), false ); CHECK( parElement.previousSibling().isNull(), true ); @@ -1368,8 +1368,8 @@ void testSimpleOpenDocumentSpreadsheet() sheet2Element = sheet1Element.nextSibling().toElement(); CHECK( sheet2Element.isNull(), false ); CHECK( sheet2Element.isElement(), true ); - CHECK( sheet2Element.tqparentNode().isNull(), false ); - CHECK( sheet2Element.tqparentNode()==spreadsheetElement, true ); + CHECK( sheet2Element.parentNode().isNull(), false ); + CHECK( sheet2Element.parentNode()==spreadsheetElement, true ); CHECK( sheet2Element.firstChild().isNull(), false ); CHECK( sheet2Element.lastChild().isNull(), false ); CHECK( sheet2Element.previousSibling().isNull(), false ); @@ -1381,8 +1381,8 @@ void testSimpleOpenDocumentSpreadsheet() sheet3Element = sheet2Element.nextSibling().toElement(); CHECK( sheet3Element.isNull(), false ); CHECK( sheet3Element.isElement(), true ); - CHECK( sheet3Element.tqparentNode().isNull(), false ); - CHECK( sheet3Element.tqparentNode()==spreadsheetElement, true ); + CHECK( sheet3Element.parentNode().isNull(), false ); + CHECK( sheet3Element.parentNode()==spreadsheetElement, true ); CHECK( sheet3Element.firstChild().isNull(), false ); CHECK( sheet3Element.lastChild().isNull(), false ); CHECK( sheet3Element.previousSibling().isNull(), false ); @@ -1469,8 +1469,8 @@ void testSimpleOpenDocumentPresentation() CHECK( contentElement.isNull(), false ); CHECK( contentElement.isElement(), true ); - CHECK( contentElement.tqparentNode().isNull(), false ); - CHECK( contentElement.tqparentNode().toDocument()==doc, true ); + CHECK( contentElement.parentNode().isNull(), false ); + CHECK( contentElement.parentNode().toDocument()==doc, true ); CHECK( contentElement.firstChild().isNull(), false ); CHECK( contentElement.lastChild().isNull(), false ); CHECK( contentElement.previousSibling().isNull(), false ); @@ -1485,8 +1485,8 @@ void testSimpleOpenDocumentPresentation() scriptsElement = KoXml::namedItemNS( contentElement, officeNS, "scripts" ); CHECK( scriptsElement.isNull(), false ); CHECK( scriptsElement.isElement(), true ); - CHECK( scriptsElement.tqparentNode().isNull(), false ); - CHECK( scriptsElement.tqparentNode()==contentElement, true ); + CHECK( scriptsElement.parentNode().isNull(), false ); + CHECK( scriptsElement.parentNode()==contentElement, true ); CHECK( scriptsElement.firstChild().isNull(), true ); CHECK( scriptsElement.lastChild().isNull(), true ); CHECK( scriptsElement.previousSibling().isNull(), true ); @@ -1498,8 +1498,8 @@ void testSimpleOpenDocumentPresentation() stylesElement = KoXml::namedItemNS( contentElement, officeNS, "automatic-styles" ); CHECK( stylesElement.isNull(), false ); CHECK( stylesElement.isElement(), true ); - CHECK( stylesElement.tqparentNode().isNull(), false ); - CHECK( stylesElement.tqparentNode()==contentElement, true ); + CHECK( stylesElement.parentNode().isNull(), false ); + CHECK( stylesElement.parentNode()==contentElement, true ); CHECK( stylesElement.firstChild().isNull(), true ); CHECK( stylesElement.lastChild().isNull(), true ); CHECK( stylesElement.previousSibling().isNull(), false ); @@ -1511,8 +1511,8 @@ void testSimpleOpenDocumentPresentation() styles2Element = scriptsElement.nextSibling().toElement(); CHECK( styles2Element.isNull(), false ); CHECK( styles2Element.isElement(), true ); - CHECK( styles2Element.tqparentNode().isNull(), false ); - CHECK( styles2Element.tqparentNode()==contentElement, true ); + CHECK( styles2Element.parentNode().isNull(), false ); + CHECK( styles2Element.parentNode()==contentElement, true ); CHECK( styles2Element.firstChild().isNull(), true ); CHECK( styles2Element.lastChild().isNull(), true ); CHECK( styles2Element.previousSibling().isNull(), false ); @@ -1524,8 +1524,8 @@ void testSimpleOpenDocumentPresentation() bodyElement = KoXml::namedItemNS( contentElement, officeNS, "body" ); CHECK( bodyElement.isNull(), false ); CHECK( bodyElement.isElement(), true ); - CHECK( bodyElement.tqparentNode().isNull(), false ); - CHECK( bodyElement.tqparentNode()==contentElement, true ); + CHECK( bodyElement.parentNode().isNull(), false ); + CHECK( bodyElement.parentNode()==contentElement, true ); CHECK( bodyElement.firstChild().isNull(), false ); CHECK( bodyElement.lastChild().isNull(), false ); CHECK( bodyElement.previousSibling().isNull(), false ); @@ -1537,8 +1537,8 @@ void testSimpleOpenDocumentPresentation() body2Element = stylesElement.nextSibling().toElement(); CHECK( body2Element.isNull(), false ); CHECK( body2Element.isElement(), true ); - CHECK( body2Element.tqparentNode().isNull(), false ); - CHECK( body2Element.tqparentNode()==contentElement, true ); + CHECK( body2Element.parentNode().isNull(), false ); + CHECK( body2Element.parentNode()==contentElement, true ); CHECK( body2Element.firstChild().isNull(), false ); CHECK( body2Element.lastChild().isNull(), false ); CHECK( body2Element.previousSibling().isNull(), false ); @@ -1550,8 +1550,8 @@ void testSimpleOpenDocumentPresentation() presentationElement = KoXml::namedItemNS( bodyElement, officeNS, "presentation" ); CHECK( presentationElement.isNull(), false ); CHECK( presentationElement.isElement(), true ); - CHECK( presentationElement.tqparentNode().isNull(), false ); - CHECK( presentationElement.tqparentNode()==bodyElement, true ); + CHECK( presentationElement.parentNode().isNull(), false ); + CHECK( presentationElement.parentNode()==bodyElement, true ); CHECK( presentationElement.firstChild().isNull(), false ); CHECK( presentationElement.lastChild().isNull(), false ); CHECK( presentationElement.previousSibling().isNull(), true ); @@ -1563,8 +1563,8 @@ void testSimpleOpenDocumentPresentation() presentation2Element = bodyElement.firstChild().toElement(); CHECK( presentation2Element.isNull(), false ); CHECK( presentation2Element.isElement(), true ); - CHECK( presentation2Element.tqparentNode().isNull(), false ); - CHECK( presentation2Element.tqparentNode()==bodyElement, true ); + CHECK( presentation2Element.parentNode().isNull(), false ); + CHECK( presentation2Element.parentNode()==bodyElement, true ); CHECK( presentation2Element.firstChild().isNull(), false ); CHECK( presentation2Element.lastChild().isNull(), false ); CHECK( presentation2Element.previousSibling().isNull(), true ); @@ -1576,8 +1576,8 @@ void testSimpleOpenDocumentPresentation() titlePageElement = presentationElement.firstChild().toElement(); CHECK( titlePageElement.isNull(), false ); CHECK( titlePageElement.isElement(), true ); - CHECK( titlePageElement.tqparentNode().isNull(), false ); - CHECK( titlePageElement.tqparentNode()==presentationElement, true ); + CHECK( titlePageElement.parentNode().isNull(), false ); + CHECK( titlePageElement.parentNode()==presentationElement, true ); CHECK( titlePageElement.firstChild().isNull(), false ); CHECK( titlePageElement.lastChild().isNull(), false ); CHECK( titlePageElement.previousSibling().isNull(), true ); @@ -1594,8 +1594,8 @@ void testSimpleOpenDocumentPresentation() titleFrameElement = titlePageElement.firstChild().toElement(); CHECK( titleFrameElement.isNull(), false ); CHECK( titleFrameElement.isElement(), true ); - CHECK( titleFrameElement.tqparentNode().isNull(), false ); - CHECK( titleFrameElement.tqparentNode()==titlePageElement, true ); + CHECK( titleFrameElement.parentNode().isNull(), false ); + CHECK( titleFrameElement.parentNode()==titlePageElement, true ); CHECK( titleFrameElement.firstChild().isNull(), false ); CHECK( titleFrameElement.lastChild().isNull(), false ); CHECK( titleFrameElement.previousSibling().isNull(), true ); @@ -1616,8 +1616,8 @@ void testSimpleOpenDocumentPresentation() titleBoxElement = titleFrameElement.firstChild().toElement(); CHECK( titleBoxElement.isNull(), false ); CHECK( titleBoxElement.isElement(), true ); - CHECK( titleBoxElement.tqparentNode().isNull(), false ); - CHECK( titleBoxElement.tqparentNode()==titleFrameElement, true ); + CHECK( titleBoxElement.parentNode().isNull(), false ); + CHECK( titleBoxElement.parentNode()==titleFrameElement, true ); CHECK( titleBoxElement.firstChild().isNull(), false ); CHECK( titleBoxElement.lastChild().isNull(), false ); CHECK( titleBoxElement.previousSibling().isNull(), true ); @@ -1629,8 +1629,8 @@ void testSimpleOpenDocumentPresentation() titleParElement = titleBoxElement.firstChild().toElement(); CHECK( titleParElement.isNull(), false ); CHECK( titleParElement.isElement(), true ); - CHECK( titleParElement.tqparentNode().isNull(), false ); - CHECK( titleParElement.tqparentNode()==titleBoxElement, true ); + CHECK( titleParElement.parentNode().isNull(), false ); + CHECK( titleParElement.parentNode()==titleBoxElement, true ); CHECK( titleParElement.firstChild().isNull(), false ); CHECK( titleParElement.lastChild().isNull(), false ); CHECK( titleParElement.previousSibling().isNull(), true ); @@ -1644,8 +1644,8 @@ void testSimpleOpenDocumentPresentation() subtitleFrameElement = titleFrameElement.nextSibling().toElement(); CHECK( subtitleFrameElement.isNull(), false ); CHECK( subtitleFrameElement.isElement(), true ); - CHECK( subtitleFrameElement.tqparentNode().isNull(), false ); - CHECK( subtitleFrameElement.tqparentNode()==titlePageElement, true ); + CHECK( subtitleFrameElement.parentNode().isNull(), false ); + CHECK( subtitleFrameElement.parentNode()==titlePageElement, true ); CHECK( subtitleFrameElement.firstChild().isNull(), false ); CHECK( subtitleFrameElement.lastChild().isNull(), false ); CHECK( subtitleFrameElement.previousSibling().isNull(), false ); @@ -1666,8 +1666,8 @@ void testSimpleOpenDocumentPresentation() subtitleBoxElement = subtitleFrameElement.firstChild().toElement(); CHECK( subtitleBoxElement.isNull(), false ); CHECK( subtitleBoxElement.isElement(), true ); - CHECK( subtitleBoxElement.tqparentNode().isNull(), false ); - CHECK( subtitleBoxElement.tqparentNode()==subtitleFrameElement, true ); + CHECK( subtitleBoxElement.parentNode().isNull(), false ); + CHECK( subtitleBoxElement.parentNode()==subtitleFrameElement, true ); CHECK( subtitleBoxElement.firstChild().isNull(), false ); CHECK( subtitleBoxElement.lastChild().isNull(), false ); CHECK( subtitleBoxElement.previousSibling().isNull(), true ); @@ -1679,8 +1679,8 @@ void testSimpleOpenDocumentPresentation() subtitleParElement = subtitleBoxElement.firstChild().toElement(); CHECK( subtitleParElement.isNull(), false ); CHECK( subtitleParElement.isElement(), true ); - CHECK( subtitleParElement.tqparentNode().isNull(), false ); - CHECK( subtitleParElement.tqparentNode()==subtitleBoxElement, true ); + CHECK( subtitleParElement.parentNode().isNull(), false ); + CHECK( subtitleParElement.parentNode()==subtitleBoxElement, true ); CHECK( subtitleParElement.firstChild().isNull(), false ); CHECK( subtitleParElement.lastChild().isNull(), false ); CHECK( subtitleParElement.previousSibling().isNull(), true ); @@ -1731,8 +1731,8 @@ void testSimpleOpenDocumentFormula() mathElement = doc.documentElement(); CHECK( mathElement.isNull(), false ); CHECK( mathElement.isElement(), true ); - CHECK( mathElement.tqparentNode().isNull(), false ); - CHECK( mathElement.tqparentNode().toDocument()==doc, true ); + CHECK( mathElement.parentNode().isNull(), false ); + CHECK( mathElement.parentNode().toDocument()==doc, true ); CHECK( mathElement.firstChild().isNull(), false ); CHECK( mathElement.lastChild().isNull(), false ); CHECK( mathElement.previousSibling().isNull(), false ); @@ -1744,8 +1744,8 @@ void testSimpleOpenDocumentFormula() semanticsElement = KoXml::namedItemNS( mathElement, mathNS, "semantics" ); CHECK( semanticsElement.isNull(), false ); CHECK( semanticsElement.isElement(), true ); - CHECK( semanticsElement.tqparentNode().isNull(), false ); - CHECK( semanticsElement.tqparentNode().toElement()==mathElement, true ); + CHECK( semanticsElement.parentNode().isNull(), false ); + CHECK( semanticsElement.parentNode().toElement()==mathElement, true ); CHECK( semanticsElement.firstChild().isNull(), false ); CHECK( semanticsElement.lastChild().isNull(), false ); CHECK( semanticsElement.previousSibling().isNull(), true ); @@ -1757,8 +1757,8 @@ void testSimpleOpenDocumentFormula() semantics2Element = mathElement.firstChild().toElement(); CHECK( semantics2Element.isNull(), false ); CHECK( semantics2Element.isElement(), true ); - CHECK( semantics2Element.tqparentNode().isNull(), false ); - CHECK( semantics2Element.tqparentNode().toElement()==mathElement, true ); + CHECK( semantics2Element.parentNode().isNull(), false ); + CHECK( semantics2Element.parentNode().toElement()==mathElement, true ); CHECK( semantics2Element.firstChild().isNull(), false ); CHECK( semantics2Element.lastChild().isNull(), false ); CHECK( semantics2Element.previousSibling().isNull(), true ); @@ -1770,8 +1770,8 @@ void testSimpleOpenDocumentFormula() mrowElement = semanticsElement.firstChild().toElement(); CHECK( mrowElement.isNull(), false ); CHECK( mrowElement.isElement(), true ); - CHECK( mrowElement.tqparentNode().isNull(), false ); - CHECK( mrowElement.tqparentNode().toElement()==semanticsElement, true ); + CHECK( mrowElement.parentNode().isNull(), false ); + CHECK( mrowElement.parentNode().toElement()==semanticsElement, true ); CHECK( mrowElement.firstChild().isNull(), false ); CHECK( mrowElement.lastChild().isNull(), false ); CHECK( mrowElement.previousSibling().isNull(), true ); @@ -1783,8 +1783,8 @@ void testSimpleOpenDocumentFormula() miElement = mrowElement.firstChild().toElement(); CHECK( miElement.isNull(), false ); CHECK( miElement.isElement(), true ); - CHECK( miElement.tqparentNode().isNull(), false ); - CHECK( miElement.tqparentNode().toElement()==mrowElement, true ); + CHECK( miElement.parentNode().isNull(), false ); + CHECK( miElement.parentNode().toElement()==mrowElement, true ); CHECK( miElement.firstChild().isNull(), false ); CHECK( miElement.lastChild().isNull(), false ); CHECK( miElement.previousSibling().isNull(), true ); @@ -1796,8 +1796,8 @@ void testSimpleOpenDocumentFormula() moElement = miElement.nextSibling().toElement(); CHECK( moElement.isNull(), false ); CHECK( moElement.isElement(), true ); - CHECK( moElement.tqparentNode().isNull(), false ); - CHECK( moElement.tqparentNode().toElement()==mrowElement, true ); + CHECK( moElement.parentNode().isNull(), false ); + CHECK( moElement.parentNode().toElement()==mrowElement, true ); CHECK( moElement.firstChild().isNull(), false ); CHECK( moElement.lastChild().isNull(), false ); CHECK( moElement.previousSibling().isNull(), false ); @@ -1810,8 +1810,8 @@ void testSimpleOpenDocumentFormula() msupElement = moElement.nextSibling().toElement(); CHECK( msupElement.isNull(), false ); CHECK( msupElement.isElement(), true ); - CHECK( msupElement.tqparentNode().isNull(), false ); - CHECK( msupElement.tqparentNode().toElement()==mrowElement, true ); + CHECK( msupElement.parentNode().isNull(), false ); + CHECK( msupElement.parentNode().toElement()==mrowElement, true ); CHECK( msupElement.firstChild().isNull(), false ); CHECK( msupElement.lastChild().isNull(), false ); CHECK( msupElement.previousSibling().isNull(), false ); @@ -1823,8 +1823,8 @@ void testSimpleOpenDocumentFormula() mcElement = msupElement.firstChild().toElement(); CHECK( mcElement.isNull(), false ); CHECK( mcElement.isElement(), true ); - CHECK( mcElement.tqparentNode().isNull(), false ); - CHECK( mcElement.tqparentNode().toElement()==msupElement, true ); + CHECK( mcElement.parentNode().isNull(), false ); + CHECK( mcElement.parentNode().toElement()==msupElement, true ); CHECK( mcElement.firstChild().isNull(), false ); CHECK( mcElement.lastChild().isNull(), false ); CHECK( mcElement.previousSibling().isNull(), true ); @@ -1838,8 +1838,8 @@ void testSimpleOpenDocumentFormula() mnElement = mcElement.nextSibling().toElement(); CHECK( mnElement.isNull(), false ); CHECK( mnElement.isElement(), true ); - CHECK( mnElement.tqparentNode().isNull(), false ); - CHECK( mnElement.tqparentNode().toElement()==msupElement, true ); + CHECK( mnElement.parentNode().isNull(), false ); + CHECK( mnElement.parentNode().toElement()==msupElement, true ); CHECK( mnElement.firstChild().isNull(), false ); CHECK( mnElement.lastChild().isNull(), false ); CHECK( mnElement.previousSibling().isNull(), false ); @@ -1852,8 +1852,8 @@ void testSimpleOpenDocumentFormula() annotationElement = semanticsElement.lastChild().toElement(); CHECK( annotationElement.isNull(), false ); CHECK( annotationElement.isElement(), true ); - CHECK( annotationElement.tqparentNode().isNull(), false ); - CHECK( annotationElement.tqparentNode().toElement()==semanticsElement, true ); + CHECK( annotationElement.parentNode().isNull(), false ); + CHECK( annotationElement.parentNode().toElement()==semanticsElement, true ); CHECK( annotationElement.firstChild().isNull(), false ); CHECK( annotationElement.lastChild().isNull(), false ); CHECK( annotationElement.previousSibling().isNull(), false ); @@ -1992,8 +1992,8 @@ void testLargeOpenDocumentSpreadsheet() // load everything for this table KoXml::load( tableElement, 99 ); - CHECK( tableElement.tqparentNode().isNull(), false ); - CHECK( tableElement.tqparentNode()==spreadsheetElement, true ); + CHECK( tableElement.parentNode().isNull(), false ); + CHECK( tableElement.parentNode()==spreadsheetElement, true ); CHECK( tableElement.firstChild().isNull(), false ); CHECK( tableElement.lastChild().isNull(), false ); @@ -2004,8 +2004,8 @@ void testLargeOpenDocumentSpreadsheet() CHECK( rowElement.isNull(), false ); CHECK( rowElement.isElement(), true ); CHECK( rowElement.localName(), TQString("table-row") ); - CHECK( rowElement.tqparentNode().isNull(), false ); - CHECK( rowElement.tqparentNode()==tableElement, true ); + CHECK( rowElement.parentNode().isNull(), false ); + CHECK( rowElement.parentNode()==tableElement, true ); CHECK( rowElement.firstChild().isNull(), false ); CHECK( rowElement.lastChild().isNull(), false ); @@ -2019,8 +2019,8 @@ void testLargeOpenDocumentSpreadsheet() CHECK( cellElement.text(), TQString("Hello, world") ); CHECK( cellElement.hasAttributeNS(officeNS,"value-type"), true ); CHECK( cellElement.attributeNS(officeNS,"value-type",""), TQString("string" ) ); - CHECK( cellElement.tqparentNode().isNull(), false ); - CHECK( cellElement.tqparentNode()==rowElement, true ); + CHECK( cellElement.parentNode().isNull(), false ); + CHECK( cellElement.parentNode()==rowElement, true ); CHECK( cellElement.firstChild().isNull(), false ); CHECK( cellElement.lastChild().isNull(), false ); cellElement = cellElement.nextSibling().toElement(); |