diff options
Diffstat (limited to 'lib/kformula/matrixelement.cc')
-rw-r--r-- | lib/kformula/matrixelement.cc | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/lib/kformula/matrixelement.cc b/lib/kformula/matrixelement.cc index 56062dcd6..6b5a5898a 100644 --- a/lib/kformula/matrixelement.cc +++ b/lib/kformula/matrixelement.cc @@ -43,7 +43,7 @@ class MatrixSequenceElement : public SequenceElement { typedef SequenceElement inherited; public: - MatrixSequenceElement( BasicElement* tqparent = 0 ) : SequenceElement( tqparent ) {} + MatrixSequenceElement( BasicElement* parent = 0 ) : SequenceElement( parent ) {} virtual MatrixSequenceElement* clone() { return new MatrixSequenceElement( *this ); } @@ -269,8 +269,8 @@ KFCInsertColumn::KFCInsertColumn( const TQString& name, Container* document, Mat } -MatrixElement::MatrixElement(uint rows, uint columns, BasicElement* tqparent) - : BasicElement(tqparent), +MatrixElement::MatrixElement(uint rows, uint columns, BasicElement* parent) + : BasicElement(parent), m_rowNumber( 0 ), m_align( NoAlign ), m_widthType( NoSize ), @@ -509,7 +509,7 @@ void MatrixElement::calcSizes( const ContextStyle& context, /** * Draws the whole element including its tqchildren. - * The `parentOrigin' is the point this element's tqparent starts. + * The `parentOrigin' is the point this element's parent starts. * We can use our parentPosition to get our own origin then. */ void MatrixElement::draw( TQPainter& painter, const LuPixelRect& rect, @@ -1799,7 +1799,7 @@ class MultilineSequenceElement : public SequenceElement { typedef SequenceElement inherited; public: - MultilineSequenceElement( BasicElement* tqparent = 0 ); + MultilineSequenceElement( BasicElement* parent = 0 ); virtual MultilineSequenceElement* clone() { return new MultilineSequenceElement( *this ); @@ -1846,7 +1846,7 @@ public: /// Return the position of tab i. int tabPos( uint i ); - virtual void writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool oasisFormat = false ) const ; + virtual void writeMathML( TQDomDocument& doc, TQDomNode& parent, bool oasisFormat = false ) const ; private: @@ -1890,9 +1890,9 @@ KFCNewLine::~KFCNewLine() void KFCNewLine::execute() { FormulaCursor* cursor = getExecuteCursor(); - MultilineElement* tqparent = static_cast<MultilineElement*>( m_line->getParent() ); - int linePos = tqparent->content.find( m_line ); - tqparent->content.insert( linePos+1, m_newline ); + MultilineElement* parent = static_cast<MultilineElement*>( m_line->getParent() ); + int linePos = parent->content.find( m_line ); + parent->content.insert( linePos+1, m_newline ); // If there are tqchildren to be moved. if ( m_line->countChildren() > static_cast<int>( m_pos ) ) { @@ -1925,11 +1925,11 @@ void KFCNewLine::execute() void KFCNewLine::unexecute() { FormulaCursor* cursor = getExecuteCursor(); - MultilineElement* tqparent = static_cast<MultilineElement*>( m_line->getParent() ); - int linePos = tqparent->content.find( m_line ); + MultilineElement* parent = static_cast<MultilineElement*>( m_line->getParent() ); + int linePos = parent->content.find( m_line ); // Now the command owns the new line again. - m_newline = tqparent->content.at( linePos+1 ); + m_newline = parent->content.at( linePos+1 ); // Tell all cursors to leave this sequence FormulaElement* formula = m_line->formula(); @@ -1951,7 +1951,7 @@ void KFCNewLine::unexecute() else { m_line->moveEnd( cursor ); } - tqparent->content.take( linePos+1 ); + parent->content.take( linePos+1 ); // Tell that something changed formula->changed(); @@ -1959,8 +1959,8 @@ void KFCNewLine::unexecute() } -MultilineSequenceElement::MultilineSequenceElement( BasicElement* tqparent ) - : SequenceElement( tqparent ) +MultilineSequenceElement::MultilineSequenceElement( BasicElement* parent ) + : SequenceElement( parent ) { tabs.setAutoDelete( false ); } @@ -2111,9 +2111,9 @@ int MultilineSequenceElement::tabPos( uint i ) void MultilineSequenceElement::writeMathML( TQDomDocument& doc, - TQDomNode& tqparent, bool oasisFormat ) const + TQDomNode& parent, bool oasisFormat ) const { - // tqparent is required to be a <mtr> tag + // parent is required to be a <mtr> tag TQDomElement tmp = doc.createElement( "TMP" ); @@ -2131,7 +2131,7 @@ void MultilineSequenceElement::writeMathML( TQDomDocument& doc, while ( !n.isNull() ) { // the illegal TabMarkers are tqchildren of the mrow, child of tmp. if ( n.isElement() && n.toElement().tagName() == "TAB" ) { - tqparent.appendChild( mtd ); + parent.appendChild( mtd ); mtd = doc.createElement( oasisFormat ? "math:mtd" : "mtd" ); } else { @@ -2140,12 +2140,12 @@ void MultilineSequenceElement::writeMathML( TQDomDocument& doc, n = n.nextSibling(); } - tqparent.appendChild( mtd ); + parent.appendChild( mtd ); } -MultilineElement::MultilineElement( BasicElement* tqparent ) - : BasicElement( tqparent ) +MultilineElement::MultilineElement( BasicElement* parent ) + : BasicElement( parent ) { content.setAutoDelete( true ); content.append( new MultilineSequenceElement( this ) ); @@ -2217,14 +2217,14 @@ void MultilineElement::moveLeft( FormulaCursor* cursor, BasicElement* from ) getParent()->moveLeft(cursor, this); } else { - // Coming from the tqparent (sequence) we go to + // Coming from the parent (sequence) we go to // the very last position if (from == getParent()) { content.at( content.count()-1 )->moveLeft(cursor, this); } else { // Coming from one of the lines we go to the previous line - // or to the tqparent if there is none. + // or to the parent if there is none. int pos = content.find( static_cast<MultilineSequenceElement*>( from ) ); if ( pos > -1 ) { if ( pos > 0 ) { @@ -2279,14 +2279,14 @@ void MultilineElement::moveUp( FormulaCursor* cursor, BasicElement* from ) getParent()->moveLeft(cursor, this); } else { - // Coming from the tqparent (sequence) we go to + // Coming from the parent (sequence) we go to // the very last position if (from == getParent()) { content.at( content.count()-1 )->moveLeft(cursor, this); } else { // Coming from one of the lines we go to the previous line - // or to the tqparent if there is none. + // or to the parent if there is none. int pos = content.find( static_cast<MultilineSequenceElement*>( from ) ); if ( pos > -1 ) { if ( pos > 0 ) { @@ -2591,7 +2591,7 @@ void MultilineElement::writeDom(TQDomElement element) } } -void MultilineElement::writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool oasisFormat ) const +void MultilineElement::writeMathML( TQDomDocument& doc, TQDomNode& parent, bool oasisFormat ) const { TQDomElement de = doc.createElement( oasisFormat ? "math:mtable" : "mtable" ); TQDomElement row; TQDomElement cell; @@ -2606,7 +2606,7 @@ void MultilineElement::writeMathML( TQDomDocument& doc, TQDomNode& tqparent, boo it.current()->writeMathML( doc, row, oasisFormat ); } - tqparent.appendChild( de ); + parent.appendChild( de ); } /** |