diff options
Diffstat (limited to 'lib/kotext')
37 files changed, 277 insertions, 277 deletions
diff --git a/lib/kotext/DESIGN b/lib/kotext/DESIGN index dcb08ca71..4fd1e479d 100644 --- a/lib/kotext/DESIGN +++ b/lib/kotext/DESIGN @@ -87,11 +87,11 @@ However font metrics are calculated from the 100%-zoom-level font (e.g. 12pt for and _then_ multiplied by 20, instead of loading a 240pt font for that as we did before. This is implemented by KoTextFormat::charWidth(). -On screen, at 100%, a tqlayoutUnitToFontSize(240,false)=(240/20)*1.0=20.0pt font size will be used. +On screen, at 100%, a layoutUnitToFontSize(240,false)=(240/20)*1.0=20.0pt font size will be used. This does NOT depend on the DPI settings. Qt takes care of pt->pixel conversion for fonts. When printing... TODO, double-check whether Qt does pt->pixel conversion correctly -(aptqparently it didn't, in Qt 2). +(apparently it didn't, in Qt 2). QFont multiplies by 10 and stores into a 'short'... So for QFont the maximum font size is 3276, and in KOffice the maximum font size in points is around 163. diff --git a/lib/kotext/KFontDialog_local.cpp b/lib/kotext/KFontDialog_local.cpp index d979fc660..bcbdde6b8 100644 --- a/lib/kotext/KFontDialog_local.cpp +++ b/lib/kotext/KFontDialog_local.cpp @@ -733,11 +733,11 @@ void KFontChooser_local::showXLFDArea(bool show) { if( show ) { - xlfdEdit->tqparentWidget()->show(); + xlfdEdit->parentWidget()->show(); } else { - xlfdEdit->tqparentWidget()->hide(); + xlfdEdit->parentWidget()->hide(); } } diff --git a/lib/kotext/KoCompletionBase.ui b/lib/kotext/KoCompletionBase.ui index 97beae8cb..12ae9d5d3 100644 --- a/lib/kotext/KoCompletionBase.ui +++ b/lib/kotext/KoCompletionBase.ui @@ -366,5 +366,5 @@ This option is most important when Automatically add words to completion list is <slot>setValue(int)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/lib/kotext/KoComplexText.cpp b/lib/kotext/KoComplexText.cpp index 41c102391..e3196085a 100644 --- a/lib/kotext/KoComplexText.cpp +++ b/lib/kotext/KoComplexText.cpp @@ -48,7 +48,7 @@ /* a small helper class used internally to resolve Bidi embedding levels. Each line of text caches the embedding level at the start of the line for faster - retqlayouting + relayouting */ KoBidiContext::KoBidiContext( uchar l, TQChar::Direction e, KoBidiContext *p, bool o ) : level(l) , override(o), dir(e) diff --git a/lib/kotext/KoFontDia.cpp b/lib/kotext/KoFontDia.cpp index 7373ec0e5..93f3a21e6 100644 --- a/lib/kotext/KoFontDia.cpp +++ b/lib/kotext/KoFontDia.cpp @@ -90,12 +90,12 @@ KoFontDia::KoFontDia( const KoTextFormat& initialFormat, connect( decorationTab, TQT_SIGNAL( shadowDirectionChanged( int ) ), this, TQT_SLOT( slotShadowDirectionChanged( int ) ) ); //Layout tab - tqlayoutTab = new KoLayoutTab( true, this ); - fontTabWidget->addTab( tqlayoutTab, i18n( "Layout" ) ); - connect( tqlayoutTab, TQT_SIGNAL( subSuperScriptChanged() ), this, TQT_SLOT( slotSubSuperChanged() ) );; - connect( tqlayoutTab, TQT_SIGNAL( offsetChanged( int ) ), this, TQT_SLOT( slotOffsetChanged( int ) ) ); - connect( tqlayoutTab, TQT_SIGNAL( relativeSizeChanged( double ) ), this, TQT_SLOT( slotRelativeSizeChanged( double ) ) ); - connect( tqlayoutTab, TQT_SIGNAL( hyphenationChanged( bool ) ), this, TQT_SLOT( slotHyphenationChanged( bool ) ) ); + layoutTab = new KoLayoutTab( true, this ); + fontTabWidget->addTab( layoutTab, i18n( "Layout" ) ); + connect( layoutTab, TQT_SIGNAL( subSuperScriptChanged() ), this, TQT_SLOT( slotSubSuperChanged() ) );; + connect( layoutTab, TQT_SIGNAL( offsetChanged( int ) ), this, TQT_SLOT( slotOffsetChanged( int ) ) ); + connect( layoutTab, TQT_SIGNAL( relativeSizeChanged( double ) ), this, TQT_SLOT( slotRelativeSizeChanged( double ) ) ); + connect( layoutTab, TQT_SIGNAL( hyphenationChanged( bool ) ), this, TQT_SLOT( slotHyphenationChanged( bool ) ) ); //Language tab languageTab = new KoLanguageTab( broker, this ); @@ -123,7 +123,7 @@ void KoFontDia::init() KoTextFormat KoFontDia::newFormat() const { return KoTextFormat( fontTab->getSelection(), - tqlayoutTab->getSubSuperScript(), + layoutTab->getSubSuperScript(), decorationTab->getTextColor(), decorationTab->getBackgroundColor(), highlightingTab->getUnderlineColor(), @@ -133,10 +133,10 @@ KoTextFormat KoFontDia::newFormat() const highlightingTab->getStrikethroughStyle(), highlightingTab->getCapitalisation(), languageTab->getLanguage(), - tqlayoutTab->getRelativeTextSize(), - tqlayoutTab->getOffsetFromBaseline(), + layoutTab->getRelativeTextSize(), + layoutTab->getOffsetFromBaseline(), highlightingTab->getWordByWord(), - tqlayoutTab->getAutoHyphenation(), + layoutTab->getAutoHyphenation(), decorationTab->getShadowDistanceX(), decorationTab->getShadowDistanceY(), decorationTab->getShadowColor() @@ -167,8 +167,8 @@ void KoFontDia::slotReset() decorationTab->setTextColor( m_initialFormat.color() ); decorationTab->setBackgroundColor( m_initialFormat.textBackgroundColor() ); decorationTab->setShadow( m_initialFormat.shadowDistanceX(), m_initialFormat.shadowDistanceY(), m_initialFormat.shadowColor() ); - tqlayoutTab->setSubSuperScript( m_initialFormat.vAlign(), m_initialFormat.offsetFromBaseLine(), m_initialFormat.relativeTextSize() ); - tqlayoutTab->setAutoHyphenation( m_initialFormat.hyphenation() ); + layoutTab->setSubSuperScript( m_initialFormat.vAlign(), m_initialFormat.offsetFromBaseLine(), m_initialFormat.relativeTextSize() ); + layoutTab->setAutoHyphenation( m_initialFormat.hyphenation() ); languageTab->setLanguage( m_initialFormat.language() ); } @@ -276,19 +276,19 @@ void KoFontDia::slotShadowColorChanged( const TQColor & ) void KoFontDia::slotSubSuperChanged() { m_changedFlags |= KoTextFormat::VAlign; - fontDiaPreview->setSubSuperscript( tqlayoutTab->getSubSuperScript(), tqlayoutTab->getOffsetFromBaseline(), tqlayoutTab->getRelativeTextSize() ); + fontDiaPreview->setSubSuperscript( layoutTab->getSubSuperScript(), layoutTab->getOffsetFromBaseline(), layoutTab->getRelativeTextSize() ); } void KoFontDia::slotOffsetChanged( int offset ) { m_changedFlags |= KoTextFormat::OffsetFromBaseLine; - fontDiaPreview->setSubSuperscript( tqlayoutTab->getSubSuperScript(), offset, tqlayoutTab->getRelativeTextSize() ); + fontDiaPreview->setSubSuperscript( layoutTab->getSubSuperScript(), offset, layoutTab->getRelativeTextSize() ); } void KoFontDia::slotRelativeSizeChanged( double relativeSize ) { m_changedFlags |= KoTextFormat::VAlign; - fontDiaPreview->setSubSuperscript( tqlayoutTab->getSubSuperScript(), tqlayoutTab->getOffsetFromBaseline(), relativeSize ); + fontDiaPreview->setSubSuperscript( layoutTab->getSubSuperScript(), layoutTab->getOffsetFromBaseline(), relativeSize ); } void KoFontDia::slotHyphenationChanged( bool ) diff --git a/lib/kotext/KoFontDia.h b/lib/kotext/KoFontDia.h index cd1707646..ebd4a93fb 100644 --- a/lib/kotext/KoFontDia.h +++ b/lib/kotext/KoFontDia.h @@ -91,7 +91,7 @@ private: KoFontTab *fontTab; KoHighlightingTab *highlightingTab; KoDecorationTab *decorationTab; - KoLayoutTab *tqlayoutTab; + KoLayoutTab *layoutTab; KoLanguageTab *languageTab; KoFontDiaPreview *fontDiaPreview; diff --git a/lib/kotext/KoLayoutTab.h b/lib/kotext/KoLayoutTab.h index 6620721d3..611e3afa1 100644 --- a/lib/kotext/KoLayoutTab.h +++ b/lib/kotext/KoLayoutTab.h @@ -17,8 +17,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef __kotqlayouttab_h__ -#define __kotqlayouttab_h__ +#ifndef __kolayouttab_h__ +#define __kolayouttab_h__ #include <kolayouttabbase.h> #include <KoTextFormat.h> diff --git a/lib/kotext/KoParagCounter.cpp b/lib/kotext/KoParagCounter.cpp index 71887c2c4..b5058f1b6 100644 --- a/lib/kotext/KoParagCounter.cpp +++ b/lib/kotext/KoParagCounter.cpp @@ -729,7 +729,7 @@ TQString KoParagCounter::text( const KoTextParag *paragraph ) str.append('.'); // hardcoded on purpose (like OO) until anyone complains - // Find the number of missing tqparents, and add dummy text for them. + // Find the number of missing parents, and add dummy text for them. int missingParents = m_depth - level - p->counter()->m_depth; //kdDebug() << "levelText = " << str << " missingParents=" << missingParents << endl; level += missingParents; @@ -742,7 +742,7 @@ TQString KoParagCounter::text( const KoTextParag *paragraph ) if ( level < displayLevels ) // no need to calc it if we won't use it p = counter->tqparent( p ); } - else // toplevel tqparents are missing + else // toplevel parents are missing { // Special case for one-paragraph-documents like preview widgets KoTextDocument* textdoc = paragraph->textDocument(); diff --git a/lib/kotext/KoParagDecorationTab.ui b/lib/kotext/KoParagDecorationTab.ui index c38926011..4c93c261f 100644 --- a/lib/kotext/KoParagDecorationTab.ui +++ b/lib/kotext/KoParagDecorationTab.ui @@ -388,7 +388,7 @@ regardless of the style of the preceeding and subsequent paragraphs.</p></ <data format="PNG" length="101">89504e470d0a1a0a0000000d49484452000000140000001408060000008d891d0d0000002c49444154388d63601805b400ffc9a4e90748b571d48594db38ea42ca6d4451cf422543e180895c8da3000e00765a11f509a137610000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcombobox.h</includehint> diff --git a/lib/kotext/KoParagDia.cpp b/lib/kotext/KoParagDia.cpp index 02949bb08..65cc1f2ea 100644 --- a/lib/kotext/KoParagDia.cpp +++ b/lib/kotext/KoParagDia.cpp @@ -173,7 +173,7 @@ KoCounterStyleWidget::KoCounterStyleWidget( bool displayDepth, bool onlyStyleTyp connect( spnStart, TQT_SIGNAL( valueChanged (int) ), this, TQT_SLOT( startChanged(int) ) ); connect( spnDepth, TQT_SIGNAL( valueChanged (int) ), this, TQT_SLOT( depthChanged(int) ) ); connect( spnDisplayLevels, TQT_SIGNAL( valueChanged (int) ), this, TQT_SLOT( displayLevelsChanged(int) ) ); - connect( cbAlignment, TQT_SIGNAL( activated (const TQString&) ), this, TQT_SLOT( tqalignmentChanged(const TQString&) ) ); + connect( cbAlignment, TQT_SIGNAL( activated (const TQString&) ), this, TQT_SLOT( alignmentChanged(const TQString&) ) ); noSignals = false; if ( disableAll ) { @@ -192,7 +192,7 @@ KoCounterStyleWidget::KoCounterStyleWidget( bool displayDepth, bool onlyStyleTyp } } -void KoCounterStyleWidget::tqalignmentChanged(const TQString& s) +void KoCounterStyleWidget::alignmentChanged(const TQString& s) { int a; if(s==i18n("Align Left")) @@ -206,7 +206,7 @@ void KoCounterStyleWidget::tqalignmentChanged(const TQString& s) return; } m_counter.tqsetAlignment(a); - emit sig_tqalignmentChanged(a); + emit sig_alignmentChanged(a); } void KoCounterStyleWidget::setCounter( const KoParagCounter& counter ) @@ -866,7 +866,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW TQString unitName = KoUnit::unitName( m_unit ); TQGridLayout *mainGrid = new TQGridLayout( this, 3, 2, KDialog::marginHint(), KDialog::spacingHint() ); - // mainGrid gives equal space to each groupbox, aptqparently + // mainGrid gives equal space to each groupbox, apparently // I tried setRowStretch but the result is awful (much space between them and not equal!) // Any other way (in order to make the 2nd, the one with a single checkbox, a bit // smaller than the other 3) ? (DF) @@ -1639,7 +1639,7 @@ KoParagCounterWidget::KoParagCounterWidget( bool disableAll, TQWidget * tqparent connect( m_styleWidget, TQT_SIGNAL( sig_restartChanged(bool) ), this, TQT_SLOT( restartChanged(bool) ) ); connect( m_styleWidget, TQT_SIGNAL( sig_depthChanged (int) ), this, TQT_SLOT( depthChanged(int) ) ); connect( m_styleWidget, TQT_SIGNAL( sig_displayLevelsChanged (int) ), this, TQT_SLOT( displayLevelsChanged(int) ) ); - connect( m_styleWidget, TQT_SIGNAL( sig_tqalignmentChanged (int) ), this, TQT_SLOT( tqalignmentChanged(int) ) ); + connect( m_styleWidget, TQT_SIGNAL( sig_alignmentChanged (int) ), this, TQT_SLOT( alignmentChanged(int) ) ); connect( m_styleWidget, TQT_SIGNAL( changeCustomBullet( const TQString & , TQChar ) ), this, TQT_SLOT( slotChangeCustomBullet( const TQString & , TQChar ) ) ); connect( m_styleWidget, TQT_SIGNAL( sig_numTypeChanged( int ) ), this, TQT_SLOT( numTypeChanged(int ) ) ); @@ -2210,19 +2210,19 @@ void KoParagDia::setCurrentPage( int page ) switch( page ) { case PD_SPACING: - showPage( pageIndex( m_indentSpacingWidget->tqparentWidget() ) ); + showPage( pageIndex( m_indentSpacingWidget->parentWidget() ) ); break; case PD_ALIGN: - showPage( pageIndex( m_alignWidget->tqparentWidget() ) ); + showPage( pageIndex( m_alignWidget->parentWidget() ) ); break; case PD_DECORATION: - showPage( pageIndex( m_decorationsWidget->tqparentWidget() ) ); + showPage( pageIndex( m_decorationsWidget->parentWidget() ) ); break; case PD_NUMBERING: - showPage( pageIndex( m_counterWidget->tqparentWidget() ) ); + showPage( pageIndex( m_counterWidget->parentWidget() ) ); break; case PD_TABS: - showPage( pageIndex( m_tabulatorsWidget->tqparentWidget() ) ); + showPage( pageIndex( m_tabulatorsWidget->parentWidget() ) ); break; default: break; diff --git a/lib/kotext/KoParagDia.h b/lib/kotext/KoParagDia.h index 1c776af6d..6de8115e6 100644 --- a/lib/kotext/KoParagDia.h +++ b/lib/kotext/KoParagDia.h @@ -302,7 +302,7 @@ signals: void sig_suffixChanged(const TQString &); void sig_prefixChanged(const TQString &); void sig_numTypeChanged( int ); - void sig_tqalignmentChanged( int ); + void sig_alignmentChanged( int ); void changeCustomBullet( const TQString & , TQChar ); void changeStyle( KoParagCounter::Style ); protected slots: @@ -310,7 +310,7 @@ protected slots: void restartChanged(bool b) {m_counter.setRestartCounter(b);emit sig_restartChanged(b);} void depthChanged(int i) {m_counter.setDepth(i);emit sig_depthChanged(i);} void displayLevelsChanged(int i) {m_counter.setDisplayLevels(i);emit sig_displayLevelsChanged(i);} - void tqalignmentChanged(const TQString& s); + void alignmentChanged(const TQString& s); void suffixChanged(const TQString & txt) {m_counter.setSuffix(txt);emit sig_suffixChanged(txt); } void prefixChanged(const TQString & txt) {m_counter.setPrefix(txt);emit sig_prefixChanged(txt); } @@ -369,7 +369,7 @@ protected slots: void restartChanged(bool b) {m_counter.setRestartCounter(b); } void depthChanged(int i) {m_counter.setDepth(i); updatePreview();} void displayLevelsChanged(int i) {m_counter.setDisplayLevels(i); updatePreview();} - void tqalignmentChanged(int i) {m_counter.tqsetAlignment(i); updatePreview();} + void alignmentChanged(int i) {m_counter.tqsetAlignment(i); updatePreview();} void slotChangeCustomBullet( const TQString & f, TQChar c); void styleChanged (KoParagCounter::Style st ); diff --git a/lib/kotext/KoParagLayout.cpp b/lib/kotext/KoParagLayout.cpp index 8cb9682f7..129c4d4a6 100644 --- a/lib/kotext/KoParagLayout.cpp +++ b/lib/kotext/KoParagLayout.cpp @@ -141,7 +141,7 @@ KoParagLayout::~KoParagLayout() delete counter; } -void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement& tqparentElem, int docVersion ) +void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement& parentElem, int docVersion ) { // tqlayout is an input and output parameter // It can have been initialized already, e.g. by copying from a style @@ -152,7 +152,7 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement // there is no way to differentiate between "I want no tabs in the parag" // and "use default from style". KoTabulatorList tabList; - TQDomElement element = tqparentElem.firstChild().toElement(); + TQDomElement element = parentElem.firstChild().toElement(); for ( ; !element.isNull() ; element = element.nextSibling().toElement() ) { if ( element.tagName() == "TABULATOR" ) @@ -173,7 +173,7 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement qHeapSort( tabList ); tqlayout.setTabList( tabList ); tqlayout.tqalignment = TQt::AlignAuto; - element = tqparentElem.namedItem( "FLOW" ).toElement(); // Flow is what is now called tqalignment internally + element = parentElem.namedItem( "FLOW" ).toElement(); // Flow is what is now called tqalignment internally if ( !element.isNull() ) { TQString flow = element.attribute( "align" ); // KWord-1.0 DTD @@ -203,32 +203,32 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement if ( docVersion < 2 ) { - element = tqparentElem.namedItem( "OHEAD" ).toElement(); // used by KWord-0.8 + element = parentElem.namedItem( "OHEAD" ).toElement(); // used by KWord-0.8 if ( !element.isNull() ) tqlayout.margins[TQStyleSheetItem::MarginTop] = getAttribute( element, "pt", 0.0 ); - element = tqparentElem.namedItem( "OFOOT" ).toElement(); // used by KWord-0.8 + element = parentElem.namedItem( "OFOOT" ).toElement(); // used by KWord-0.8 if ( !element.isNull() ) tqlayout.margins[TQStyleSheetItem::MarginBottom] = getAttribute( element, "pt", 0.0 ); - element = tqparentElem.namedItem( "IFIRST" ).toElement(); // used by KWord-0.8 + element = parentElem.namedItem( "IFIRST" ).toElement(); // used by KWord-0.8 if ( !element.isNull() ) tqlayout.margins[TQStyleSheetItem::MarginFirstLine] = getAttribute( element, "pt", 0.0 ); - element = tqparentElem.namedItem( "ILEFT" ).toElement(); // used by KWord-0.8 + element = parentElem.namedItem( "ILEFT" ).toElement(); // used by KWord-0.8 if ( !element.isNull() ) tqlayout.margins[TQStyleSheetItem::MarginLeft] = getAttribute( element, "pt", 0.0 ); } // KWord-1.0 DTD - element = tqparentElem.namedItem( "INDENTS" ).toElement(); + element = parentElem.namedItem( "INDENTS" ).toElement(); if ( !element.isNull() ) { tqlayout.margins[TQStyleSheetItem::MarginFirstLine] = getAttribute( element, "first", 0.0 ); tqlayout.margins[TQStyleSheetItem::MarginLeft] = getAttribute( element, "left", 0.0 ); tqlayout.margins[TQStyleSheetItem::MarginRight] = getAttribute( element, "right", 0.0 ); } - element = tqparentElem.namedItem( "OFFSETS" ).toElement(); + element = parentElem.namedItem( "OFFSETS" ).toElement(); if ( !element.isNull() ) { tqlayout.margins[TQStyleSheetItem::MarginTop] = getAttribute( element, "before", 0.0 ); @@ -237,7 +237,7 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement if ( docVersion < 2 ) { - element = tqparentElem.namedItem( "LINESPACE" ).toElement(); // used by KWord-0.8 + element = parentElem.namedItem( "LINESPACE" ).toElement(); // used by KWord-0.8 if ( !element.isNull() ) { tqlayout.lineSpacingType = KoParagLayout::LS_CUSTOM; @@ -245,7 +245,7 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement } } - element = tqparentElem.namedItem( "LINESPACING" ).toElement(); // KWord-1.0 DTD + element = parentElem.namedItem( "LINESPACING" ).toElement(); // KWord-1.0 DTD if ( !element.isNull() ) { //compatibility with koffice 1.1 @@ -307,7 +307,7 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement } int pageBreaking = 0; - element = tqparentElem.namedItem( "PAGEBREAKING" ).toElement(); + element = parentElem.namedItem( "PAGEBREAKING" ).toElement(); if ( !element.isNull() ) { if ( element.attribute( "linesTogether" ) == "true" ) @@ -319,37 +319,37 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement } if ( docVersion < 2 ) { - element = tqparentElem.namedItem( "HARDBRK" ).toElement(); // KWord-0.8 + element = parentElem.namedItem( "HARDBRK" ).toElement(); // KWord-0.8 if ( !element.isNull() ) pageBreaking |= KoParagLayout::HardFrameBreakBefore; } tqlayout.pageBreaking = pageBreaking; - element = tqparentElem.namedItem( "LEFTBORDER" ).toElement(); + element = parentElem.namedItem( "LEFTBORDER" ).toElement(); if ( !element.isNull() ) tqlayout.leftBorder = KoBorder::loadBorder( element ); else tqlayout.leftBorder.setPenWidth(0); - element = tqparentElem.namedItem( "RIGHTBORDER" ).toElement(); + element = parentElem.namedItem( "RIGHTBORDER" ).toElement(); if ( !element.isNull() ) tqlayout.rightBorder = KoBorder::loadBorder( element ); else tqlayout.rightBorder.setPenWidth(0); - element = tqparentElem.namedItem( "TOPBORDER" ).toElement(); + element = parentElem.namedItem( "TOPBORDER" ).toElement(); if ( !element.isNull() ) tqlayout.topBorder = KoBorder::loadBorder( element ); else tqlayout.topBorder.setPenWidth(0); - element = tqparentElem.namedItem( "BOTTOMBORDER" ).toElement(); + element = parentElem.namedItem( "BOTTOMBORDER" ).toElement(); if ( !element.isNull() ) tqlayout.bottomBorder = KoBorder::loadBorder( element ); else tqlayout.bottomBorder.setPenWidth(0); - element = tqparentElem.namedItem( "COUNTER" ).toElement(); + element = parentElem.namedItem( "COUNTER" ).toElement(); if ( !element.isNull() ) { tqlayout.counter = new KoParagCounter; @@ -357,7 +357,7 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement } // Compatibility with KOffice-1.2 - element = tqparentElem.namedItem( "SHADOW" ).toElement(); + element = parentElem.namedItem( "SHADOW" ).toElement(); if ( !element.isNull() && element.hasAttribute("direction") ) { int shadowDistance = element.attribute("distance").toInt(); @@ -658,19 +658,19 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContex } } -void KoParagLayout::saveParagLayout( TQDomElement & tqparentElem, int tqalignment ) const +void KoParagLayout::saveParagLayout( TQDomElement & parentElem, int tqalignment ) const { const KoParagLayout& tqlayout = *this; // code moved from somewhere else;) - TQDomDocument doc = tqparentElem.ownerDocument(); + TQDomDocument doc = parentElem.ownerDocument(); TQDomElement element = doc.createElement( "NAME" ); - tqparentElem.appendChild( element ); + parentElem.appendChild( element ); if ( tqlayout.style ) element.setAttribute( "value", tqlayout.style->displayName() ); //else // kdWarning() << "KoParagLayout::saveParagLayout: style==0!" << endl; element = doc.createElement( "FLOW" ); - tqparentElem.appendChild( element ); + parentElem.appendChild( element ); element.setAttribute( "align", tqalignment==TQt::AlignRight ? "right" : tqalignment==TQt::AlignHCenter ? "center" : @@ -688,7 +688,7 @@ void KoParagLayout::saveParagLayout( TQDomElement & tqparentElem, int tqalignmen tqlayout.margins[TQStyleSheetItem::MarginRight] != 0 ) { element = doc.createElement( "INDENTS" ); - tqparentElem.appendChild( element ); + parentElem.appendChild( element ); if ( tqlayout.margins[TQStyleSheetItem::MarginFirstLine] != 0 ) element.setAttribute( "first", tqlayout.margins[TQStyleSheetItem::MarginFirstLine] ); if ( tqlayout.margins[TQStyleSheetItem::MarginLeft] != 0 ) @@ -701,7 +701,7 @@ void KoParagLayout::saveParagLayout( TQDomElement & tqparentElem, int tqalignmen tqlayout.margins[TQStyleSheetItem::MarginBottom] != 0 ) { element = doc.createElement( "OFFSETS" ); - tqparentElem.appendChild( element ); + parentElem.appendChild( element ); if ( tqlayout.margins[TQStyleSheetItem::MarginTop] != 0 ) element.setAttribute( "before", tqlayout.margins[TQStyleSheetItem::MarginTop] ); if ( tqlayout.margins[TQStyleSheetItem::MarginBottom] != 0 ) @@ -710,7 +710,7 @@ void KoParagLayout::saveParagLayout( TQDomElement & tqparentElem, int tqalignmen if ( tqlayout.lineSpacingType != LS_SINGLE ) { element = doc.createElement( "LINESPACING" ); - tqparentElem.appendChild( element ); + parentElem.appendChild( element ); if ( tqlayout.lineSpacingType == KoParagLayout::LS_ONEANDHALF ) { element.setAttribute( "type", "oneandhalf" ); element.setAttribute( "value", "oneandhalf" ); //compatibility with koffice 1.2 @@ -747,7 +747,7 @@ void KoParagLayout::saveParagLayout( TQDomElement & tqparentElem, int tqalignmen if ( tqlayout.pageBreaking != 0 ) { element = doc.createElement( "PAGEBREAKING" ); - tqparentElem.appendChild( element ); + parentElem.appendChild( element ); if ( tqlayout.pageBreaking & KoParagLayout::KeepLinesTogether ) element.setAttribute( "linesTogether", "true" ); if ( tqlayout.pageBreaking & KoParagLayout::HardFrameBreakBefore ) @@ -759,31 +759,31 @@ void KoParagLayout::saveParagLayout( TQDomElement & tqparentElem, int tqalignmen if ( tqlayout.leftBorder.penWidth() > 0 ) { element = doc.createElement( "LEFTBORDER" ); - tqparentElem.appendChild( element ); + parentElem.appendChild( element ); tqlayout.leftBorder.save( element ); } if ( tqlayout.rightBorder.penWidth() > 0 ) { element = doc.createElement( "RIGHTBORDER" ); - tqparentElem.appendChild( element ); + parentElem.appendChild( element ); tqlayout.rightBorder.save( element ); } if ( tqlayout.topBorder.penWidth() > 0 ) { element = doc.createElement( "TOPBORDER" ); - tqparentElem.appendChild( element ); + parentElem.appendChild( element ); tqlayout.topBorder.save( element ); } if ( tqlayout.bottomBorder.penWidth() > 0 ) { element = doc.createElement( "BOTTOMBORDER" ); - tqparentElem.appendChild( element ); + parentElem.appendChild( element ); tqlayout.bottomBorder.save( element ); } if ( tqlayout.counter && tqlayout.counter->numbering() != KoParagCounter::NUM_NONE ) { element = doc.createElement( "COUNTER" ); - tqparentElem.appendChild( element ); + parentElem.appendChild( element ); if ( tqlayout.counter ) tqlayout.counter->save( element ); } @@ -793,7 +793,7 @@ void KoParagLayout::saveParagLayout( TQDomElement & tqparentElem, int tqalignmen for ( ; it != tabList.end() ; it++ ) { element = doc.createElement( "TABULATOR" ); - tqparentElem.appendChild( element ); + parentElem.appendChild( element ); element.setAttribute( "type", (*it).type ); element.setAttribute( "ptpos", (*it).ptPos ); element.setAttribute( "filling", (*it).filling ); diff --git a/lib/kotext/KoParagLayout.h b/lib/kotext/KoParagLayout.h index a60d39345..2c9b9dea3 100644 --- a/lib/kotext/KoParagLayout.h +++ b/lib/kotext/KoParagLayout.h @@ -17,8 +17,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef koparagtqlayout_h -#define koparagtqlayout_h +#ifndef koparaglayout_h +#define koparaglayout_h #include <KoRuler.h> // for KoTabulatorList #include <tqdom.h> @@ -135,12 +135,12 @@ public: /** Save this parag tqlayout to XML. * This format is used by KWord for paragraphs, and by KPresenter+KWord for styles. */ - void saveParagLayout( TQDomElement & tqparentElem, int tqalignment ) const; + void saveParagLayout( TQDomElement & parentElem, int tqalignment ) const; /** Load this parag tqlayout from XML. * This format is used by KWord for paragraphs, and by KPresenter+KWord for styles. */ - static void loadParagLayout( KoParagLayout& tqlayout, const TQDomElement& tqparentElem, int docVersion = 2 ); + static void loadParagLayout( KoParagLayout& tqlayout, const TQDomElement& parentElem, int docVersion = 2 ); /// Load this parag tqlayout from Oasis XML static void loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContext& context ); diff --git a/lib/kotext/KoParagStyle.cpp b/lib/kotext/KoParagStyle.cpp index e3bf15e9d..f44bcd597 100644 --- a/lib/kotext/KoParagStyle.cpp +++ b/lib/kotext/KoParagStyle.cpp @@ -86,32 +86,32 @@ void KoParagStyle::setFollowingStyle( KoParagStyle *fst ) m_followingStyle = fst; } -void KoParagStyle::saveStyle( TQDomElement & tqparentElem ) +void KoParagStyle::saveStyle( TQDomElement & parentElem ) { - m_paragLayout.saveParagLayout( tqparentElem, m_paragLayout.tqalignment ); + m_paragLayout.saveParagLayout( parentElem, m_paragLayout.tqalignment ); if ( followingStyle() ) { - TQDomElement element = tqparentElem.ownerDocument().createElement( "FOLLOWING" ); - tqparentElem.appendChild( element ); + TQDomElement element = parentElem.ownerDocument().createElement( "FOLLOWING" ); + parentElem.appendChild( element ); element.setAttribute( "name", followingStyle()->displayName() ); } // TODO save tqparent style, and inherited flags. - tqparentElem.setAttribute( "outline", m_bOutline ? "true" : "false" ); + parentElem.setAttribute( "outline", m_bOutline ? "true" : "false" ); } -void KoParagStyle::loadStyle( TQDomElement & tqparentElem, int docVersion ) +void KoParagStyle::loadStyle( TQDomElement & parentElem, int docVersion ) { KoParagLayout tqlayout; - KoParagLayout::loadParagLayout( tqlayout, tqparentElem, docVersion ); + KoParagLayout::loadParagLayout( tqlayout, parentElem, docVersion ); // This way, KoTextParag::setParagLayout also sets the style pointer, to this style tqlayout.style = this; m_paragLayout = tqlayout; // Load name - TQDomElement nameElem = tqparentElem.namedItem("NAME").toElement(); + TQDomElement nameElem = parentElem.namedItem("NAME").toElement(); if ( !nameElem.isNull() ) { m_name = nameElem.attribute("value"); m_displayName = i18n( "Style name", m_name.utf8() ); @@ -120,7 +120,7 @@ void KoParagStyle::loadStyle( TQDomElement & tqparentElem, int docVersion ) // The followingStyle stuff has to be done after loading all styles. - m_bOutline = tqparentElem.attribute( "outline" ) == "true"; + m_bOutline = parentElem.attribute( "outline" ) == "true"; } void KoParagStyle::loadStyle( TQDomElement & styleElem, KoOasisContext& context ) @@ -137,7 +137,7 @@ void KoParagStyle::loadStyle( TQDomElement & styleElem, KoOasisContext& context m_bOutline = styleElem.hasAttributeNS( KoXmlNS::style, "default-outline-level" ); context.styleStack().save(); - context.addStyles( &styleElem, "paragraph" ); // Load all tqparents - only because we don't support inheritance. + context.addStyles( &styleElem, "paragraph" ); // Load all parents - only because we don't support inheritance. KoParagLayout tqlayout; KoParagLayout::loadOasisParagLayout( tqlayout, context ); @@ -187,9 +187,9 @@ void KoParagStyle::loadStyle( TQDomElement & styleElem, KoOasisContext& context context.styleStack().restore(); } -TQString KoParagStyle::saveStyle( KoGenStyles& genStyles, int styleType, const TQString& tqparentStyleName, KoSavingContext& context ) const +TQString KoParagStyle::saveStyle( KoGenStyles& genStyles, int styleType, const TQString& parentStyleName, KoSavingContext& context ) const { - KoGenStyle gs( styleType, "paragraph", tqparentStyleName ); + KoGenStyle gs( styleType, "paragraph", parentStyleName ); gs.addAttribute( "style:display-name", m_displayName ); if ( m_paragLayout.counter ) { diff --git a/lib/kotext/KoParagStyle.h b/lib/kotext/KoParagStyle.h index 46e4f242b..190ad345f 100644 --- a/lib/kotext/KoParagStyle.h +++ b/lib/kotext/KoParagStyle.h @@ -73,18 +73,18 @@ public: /// Saves the name, tqlayout, the following style and the outline bool. Not the format. /// @deprecated (1.3 format) - void saveStyle( TQDomElement & tqparentElem ); + void saveStyle( TQDomElement & parentElem ); /// Loads the name, tqlayout and the outline bool. Not the "following style" nor the format. /// (1.3 format) - void loadStyle( TQDomElement & tqparentElem, int docVersion = 2 ); + void loadStyle( TQDomElement & parentElem, int docVersion = 2 ); /// Load the style from OASIS void loadStyle( TQDomElement & styleElem, KoOasisContext& context ); /// Save the style to OASIS /// Don't use, use the method in KoStyleCollection instead - TQString saveStyle( KoGenStyles& genStyles, int styleType, const TQString& tqparentStyleName, KoSavingContext& context ) const; + TQString saveStyle( KoGenStyles& genStyles, int styleType, const TQString& parentStyleName, KoSavingContext& context ) const; - KoParagStyle * tqparentStyle() const {return m_parentStyle;} + KoParagStyle * parentStyle() const {return m_parentStyle;} void setParentStyle( KoParagStyle *_style){ m_parentStyle = _style;} int inheritedParagLayoutFlag() const { return m_inheritedParagLayoutFlag; } diff --git a/lib/kotext/KoRichText.cpp b/lib/kotext/KoRichText.cpp index dc6c6922f..157f79a8e 100644 --- a/lib/kotext/KoRichText.cpp +++ b/lib/kotext/KoRichText.cpp @@ -939,7 +939,7 @@ bool KoTextCursor::removePreviousChar() } else if ( string->prev() ) { string = string->prev(); string->join( string->next() ); - string->tqinvalidateCounters(); + string->invalidateCounters(); return TRUE; } return FALSE; @@ -965,7 +965,7 @@ bool KoTextCursor::remove() string = p; string->tqinvalidate( 0 ); //// kotext - string->tqinvalidateCounters(); + string->invalidateCounters(); //// KoTextParag *s = string; while ( s ) { @@ -1242,7 +1242,7 @@ void KoTextString::checkBidi() const const KoTextStringChar *start = data.data(); const KoTextStringChar *end = start + length; - // determines the properties we need for tqlayouting + // determines the properties we need for layouting #ifdef USE_QT4 #warning "KoTextString::checkBidi() for Qt4 partially implemented" printf("[WARNING] KoTextString::checkBidi() partially implemented\n\r"); diff --git a/lib/kotext/KoStyleManager.cpp b/lib/kotext/KoStyleManager.cpp index 9017d8a1a..ef9252893 100644 --- a/lib/kotext/KoStyleManager.cpp +++ b/lib/kotext/KoStyleManager.cpp @@ -318,7 +318,7 @@ void KoStyleManager::updateGUI() { } } - TQString inheritName = m_currentStyle->tqparentStyle() ? m_currentStyle->tqparentStyle()->displayName() : TQString(); + TQString inheritName = m_currentStyle->parentStyle() ? m_currentStyle->parentStyle()->displayName() : TQString(); kdDebug(32500) << "KoStyleManager::updateGUI updating combo to " << inheritName << endl; for ( int i = 0; i < m_inheritCombo->count(); i++ ) { if ( m_inheritCombo->text( i ) == inheritName ) { @@ -449,7 +449,7 @@ void KoStyleManager::updateInheritStyle( KoParagStyle *s ) //when we remove style, we must replace inherite style to 0L //when tqparent style was removed. //##########Laurent change inherited style attribute - if ( p->tqparentStyle() == s) + if ( p->parentStyle() == s) p->setParentStyle(0L); } diff --git a/lib/kotext/KoStyleManager.h b/lib/kotext/KoStyleManager.h index 10dbf8e6c..328668fde 100644 --- a/lib/kotext/KoStyleManager.h +++ b/lib/kotext/KoStyleManager.h @@ -181,7 +181,7 @@ private: Font simple font dia Color simple color dia Spacing and Indents paragraph spacing dia (KWParagDia) -tqalignments KoParagDia tqalignment tab +alignments KoParagDia tqalignment tab borders KoParagDia borders tab numbering KoParagDia tab numbering tabulators KoParagDia tab tabs */ diff --git a/lib/kotext/KoTextCommand.cpp b/lib/kotext/KoTextCommand.cpp index 68f83ad3f..fb4968363 100644 --- a/lib/kotext/KoTextCommand.cpp +++ b/lib/kotext/KoTextCommand.cpp @@ -88,9 +88,9 @@ KoTextCursor * KoTextDeleteCommand::unexecute( KoTextCursor *c ) // Set any custom item that we had m_customItemsMap.insertItems( cursor, text.size() ); - // Now restore the parag tqlayouts (i.e. libkotext specific stuff) + // Now restore the parag layouts (i.e. libkotext specific stuff) TQValueList<KoParagLayout>::Iterator lit = m_oldParagLayouts.begin(); - kdDebug(32500) << "KoTextDeleteCommand::unexecute " << m_oldParagLayouts.count() << " parag tqlayouts. First parag=" << s->paragId() << endl; + kdDebug(32500) << "KoTextDeleteCommand::unexecute " << m_oldParagLayouts.count() << " parag layouts. First parag=" << s->paragId() << endl; Q_ASSERT( id == s->paragId() ); KoTextParag *p = s; while ( p ) { diff --git a/lib/kotext/KoTextCustomItem.cpp b/lib/kotext/KoTextCustomItem.cpp index e90eae478..f6eaf7de2 100644 --- a/lib/kotext/KoTextCustomItem.cpp +++ b/lib/kotext/KoTextCustomItem.cpp @@ -81,16 +81,16 @@ void KoTextCustomItem::draw(TQPainter* p, int _x, int _y, int cx, int cy, int cw KoTextStringChar* stringChar = paragraph()->at( charIndex ); // Convert x, y, cx, cy, cw and ch from Layout Units to pixels. - int x = zh->tqlayoutUnitToPixelX(_x) /*+ stringChar->pixelxadj*/; - int y = zh->tqlayoutUnitToPixelY(_y); - cx = zh->tqlayoutUnitToPixelX(cx); - cy = zh->tqlayoutUnitToPixelY(cy); - cw = zh->tqlayoutUnitToPixelX(_x,cw); - ch = zh->tqlayoutUnitToPixelY(_y,ch); - int wpix = zh->tqlayoutUnitToPixelX(_x,width); - int hpix = zh->tqlayoutUnitToPixelX(_y,height); + int x = zh->layoutUnitToPixelX(_x) /*+ stringChar->pixelxadj*/; + int y = zh->layoutUnitToPixelY(_y); + cx = zh->layoutUnitToPixelX(cx); + cy = zh->layoutUnitToPixelY(cy); + cw = zh->layoutUnitToPixelX(_x,cw); + ch = zh->layoutUnitToPixelY(_y,ch); + int wpix = zh->layoutUnitToPixelX(_x,width); + int hpix = zh->layoutUnitToPixelX(_y,height); //kdDebug(32500)<<"After x :"<<x<<" y :"<<y<<" cx :"<<cx<<" cy :"<<cy<<" ch :"<<ch<<" cw :"<<cw<<endl; - int ascentpix = zh->tqlayoutUnitToPixelY( _y, ascent() ); + int ascentpix = zh->layoutUnitToPixelY( _y, ascent() ); KoTextFormat * fmt = stringChar->format(); diff --git a/lib/kotext/KoTextDocument.cpp b/lib/kotext/KoTextDocument.cpp index b637f0a6c..b5de2a735 100644 --- a/lib/kotext/KoTextDocument.cpp +++ b/lib/kotext/KoTextDocument.cpp @@ -1104,7 +1104,7 @@ KoTextParag *KoTextDocument::drawWYSIWYG( TQPainter *p, int cx, int cy, int cw, TQRect pixelRect = parag->pixelRect( zoomHandler ); if ( isPageBreakEnabled() && parag && cy <= pixelRect.y() && pixelRect.y() > 0 ) { TQRect r( 0, 0, - zoomHandler->tqlayoutUnitToPixelX( parag->document()->x() + parag->document()->width() ), + zoomHandler->layoutUnitToPixelX( parag->document()->x() + parag->document()->width() ), pixelRect.y() ); r &= crect; if ( !r.isEmpty() ) { @@ -1131,7 +1131,7 @@ KoTextParag *KoTextDocument::drawWYSIWYG( TQPainter *p, int cx, int cy, int cw, // (as opposed ir.bottom() which is the last pixel of the parag) if ( ir.y() + ir.height() < nexty ) { TQRect r( 0, ir.y() + ir.height(), - zoomHandler->tqlayoutUnitToPixelX( parag->document()->x() + parag->document()->width() ), + zoomHandler->layoutUnitToPixelX( parag->document()->x() + parag->document()->width() ), nexty - ( ir.y() + ir.height() ) ); r &= crect; if ( !r.isEmpty() ) @@ -1146,7 +1146,7 @@ KoTextParag *KoTextDocument::drawWYSIWYG( TQPainter *p, int cx, int cy, int cw, if ( !ir.intersects( crect ) ) { // Paragraph is not in the crect - but let's check if the area on its right is. - ir.setWidth( zoomHandler->tqlayoutUnitToPixelX( parag->document()->width() ) ); + ir.setWidth( zoomHandler->layoutUnitToPixelX( parag->document()->width() ) ); if ( ir.intersects( crect ) && ( drawingFlags & TransparentBackground ) == 0 ) p->fillRect( ir.intersect( crect ), cg.brush( TQColorGroup::Base ) ); if ( ir.y() > cy + ch ) { @@ -1169,9 +1169,9 @@ KoTextParag *KoTextDocument::drawWYSIWYG( TQPainter *p, int cx, int cy, int cw, floating: pixelRect = parag->pixelRect(zoomHandler); - int docheight = zoomHandler->tqlayoutUnitToPixelY( parag->document()->height() ); + int docheight = zoomHandler->layoutUnitToPixelY( parag->document()->height() ); if ( pixelRect.y() + pixelRect.height() < docheight ) { - int docwidth = zoomHandler->tqlayoutUnitToPixelX( parag->document()->width() ); + int docwidth = zoomHandler->layoutUnitToPixelX( parag->document()->width() ); if ( ( drawingFlags & TransparentBackground ) == 0 ) { p->fillRect( 0, pixelRect.y() + pixelRect.height(), docwidth, docheight - ( pixelRect.y() + pixelRect.height() ), @@ -1267,7 +1267,7 @@ void KoTextDocument::drawParagWYSIWYG( TQPainter *p, KoTextParag *parag, int cx, // Start painting from a given line number. if ( parag->lineChanged() > -1 ) { - offsetY = zoomHandler->tqlayoutUnitToPixelY( parag->lineY( parag->lineChanged() ) - parag->topMargin() ); + offsetY = zoomHandler->layoutUnitToPixelY( parag->lineY( parag->lineChanged() ) - parag->topMargin() ); #ifdef DEBUG_PAINTING kdDebug(32500) << " Repainting from lineChanged=" << parag->lineChanged() << " -> adding " << offsetY << " to rect" << endl; #endif @@ -1384,7 +1384,7 @@ void KoTextDocument::drawParagWYSIWYG( TQPainter *p, KoTextParag *parag, int cx, } if ( needBrush ) { - int docright = zoomHandler->tqlayoutUnitToPixelX( parag->document()->x() + parag->document()->width() ); + int docright = zoomHandler->layoutUnitToPixelX( parag->document()->x() + parag->document()->width() ); #ifdef DEBUG_PAINTING // kdDebug(32500) << "KoTextDocument::drawParagWYSIWYG my rect is: " << rect << endl; #endif diff --git a/lib/kotext/KoTextFormat.cpp b/lib/kotext/KoTextFormat.cpp index 7395a0504..5a1570ac5 100644 --- a/lib/kotext/KoTextFormat.cpp +++ b/lib/kotext/KoTextFormat.cpp @@ -1094,7 +1094,7 @@ float KoTextFormat::screenPointSize( const KoTextZoomHandler* zh ) const int pointSizeLU = KoTextZoomHandler::ptToLayoutUnitPt( pointSize() ); if ( vAlign() != KoTextFormat::AlignNormal ) pointSizeLU = (int)( pointSizeLU *relativeTextSize() ); - return zh->tqlayoutUnitToFontSize( pointSizeLU, false /* forPrint */ ); + return zh->layoutUnitToFontSize( pointSizeLU, false /* forPrint */ ); } float KoTextFormat::refPointSize() const @@ -1145,7 +1145,7 @@ const TQFontMetrics& KoTextFormat::screenFontMetrics( const KoTextZoomHandler* z { TQFont f = screenFont(zh); // don't move inside the if! - if ( !d->m_screenFontMetrics ) // not calculated, or tqinvalidated by screenFont above + if ( !d->m_screenFontMetrics ) // not calculated, or invalidated by screenFont above { //kdDebug(32500) << this << " KoTextFormat::screenFontMetrics pointSize=" << pointSize << " d->m_screenFont->pointSizeFloat()=" << d->m_screenFont->pointSizeFloat() << endl; d->m_screenFontMetrics = new TQFontMetrics( f ); @@ -1186,7 +1186,7 @@ int KoTextFormat::charWidth( const KoTextZoomHandler* zh, bool applyZoom, const if( c->isCustom() ) { if( c->customItem()->placement() == KoTextCustomItem::PlaceInline ) { // customitem width is in LU pixels. Convert to 100%-zoom-pixels (pt2pt==pix2pix) - double w = KoTextZoomHandler::tqlayoutUnitPtToPt( c->customItem()->width ); + double w = KoTextZoomHandler::layoutUnitPtToPt( c->customItem()->width ); return tqRound( applyZoom ? ( w * zh->zoomFactorX() ) : w ); } else diff --git a/lib/kotext/KoTextFormatter.cpp b/lib/kotext/KoTextFormatter.cpp index 6696f0411..7bdfbc0cf 100644 --- a/lib/kotext/KoTextFormatter.cpp +++ b/lib/kotext/KoTextFormatter.cpp @@ -94,7 +94,7 @@ TQPair<int, int> KoTextFormatterCore::determineCharWidth() Q_ASSERT( ww >= 0 ); ww = TQMAX(0, ww); #ifndef REF_IS_LU - pixelww = zh->tqlayoutUnitToPixelX( ww ); + pixelww = zh->layoutUnitToPixelX( ww ); #endif } else { ww = charFormat->charWidthLU( c, parag, i ); @@ -113,7 +113,7 @@ TQPair<int, int> KoTextFormatterCore::determineCharWidth() kdDebug(32500) << "nextTab for x=" << x << " returned nx=" << nx << " (=> ww=" << ww << ")" << endl; #endif #ifndef REF_IS_LU - pixelww = zh->tqlayoutUnitToPixelX( ww ); + pixelww = zh->layoutUnitToPixelX( ww ); #endif } Q_ASSERT( ww >= 0 ); @@ -260,7 +260,7 @@ bool KoTextFormatterCore::format() maxAvailableWidth = tqMakePair( 0, 0 ); KoTextZoomHandler *zh = doc->formattingZoomHandler(); - int pixelx = zh->tqlayoutUnitToPixelX( x ); + int pixelx = zh->layoutUnitToPixelX( x ); int lastPixelx = 0; KoTextStringChar* lastChr = 0; @@ -445,7 +445,7 @@ bool KoTextFormatterCore::format() ww, // ## correct? x, initialRMargin, dw, parag ); - pixelx = zh->tqlayoutUnitToPixelX( x ); + pixelx = zh->layoutUnitToPixelX( x ); initialHeight = tmph; initialLMargin = x; availableWidth = dw - initialRMargin; @@ -545,7 +545,7 @@ bool KoTextFormatterCore::format() c->width, x, initialRMargin, dw, parag ); - pixelx = zh->tqlayoutUnitToPixelX( x ); + pixelx = zh->layoutUnitToPixelX( x ); initialHeight = tmph; initialLMargin = x; availableWidth = dw - initialRMargin; @@ -624,7 +624,7 @@ bool KoTextFormatterCore::format() #endif i = (firstChar - &string->at(0)); x = newLMargin; - pixelx = zh->tqlayoutUnitToPixelX( x ); + pixelx = zh->layoutUnitToPixelX( x ); availableWidth = dw - newRMargin; initialLMargin = newLMargin; initialRMargin = newRMargin; @@ -679,10 +679,10 @@ bool KoTextFormatterCore::format() c->x = x; // pixelxadj is the adjustement to add to lu2pixel(x), to find pixelx // (pixelx would be too expensive to store directly since it would require an int) - c->pixelxadj = pixelx - zh->tqlayoutUnitToPixelX( x ); + c->pixelxadj = pixelx - zh->layoutUnitToPixelX( x ); //c->pixelwidth = pixelww; // done as pixelx - lastPixelx below #ifdef DEBUG_FORMATTER - kdDebug(32500) << "LU: x=" << x << " [equiv. to pix=" << zh->tqlayoutUnitToPixelX( x ) << "] ; PIX: x=" << pixelx << " --> adj=" << c->pixelxadj << endl; + kdDebug(32500) << "LU: x=" << x << " [equiv. to pix=" << zh->layoutUnitToPixelX( x ) << "] ; PIX: x=" << pixelx << " --> adj=" << c->pixelxadj << endl; #endif x += ww; @@ -692,11 +692,11 @@ bool KoTextFormatterCore::format() if ( i < len - 1 ) tmpWused = TQMAX( tmpWused, x ); else // trailing space - c->pixelwidth = zh->tqlayoutUnitToPixelX( ww ); // was: pixelww; + c->pixelwidth = zh->layoutUnitToPixelX( ww ); // was: pixelww; lastPixelx = pixelx; #ifdef REF_IS_LU - pixelx = zh->tqlayoutUnitToPixelX( x ); // no accumulating rounding errors anymore + pixelx = zh->layoutUnitToPixelX( x ); // no accumulating rounding errors anymore #else pixelx += pixelww; #endif @@ -706,7 +706,7 @@ bool KoTextFormatterCore::format() } // ### hack. The last char in the paragraph is always invisible, and somehow sometimes has a wrong format. It changes between - // tqlayouting and printing. This corrects some tqlayouting errors in BiDi mode due to this. + // layouting and printing. This corrects some layouting errors in BiDi mode due to this. if ( len > 1 /*&& !c->isAnchor()*/ ) { c->format()->removeRef(); c->setFormat( string->at( len - 2 ).format() ); @@ -787,11 +787,11 @@ void KoTextFormatterCore::moveChar( KoTextStringChar& chr, KoTextZoomHandler *zh int deltaX, int deltaPixelX ) { #ifndef REF_IS_LU - int pixelx = chr.pixelxadj + zh->tqlayoutUnitToPixelX( chr.x ); + int pixelx = chr.pixelxadj + zh->layoutUnitToPixelX( chr.x ); #endif chr.x += deltaX; #ifndef REF_IS_LU - chr.pixelxadj = pixelx + deltaPixelX - zh->tqlayoutUnitToPixelX( chr.x ); + chr.pixelxadj = pixelx + deltaPixelX - zh->layoutUnitToPixelX( chr.x ); #endif } @@ -814,7 +814,7 @@ KoTextParagLineStart *KoTextFormatterCore::koFormatLine( if ( align & TQt::AlignHCenter || align & TQt::AlignRight ) { if ( align & TQt::AlignHCenter ) space /= 2; - int toAddPix = zh->tqlayoutUnitToPixelX( space ); + int toAddPix = zh->layoutUnitToPixelX( space ); for ( int j = last; j >= start; --j ) { KoTextStringChar &chr = string->at( j ); moveChar( chr, zh, space, toAddPix ); @@ -841,12 +841,12 @@ KoTextParagLineStart *KoTextFormatterCore::koFormatLine( if( settings->isStretchable( string, k ) && numSpaces ) { int s = space / numSpaces; toAdd += s; - toAddPix = zh->tqlayoutUnitToPixelX( toAdd ); + toAddPix = zh->layoutUnitToPixelX( toAdd ); space -= s; numSpaces--; chr.width += s; #ifndef REF_IS_LU - chr.pixelwidth += zh->tqlayoutUnitToPixelX( s ); // ### rounding problem, recalculate + chr.pixelwidth += zh->layoutUnitToPixelX( s ); // ### rounding problem, recalculate #endif } } @@ -973,7 +973,7 @@ KoTextParagLineStart *KoTextFormatterCore::koBidiReorderLine( } } // TODO #ifndef REF_IS_LU or remove - int pixelx = zh->tqlayoutUnitToPixelX( x ); + int pixelx = zh->layoutUnitToPixelX( x ); int toAdd = 0; int toAddPix = 0; bool first = TRUE; @@ -991,11 +991,11 @@ KoTextParagLineStart *KoTextFormatterCore::koBidiReorderLine( if( numSpaces && !first && settings->isBreakable( text, pos ) ) { int s = space / numSpaces; toAdd += s; - toAddPix = zh->tqlayoutUnitToPixelX( toAdd ); + toAddPix = zh->layoutUnitToPixelX( toAdd ); space -= s; numSpaces--; chr.width += s; - chr.pixelwidth += zh->tqlayoutUnitToPixelX( s ); // ### rounding problem, recalculate + chr.pixelwidth += zh->layoutUnitToPixelX( s ); // ### rounding problem, recalculate } else if ( first ) { first = FALSE; if ( chr.c == ' ' ) // trailing space @@ -1006,9 +1006,9 @@ KoTextParagLineStart *KoTextFormatterCore::koBidiReorderLine( } } chr.x = x + toAdd; - chr.pixelxadj = pixelx + toAddPix - zh->tqlayoutUnitToPixelX( chr.x ); + chr.pixelxadj = pixelx + toAddPix - zh->layoutUnitToPixelX( chr.x ); #ifdef DEBUG_FORMATTER - kdDebug(32500) << "koBidiReorderLine: pos=" << pos << " x(LU)=" << x << " toAdd(LU)=" << toAdd << " -> chr.x=" << chr.x << " pixelx=" << pixelx << "+" << zh->tqlayoutUnitToPixelX( toAdd ) << ", pixelxadj=" << pixelx+zh->tqlayoutUnitToPixelX( toAdd )-zh->tqlayoutUnitToPixelX( chr.x ) << endl; + kdDebug(32500) << "koBidiReorderLine: pos=" << pos << " x(LU)=" << x << " toAdd(LU)=" << toAdd << " -> chr.x=" << chr.x << " pixelx=" << pixelx << "+" << zh->layoutUnitToPixelX( toAdd ) << ", pixelxadj=" << pixelx+zh->layoutUnitToPixelX( toAdd )-zh->layoutUnitToPixelX( chr.x ) << endl; #endif chr.rightToLeft = TRUE; chr.startOfRun = FALSE; @@ -1028,7 +1028,7 @@ KoTextParagLineStart *KoTextFormatterCore::koBidiReorderLine( if( numSpaces && !first && settings->isBreakable( text, pos ) ) { int s = space / numSpaces; toAdd += s; - toAddPix = zh->tqlayoutUnitToPixelX( toAdd ); + toAddPix = zh->layoutUnitToPixelX( toAdd ); space -= s; numSpaces--; } else if ( first ) { @@ -1041,7 +1041,7 @@ KoTextParagLineStart *KoTextFormatterCore::koBidiReorderLine( } } chr.x = x + toAdd; - chr.pixelxadj = pixelx + toAddPix - zh->tqlayoutUnitToPixelX( chr.x ); + chr.pixelxadj = pixelx + toAddPix - zh->layoutUnitToPixelX( chr.x ); chr.rightToLeft = FALSE; chr.startOfRun = FALSE; int ww = chr.width; diff --git a/lib/kotext/KoTextObject.cpp b/lib/kotext/KoTextObject.cpp index f6716b2dc..6289482bd 100644 --- a/lib/kotext/KoTextObject.cpp +++ b/lib/kotext/KoTextObject.cpp @@ -887,7 +887,7 @@ KCommand *KoTextObject::applyStyleCommand( KoTextCursor * cursor, const KoParagS c2.setIndex( lastParag->string()->length() ); undoRedoInfo.clear(); undoRedoInfo.type = UndoRedoInfo::Invalid; // same trick - readFormats( c1, c2 ); // gather char-format info but not paragtqlayouts nor customitems + readFormats( c1, c2 ); // gather char-format info but not paraglayouts nor customitems KoTextDocCommand * cmd = new KoTextFormatCommand( textdoc, firstParag->paragId(), 0, lastParag->paragId(), c2.index(), @@ -2634,7 +2634,7 @@ TQFont KoTextFormatInterface::textFont() const { TQFont fn( currentFormat()->font() ); // "unzoom" the font size - //fn.setPointSize( static_cast<int>( KoTextZoomHandler::tqlayoutUnitPtToPt( fn.pointSize() ) ) ); + //fn.setPointSize( static_cast<int>( KoTextZoomHandler::layoutUnitPtToPt( fn.pointSize() ) ) ); return fn; } diff --git a/lib/kotext/KoTextParag.cpp b/lib/kotext/KoTextParag.cpp index 8f9485968..f516b7cae 100644 --- a/lib/kotext/KoTextParag.cpp +++ b/lib/kotext/KoTextParag.cpp @@ -254,7 +254,7 @@ void KoTextParag::join( KoTextParag *s ) delete s; tqinvalidate( 0 ); //// kotext - tqinvalidateCounters(); + invalidateCounters(); //// r.setHeight( oh ); //needPreProcess = TRUE; @@ -693,7 +693,7 @@ void KoTextParag::setDirection( TQChar::Direction d ) tqinvalidate( 0 ); //// kotext m_layout.direction = d; - tqinvalidateCounters(); // #47178 + invalidateCounters(); // #47178 //// } } @@ -1012,7 +1012,7 @@ void KoTextParag::setNoCounter() { delete m_layout.counter; m_layout.counter = 0L; - tqinvalidateCounters(); + invalidateCounters(); } void KoTextParag::setCounter( const KoParagCounter * pCounter ) @@ -1028,7 +1028,7 @@ void KoTextParag::setCounter( const KoParagCounter * pCounter ) m_layout.counter->setStyle( KoParagCounter::STYLE_NONE ); // no number after the 'prefix' m_layout.counter->setPrefix( footNotePrefix ); m_layout.counter->setSuffix( TQString() ); - tqinvalidateCounters(); + invalidateCounters(); } else { if ( pCounter ) setCounter( *pCounter ); @@ -1052,11 +1052,11 @@ void KoTextParag::setCounter( const KoParagCounter & counter ) m_layout.counter = new KoParagCounter( counter ); // Invalidate the counters - tqinvalidateCounters(); + invalidateCounters(); } } -void KoTextParag::tqinvalidateCounters() +void KoTextParag::invalidateCounters() { // Invalidate this paragraph and all the following ones // (Numbering may have changed) @@ -1065,7 +1065,7 @@ void KoTextParag::tqinvalidateCounters() m_layout.counter->tqinvalidate(); KoTextParag *s = next(); // #### Possible optimization: since any invalidation propagates down, - // it's enough to stop at the first paragraph with an already-tqinvalidated counter, isn't it? + // it's enough to stop at the first paragraph with an already-invalidated counter, isn't it? // This is only true if nobody else calls counter->tqinvalidate... while ( s ) { if ( s->m_layout.counter ) @@ -1117,12 +1117,12 @@ void KoTextParag::drawLabel( TQPainter* p, int xLU, int yLU, int /*wLU*/, int /* //bool forPrint = ( p->device()->devType() == TQInternal::Printer ); bool rtl = str->isRightToLeft(); // when true, we put suffix+counter+prefix at the RIGHT of the paragraph. - int xLeft = zh->tqlayoutUnitToPixelX( xLU - (rtl ? 0 : counterWidthLU) ); - int y = zh->tqlayoutUnitToPixelY( yLU ); - //int h = zh->tqlayoutUnitToPixelY( yLU, hLU ); - int base = zh->tqlayoutUnitToPixelY( yLU, baseLU ); - int counterWidth = zh->tqlayoutUnitToPixelX( xLU, counterWidthLU ); - int height = zh->tqlayoutUnitToPixelY( yLU, format->height() ); + int xLeft = zh->layoutUnitToPixelX( xLU - (rtl ? 0 : counterWidthLU) ); + int y = zh->layoutUnitToPixelY( yLU ); + //int h = zh->layoutUnitToPixelY( yLU, hLU ); + int base = zh->layoutUnitToPixelY( yLU, baseLU ); + int counterWidth = zh->layoutUnitToPixelX( xLU, counterWidthLU ); + int height = zh->layoutUnitToPixelY( yLU, format->height() ); TQFont font( format->screenFont( zh ) ); // Footnote numbers are in superscript (in WP and Word, not in OO) @@ -1137,11 +1137,11 @@ void KoTextParag::drawLabel( TQPainter* p, int xLU, int yLU, int /*wLU*/, int /* // Now draw any bullet that is required over the space left for it. if ( m_layout.counter->isBullet() ) { - int xBullet = xLeft + zh->tqlayoutUnitToPixelX( m_layout.counter->bulletX() ); + int xBullet = xLeft + zh->layoutUnitToPixelX( m_layout.counter->bulletX() ); //kdDebug(32500) << "KoTextParag::drawLabel xLU=" << xLU << " counterWidthLU=" << counterWidthLU << endl; // The width and height of the bullet is the width of one space - int width = zh->tqlayoutUnitToPixelX( xLeft, format->width( ' ' ) ); + int width = zh->layoutUnitToPixelX( xLeft, format->width( ' ' ) ); //kdDebug(32500) << "Pix: xLeft=" << xLeft << " counterWidth=" << counterWidth // << " xBullet=" << xBullet << " width=" << width << endl; @@ -1387,14 +1387,14 @@ int KoTextParag::calculateLineSpacing( int line, int startChar, int lastChar ) c TQRect KoTextParag::pixelRect( KoTextZoomHandler *zh ) const { - TQRect rct( zh->tqlayoutUnitToPixel( rect() ) ); + TQRect rct( zh->layoutUnitToPixel( rect() ) ); //kdDebug(32500) << " pixelRect for parag " << paragId() // << ": rect=" << rect() << " pixelRect=" << rct << endl; // After division we almost always end up with the top overwriting the bottom of the parag above if ( prev() ) { - TQRect prevRect( zh->tqlayoutUnitToPixel( prev()->rect() ) ); + TQRect prevRect( zh->layoutUnitToPixel( prev()->rect() ) ); if ( rct.top() < prevRect.bottom() + 1 ) { //kdDebug(32500) << " pixelRect: rct.top() adjusted to " << prevRect.bottom() + 1 << " (was " << rct.top() << ")" << endl; @@ -1411,7 +1411,7 @@ void KoTextParag::paint( TQPainter &painter, const TQColorGroup &cg, KoTextCurso { #ifdef DEBUG_PAINT kdDebug(32500) << "KoTextParag::paint ===== id=" << paragId() << " clipx=" << clipx << " clipy=" << clipy << " clipw=" << clipw << " cliph=" << cliph << endl; - kdDebug(32500) << " clipw in pix (approx) : " << textDocument()->paintingZoomHandler()->tqlayoutUnitToPixelX( clipw ) << " cliph in pix (approx) : " << textDocument()->paintingZoomHandler()->tqlayoutUnitToPixelX( cliph ) << endl; + kdDebug(32500) << " clipw in pix (approx) : " << textDocument()->paintingZoomHandler()->layoutUnitToPixelX( clipw ) << " cliph in pix (approx) : " << textDocument()->paintingZoomHandler()->layoutUnitToPixelX( cliph ) << endl; #endif KoTextZoomHandler * zh = textDocument()->paintingZoomHandler(); @@ -1420,13 +1420,13 @@ void KoTextParag::paint( TQPainter &painter, const TQColorGroup &cg, KoTextCurso TQRect paraRect = pixelRect( zh ); // Find left margin size, first line offset and right margin in pixels - int leftMarginPix = zh->tqlayoutUnitToPixelX( leftMargin() ); - int firstLineOffset = zh->tqlayoutUnitToPixelX( firstLineMargin() ); + int leftMarginPix = zh->layoutUnitToPixelX( leftMargin() ); + int firstLineOffset = zh->layoutUnitToPixelX( firstLineMargin() ); // The furthest left and right x-coords of the paragraph, // including the bullet/counter, but not the borders. int leftExtent = TQMIN ( leftMarginPix, leftMarginPix + firstLineOffset ); - int rightExtent = paraRect.width() - zh->tqlayoutUnitToPixelX( rightMargin() ); + int rightExtent = paraRect.width() - zh->layoutUnitToPixelX( rightMargin() ); // Draw the paragraph background color if ( backgroundColor().isValid() ) @@ -1470,7 +1470,7 @@ void KoTextParag::paint( TQPainter &painter, const TQColorGroup &cg, KoTextCurso TQRect r; r.setLeft( leftExtent ); r.setRight( rightExtent ); - r.setTop( zh->tqlayoutUnitToPixelY(lineY( 0 )) ); + r.setTop( zh->layoutUnitToPixelY(lineY( 0 )) ); int lastLine = lines() - 1; // We need to start from the pixelRect, to make sure the bottom border is entirely painted. @@ -1479,13 +1479,13 @@ void KoTextParag::paint( TQPainter &painter, const TQColorGroup &cg, KoTextCurso // If we don't have a bottom border, we need go as low as possible ( to touch the next parag's border ). // If we have a bottom border, then we rather exclude the linespacing. Looks nicer. OO does that too. if ( m_layout.bottomBorder.width() > 0 && drawBottomBorder) - paragBottom -= zh->tqlayoutUnitToPixelY( lineSpacing( lastLine ) ); + paragBottom -= zh->layoutUnitToPixelY( lineSpacing( lastLine ) ); paragBottom -= KoBorder::zoomWidthY( m_layout.bottomBorder.width(), zh, 0 ); //kdDebug(32500) << "Parag border: paragBottom=" << paragBottom // << " bottom border width = " << KoBorder::zoomWidthY( m_layout.bottomBorder.width(), zh, 0 ) << endl; r.setBottom( paragBottom ); - //kdDebug(32500) << "KoTextParag::paint documentWidth=" << documentWidth() << " LU (" << zh->tqlayoutUnitToPixelX(documentWidth()) << " pixels) bordersRect=" << r << endl; + //kdDebug(32500) << "KoTextParag::paint documentWidth=" << documentWidth() << " LU (" << zh->layoutUnitToPixelX(documentWidth()) << " pixels) bordersRect=" << r << endl; KoBorder::drawBorders( painter, zh, r, m_layout.leftBorder, m_layout.rightBorder, m_layout.topBorder, m_layout.bottomBorder, 0, TQPen(), drawTopBorder, drawBottomBorder ); @@ -1696,19 +1696,19 @@ void KoTextParag::drawParagString( TQPainter &painter, const TQString &str, int // Calculate offset (e.g. due to shadow on left or top) // Important: don't use the 2-args methods here, offsets are not heights // (0 should be 0, not 1) (#63256) - int shadowOffsetX_pix = zh->tqlayoutUnitToPixelX( format->offsetX() ); - int shadowOffsetY_pix = zh->tqlayoutUnitToPixelY( format->offsetY() ); + int shadowOffsetX_pix = zh->layoutUnitToPixelX( format->offsetX() ); + int shadowOffsetY_pix = zh->layoutUnitToPixelY( format->offsetY() ); // Calculate startX in pixels - int startX_pix = zh->tqlayoutUnitToPixelX( startX ) /* + at( rightToLeft ? start+len-1 : start )->pixelxadj */; + int startX_pix = zh->layoutUnitToPixelX( startX ) /* + at( rightToLeft ? start+len-1 : start )->pixelxadj */; #ifdef DEBUG_PAINT kdDebug(32500) << "KoTextParag::drawParagString startX in pixels : " << startX_pix /*<< " adjustment:" << at( rightToLeft ? start+len-1 : start )->pixelxadj*/ << " bw=" << bw << endl; #endif - int bw_pix = zh->tqlayoutUnitToPixelX( startX, bw ); - int lastY_pix = zh->tqlayoutUnitToPixelY( lastY ); - int baseLine_pix = zh->tqlayoutUnitToPixelY( lastY, baseLine ); // 2 args=>+1. Is that correct? - int h_pix = zh->tqlayoutUnitToPixelY( lastY, h ); + int bw_pix = zh->layoutUnitToPixelX( startX, bw ); + int lastY_pix = zh->layoutUnitToPixelY( lastY ); + int baseLine_pix = zh->layoutUnitToPixelY( lastY, baseLine ); // 2 args=>+1. Is that correct? + int h_pix = zh->layoutUnitToPixelY( lastY, h ); #ifdef DEBUG_PAINT kdDebug(32500) << "KoTextParag::drawParagString h(LU)=" << h << " lastY(LU)=" << lastY << " h(PIX)=" << h_pix << " lastY(PIX)=" << lastY_pix @@ -1772,7 +1772,7 @@ void KoTextParag::drawParagString( TQPainter &painter, const TQString &str, int if ( draw_len > 0 ) { - int draw_startX_pix = zh->tqlayoutUnitToPixelX( draw_startX ) /* + at( rightToLeft ? start+draw_len-1 : start )->pixelxadj*/; + int draw_startX_pix = zh->layoutUnitToPixelX( draw_startX ) /* + at( rightToLeft ? start+draw_len-1 : start )->pixelxadj*/; draw_startX_pix += shadowOffsetX_pix; lastY_pix += shadowOffsetY_pix; @@ -2028,11 +2028,11 @@ bool KoTextParag::lineHyphenated( int l ) const void KoTextParag::drawCursor( TQPainter &painter, KoTextCursor *cursor, int curx, int cury, int curh, const TQColorGroup &cg ) { KoTextZoomHandler * zh = textDocument()->paintingZoomHandler(); - int x = zh->tqlayoutUnitToPixelX( curx ) /*+ cursor->parag()->at( cursor->index() )->pixelxadj*/; - //kdDebug(32500) << " drawCursor: LU: [cur]x=" << curx << ", cury=" << cury << " -> PIX: x=" << x << ", y=" << zh->tqlayoutUnitToPixelY( cury ) << endl; + int x = zh->layoutUnitToPixelX( curx ) /*+ cursor->parag()->at( cursor->index() )->pixelxadj*/; + //kdDebug(32500) << " drawCursor: LU: [cur]x=" << curx << ", cury=" << cury << " -> PIX: x=" << x << ", y=" << zh->layoutUnitToPixelY( cury ) << endl; KoTextParag::drawCursorDefault( painter, cursor, x, - zh->tqlayoutUnitToPixelY( cury ), - zh->tqlayoutUnitToPixelY( cury, curh ), cg ); + zh->layoutUnitToPixelY( cury ), + zh->layoutUnitToPixelY( cury, curh ), cg ); } // Reimplemented from KoTextParag @@ -2407,7 +2407,7 @@ void KoTextParag::printRTDebug( int info ) for ( int i = 0 ; i < s->length() ; ++i ) { KoTextStringChar & ch = s->at(i); - int pixelx = textDocument()->formattingZoomHandler()->tqlayoutUnitToPixelX( ch.x ) + int pixelx = textDocument()->formattingZoomHandler()->layoutUnitToPixelX( ch.x ) + ch.pixelxadj; if ( ch.lineStart ) kdDebug(32500) << "LINESTART" << endl; @@ -2916,11 +2916,11 @@ void KoTextParag::saveOasis( KoXmlWriter& writer, KoSavingContext& context, KoGenStyles& mainStyles = context.mainStyles(); // Write paragtqlayout to styles (with tqparent == the parag's style) - TQString tqparentStyleName; + TQString parentStyleName; if ( m_layout.style ) - tqparentStyleName = m_layout.style->name(); + parentStyleName = m_layout.style->name(); - KoGenStyle autoStyle( KoGenStyle::STYLE_AUTO, "paragraph", tqparentStyleName ); + KoGenStyle autoStyle( KoGenStyle::STYLE_AUTO, "paragraph", parentStyleName ); paragFormat()->save( autoStyle, context ); m_layout.saveOasis( autoStyle, context, false ); @@ -3116,7 +3116,7 @@ void KoTextParag::applyListStyle( KoOasisContext& context, int restartNumbering, double spaceBefore = KoUnit::parseValue( listStyleProperties.attributeNS( KoXmlNS::text, "space-before", TQString() ) ); m_layout.margins[ TQStyleSheetItem::MarginLeft ] += spaceBefore; // added to left-margin, see 15.12 in spec. } - // need to call tqinvalidateCounters() ? Not during the initial loading at least. + // need to call invalidateCounters() ? Not during the initial loading at least. } int KoTextParag::documentWidth() const @@ -3177,9 +3177,9 @@ void KoTextParag::drawFormattingChars( TQPainter &painter, int start, int len, //kdDebug() << "startX=" << startX << " bw=" << bw << " w=" << w << endl; int x; if ( rightToLeft ) - x = zh->tqlayoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ + ch.pixelwidth - 1; + x = zh->layoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ + ch.pixelwidth - 1; else - x = zh->tqlayoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ + w; + x = zh->layoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ + w; int y = lastY_pix + baseLine_pix; //kdDebug() << "KWTextParag::drawFormattingChars drawing CR at " << x << "," << y << endl; painter.drawLine( (int)(x - size * 0.2), y - size, (int)(x - size * 0.2), y ); @@ -3189,7 +3189,7 @@ void KoTextParag::drawFormattingChars( TQPainter &painter, int start, int len, painter.drawArc( x - size, y - size, size, (int)(size / 2), -90*16, -180*16 ); #ifdef DEBUG_FORMATTING painter.setPen( TQt::blue ); - painter.drawRect( zh->tqlayoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ - 1, lastY_pix, ch.pixelwidth, baseLine_pix ); + painter.drawRect( zh->layoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ - 1, lastY_pix, ch.pixelwidth, baseLine_pix ); TQPen pen( cg.color( TQColorGroup::Highlight ) ); painter.setPen( pen ); #endif @@ -3206,7 +3206,7 @@ void KoTextParag::drawFormattingChars( TQPainter &painter, int start, int len, KoTextStringChar &ch = str->at(i); #ifdef DEBUG_FORMATTING painter.setPen( (i % 2)? TQt::red: TQt::green ); - painter.drawRect( zh->tqlayoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ - 1, lastY_pix, ch.pixelwidth, baseLine_pix ); + painter.drawRect( zh->layoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ - 1, lastY_pix, ch.pixelwidth, baseLine_pix ); TQPen pen( cg.color( TQColorGroup::Highlight ) ); painter.setPen( pen ); #endif @@ -3217,10 +3217,10 @@ void KoTextParag::drawFormattingChars( TQPainter &painter, int start, int len, { // Don't use ch.pixelwidth here. We want a square with // the same size for all spaces, even the justified ones - int w = zh->tqlayoutUnitToPixelX( ch.format()->width( ' ' ) ); - int height = zh->tqlayoutUnitToPixelY( ch.ascent() ); + int w = zh->layoutUnitToPixelX( ch.format()->width( ' ' ) ); + int height = zh->layoutUnitToPixelY( ch.ascent() ); int size = TQMAX( 2, TQMIN( w/2, height/3 ) ); // Enfore that it's a square, and that it's visible - int x = zh->tqlayoutUnitToPixelX( ch.x ); // + ch.pixelxadj; + int x = zh->layoutUnitToPixelX( ch.x ); // + ch.pixelxadj; TQRect spcRect( x + (ch.pixelwidth - size) / 2, lastY_pix + baseLine_pix - (height - size) / 2, size, size ); if ( ch.c == ' ' ) painter.drawRect( spcRect ); @@ -3234,15 +3234,15 @@ void KoTextParag::drawFormattingChars( TQPainter &painter, int start, int len, //kdDebug() << "tab x=" << ch.x << " nextch.x=" << nextch.x // << " nextx=" << nextx << " startX=" << startX << " bw=" << bw << endl; int availWidth = nextx - ch.x - 1; - availWidth=zh->tqlayoutUnitToPixelX(availWidth);*/ + availWidth=zh->layoutUnitToPixelX(availWidth);*/ int availWidth = ch.pixelwidth; KoTextFormat* format = ch.format(); - int x = zh->tqlayoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ + availWidth / 2; + int x = zh->layoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ + availWidth / 2; int charWidth = format->screenFontMetrics( zh ).width( 'W' ); int size = TQMIN( availWidth, charWidth ) / 2 ; // actually the half size - int y = lastY_pix + baseLine_pix - zh->tqlayoutUnitToPixelY( ch.ascent()/2 ); + int y = lastY_pix + baseLine_pix - zh->layoutUnitToPixelY( ch.ascent()/2 ); int arrowsize = zh->zoomItY( 2 ); painter.drawLine( x - size, y, x + size, y ); if ( rightToLeft ) @@ -3269,7 +3269,7 @@ void KoTextParag::drawFormattingChars( TQPainter &painter, int start, int len, //kdDebug() << "KWTextParag::drawFormattingChars drawing Line Break at " << x << "," << y << endl; if ( rightToLeft ) { - int x = zh->tqlayoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ + ch.pixelwidth - 1; + int x = zh->layoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ + ch.pixelwidth - 1; painter.drawLine( x - size, y - size, x - size, y ); painter.drawLine( x - size, y, (int)(x - size * 0.3), y ); // Now the arrow @@ -3278,7 +3278,7 @@ void KoTextParag::drawFormattingChars( TQPainter &painter, int start, int len, } else { - int x = zh->tqlayoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ + w - 1; + int x = zh->layoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ + w - 1; painter.drawLine( x, y - size, x, y ); painter.drawLine( x, y, (int)(x - size * 0.7), y ); // Now the arrow diff --git a/lib/kotext/KoTextParag.h b/lib/kotext/KoTextParag.h index 486a4ae3e..4ccc21962 100644 --- a/lib/kotext/KoTextParag.h +++ b/lib/kotext/KoTextParag.h @@ -350,7 +350,7 @@ public: #endif protected: - void tqinvalidateCounters(); + void invalidateCounters(); bool lineHyphenated( int l ) const; void paintLines( TQPainter &painter, const TQColorGroup &cg, KoTextCursor *cursor, bool drawSelections, diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp index 68df49923..cea0fae1e 100644 --- a/lib/kotext/KoTextView.cpp +++ b/lib/kotext/KoTextView.cpp @@ -328,7 +328,7 @@ void KoTextView::handleKeyPressEvent( TQKeyEvent * e, TQWidget *widget, const TQ } if ( !text.isEmpty() ) { - // Bidi support: need to reverse mirrored chars (e.g. tqparenthesis) + // Bidi support: need to reverse mirrored chars (e.g. parenthesis) KoTextParag *p = m_cursor->parag(); if ( p && p->string() && p->string()->isRightToLeft() ) { TQChar *c = (TQChar *)text.tqunicode(); diff --git a/lib/kotext/KoTextZoomHandler.cpp b/lib/kotext/KoTextZoomHandler.cpp index acd2285d4..e9fc430fa 100644 --- a/lib/kotext/KoTextZoomHandler.cpp +++ b/lib/kotext/KoTextZoomHandler.cpp @@ -36,39 +36,39 @@ int KoTextZoomHandler::fontSizeToLayoutUnit( double ptSizeFloat, bool forPrint ) } #endif -double KoTextZoomHandler::tqlayoutUnitToFontSize( int luSize, bool /*forPrint*/ ) const +double KoTextZoomHandler::layoutUnitToFontSize( int luSize, bool /*forPrint*/ ) const { // TQt will use TQPaintDevice::x11AppDpiY() to go from pt to pixel for fonts - return tqlayoutUnitPtToPt( luSize ) * m_zoomedResolutionY + return layoutUnitPtToPt( luSize ) * m_zoomedResolutionY #ifdef Q_WS_X11 / POINT_TO_INCH(TQPaintDevice::x11AppDpiY()) #endif ; } -int KoTextZoomHandler::tqlayoutUnitToPixelX( int x, int w ) const +int KoTextZoomHandler::layoutUnitToPixelX( int x, int w ) const { - // We call tqlayoutUnitToPixelX on the right value, i.e. x+w-1, + // We call layoutUnitToPixelX on the right value, i.e. x+w-1, // and then determine the height from the result (i.e. right-left+1). - // Calling tqlayoutUnitToPixelX(w) leads to rounding problems. - return tqlayoutUnitToPixelY( x + w - 1 ) - tqlayoutUnitToPixelY( x ) + 1; + // Calling layoutUnitToPixelX(w) leads to rounding problems. + return layoutUnitToPixelY( x + w - 1 ) - layoutUnitToPixelY( x ) + 1; } -int KoTextZoomHandler::tqlayoutUnitToPixelY( int y, int h ) const +int KoTextZoomHandler::layoutUnitToPixelY( int y, int h ) const { - // We call tqlayoutUnitToPixelY on the bottom value, i.e. y+h-1, + // We call layoutUnitToPixelY on the bottom value, i.e. y+h-1, // and then determine the height from the result (i.e. bottom-top+1). - // Calling tqlayoutUnitToPixelY(h) leads to rounding problems. - return tqlayoutUnitToPixelY( y + h - 1 ) - tqlayoutUnitToPixelY( y ) + 1; + // Calling layoutUnitToPixelY(h) leads to rounding problems. + return layoutUnitToPixelY( y + h - 1 ) - layoutUnitToPixelY( y ) + 1; } -int KoTextZoomHandler::tqlayoutUnitToPixelX( int lupix ) const +int KoTextZoomHandler::layoutUnitToPixelX( int lupix ) const { return int( static_cast<double>( lupix * m_zoomedResolutionX ) / ( static_cast<double>( m_layoutUnitFactor ) * m_resolutionX ) ); } -int KoTextZoomHandler::tqlayoutUnitToPixelY( int lupix ) const +int KoTextZoomHandler::layoutUnitToPixelY( int lupix ) const { // tqRound replaced with a truncation, too many problems (e.g. bottom of parags) return int( static_cast<double>( lupix * m_zoomedResolutionY ) diff --git a/lib/kotext/KoTextZoomHandler.h b/lib/kotext/KoTextZoomHandler.h index 812110868..f8c2ef124 100644 --- a/lib/kotext/KoTextZoomHandler.h +++ b/lib/kotext/KoTextZoomHandler.h @@ -23,7 +23,7 @@ #include <KoZoomHandler.h> /** - * This class extends KoZoomHandler to add support for WYSIWYG text tqlayouting. + * This class extends KoZoomHandler to add support for WYSIWYG text layouting. */ class KOTEXT_EXPORT KoTextZoomHandler : public KoZoomHandler { @@ -31,7 +31,7 @@ public: KoTextZoomHandler() {} virtual ~KoTextZoomHandler() {} - //// Support for WYSIWYG text tqlayouting ///// + //// Support for WYSIWYG text layouting ///// /** The "[zoomed] view pixel" -> "tqlayout unit pixel" conversions. */ int pixelToLayoutUnitX( int x ) const; @@ -44,22 +44,22 @@ public: pixelToLayoutUnit( r.bottomRight() ) ); } /** The "tqlayout unit pixel" -> "[zoomed] view pixel" conversions. */ - int tqlayoutUnitToPixelX( int lupix ) const; - int tqlayoutUnitToPixelY( int lupix ) const; + int layoutUnitToPixelX( int lupix ) const; + int layoutUnitToPixelY( int lupix ) const; /** This variant converts a width, using a reference X position. * This prevents rounding problems. */ - int tqlayoutUnitToPixelX( int x, int w ) const; + int layoutUnitToPixelX( int x, int w ) const; /** This variant converts a height, using a reference Y position. * This prevents rounding problems. */ - int tqlayoutUnitToPixelY( int y, int h ) const; + int layoutUnitToPixelY( int y, int h ) const; - TQPoint tqlayoutUnitToPixel( const TQPoint &p ) const - { return TQPoint( tqlayoutUnitToPixelX( p.x() ), - tqlayoutUnitToPixelY( p.y() ) ); } - TQRect tqlayoutUnitToPixel( const TQRect &r ) const - { return TQRect( tqlayoutUnitToPixel( r.topLeft() ), - tqlayoutUnitToPixel( r.bottomRight() ) ); } + TQPoint layoutUnitToPixel( const TQPoint &p ) const + { return TQPoint( layoutUnitToPixelX( p.x() ), + layoutUnitToPixelY( p.y() ) ); } + TQRect layoutUnitToPixel( const TQRect &r ) const + { return TQRect( layoutUnitToPixel( r.topLeft() ), + layoutUnitToPixel( r.bottomRight() ) ); } /** Basic pt to pixel and pixel to pt conversions, valid at any zoom level, as well as at the Layout Unit level (and mostly useful for Layout Units). @@ -92,11 +92,11 @@ public: * Given the font size for the font in tqlayout units, in pt (use pointSize()) * this returns the font size to use on screen the current zoom, in pt (use setPointSizeFloat()), */ - double tqlayoutUnitToFontSize( int luSize, bool /*forPrint*/ ) const; + double layoutUnitToFontSize( int luSize, bool /*forPrint*/ ) const; // Note: For converting fontsizes from/to tqlayout units and zoom-independent // pt sizes (like the one the user sees, e.g. 12pt), - // use ptToLayoutUnit and tqlayoutUnitToPt, not tqlayoutToFontSize. + // use ptToLayoutUnit and layoutUnitToPt, not layoutToFontSize. // The conversions below convert between an internal text tqlayout resolution of @@ -122,11 +122,11 @@ public: { return KoRect( ptToLayoutUnitPt( r.topLeft() ), ptToLayoutUnitPt( r.bottomRight() ) ); } - static double tqlayoutUnitPtToPt( double lupt ) + static double layoutUnitPtToPt( double lupt ) { return lupt / static_cast<double>( m_layoutUnitFactor ); } - static KoPoint tqlayoutUnitPtToPt( const KoPoint& p ) - { return KoPoint( tqlayoutUnitPtToPt( p.x() ), - tqlayoutUnitPtToPt( p.y() ) ); } + static KoPoint layoutUnitPtToPt( const KoPoint& p ) + { return KoPoint( layoutUnitPtToPt( p.x() ), + layoutUnitPtToPt( p.y() ) ); } protected: /** This being static ensures that the same value is used by all KoTextZoomHandler instances */ diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp index e333eb369..bd03ecf94 100644 --- a/lib/kotext/KoVariable.cpp +++ b/lib/kotext/KoVariable.cpp @@ -165,10 +165,10 @@ void KoVariableSettings::loadOasis(const KoOasisSettings&settingsDoc) } } -void KoVariableSettings::save( TQDomElement &tqparentElem ) +void KoVariableSettings::save( TQDomElement &parentElem ) { - TQDomElement elem = tqparentElem.ownerDocument().createElement( "VARIABLESETTINGS" ); - tqparentElem.appendChild( elem ); + TQDomElement elem = parentElem.ownerDocument().createElement( "VARIABLESETTINGS" ); + parentElem.appendChild( elem ); if(m_startingPageNumber!=1) { elem.setAttribute( "startingPageNumber", m_startingPageNumber ); @@ -991,18 +991,18 @@ void KoVariable::drawCustomItemHelper( TQPainter* p, int x, int y, int wpix, int // Do like KoTextFormatter: do the tqlayout in tqlayout units. xLU += KoTextZoomHandler::ptToLayoutUnitPt( fm.width( ch ) ); // And then compute the X position in pixels from the tqlayout unit X. - x = zh->tqlayoutUnitToPixelX( xLU ); + x = zh->layoutUnitToPixelX( xLU ); } p->restore(); } -void KoVariable::save( TQDomElement &tqparentElem ) +void KoVariable::save( TQDomElement &parentElem ) { //kdDebug(32500) << "KoVariable::save" << endl; - TQDomElement variableElem = tqparentElem.ownerDocument().createElement( "VARIABLE" ); - tqparentElem.appendChild( variableElem ); - TQDomElement typeElem = tqparentElem.ownerDocument().createElement( "TYPE" ); + TQDomElement variableElem = parentElem.ownerDocument().createElement( "VARIABLE" ); + parentElem.appendChild( variableElem ); + TQDomElement typeElem = parentElem.ownerDocument().createElement( "TYPE" ); variableElem.appendChild( typeElem ); typeElem.setAttribute( "type", static_cast<int>( type() ) ); @@ -1490,10 +1490,10 @@ void KoTimeVariable::recalc() } -void KoTimeVariable::saveVariable( TQDomElement& tqparentElem ) +void KoTimeVariable::saveVariable( TQDomElement& parentElem ) { - TQDomElement elem = tqparentElem.ownerDocument().createElement( "TIME" ); - tqparentElem.appendChild( elem ); + TQDomElement elem = parentElem.ownerDocument().createElement( "TIME" ); + parentElem.appendChild( elem ); TQTime time = m_varValue.toTime(); time = time.addSecs(-60*m_correctTime); @@ -1687,10 +1687,10 @@ TQString KoCustomVariable::text(bool realValue) -void KoCustomVariable::saveVariable( TQDomElement& tqparentElem ) +void KoCustomVariable::saveVariable( TQDomElement& parentElem ) { - TQDomElement elem = tqparentElem.ownerDocument().createElement( "CUSTOM" ); - tqparentElem.appendChild( elem ); + TQDomElement elem = parentElem.ownerDocument().createElement( "CUSTOM" ); + parentElem.appendChild( elem ); elem.setAttribute( "name", m_varValue.toString() ); elem.setAttribute( "value", value() ); } @@ -1777,10 +1777,10 @@ void KoMailMergeVariable::saveOasis( KoXmlWriter& /*writer*/, KoSavingContext& / -void KoMailMergeVariable::saveVariable( TQDomElement& tqparentElem ) +void KoMailMergeVariable::saveVariable( TQDomElement& parentElem ) { - TQDomElement elem = tqparentElem.ownerDocument().createElement( "MAILMERGE" ); - tqparentElem.appendChild( elem ); + TQDomElement elem = parentElem.ownerDocument().createElement( "MAILMERGE" ); + parentElem.appendChild( elem ); elem.setAttribute( "name", m_varValue.toString() ); } @@ -1837,10 +1837,10 @@ TQString KoPageVariable::fieldCode() } -void KoPageVariable::saveVariable( TQDomElement& tqparentElem ) +void KoPageVariable::saveVariable( TQDomElement& parentElem ) { - TQDomElement pgNumElem = tqparentElem.ownerDocument().createElement( "PGNUM" ); - tqparentElem.appendChild( pgNumElem ); + TQDomElement pgNumElem = parentElem.ownerDocument().createElement( "PGNUM" ); + parentElem.appendChild( pgNumElem ); pgNumElem.setAttribute( "subtype", m_subtype ); if ( m_subtype != VST_CURRENT_SECTION ) pgNumElem.setAttribute( "value", m_varValue.toInt() ); @@ -2046,11 +2046,11 @@ TQString KoFieldVariable::text(bool realValue) } // use a format when they are customizable -void KoFieldVariable::saveVariable( TQDomElement& tqparentElem ) +void KoFieldVariable::saveVariable( TQDomElement& parentElem ) { //kdDebug(32500) << "KoFieldVariable::saveVariable" << endl; - TQDomElement elem = tqparentElem.ownerDocument().createElement( "FIELD" ); - tqparentElem.appendChild( elem ); + TQDomElement elem = parentElem.ownerDocument().createElement( "FIELD" ); + parentElem.appendChild( elem ); elem.setAttribute( "subtype", m_subtype ); elem.setAttribute( "value", m_varValue.toString() ); } @@ -2455,10 +2455,10 @@ TQString KoLinkVariable::text(bool realValue) return value(); } -void KoLinkVariable::saveVariable( TQDomElement& tqparentElem ) +void KoLinkVariable::saveVariable( TQDomElement& parentElem ) { - TQDomElement linkElem = tqparentElem.ownerDocument().createElement( "LINK" ); - tqparentElem.appendChild( linkElem ); + TQDomElement linkElem = parentElem.ownerDocument().createElement( "LINK" ); + parentElem.appendChild( linkElem ); linkElem.setAttribute( "linkName", m_varValue.toString() ); linkElem.setAttribute( "hrefName", m_url ); } @@ -2557,10 +2557,10 @@ void KoNoteVariable::saveOasis( KoXmlWriter& writer, KoSavingContext& /*context* writer.endElement(); } -void KoNoteVariable::saveVariable( TQDomElement& tqparentElem ) +void KoNoteVariable::saveVariable( TQDomElement& parentElem ) { - TQDomElement linkElem = tqparentElem.ownerDocument().createElement( "NOTE" ); - tqparentElem.appendChild( linkElem ); + TQDomElement linkElem = parentElem.ownerDocument().createElement( "NOTE" ); + parentElem.appendChild( linkElem ); linkElem.setAttribute( "note", m_varValue.toString() ); } diff --git a/lib/kotext/KoVariable.h b/lib/kotext/KoVariable.h index e0a5a5305..88f179752 100644 --- a/lib/kotext/KoVariable.h +++ b/lib/kotext/KoVariable.h @@ -85,7 +85,7 @@ class KOTEXT_EXPORT KoVariableSettings bool displayFieldCode() const { return m_displayFieldCode; } void setDisplayFieldCode( bool b) { m_displayFieldCode=b; } - virtual void save( TQDomElement &tqparentElem ); + virtual void save( TQDomElement &parentElem ); virtual void load( TQDomElement &elem ); TQDateTime lastPrintingDate() const; @@ -413,7 +413,7 @@ public: void recalcAndRepaint(); /** Save the variable. Public API, does the common job and then calls saveVariable. */ - virtual void save( TQDomElement &tqparentElem ); + virtual void save( TQDomElement &parentElem ); virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context ) const; virtual void load( TQDomElement &elem ); virtual void loadOasis( const TQDomElement &elem, KoOasisContext& context ); @@ -438,7 +438,7 @@ public: protected: /** Variable should reimplement this to implement saving. */ - virtual void saveVariable( TQDomElement &tqparentElem ) = 0; + virtual void saveVariable( TQDomElement &parentElem ) = 0; virtual int correctValue() const { return 0;} KoVariableFormat *m_varFormat; @@ -472,7 +472,7 @@ public: virtual void resize(); void setDate( const TQDate & _date ) { m_varValue = TQVariant(_date); } - virtual void saveVariable( TQDomElement &tqparentElem ); + virtual void saveVariable( TQDomElement &parentElem ); virtual int correctValue() const { return m_correctDate;} virtual void load( TQDomElement &elem ); virtual void loadOasis( const TQDomElement &elem, KoOasisContext& context ); @@ -518,7 +518,7 @@ public: void setTime( const TQTime & _time ) { m_varValue = TQVariant(_time); } - virtual void saveVariable( TQDomElement &tqparentElem ); + virtual void saveVariable( TQDomElement &parentElem ); virtual int correctValue() const { return m_correctTime;} virtual void load( TQDomElement &elem ); virtual void loadOasis( const TQDomElement &elem, KoOasisContext& context ); @@ -557,7 +557,7 @@ public: { return VT_CUSTOM; } static TQStringList actionTexts(); - virtual void saveVariable( TQDomElement &tqparentElem ); + virtual void saveVariable( TQDomElement &parentElem ); virtual void load( TQDomElement &elem ); virtual void loadOasis( const TQDomElement &elem, KoOasisContext& context ); virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context ) const; @@ -598,7 +598,7 @@ public: virtual VariableType type() const { return VT_FIELD; } - virtual void saveVariable( TQDomElement &tqparentElem ); + virtual void saveVariable( TQDomElement &parentElem ); virtual void load( TQDomElement &elem ); virtual void loadOasis( const TQDomElement &elem, KoOasisContext& context ); virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context ) const; @@ -640,7 +640,7 @@ public: static TQStringList actionTexts(); virtual TQString fieldCode(); - virtual void saveVariable( TQDomElement &tqparentElem ); + virtual void saveVariable( TQDomElement &parentElem ); virtual void load( TQDomElement &elem ); virtual void loadOasis( const TQDomElement &elem, KoOasisContext& context ); virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context ) const; @@ -684,7 +684,7 @@ public: virtual void recalc() = 0; - virtual void saveVariable( TQDomElement &tqparentElem ); + virtual void saveVariable( TQDomElement &parentElem ); virtual void load( TQDomElement &elem ); virtual void loadOasis( const TQDomElement &elem, KoOasisContext& context ); virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context ) const; @@ -705,7 +705,7 @@ public: static TQStringList actionTexts(); virtual TQString fieldCode(); - virtual void saveVariable( TQDomElement &tqparentElem ); + virtual void saveVariable( TQDomElement &parentElem ); virtual void load( TQDomElement &elem ); virtual void loadOasis( const TQDomElement &elem, KoOasisContext& context ); virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context ) const; @@ -740,7 +740,7 @@ public: static TQStringList actionTexts(); virtual TQString fieldCode(); - virtual void saveVariable( TQDomElement &tqparentElem ); + virtual void saveVariable( TQDomElement &parentElem ); virtual void load( TQDomElement &elem ); virtual void loadOasis( const TQDomElement &elem, KoOasisContext& context ); virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context ) const; @@ -782,7 +782,7 @@ public: virtual TQStringList subTypeList(); - virtual void saveVariable( TQDomElement &tqparentElem ); + virtual void saveVariable( TQDomElement &parentElem ); virtual void load( TQDomElement &elem ); virtual void loadOasis( const TQDomElement &elem, KoOasisContext& context ); virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context ) const; diff --git a/lib/kotext/kodecorationtabbase.ui b/lib/kotext/kodecorationtabbase.ui index 31e7b464b..cd8f17f2c 100644 --- a/lib/kotext/kodecorationtabbase.ui +++ b/lib/kotext/kodecorationtabbase.ui @@ -341,7 +341,7 @@ <data format="PNG" length="96">89504e470d0a1a0a0000000d49484452000000140000001408060000008d891d0d0000002749444154388d63601805c31f3022b1ffc309d20c40368381895217a1835103478281a360240000f61e021097bbc8b20000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/lib/kotext/kofonttabbase.ui b/lib/kotext/kofonttabbase.ui index 32800dd83..fa8b9ba4a 100644 --- a/lib/kotext/kofonttabbase.ui +++ b/lib/kotext/kofonttabbase.ui @@ -18,7 +18,7 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includes> <include location="local" impldecl="in declaration">KFontDialog_local.h</include> </includes> diff --git a/lib/kotext/kohighlightingtabbase.ui b/lib/kotext/kohighlightingtabbase.ui index 3f0b8512e..27be07027 100644 --- a/lib/kotext/kohighlightingtabbase.ui +++ b/lib/kotext/kohighlightingtabbase.ui @@ -129,7 +129,7 @@ </spacer> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcombobox.h</includehint> diff --git a/lib/kotext/kolanguagetabbase.ui b/lib/kotext/kolanguagetabbase.ui index f280097e8..a90735847 100644 --- a/lib/kotext/kolanguagetabbase.ui +++ b/lib/kotext/kolanguagetabbase.ui @@ -69,7 +69,7 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> </includehints> diff --git a/lib/kotext/kolayouttabbase.ui b/lib/kotext/kolayouttabbase.ui index 9a8e4a935..471607d4d 100644 --- a/lib/kotext/kolayouttabbase.ui +++ b/lib/kotext/kolayouttabbase.ui @@ -288,7 +288,7 @@ <include location="global" impldecl="in declaration">knuminput.h</include> <include location="global" impldecl="in declaration">klocale.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/lib/kotext/timedateformatwidget.ui b/lib/kotext/timedateformatwidget.ui index fbd342cb2..830b3bdb3 100644 --- a/lib/kotext/timedateformatwidget.ui +++ b/lib/kotext/timedateformatwidget.ui @@ -210,7 +210,7 @@ <slot>comboActivated()</slot> <slot>updateLabel()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> |