diff options
Diffstat (limited to 'kpresenter/KPrTextDocument.cpp')
| -rw-r--r-- | kpresenter/KPrTextDocument.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kpresenter/KPrTextDocument.cpp b/kpresenter/KPrTextDocument.cpp index 51a5be7fe..97bfd44c9 100644 --- a/kpresenter/KPrTextDocument.cpp +++ b/kpresenter/KPrTextDocument.cpp @@ -42,11 +42,11 @@ KPrTextDocument::~KPrTextDocument() } -bool KPrTextDocument::loadSpanTag( const QDomElement& tag, KoOasisContext& context, +bool KPrTextDocument::loadSpanTag( const TQDomElement& tag, KoOasisContext& context, KoTextParag* parag, uint pos, - QString& textData, KoTextCustomItem* & customItem ) + TQString& textData, KoTextCustomItem* & customItem ) { - const QString localName( tag.localName() ); + const TQString localName( tag.localName() ); const bool isTextNS = tag.namespaceURI() == KoXmlNS::text; kdDebug( 32500 ) << "KPrTextDocument::loadSpanTag: " << localName << endl; @@ -54,7 +54,7 @@ bool KPrTextDocument::loadSpanTag( const QDomElement& tag, KoOasisContext& conte { if ( localName == "a" ) { - QString href( tag.attributeNS( KoXmlNS::xlink, "href", QString::null ) ); + TQString href( tag.attributeNS( KoXmlNS::xlink, "href", TQString() ) ); if ( href.startsWith( "#" ) ) { context.styleStack().save(); @@ -69,8 +69,8 @@ bool KPrTextDocument::loadSpanTag( const QDomElement& tag, KoOasisContext& conte // we could have multiple spans there, but OO ensures that there is always only one, // splitting the hyperlink if necessary (at format changes). // Note that we ignore the formatting of the span. - QDomElement spanElem = KoDom::namedItemNS( tag, KoXmlNS::text, "span" ); - QString text; + TQDomElement spanElem = KoDom::namedItemNS( tag, KoXmlNS::text, "span" ); + TQString text; if ( spanElem.isNull() ) text = tag.text(); if ( spanElem.isNull() ) @@ -78,12 +78,12 @@ bool KPrTextDocument::loadSpanTag( const QDomElement& tag, KoOasisContext& conte else { // The save/restore of the stack is done by the caller (KoTextParag::loadOasisSpan) // This allows to use the span's format for the variable. - //kdDebug(32500) << "filling stack with " << spanElem.attributeNS( KoXmlNS::text, "style-name", QString::null ) << endl; + //kdDebug(32500) << "filling stack with " << spanElem.attributeNS( KoXmlNS::text, "style-name", TQString() ) << endl; context.fillStyleStack( spanElem, KoXmlNS::text, "style-name", "text" ); text = spanElem.text(); } textData = KoTextObject::customItemChar(); // hyperlink placeholder - // unused tag.attributeNS( KoXmlNS::office, "name", QString::null ) + // unused tag.attributeNS( KoXmlNS::office, "name", TQString() ) KoVariableCollection& coll = context.variableCollection(); customItem = new KoLinkVariable( this, text, href, coll.formatCollection()->format( "STRING" ), |