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 --- filters/kword/abiword/ImportFormatting.cc | 22 ++++---- filters/kword/abiword/ImportFormatting.h | 4 +- filters/kword/abiword/abiwordexport.cc | 30 +++++----- filters/kword/abiword/abiwordimport.cc | 14 ++--- filters/kword/ascii/ExportDialogUI.ui | 2 +- filters/kword/ascii/ImportDialogUI.ui | 2 +- filters/kword/ascii/asciiimport.cc | 8 +-- filters/kword/ascii/status.html | 2 +- filters/kword/html/export/ExportCss.cc | 28 +++++----- filters/kword/html/export/ExportCss.h | 2 +- filters/kword/html/export/ExportDialogUI.ui | 2 +- filters/kword/html/export/ExportFilter.cc | 10 ++-- filters/kword/html/import/khtmlreader.cpp | 36 ++++++------ filters/kword/html/import/kwdwriter.cpp | 14 ++--- filters/kword/html/import/kwdwriter.h | 2 +- filters/kword/kword1.3/import/kword13parser.cpp | 2 +- filters/kword/latex/export/latexexportdia.ui | 2 +- filters/kword/libexport/TagProcessing.cc | 12 ++-- filters/kword/libexport/TagProcessing.h | 2 +- filters/kword/msword/conversion.cpp | 2 +- filters/kword/msword/document.cpp | 8 +-- filters/kword/msword/document.h | 2 +- filters/kword/msword/texthandler.cpp | 42 +++++++------- filters/kword/msword/texthandler.h | 6 +- filters/kword/mswrite/ImportDialogUI.ui | 2 +- filters/kword/mswrite/structures_generated.h | 2 +- filters/kword/oowriter/ExportFilter.cc | 26 ++++----- filters/kword/oowriter/ExportFilter.h | 2 +- filters/kword/oowriter/oowriterimport.cc | 64 +++++++++++----------- filters/kword/oowriter/oowriterimport.h | 14 ++--- filters/kword/pdf/DESIGN | 2 +- filters/kword/pdf/FilterDevice.cpp | 10 ++-- filters/kword/pdf/FilterDevice.h | 2 +- filters/kword/pdf/FilterPage.cpp | 12 ++-- filters/kword/pdf/data.cpp | 6 +- filters/kword/pdf/data.h | 2 +- .../diffs/xpdf_security_integer_overflow_2.diff | 12 ++-- filters/kword/pdf/fstring.cpp | 2 +- filters/kword/pdf/fstring.h | 2 +- filters/kword/pdf/status.html | 2 +- filters/kword/pdf/transform.h | 2 +- filters/kword/pdf/xpdf/xpdf/Catalog.cc | 2 +- filters/kword/pdf/xpdf/xpdf/Gfx.cc | 18 +++--- filters/kword/pdf/xpdf/xpdf/GfxFont.cc | 2 +- filters/kword/pdf/xpdf/xpdf/ImageOutputDev.cc | 2 +- filters/kword/pdf/xpdf/xpdf/ImageOutputDev.h | 2 +- filters/kword/pdf/xpdf/xpdf/OutputDev.cc | 2 +- filters/kword/pdf/xpdf/xpdf/OutputDev.h | 2 +- filters/kword/pdf/xpdf/xpdf/PSOutputDev.cc | 10 ++-- filters/kword/pdf/xpdf/xpdf/PSOutputDev.h | 6 +- filters/kword/pdf/xpdf/xpdf/XOutputDev.cc | 14 ++--- filters/kword/pdf/xpdf/xpdf/XOutputDev.h | 2 +- filters/kword/pdf/xpdf/xpdf/XPDFCore.cc | 10 ++-- filters/kword/pdf/xpdf/xpdf/XPDFCore.h | 6 +- filters/kword/pdf/xpdf/xpdf/XPDFTree.cc | 26 ++++----- filters/kword/pdf/xpdf/xpdf/XPDFTreeP.h | 6 +- filters/kword/rtf/export/ExportFilter.cc | 32 +++++------ filters/kword/rtf/export/ExportFilter.h | 2 +- 58 files changed, 282 insertions(+), 282 deletions(-) (limited to 'filters/kword') diff --git a/filters/kword/abiword/ImportFormatting.cc b/filters/kword/abiword/ImportFormatting.cc index 14a059eb..1687e958 100644 --- a/filters/kword/abiword/ImportFormatting.cc +++ b/filters/kword/abiword/ImportFormatting.cc @@ -186,14 +186,14 @@ void AddFormat(TQDomElement& formatElementOut, StackItem* stackItem, TQDomDocume } } -void AddLayout(const TQString& strStyleName, TQDomElement& tqlayoutElement, +void AddLayout(const TQString& strStyleName, TQDomElement& layoutElement, StackItem* stackItem, TQDomDocument& mainDocument, const AbiPropsMap& abiPropsMap, const int level, const bool isStyle) { TQDomElement element; element=mainDocument.createElement("NAME"); element.setAttribute("value",strStyleName); - tqlayoutElement.appendChild(element); + layoutElement.appendChild(element); TQString strFollowing=abiPropsMap["followedby"].getValue(); TQDomElement followingElement=mainDocument.createElement("FOLLOWING"); @@ -206,7 +206,7 @@ void AddLayout(const TQString& strStyleName, TQDomElement& tqlayoutElement, { // We are a style, so we need a default followingElement.setAttribute("name","Normal"); - tqlayoutElement.appendChild(followingElement); + layoutElement.appendChild(followingElement); } // Else: we are a tqlayout, so we leave the work to KWord (from the style) } @@ -214,7 +214,7 @@ void AddLayout(const TQString& strStyleName, TQDomElement& tqlayoutElement, { // Following style is defined // TODO: we should be sure that this style is defined! - tqlayoutElement.appendChild(followingElement); + layoutElement.appendChild(followingElement); } TQString strFlow=abiPropsMap["text-align"].getValue(); @@ -227,7 +227,7 @@ void AddLayout(const TQString& strStyleName, TQDomElement& tqlayoutElement, { element.setAttribute("align","left"); } - tqlayoutElement.appendChild(element); + layoutElement.appendChild(element); int kwordDepth; int kwordNumberingType; @@ -258,7 +258,7 @@ void AddLayout(const TQString& strStyleName, TQDomElement& tqlayoutElement, element.setAttribute("bullet",64); element.setAttribute("bulletfont","Symbol"); element.setAttribute("customdef",""); - tqlayoutElement.appendChild(element); + layoutElement.appendChild(element); TQString strLeftMargin=abiPropsMap["margin-left"].getValue(); TQString strRightMargin=abiPropsMap["margin-right"].getValue(); @@ -275,7 +275,7 @@ void AddLayout(const TQString& strStyleName, TQDomElement& tqlayoutElement, element.setAttribute("right",ValueWithLengthUnit(strRightMargin)); if (!strTextIndent.isEmpty()) element.setAttribute("first",ValueWithLengthUnit(strTextIndent)); - tqlayoutElement.appendChild(element); + layoutElement.appendChild(element); } TQString strTopMargin=abiPropsMap["margin-top"].getValue(); @@ -290,7 +290,7 @@ void AddLayout(const TQString& strStyleName, TQDomElement& tqlayoutElement, element.setAttribute("after",margin_bottom); if (!strTopMargin.isEmpty()) element.setAttribute("before",margin_top); - tqlayoutElement.appendChild(element); + layoutElement.appendChild(element); } TQString strLineHeight=abiPropsMap["line-height"].getValue(); @@ -351,7 +351,7 @@ void AddLayout(const TQString& strStyleName, TQDomElement& tqlayoutElement, element.setAttribute( "spacingvalue", lineHeight ); } } - tqlayoutElement.appendChild(element); + layoutElement.appendChild(element); } TQString strTab=abiPropsMap["tabstops"].getValue(); @@ -397,12 +397,12 @@ void AddLayout(const TQString& strStyleName, TQDomElement& tqlayoutElement, element.setAttribute("type",type); element.setAttribute("filling",filling); element.setAttribute("width",width); - tqlayoutElement.appendChild(element); + layoutElement.appendChild(element); } } TQDomElement formatElementOut=mainDocument.createElement("FORMAT"); - tqlayoutElement.appendChild(formatElementOut); + layoutElement.appendChild(formatElementOut); AddFormat(formatElementOut, stackItem, mainDocument); } diff --git a/filters/kword/abiword/ImportFormatting.h b/filters/kword/abiword/ImportFormatting.h index 31b26b3f..f26f5f01 100644 --- a/filters/kword/abiword/ImportFormatting.h +++ b/filters/kword/abiword/ImportFormatting.h @@ -103,7 +103,7 @@ public: */ /** * for tables (\, \): defines the widths of the columns. - * Be careful: we are using the shallow copy mechanism of TQt. Use TQMemArray::detach when needed to avoid modifying the tqparents + * Be careful: we are using the shallow copy mechanism of TQt. Use TQMemArray::detach when needed to avoid modifying the parents */ TQMemArray m_doubleArray; }; @@ -122,7 +122,7 @@ void PopulateProperties(StackItem* stackItem, const TQString& strStyleProps, const bool allowInit); void AddFormat(TQDomElement& formatElementOut, StackItem* stackItem, TQDomDocument& mainDocument); -void AddLayout(const TQString& strStyleName, TQDomElement& tqlayoutElement, +void AddLayout(const TQString& strStyleName, TQDomElement& layoutElement, StackItem* stackItem, TQDomDocument& mainDocument, const AbiPropsMap& abiPropsMap, const int level, const bool isStyle); void AddStyle(TQDomElement& styleElement, const TQString& strStyleName, diff --git a/filters/kword/abiword/abiwordexport.cc b/filters/kword/abiword/abiwordexport.cc index 281f5d7e..c48b3c27 100644 --- a/filters/kword/abiword/abiwordexport.cc +++ b/filters/kword/abiword/abiwordexport.cc @@ -115,7 +115,7 @@ private: const FormatData& formatData); TQString textFormatToAbiProps(const TextFormatting& formatOrigin, const TextFormatting& formatData, const bool force) const; - TQString tqlayoutToCss(const LayoutData& tqlayoutOrigin, + TQString layoutToCss(const LayoutData& layoutOrigin, const LayoutData& tqlayout, const bool force) const; TQString escapeAbiWordText(const TQString& strText) const; bool makeTable(const FrameAnchor& anchor); @@ -718,12 +718,12 @@ void AbiWordWorker::processParagraphData ( const TQString ¶Text, } } -TQString AbiWordWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin, +TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin, const LayoutData& tqlayout, const bool force) const { TQString props; - if (force || (tqlayoutOrigin.tqalignment!=tqlayout.tqalignment)) + if (force || (layoutOrigin.tqalignment!=tqlayout.tqalignment)) { // Check if the current tqalignment is a valid one for AbiWord. if ((tqlayout.tqalignment == "left") || (tqlayout.tqalignment == "right") @@ -748,7 +748,7 @@ TQString AbiWordWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin, #if 0 // DEPRECATED! if (!tqlayout.tabulator.isEmpty() - && (force || (tqlayoutOrigin.tabulator!=tqlayout.tabulator))) + && (force || (layoutOrigin.tabulator!=tqlayout.tabulator))) { props += "tabstops:"; props += tqlayout.tabulator; @@ -756,7 +756,7 @@ TQString AbiWordWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin, } #endif if (!tqlayout.tabulatorList.isEmpty() - && (force || (tqlayoutOrigin.tabulatorList!=tqlayout.tabulatorList) )) + && (force || (layoutOrigin.tabulatorList!=tqlayout.tabulatorList) )) { props += "tabstops:"; bool first=true; @@ -790,18 +790,18 @@ TQString AbiWordWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin, } if ((tqlayout.indentLeft>=0.0) - && (force || (tqlayoutOrigin.indentLeft!=tqlayout.indentLeft))) + && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft))) { props += TQString("margin-left:%1pt; ").tqarg(tqlayout.indentLeft); } if ((tqlayout.indentRight>=0.0) - && (force || (tqlayoutOrigin.indentRight!=tqlayout.indentRight))) + && (force || (layoutOrigin.indentRight!=tqlayout.indentRight))) { props += TQString("margin-right:%1pt; ").tqarg(tqlayout.indentRight); } - if (force || (tqlayoutOrigin.indentLeft!=tqlayout.indentLeft)) + if (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)) { props += "text-indent: "; props += TQString::number(tqlayout.indentFirst); @@ -809,20 +809,20 @@ TQString AbiWordWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin, } if ((tqlayout.marginBottom>=0.0) - && ( force || ( tqlayoutOrigin.marginBottom != tqlayout.marginBottom ) ) ) + && ( force || ( layoutOrigin.marginBottom != tqlayout.marginBottom ) ) ) { props += TQString("margin-bottom:%1pt; ").tqarg(tqlayout.marginBottom); } if ((tqlayout.marginTop>=0.0) - && ( force || ( tqlayoutOrigin.marginTop != tqlayout.marginTop ) ) ) + && ( force || ( layoutOrigin.marginTop != tqlayout.marginTop ) ) ) { props += TQString("margin-top:%1pt; ").tqarg(tqlayout.marginTop); } if (force - || ( tqlayoutOrigin.lineSpacingType != tqlayout.lineSpacingType ) - || ( tqlayoutOrigin.lineSpacing != tqlayout.lineSpacing ) ) + || ( layoutOrigin.lineSpacingType != tqlayout.lineSpacingType ) + || ( layoutOrigin.lineSpacing != tqlayout.lineSpacing ) ) { switch ( tqlayout.lineSpacingType ) { @@ -881,7 +881,7 @@ TQString AbiWordWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin, } // Add all AbiWord properties collected in the element - props += textFormatToAbiProps(tqlayoutOrigin.formatData.text,tqlayout.formatData.text,force); + props += textFormatToAbiProps(layoutOrigin.formatData.text,tqlayout.formatData.text,force); return props; } @@ -893,7 +893,7 @@ bool AbiWordWorker::doFullParagraph(const TQString& paraText, const LayoutData& const LayoutData& styleLayout=m_styleMap[style]; - TQString props=tqlayoutToCss(styleLayout,tqlayout,false); + TQString props=layoutToCss(styleLayout,tqlayout,false); *m_streamOut << "=0) diff --git a/filters/kword/abiword/abiwordimport.cc b/filters/kword/abiword/abiwordimport.cc index 9533d5df..2d0697ba 100644 --- a/filters/kword/abiword/abiwordimport.cc +++ b/filters/kword/abiword/abiwordimport.cc @@ -364,10 +364,10 @@ bool StartElementP(StackItem* stackItem, StackItem* stackCurrent, stackItem->pos=0; // No text characters yet // Now we populate the tqlayout - TQDomElement tqlayoutElement=mainDocument.createElement("LAYOUT"); - paragraphElementOut.appendChild(tqlayoutElement); + TQDomElement layoutElement=mainDocument.createElement("LAYOUT"); + paragraphElementOut.appendChild(layoutElement); - AddLayout(strStyle,tqlayoutElement, stackItem, mainDocument, abiPropsMap, level, false); + AddLayout(strStyle,layoutElement, stackItem, mainDocument, abiPropsMap, level, false); return true; } @@ -1114,7 +1114,7 @@ bool StructureParser::StartElementTable(StackItem* stackItem, StackItem* stackCu TQStringList widthList; widthList.split('/', attributes.value("table-column-props"), false); const uint columns = widthList.size(); - stackItem->m_doubleArray.detach(); // Be sure not to modify tqparents + stackItem->m_doubleArray.detach(); // Be sure not to modify parents stackItem->m_doubleArray.resize(columns+1); // All left positions but the last right one stackItem->m_doubleArray[0] = 0.0; TQStringList::ConstIterator it; @@ -1160,12 +1160,12 @@ bool StructureParser::StartElementTable(StackItem* stackItem, StackItem* stackCu stackItem->pos=1; // Just # // Now we populate the tqlayout - TQDomElement tqlayoutElement=mainDocument.createElement("LAYOUT"); - paragraphElementOut.appendChild(tqlayoutElement); + TQDomElement layoutElement=mainDocument.createElement("LAYOUT"); + paragraphElementOut.appendChild(layoutElement); AbiPropsMap abiPropsMap; styleDataMap.useOrCreateStyle("Normal"); // We might have to create the "Normal" style. - AddLayout("Normal", tqlayoutElement, stackItem, mainDocument, abiPropsMap, 0, false); + AddLayout("Normal", layoutElement, stackItem, mainDocument, abiPropsMap, 0, false); #else stackItem->elementType=ElementTypeIgnore; #endif diff --git a/filters/kword/ascii/ExportDialogUI.ui b/filters/kword/ascii/ExportDialogUI.ui index 2cef87d5..8f66942c 100644 --- a/filters/kword/ascii/ExportDialogUI.ui +++ b/filters/kword/ascii/ExportDialogUI.ui @@ -152,7 +152,7 @@ radioEndOfLineCRLF radioEndOfLineCR - + kcombobox.h klineedit.h diff --git a/filters/kword/ascii/ImportDialogUI.ui b/filters/kword/ascii/ImportDialogUI.ui index a67a43c2..fd124062 100644 --- a/filters/kword/ascii/ImportDialogUI.ui +++ b/filters/kword/ascii/ImportDialogUI.ui @@ -141,7 +141,7 @@ - + kcombobox.h klineedit.h diff --git a/filters/kword/ascii/asciiimport.cc b/filters/kword/ascii/asciiimport.cc index ceb93582..a04da78f 100644 --- a/filters/kword/ascii/asciiimport.cc +++ b/filters/kword/ascii/asciiimport.cc @@ -370,7 +370,7 @@ void ASCIIImport::sentenceConvert(TQTextStream& stream, TQDomDocument& mainDocum TQDomElement& mainFramesetElement) // Strategy: // - end a paragraph when a line ends with a point or similar punctuation. -// - search the punctuation at the end of the line, even if the sentence is quoted or in tqparentheses. +// - search the punctuation at the end of the line, even if the sentence is quoted or in parentheses. // - an empty line also ends the paragraph // TODO/FIXME: we have a little problem with empty lines. Perhaps we should not allow empty paragraphs! { @@ -471,13 +471,13 @@ void ASCIIImport::writeOutParagraph(TQDomDocument& mainDocument, paragraphElementOut.appendChild(textElement); //TQDomElement formatsPluralElementOut=mainDocument.createElement("FORMATS"); //paragraphElementOut.appendChild(formatsPluralElementOut); - TQDomElement tqlayoutElement=mainDocument.createElement("LAYOUT"); - paragraphElementOut.appendChild(tqlayoutElement); + TQDomElement layoutElement=mainDocument.createElement("LAYOUT"); + paragraphElementOut.appendChild(layoutElement); TQDomElement element; element=mainDocument.createElement("NAME"); element.setAttribute("value",name); - tqlayoutElement.appendChild(element); + layoutElement.appendChild(element); double size; element=mainDocument.createElement("INDENTS"); diff --git a/filters/kword/ascii/status.html b/filters/kword/ascii/status.html index e8af7c5d..6b53717d 100644 --- a/filters/kword/ascii/status.html +++ b/filters/kword/ascii/status.html @@ -98,7 +98,7 @@ (Recommended strategy)
Sentence:
- a paragraph ends when a line ends with a point or similar punctuation.
- - the punctuation is searched at the end of the line, even if the sentence is quoted or in tqparentheses.
+ - the punctuation is searched at the end of the line, even if the sentence is quoted or in parentheses.
- an empty line also ends the paragraph.
Old Way: (similar to KOffice 1.1.x)
- a paragraph ends at an empty line.
diff --git a/filters/kword/html/export/ExportCss.cc b/filters/kword/html/export/ExportCss.cc index 51c4da91..057cdd86 100644 --- a/filters/kword/html/export/ExportCss.cc +++ b/filters/kword/html/export/ExportCss.cc @@ -308,12 +308,12 @@ TQString HtmlCssWorker::getStartOfListOpeningTag(const CounterData::Style typeLi return strResult; } -TQString HtmlCssWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin, +TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin, const LayoutData& tqlayout, const bool force) const { TQString strLayout; - if (force || (tqlayoutOrigin.tqalignment!=tqlayout.tqalignment)) + if (force || (layoutOrigin.tqalignment!=tqlayout.tqalignment)) { if ( (tqlayout.tqalignment=="left") || (tqlayout.tqalignment== "right") || (tqlayout.tqalignment=="center") || (tqlayout.tqalignment=="justify")) @@ -331,37 +331,37 @@ TQString HtmlCssWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin, } if ((tqlayout.indentLeft>=0.0) - && (force || (tqlayoutOrigin.indentLeft!=tqlayout.indentLeft))) + && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft))) { strLayout += TQString("margin-left:%1pt; ").tqarg(tqlayout.indentLeft); } if ((tqlayout.indentRight>=0.0) - && (force || (tqlayoutOrigin.indentRight!=tqlayout.indentRight))) + && (force || (layoutOrigin.indentRight!=tqlayout.indentRight))) { strLayout += TQString("margin-right:%1pt; ").tqarg(tqlayout.indentRight); } - if (force || (tqlayoutOrigin.indentLeft!=tqlayout.indentLeft)) + if (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)) { strLayout += TQString("text-indent:%1pt; ").tqarg(tqlayout.indentFirst); } if ((tqlayout.marginBottom>=0.0) - && ( force || ( tqlayoutOrigin.marginBottom != tqlayout.marginBottom ) ) ) + && ( force || ( layoutOrigin.marginBottom != tqlayout.marginBottom ) ) ) { strLayout += TQString("margin-bottom:%1pt; ").tqarg(tqlayout.marginBottom); } if ((tqlayout.marginTop>=0.0) - && ( force || ( tqlayoutOrigin.marginTop != tqlayout.marginTop ) ) ) + && ( force || ( layoutOrigin.marginTop != tqlayout.marginTop ) ) ) { strLayout += TQString("margin-top:%1pt; ").tqarg(tqlayout.marginTop); } if (force - || ( tqlayoutOrigin.lineSpacingType != tqlayout.lineSpacingType ) - || ( tqlayoutOrigin.lineSpacing != tqlayout.lineSpacing ) ) + || ( layoutOrigin.lineSpacingType != tqlayout.lineSpacingType ) + || ( layoutOrigin.lineSpacing != tqlayout.lineSpacing ) ) { switch ( tqlayout.lineSpacingType ) { @@ -430,8 +430,8 @@ TQString HtmlCssWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin, // TODO: Konqueror/KHTML does not support "text-shadow" if (!force - && ( tqlayoutOrigin.shadowDirection == tqlayout.shadowDirection ) - && ( tqlayoutOrigin.shadowDistance == tqlayout.shadowDistance ) ) + && ( layoutOrigin.shadowDirection == tqlayout.shadowDirection ) + && ( layoutOrigin.shadowDistance == tqlayout.shadowDistance ) ) { // Do nothing! } @@ -518,7 +518,7 @@ TQString HtmlCssWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin, // TODO: borders // This must remain last, as the last property does not have a semi-colon - strLayout+=textFormatToCss(tqlayoutOrigin.formatData.text, + strLayout+=textFormatToCss(layoutOrigin.formatData.text, tqlayout.formatData.text,force); return strLayout; @@ -535,7 +535,7 @@ void HtmlCssWorker::openParagraph(const TQString& strTag, *m_streamOut << " class=\"" << escapeCssIdentifier(tqlayout.styleName); *m_streamOut << "\""; - TQString strStyle=tqlayoutToCss(styleLayout,tqlayout,false); + TQString strStyle=layoutToCss(styleLayout,tqlayout,false); if (!strStyle.isEmpty()) { *m_streamOut << " style=\"" << strStyle; @@ -689,7 +689,7 @@ bool HtmlCssWorker::doFullDefineStyle(LayoutData& tqlayout) // the style could be forced on

by the tqlayout. *m_streamOut << "." << escapeCssIdentifier(tqlayout.styleName); - *m_streamOut << "\n{\n " << tqlayoutToCss(tqlayout,tqlayout,true) << "\n}\n"; + *m_streamOut << "\n{\n " << layoutToCss(tqlayout,tqlayout,true) << "\n}\n"; return true; } diff --git a/filters/kword/html/export/ExportCss.h b/filters/kword/html/export/ExportCss.h index acbf20cc..358ea688 100644 --- a/filters/kword/html/export/ExportCss.h +++ b/filters/kword/html/export/ExportCss.h @@ -54,7 +54,7 @@ protected: virtual void openSpan(const FormatData& formatOrigin, const FormatData& format); virtual void closeSpan(const FormatData& formatOrigin, const FormatData& format); private: - TQString tqlayoutToCss(const LayoutData& tqlayoutOrigin,const LayoutData& tqlayout, + TQString layoutToCss(const LayoutData& layoutOrigin,const LayoutData& tqlayout, const bool force) const; TQString escapeCssIdentifier(const TQString& strText) const; TQString textFormatToCss(const TextFormatting& formatOrigin, diff --git a/filters/kword/html/export/ExportDialogUI.ui b/filters/kword/html/export/ExportDialogUI.ui index 474d2912..cbdc4fc2 100644 --- a/filters/kword/html/export/ExportDialogUI.ui +++ b/filters/kword/html/export/ExportDialogUI.ui @@ -279,7 +279,7 @@ radioModeLight radioModeEnhanced - + kcombobox.h klineedit.h diff --git a/filters/kword/html/export/ExportFilter.cc b/filters/kword/html/export/ExportFilter.cc index 225a51ea..4a4cd64d 100644 --- a/filters/kword/html/export/ExportFilter.cc +++ b/filters/kword/html/export/ExportFilter.cc @@ -384,22 +384,22 @@ bool HtmlWorker::doFullParagraph(const TQString& paraText, if ( tqlayout.counter.numbering == CounterData::NUM_LIST ) { - const uint tqlayoutDepth=tqlayout.counter.depth+1; // Word's depth starts at 0! + const uint layoutDepth=tqlayout.counter.depth+1; // Word's depth starts at 0! const uint listDepth=m_listStack.size(); // We are in a list, but has it the right depth? - if (tqlayoutDepth>listDepth) + if (layoutDepth>listDepth) { ListInfo newList; newList.m_typeList=tqlayout.counter.style; - for (uint i=listDepth; itqlayoutDepth; i--) + for (uint i=listDepth; i>layoutDepth; i--) { ListInfo oldList=m_listStack.pop(); if (oldList.m_orderedList) diff --git a/filters/kword/html/import/khtmlreader.cpp b/filters/kword/html/import/khtmlreader.cpp index 1df58edf..6e134e38 100644 --- a/filters/kword/html/import/khtmlreader.cpp +++ b/filters/kword/html/import/khtmlreader.cpp @@ -236,7 +236,7 @@ void KHTMLReader::parse_head(DOM::Element e) state()->tqlayout=_writer->setLayout(state()->paragraph,state()->tqlayout);\ if (!(_writer->getText(state()->paragraph).isEmpty())) \ startNewParagraph(false,false); \ - _writer->tqlayoutAttribute(state()->paragraph, #a,#b,#c); \ + _writer->layoutAttribute(state()->paragraph, #a,#b,#c); \ return true; \ } \ } @@ -317,11 +317,11 @@ void KHTMLReader::startNewParagraph(bool startnewformat, bool startnewtqlayout) TQString ct=_writer->getLayoutAttribute(state()->paragraph,"COUNTER","type"); if ((!ct.isNull()) && (ct != "0")) { - _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","type","0"); - _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","numberingtype","0"); - _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","righttext",""); + _writer->layoutAttribute(state()->paragraph,"COUNTER","type","0"); + _writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","0"); + _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext",""); int currdepth=(_writer->getLayoutAttribute(state()->paragraph,"COUNTER","depth")).toInt(); - _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(currdepth+1)); + _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(currdepth+1)); } } @@ -353,12 +353,12 @@ bool KHTMLReader::parse_CommonAttributes(DOM::Element e) // example:

{ kdDebug(30503) << "laying out with " << e.getAttribute("class").string() << endl; - _writer->tqlayoutAttribute(state()->paragraph,"NAME","value",e.getAttribute("class").string()); + _writer->layoutAttribute(state()->paragraph,"NAME","value",e.getAttribute("class").string()); } if ( e.getAttribute("class").string()=="Standard" ) { kdDebug(30503) << "laying out with " << e.getAttribute("class").string() << endl; - _writer->tqlayoutAttribute(state()->paragraph,"NAME","value",e.getAttribute("class").string()); + _writer->layoutAttribute(state()->paragraph,"NAME","value",e.getAttribute("class").string()); } kdDebug(30503) << "leaving parse_CommonAttributes" << endl; return true; @@ -509,7 +509,7 @@ void KHTMLReader::parseStyle(DOM::Element e) if ( s1.getPropertyValue("text-align").string() != TQString() && s1.getPropertyValue("text-align").string() != TQString("left") ) { state()->tqlayout=_writer->setLayout(state()->paragraph,state()->tqlayout); - _writer->tqlayoutAttribute(state()->paragraph, "FLOW","align",s1.getPropertyValue("text-align").string()); + _writer->layoutAttribute(state()->paragraph, "FLOW","align",s1.getPropertyValue("text-align").string()); } // done @@ -684,7 +684,7 @@ bool KHTMLReader::parse_ul(DOM::Element e) _list_depth++; if (e.firstChild().nodeName().string().lower() == "#text") // e.g.

    this is indented
  • first listitem
{ - _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_list_depth-1)); // indent + _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_list_depth-1)); // indent startNewLayout(); } for (DOM::Node items=e.firstChild();!items.isNull();items=items.nextSibling()) @@ -692,21 +692,21 @@ bool KHTMLReader::parse_ul(DOM::Element e) if (items.nodeName().string().lower() == "li") { if (!(_writer->getText(state()->paragraph).isEmpty())) startNewLayout(); - _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","numberingtype","1"); - _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","righttext","."); + _writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","1"); + _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext","."); if (e.tagName().string().lower() == "ol") { - _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","type","1"); - _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","numberingtype","1"); - _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","righttext","."); + _writer->layoutAttribute(state()->paragraph,"COUNTER","type","1"); + _writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","1"); + _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext","."); } else { - _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","type","10"); - _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","numberingtype",""); - _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","righttext",""); + _writer->layoutAttribute(state()->paragraph,"COUNTER","type","10"); + _writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype",""); + _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext",""); } - _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_list_depth-1)); // indent + _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_list_depth-1)); // indent } parseNode(items); } diff --git a/filters/kword/html/import/kwdwriter.cpp b/filters/kword/html/import/kwdwriter.cpp index d2e4c450..23211ecc 100644 --- a/filters/kword/html/import/kwdwriter.cpp +++ b/filters/kword/html/import/kwdwriter.cpp @@ -207,7 +207,7 @@ void KWDWriter::finishTable(int tableno) { void KWDWriter::createHR(TQDomElement paragraph, int width) { - tqlayoutAttribute(paragraph,"BOTTOMBORDER","width",TQString("%1").tqarg(width)); + layoutAttribute(paragraph,"BOTTOMBORDER","width",TQString("%1").tqarg(width)); } void KWDWriter::finishTable(int tableno,TQRect rect) { @@ -353,16 +353,16 @@ TQRect getRect(TQDomElement frameset) { } -TQDomElement KWDWriter::addParagraph(TQDomElement tqparent, TQDomElement tqlayoutToClone) { +TQDomElement KWDWriter::addParagraph(TQDomElement tqparent, TQDomElement layoutToClone) { TQDomElement paragraph=_doc->createElement("PARAGRAPH"); TQDomElement formats=_doc->createElement("FORMATS"); TQDomElement tqlayout; - if (tqlayoutToClone.isNull()) { + if (layoutToClone.isNull()) { tqlayout=_doc->createElement("LAYOUT"); } else { - tqlayout=tqlayoutToClone.cloneNode().toElement(); + tqlayout=layoutToClone.cloneNode().toElement(); } TQDomElement text=_doc->createElement("TEXT"); TQDomText t=_doc->createTextNode(TQString("")); @@ -371,7 +371,7 @@ TQDomElement KWDWriter::addParagraph(TQDomElement tqparent, TQDomElement tqlayou paragraph.appendChild(text); tqparent.appendChild(paragraph); paragraph.appendChild(tqlayout); - tqlayoutAttribute(paragraph,"NAME","value","Standard"); + layoutAttribute(paragraph,"NAME","value","Standard"); return paragraph; } @@ -403,9 +403,9 @@ TQString KWDWriter::getLayoutAttribute(TQDomElement paragraph, TQString name, TQ return TQString(); } -TQDomElement KWDWriter::tqlayoutAttribute(TQDomElement paragraph, TQString name, TQString attrName, TQString attr) +TQDomElement KWDWriter::layoutAttribute(TQDomElement paragraph, TQString name, TQString attrName, TQString attr) { - kdDebug() << "Entering KWDWriter::tqlayoutAttribute name=" << name << " attrName=" << attrName << " attr=" << attr << endl; + kdDebug() << "Entering KWDWriter::layoutAttribute name=" << name << " attrName=" << attrName << " attr=" << attr << endl; TQDomElement currentLayout=paragraph.elementsByTagName("LAYOUT").item(0).toElement(); TQDomNodeList qdnl= currentLayout.elementsByTagName(name); diff --git a/filters/kword/html/import/kwdwriter.h b/filters/kword/html/import/kwdwriter.h index 2fc888c4..59694e8d 100644 --- a/filters/kword/html/import/kwdwriter.h +++ b/filters/kword/html/import/kwdwriter.h @@ -131,7 +131,7 @@ public: /** * adds/changes an attribute to/of the current tqlayout **/ - TQDomElement tqlayoutAttribute(TQDomElement paragraph, TQString name, TQString attrName, TQString attr); + TQDomElement layoutAttribute(TQDomElement paragraph, TQString name, TQString attrName, TQString attr); /** * creates a new format in the current paragraph. do this before adding text diff --git a/filters/kword/kword1.3/import/kword13parser.cpp b/filters/kword/kword1.3/import/kword13parser.cpp index c6dce3d5..00d8290d 100644 --- a/filters/kword/kword1.3/import/kword13parser.cpp +++ b/filters/kword/kword1.3/import/kword13parser.cpp @@ -106,7 +106,7 @@ bool KWord13Parser::startElementFormatOneProperty( const TQString& name, const T } else { - kdError(30520) << "Wrong tqparents for FORMAT property: " << name << endl; + kdError(30520) << "Wrong parents for FORMAT property: " << name << endl; return false; } } diff --git a/filters/kword/latex/export/latexexportdia.ui b/filters/kword/latex/export/latexexportdia.ui index 677329da..8c3835ed 100644 --- a/filters/kword/latex/export/latexexportdia.ui +++ b/filters/kword/latex/export/latexexportdia.ui @@ -659,7 +659,7 @@ addLanguage() removeLanguage() - + knuminput.h knuminput.h diff --git a/filters/kword/libexport/TagProcessing.cc b/filters/kword/libexport/TagProcessing.cc index ca47f1ef..b70d58d9 100644 --- a/filters/kword/libexport/TagProcessing.cc +++ b/filters/kword/libexport/TagProcessing.cc @@ -42,15 +42,15 @@ // #define DEBUG_KWORD_IGNORED_TAGS -void ProcessSubtags ( const TQDomNode &tqparentNode, +void ProcessSubtags ( const TQDomNode &parentNode, TQValueList &tagProcessingList, KWEFKWordLeader *leader) { - //kdDebug(30508) << "Starting ProcessSubtags for node: " << tqparentNode.nodeName() << endl; + //kdDebug(30508) << "Starting ProcessSubtags for node: " << parentNode.nodeName() << endl; TQDomNode childNode; - for ( childNode = tqparentNode.firstChild (); !childNode.isNull (); childNode = childNode.nextSibling () ) + for ( childNode = parentNode.firstChild (); !childNode.isNull (); childNode = childNode.nextSibling () ) { if ( childNode.isElement () ) { @@ -74,7 +74,7 @@ void ProcessSubtags ( const TQDomNode &tqparentNode, else { kdDebug(30508) << "Ignoring " << childNode.nodeName () - << " tag in " << tqparentNode.nodeName () << endl; + << " tag in " << parentNode.nodeName () << endl; } #endif break; @@ -84,11 +84,11 @@ void ProcessSubtags ( const TQDomNode &tqparentNode, if ( !found ) { kdDebug(30508) << "Unexpected tag " << childNode.nodeName () - << " in " << tqparentNode.nodeName () << "!" << endl; + << " in " << parentNode.nodeName () << "!" << endl; } } } - //kdDebug(30508) << "Ending ProcessSubtags for node: " << tqparentNode.nodeName() << endl; + //kdDebug(30508) << "Ending ProcessSubtags for node: " << parentNode.nodeName() << endl; } void AllowNoSubtags ( const TQDomNode& myNode, KWEFKWordLeader *leader ) diff --git a/filters/kword/libexport/TagProcessing.h b/filters/kword/libexport/TagProcessing.h index 01080d50..27512bfd 100644 --- a/filters/kword/libexport/TagProcessing.h +++ b/filters/kword/libexport/TagProcessing.h @@ -76,7 +76,7 @@ class TagProcessing void *data; }; -void ProcessSubtags ( const TQDomNode &tqparentNode, +void ProcessSubtags ( const TQDomNode &parentNode, TQValueList &tagProcessingList, KWEFKWordLeader *leader); diff --git a/filters/kword/msword/conversion.cpp b/filters/kword/msword/conversion.cpp index 4b221051..83dae4ab 100644 --- a/filters/kword/msword/conversion.cpp +++ b/filters/kword/msword/conversion.cpp @@ -81,7 +81,7 @@ int Conversion::fillPatternStyle( int ipat ) { // See $TQTDIR/doc/html/qbrush.html#setStyle switch( ipat ) { - case 0: // Automatic (Aptqparently it means Solid from background color instead of foreground) + case 0: // Automatic (Apparently it means Solid from background color instead of foreground) case 1: // Solid return TQt::SolidPattern; case 2: // 5% diff --git a/filters/kword/msword/document.cpp b/filters/kword/msword/document.cpp index f5737200..5044f023 100644 --- a/filters/kword/msword/document.cpp +++ b/filters/kword/msword/document.cpp @@ -371,9 +371,9 @@ void Document::slotTableCellEnd() m_textHandler->setFrameSetElement( TQDomElement() ); } -TQDomElement Document::createInitialFrame( TQDomElement& tqparentFramesetElem, double left, double right, double top, double bottom, bool autoExtend, NewFrameBehavior nfb ) +TQDomElement Document::createInitialFrame( TQDomElement& parentFramesetElem, double left, double right, double top, double bottom, bool autoExtend, NewFrameBehavior nfb ) { - TQDomElement frameElementOut = tqparentFramesetElem.ownerDocument().createElement("FRAME"); + TQDomElement frameElementOut = parentFramesetElem.ownerDocument().createElement("FRAME"); frameElementOut.setAttribute( "left", left ); frameElementOut.setAttribute( "right", right ); frameElementOut.setAttribute( "top", top ); @@ -382,7 +382,7 @@ TQDomElement Document::createInitialFrame( TQDomElement& tqparentFramesetElem, d // AutoExtendFrame for header/footer/footnote/endnote, AutoCreateNewFrame for body text frameElementOut.setAttribute( "autoCreateNewFrame", autoExtend ? 0 : 1 ); frameElementOut.setAttribute( "newFrameBehavior", nfb ); - tqparentFramesetElem.appendChild( frameElementOut ); + parentFramesetElem.appendChild( frameElementOut ); return frameElementOut; } @@ -405,7 +405,7 @@ void Document::generateFrameBorder( TQDomElement& frameElementOut, const wvWare: // If ipat = 0 (solid fill), icoBack is the background color. // But otherwise, icoFore is the one we need to set as bkColor // (and icoBack is usually white; it's the other colour of the pattern, - // something that we can't set in TQt aptqparently). + // something that we can't set in TQt apparently). int bkColor = shd.ipat ? shd.cvFore : shd.cvBack; kdDebug(30513) << "generateFrameBorder: " << " icoFore=" << shd.cvFore << " icoBack=" << shd.cvBack << " ipat=" << shd.ipat << " -> bkColor=" << bkColor << endl; diff --git a/filters/kword/msword/document.h b/filters/kword/msword/document.h index 0e79065a..af527e2a 100644 --- a/filters/kword/msword/document.h +++ b/filters/kword/msword/document.h @@ -113,7 +113,7 @@ private: void processStyles(); void processAssociatedStrings(); enum NewFrameBehavior { Reconnect=0, NoFollowup=1, Copy=2 }; - TQDomElement createInitialFrame( TQDomElement& tqparentFramesetElem, double left, double right, double top, double bottom, bool autoExtend, NewFrameBehavior nfb ); + TQDomElement createInitialFrame( TQDomElement& parentFramesetElem, double left, double right, double top, double bottom, bool autoExtend, NewFrameBehavior nfb ); void generateFrameBorder( TQDomElement& frameElementOut, const wvWare::Word97::BRC& brcTop, const wvWare::Word97::BRC& brcBottom, const wvWare::Word97::BRC& brcLeft, const wvWare::Word97::BRC& brcRight, const wvWare::Word97::SHD& shd ); TQDomDocument& m_mainDocument; diff --git a/filters/kword/msword/texthandler.cpp b/filters/kword/msword/texthandler.cpp index 0dcffdbb..e58ffead 100644 --- a/filters/kword/msword/texthandler.cpp +++ b/filters/kword/msword/texthandler.cpp @@ -315,7 +315,7 @@ void KWordTextHandler::runOfText( const wvWare::UString& text, wvWare::SharedPtr } -void KWordTextHandler::writeFormat( TQDomElement& tqparentElement, const wvWare::Word97::CHP* chp, const wvWare::Word97::CHP* refChp, int pos, int len, int formatId, TQDomElement* pChildElement ) +void KWordTextHandler::writeFormat( TQDomElement& parentElement, const wvWare::Word97::CHP* chp, const wvWare::Word97::CHP* refChp, int pos, int len, int formatId, TQDomElement* pChildElement ) { TQDomElement format( mainDocument().createElement( "FORMAT" ) ); format.setAttribute( "id", formatId ); @@ -471,7 +471,7 @@ void KWordTextHandler::writeFormat( TQDomElement& tqparentElement, const wvWare: } if ( pChildElement || !format.firstChild().isNull() ) // Don't save an empty format tag, unless the caller asked for it - tqparentElement.appendChild( format ); + parentElement.appendChild( format ); if ( pChildElement ) *pChildElement = format; } @@ -551,34 +551,34 @@ void KWordTextHandler::writeOutParagraph( const TQString& styleName, const TQStr textElement.setAttribute( "xml:space", "preserve" ); paragraphElementOut.appendChild(textElement); paragraphElementOut.appendChild( m_formats ); - TQDomElement tqlayoutElement=mainDocument().createElement("LAYOUT"); - paragraphElementOut.appendChild(tqlayoutElement); + TQDomElement layoutElement=mainDocument().createElement("LAYOUT"); + paragraphElementOut.appendChild(layoutElement); TQDomElement nameElement = mainDocument().createElement("NAME"); nameElement.setAttribute("value", styleName); - tqlayoutElement.appendChild(nameElement); + layoutElement.appendChild(nameElement); if ( m_paragraphProperties ) { // Write out the properties of the paragraph - writeLayout( tqlayoutElement, *m_paragraphProperties, m_currentStyle ); + writeLayout( layoutElement, *m_paragraphProperties, m_currentStyle ); } textElement.appendChild(mainDocument().createTextNode(text)); m_paragraph = TQString( "" ); m_index = 0; - m_oldLayout = tqlayoutElement; // Keep a reference to the old tqlayout for some hacks + m_oldLayout = layoutElement; // Keep a reference to the old tqlayout for some hacks } -void KWordTextHandler::writeLayout( TQDomElement& tqparentElement, const wvWare::ParagraphProperties& paragraphProperties, const wvWare::Style* style ) +void KWordTextHandler::writeLayout( TQDomElement& parentElement, const wvWare::ParagraphProperties& paragraphProperties, const wvWare::Style* style ) { const wvWare::Word97::PAP& pap = paragraphProperties.pap(); // Always write out the tqalignment, it's required TQDomElement flowElement = mainDocument().createElement("FLOW"); TQString tqalignment = Conversion::tqalignment( pap.jc ); flowElement.setAttribute( "align", tqalignment ); - tqparentElement.appendChild( flowElement ); + parentElement.appendChild( flowElement ); //kdDebug(30513) << k_funcinfo << " dxaLeft1=" << pap.dxaLeft1 << " dxaLeft=" << pap.dxaLeft << " dxaRight=" << pap.dxaRight << " dyaBefore=" << pap.dyaBefore << " dyaAfter=" << pap.dyaAfter << " lspd=" << pap.lspd.dyaLine << "/" << pap.lspd.fMultLinespace << endl; @@ -589,14 +589,14 @@ void KWordTextHandler::writeLayout( TQDomElement& tqparentElement, const wvWare: indentsElement.setAttribute( "first", (double)pap.dxaLeft1 / 20.0 ); indentsElement.setAttribute( "left", (double)pap.dxaLeft / 20.0 ); indentsElement.setAttribute( "right", (double)pap.dxaRight / 20.0 ); - tqparentElement.appendChild( indentsElement ); + parentElement.appendChild( indentsElement ); } if ( pap.dyaBefore || pap.dyaAfter ) { TQDomElement offsetsElement = mainDocument().createElement("OFFSETS"); offsetsElement.setAttribute( "before", (double)pap.dyaBefore / 20.0 ); offsetsElement.setAttribute( "after", (double)pap.dyaAfter / 20.0 ); - tqparentElement.appendChild( offsetsElement ); + parentElement.appendChild( offsetsElement ); } // Linespacing @@ -605,7 +605,7 @@ void KWordTextHandler::writeLayout( TQDomElement& tqparentElement, const wvWare: { TQDomElement lineSpacingElem = mainDocument().createElement( "LINESPACING" ); lineSpacingElem.setAttribute("value", lineSpacing ); - tqparentElement.appendChild( lineSpacingElem ); + parentElement.appendChild( lineSpacingElem ); } if ( pap.fKeep || pap.fKeepFollow || pap.fPageBreakBefore ) @@ -617,7 +617,7 @@ void KWordTextHandler::writeLayout( TQDomElement& tqparentElement, const wvWare: pageBreak.setAttribute("hardFrameBreak", "true" ); if ( pap.fKeepFollow ) pageBreak.setAttribute("keepWithNext", "true" ); - tqparentElement.appendChild( pageBreak ); + parentElement.appendChild( pageBreak ); } // Borders @@ -625,25 +625,25 @@ void KWordTextHandler::writeLayout( TQDomElement& tqparentElement, const wvWare: { TQDomElement borderElement = mainDocument().createElement( "TOPBORDER" ); Conversion::setBorderAttributes( borderElement, pap.brcTop ); - tqparentElement.appendChild( borderElement ); + parentElement.appendChild( borderElement ); } if ( pap.brcBottom.brcType ) { TQDomElement borderElement = mainDocument().createElement( "BOTTOMBORDER" ); Conversion::setBorderAttributes( borderElement, pap.brcBottom ); - tqparentElement.appendChild( borderElement ); + parentElement.appendChild( borderElement ); } if ( pap.brcLeft.brcType ) { TQDomElement borderElement = mainDocument().createElement( "LEFTBORDER" ); Conversion::setBorderAttributes( borderElement, pap.brcLeft ); - tqparentElement.appendChild( borderElement ); + parentElement.appendChild( borderElement ); } if ( pap.brcRight.brcType ) { TQDomElement borderElement = mainDocument().createElement( "RIGHTBORDER" ); Conversion::setBorderAttributes( borderElement, pap.brcRight ); - tqparentElement.appendChild( borderElement ); + parentElement.appendChild( borderElement ); } // Tabulators @@ -674,17 +674,17 @@ void KWordTextHandler::writeLayout( TQDomElement& tqparentElement, const wvWare: } tabElement.setAttribute( "filling", filling ); tabElement.setAttribute( "width", width ); - tqparentElement.appendChild( tabElement ); + parentElement.appendChild( tabElement ); } } if ( pap.ilfo > 0 ) { - writeCounter( tqparentElement, paragraphProperties, style ); + writeCounter( parentElement, paragraphProperties, style ); } } -void KWordTextHandler::writeCounter( TQDomElement& tqparentElement, const wvWare::ParagraphProperties& paragraphProperties, const wvWare::Style* style ) +void KWordTextHandler::writeCounter( TQDomElement& parentElement, const wvWare::ParagraphProperties& paragraphProperties, const wvWare::Style* style ) { const wvWare::ListInfo* listInfo = paragraphProperties.listInfo(); if ( !listInfo ) @@ -820,7 +820,7 @@ void KWordTextHandler::writeCounter( TQDomElement& tqparentElement, const wvWare else m_previousEnumLSID = listInfo->lsid(); counterElement.setAttribute( "numberingtype", numberingType ); - tqparentElement.appendChild( counterElement ); + parentElement.appendChild( counterElement ); } void KWordTextHandler::setFrameSetElement( const TQDomElement& frameset ) diff --git a/filters/kword/msword/texthandler.h b/filters/kword/msword/texthandler.h index 3075803b..ebea5202 100644 --- a/filters/kword/msword/texthandler.h +++ b/filters/kword/msword/texthandler.h @@ -86,10 +86,10 @@ public: // Write a tag from the given CHP // Returns that element into pChildElement if set (in that case even an empty FORMAT can be appended) - void writeFormat( TQDomElement& tqparentElement, const wvWare::Word97::CHP* chp, const wvWare::Word97::CHP* refChp, int pos, int len, int formatId, TQDomElement* pChildElement ); + void writeFormat( TQDomElement& parentElement, const wvWare::Word97::CHP* chp, const wvWare::Word97::CHP* refChp, int pos, int len, int formatId, TQDomElement* pChildElement ); // Write the _contents_ (tqchildren) of a or