diff options
Diffstat (limited to 'lib')
336 files changed, 1604 insertions, 1604 deletions
diff --git a/lib/kformula/DESIGN b/lib/kformula/DESIGN index fc404921..3402d9ee 100644 --- a/lib/kformula/DESIGN +++ b/lib/kformula/DESIGN @@ -20,15 +20,15 @@ Responsebilities (This goes for every derived element and therefore for each one.) - knows its tqchildren. Actually BasicElement doesn't have any. But it - already defines that tqchildren must be known by their tqparent. + already defines that tqchildren must be known by their parent. - knows its bounding rectangle (its size.) The tqchildren are included - in this rect. (The position is relative to the tqparent.) + in this rect. (The position is relative to the parent.) //- knows its middle line. (for tqalignment) - knows it's zero point for midline (vertical tqalignment) and keep open the possibility of negative positions (out of bounding rect) - draws itself (given a painter); tqchildren are drawn, too - knows all positions where the cursor is allowed to be. (see below) -- knows its tqparent; The topmost element has no tqparent; there is a +- knows its parent; The topmost element has no parent; there is a implicit guaranty that the topmost element is always a SequenceElement. - can save and load itself. different formates. (see below) @@ -62,11 +62,11 @@ between parenthesis" i.e. as content child of a delimiterelement) FormulaElement from SequenceElement -------------- -The only element those tqparent is null. The root of the element object +The only element those parent is null. The root of the element object tree. This is the element that is created by the KFormulaDoc and that knows -about it. As every other element knows its tqparent and therefore the +about it. As every other element knows its parent and therefore the FormulaElement we get a chance to pass messages to the outside world. @@ -129,7 +129,7 @@ GeometryElement from BasicElement --------------- One child. -Draw it at a fixed position relative to tqparent or absolute. +Draw it at a fixed position relative to parent or absolute. This is to do dirty things. This element must not be used, kformula will provide you everything @@ -193,9 +193,9 @@ before, between and after its tqchildren, too. - Each element's tqchildren are ordered. If the cursor leaves one child the next child it. The direction depends on the key that moved the -cursor. If there is child left the cursor is passed to the tqparent. +cursor. If there is child left the cursor is passed to the parent. -- If the cursor comes from our tqparent the first or the last child gets +- If the cursor comes from our parent the first or the last child gets it. Depending on the direction in which the cursor moved. Please note that because each element knows its own cursor positions diff --git a/lib/kformula/MatrixDialog.cc b/lib/kformula/MatrixDialog.cc index a0536c1d..c8169f24 100644 --- a/lib/kformula/MatrixDialog.cc +++ b/lib/kformula/MatrixDialog.cc @@ -30,8 +30,8 @@ KFORMULA_NAMESPACE_BEGIN const int DEFAULT_SIZE = 3; const int MAX_SIZE = 200; -MatrixDialog::MatrixDialog( TQWidget *tqparent, int _width, int _height ) - : KDialogBase(tqparent, "Matrix Dialog", true,i18n("Add Matrix"),Ok|Cancel) +MatrixDialog::MatrixDialog( TQWidget *parent, int _width, int _height ) + : KDialogBase(parent, "Matrix Dialog", true,i18n("Add Matrix"),Ok|Cancel) { w = _width; h = _height; diff --git a/lib/kformula/MatrixDialog.h b/lib/kformula/MatrixDialog.h index 06688b90..62e104c9 100644 --- a/lib/kformula/MatrixDialog.h +++ b/lib/kformula/MatrixDialog.h @@ -41,7 +41,7 @@ public: int w; int h; - MatrixDialog( TQWidget *tqparent, int width = 3, int height = 3 ); + MatrixDialog( TQWidget *parent, int width = 3, int height = 3 ); ~MatrixDialog() {} protected slots: diff --git a/lib/kformula/actionelement.cc b/lib/kformula/actionelement.cc index 5fa5a38e..d4ef8ec4 100644 --- a/lib/kformula/actionelement.cc +++ b/lib/kformula/actionelement.cc @@ -22,7 +22,7 @@ KFORMULA_NAMESPACE_BEGIN -ActionElement::ActionElement( BasicElement* tqparent ) : SequenceElement( tqparent ), +ActionElement::ActionElement( BasicElement* parent ) : SequenceElement( parent ), m_selection( 0 ) { } diff --git a/lib/kformula/actionelement.h b/lib/kformula/actionelement.h index 9c7342d5..09c4d0ab 100644 --- a/lib/kformula/actionelement.h +++ b/lib/kformula/actionelement.h @@ -32,7 +32,7 @@ KFORMULA_NAMESPACE_BEGIN class ActionElement : public SequenceElement { typedef SequenceElement inherited; public: - ActionElement( BasicElement* tqparent = 0 ); + ActionElement( BasicElement* parent = 0 ); virtual int buildChildrenFromMathMLDom(TQPtrList<BasicElement>& list, TQDomNode n); private: diff --git a/lib/kformula/basicelement.cc b/lib/kformula/basicelement.cc index 1d36193a..096814aa 100644 --- a/lib/kformula/basicelement.cc +++ b/lib/kformula/basicelement.cc @@ -34,7 +34,7 @@ using namespace std; int BasicElement::evilDestructionCount = 0; BasicElement::BasicElement( BasicElement* p ) - : tqparent( p ), m_baseline( 0 ), elementType( 0 ) + : parent( p ), m_baseline( 0 ), elementType( 0 ) { setX( 0 ); setY( 0 ); @@ -49,7 +49,7 @@ BasicElement::~BasicElement() } BasicElement::BasicElement( const BasicElement& other ) - : tqparent( 0 ), + : parent( 0 ), m_baseline( other.m_baseline ), elementType( other.elementType ) { @@ -63,14 +63,14 @@ BasicElement::BasicElement( const BasicElement& other ) bool BasicElement::readOnly( const BasicElement* /*child*/ ) const { - return tqparent->readOnly( this ); + return parent->readOnly( this ); } FormulaElement* BasicElement::formula() { - //if ( tqparent != 0 ) { - return tqparent->formula(); + //if ( parent != 0 ) { + return parent->formula(); //} //return 0; } @@ -99,7 +99,7 @@ LuPixelPoint BasicElement::widgetPos() { luPixel x = 0; luPixel y = 0; - for (BasicElement* element = this; element != 0; element = element->tqparent) { + for (BasicElement* element = this; element != 0; element = element->parent) { x += element->getX(); y += element->getY(); } @@ -174,12 +174,12 @@ TQDomElement BasicElement::getElementDom( TQDomDocument& doc) } -void BasicElement::writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool oasisFormat ) const +void BasicElement::writeMathML( TQDomDocument& doc, TQDomNode& parent, bool oasisFormat ) const { TQDomElement de = doc.createElement( oasisFormat ? "math:" + getElementName() : getElementName() ); writeMathMLAttributes( de ); writeMathMLContent( doc, de, oasisFormat ); - tqparent.appendChild( de ); + parent.appendChild( de ); } bool BasicElement::buildFromDom(TQDomElement element) diff --git a/lib/kformula/basicelement.h b/lib/kformula/basicelement.h index 025dfbc6..1fe46cc1 100644 --- a/lib/kformula/basicelement.h +++ b/lib/kformula/basicelement.h @@ -87,7 +87,7 @@ public: * (The SequenceElement's tqchildren are simply counted.) */ - BasicElement(BasicElement* tqparent = 0); + BasicElement(BasicElement* parent = 0); virtual ~BasicElement(); // deep copy @@ -102,7 +102,7 @@ public: /** * @returns whether the child should be read-only. The idea is - * that a read-only tqparent has read-only tqchildren. + * that a read-only parent has read-only tqchildren. */ virtual bool readOnly( const BasicElement* child ) const; @@ -114,7 +114,7 @@ public: /** * Provide fast access to the rootElement for each child. */ - virtual const FormulaElement* formula() const { return tqparent->formula(); } + virtual const FormulaElement* formula() const { return parent->formula(); } /** * @returns the character that represents this element. Used for @@ -167,7 +167,7 @@ public: /** * 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. */ virtual void draw( TQPainter& painter, const LuPixelRect& r, @@ -340,9 +340,9 @@ public: // basic support - const BasicElement* getParent() const { return tqparent; } - BasicElement* getParent() { return tqparent; } - void setParent(BasicElement* p) { tqparent = p; } + const BasicElement* getParent() const { return parent; } + BasicElement* getParent() { return parent; } + void setParent(BasicElement* p) { parent = p; } luPixel getX() const { return m_x; } luPixel getY() const { return m_y; } @@ -377,7 +377,7 @@ public: * Same as above, just MathML. * It shouldn't be redefined but for exceptional cases, use the general writeMathML* API instead */ - virtual void writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool oasisFormat = false ) const ; + virtual void writeMathML( TQDomDocument& doc, TQDomNode& parent, bool oasisFormat = false ) const ; /** * Set this element attribute, build tqchildren and @@ -396,7 +396,7 @@ public: static int getEvilDestructionCount() { return evilDestructionCount; } /** - * @returns our type. This is an object from our tqparent's syntax tree + * @returns our type. This is an object from our parent's syntax tree * or 0 if there was a very bad parsing error. */ ElementType* getElementType() const { return elementType; } @@ -495,11 +495,11 @@ private: double str2size( const TQString& str, SizeType* st, uint index, SizeType type ); /** - * Our tqparent. - * The tqparent might not be null except for the FormulaElement + * Our parent. + * The parent might not be null except for the FormulaElement * that is the top of the element tree. */ - BasicElement* tqparent; + BasicElement* parent; /** * This elements size. @@ -509,7 +509,7 @@ private: luPixel m_height; /** - * Our position relative to our tqparent. + * Our position relative to our parent. */ //KoPoint position; luPixel m_x; diff --git a/lib/kformula/bracketelement.cc b/lib/kformula/bracketelement.cc index 0a599dc0..df51ffa8 100644 --- a/lib/kformula/bracketelement.cc +++ b/lib/kformula/bracketelement.cc @@ -35,8 +35,8 @@ KFORMULA_NAMESPACE_BEGIN -SingleContentElement::SingleContentElement(BasicElement* tqparent ) - : BasicElement( tqparent ) +SingleContentElement::SingleContentElement(BasicElement* parent ) + : BasicElement( parent ) { content = new SequenceElement( this ); } @@ -137,9 +137,9 @@ void SingleContentElement::remove( FormulaCursor* cursor, { switch (cursor->getPos()) { case contentPos: - BasicElement* tqparent = getParent(); - tqparent->selectChild(cursor, this); - tqparent->remove(cursor, removedChildren, direction); + BasicElement* parent = getParent(); + parent->selectChild(cursor, this); + parent->remove(cursor, removedChildren, direction); } } @@ -213,8 +213,8 @@ void SingleContentElement::writeMathMLContent( TQDomDocument& doc, TQDomElement& -BracketElement::BracketElement(SymbolType l, SymbolType r, BasicElement* tqparent) - : SingleContentElement(tqparent), +BracketElement::BracketElement(SymbolType l, SymbolType r, BasicElement* parent) + : SingleContentElement(parent), left( 0 ), right( 0 ), leftType( l ), rightType( r ), m_operator( false ), m_customLeft( false ), m_customRight( false ) @@ -361,7 +361,7 @@ void BracketElement::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 BracketElement::draw( TQPainter& painter, const LuPixelRect& r, @@ -522,7 +522,7 @@ int BracketElement::readContentFromMathMLDom(TQDomNode& node) if ( m_operator ) { node = node.parentNode(); TQDomNode open = node; - TQDomNode tqparent = node.parentNode(); + TQDomNode parent = node.parentNode(); if ( ! operatorType( node, true ) ) return -1; int nodeNum = searchOperator( node ); @@ -548,7 +548,7 @@ int BracketElement::readContentFromMathMLDom(TQDomNode& node) de.appendChild( node.toElement() ); node = n; } while ( ++i < nodeNum ); - tqparent.insertAfter( de, open ); + parent.insertAfter( de, open ); node = de; kdWarning() << doc.toString() << endl; } @@ -563,8 +563,8 @@ int BracketElement::readContentFromMathMLDom(TQDomNode& node) next = next.nextSibling(); if ( ! next.isNull()) { TQDomDocument doc = node.ownerDocument(); - TQDomNode tqparent = node.parentNode(); - TQString ns = tqparent.prefix(); + TQDomNode parent = node.parentNode(); + TQString ns = parent.prefix(); TQDomElement de = doc.createElementNS( ns, "mrow" ); uint pos = 0; while ( ! node.isNull() ) { @@ -590,8 +590,8 @@ int BracketElement::readContentFromMathMLDom(TQDomNode& node) } node = no; } - tqparent.appendChild( de ); - node = tqparent.firstChild(); + parent.appendChild( de ); + node = parent.firstChild(); while ( ! node.isElement() ) node = node.nextSibling(); } @@ -797,8 +797,8 @@ void BracketElement::writeMathMLAttributes( TQDomElement& element ) const } } -OverlineElement::OverlineElement( BasicElement* tqparent ) - : SingleContentElement( tqparent ) +OverlineElement::OverlineElement( BasicElement* parent ) + : SingleContentElement( parent ) { } @@ -887,7 +887,7 @@ TQString OverlineElement::formulaString() return getContent()->formulaString(); } -void OverlineElement::writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool oasisFormat ) const +void OverlineElement::writeMathML( TQDomDocument& doc, TQDomNode& parent, bool oasisFormat ) const { TQDomElement de = doc.createElement( oasisFormat ? "math:mover" : "mover" ); SingleContentElement::writeMathML( doc, de, oasisFormat ); @@ -895,12 +895,12 @@ void OverlineElement::writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool // is this the right entity? Mozilla renders it correctly. op.appendChild( doc.createEntityReference( "OverBar" ) ); de.appendChild( op ); - tqparent.appendChild( de ); + parent.appendChild( de ); } -UnderlineElement::UnderlineElement( BasicElement* tqparent ) - : SingleContentElement( tqparent ) +UnderlineElement::UnderlineElement( BasicElement* parent ) + : SingleContentElement( parent ) { } @@ -991,7 +991,7 @@ TQString UnderlineElement::formulaString() return getContent()->formulaString(); } -void UnderlineElement::writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool oasisFormat ) const +void UnderlineElement::writeMathML( TQDomDocument& doc, TQDomNode& parent, bool oasisFormat ) const { TQDomElement de = doc.createElement( oasisFormat ? "math:munder" : "munder" ); SingleContentElement::writeMathML( doc, de, oasisFormat ); @@ -999,7 +999,7 @@ void UnderlineElement::writeMathML( TQDomDocument& doc, TQDomNode& tqparent, boo // is this the right entity? Mozilla renders it correctly. op.appendChild( doc.createEntityReference( "UnderBar" ) ); de.appendChild( op ); - tqparent.appendChild( de ); + parent.appendChild( de ); } KFORMULA_NAMESPACE_END diff --git a/lib/kformula/bracketelement.h b/lib/kformula/bracketelement.h index eb0e2613..83879aac 100644 --- a/lib/kformula/bracketelement.h +++ b/lib/kformula/bracketelement.h @@ -40,7 +40,7 @@ class SingleContentElement : public BasicElement { SingleContentElement& operator=( const SingleContentElement& ) { return *this; } public: - SingleContentElement(BasicElement* tqparent = 0); + SingleContentElement(BasicElement* parent = 0); ~SingleContentElement(); SingleContentElement( const SingleContentElement& ); @@ -166,7 +166,7 @@ public: enum { contentPos }; BracketElement(SymbolType left = EmptyBracket, SymbolType right = EmptyBracket, - BasicElement* tqparent = 0); + BasicElement* parent = 0); ~BracketElement(); BracketElement( const BracketElement& ); @@ -209,7 +209,7 @@ public: /** * 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. */ virtual void draw( TQPainter& painter, const LuPixelRect& r, @@ -303,7 +303,7 @@ class OverlineElement : public SingleContentElement { OverlineElement& operator=( const OverlineElement& ) { return *this; } public: - OverlineElement(BasicElement* tqparent = 0); + OverlineElement(BasicElement* parent = 0); ~OverlineElement(); OverlineElement( const OverlineElement& ); @@ -331,7 +331,7 @@ public: /** * 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. */ virtual void draw( TQPainter& painter, const LuPixelRect& r, @@ -349,7 +349,7 @@ public: virtual TQString formulaString(); - virtual void writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool oasisFormat = false ) const; + virtual void writeMathML( TQDomDocument& doc, TQDomNode& parent, bool oasisFormat = false ) const; protected: @@ -370,7 +370,7 @@ private: class UnderlineElement : public SingleContentElement { UnderlineElement& operator=( const UnderlineElement& ) { return *this; } public: - UnderlineElement(BasicElement* tqparent = 0); + UnderlineElement(BasicElement* parent = 0); ~UnderlineElement(); UnderlineElement( const UnderlineElement& ); @@ -398,7 +398,7 @@ public: /** * 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. */ virtual void draw( TQPainter& painter, const LuPixelRect& r, @@ -416,7 +416,7 @@ public: virtual TQString formulaString(); - virtual void writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool oasisFormat = false ) const; + virtual void writeMathML( TQDomDocument& doc, TQDomNode& parent, bool oasisFormat = false ) const; protected: diff --git a/lib/kformula/elementtype.h b/lib/kformula/elementtype.h index 7fc44144..47db40fd 100644 --- a/lib/kformula/elementtype.h +++ b/lib/kformula/elementtype.h @@ -61,7 +61,7 @@ public: /** * @returns the spanned text. seq must be the original - * tqparent sequence. + * parent sequence. */ virtual TQString text( SequenceElement* seq ) const; @@ -223,7 +223,7 @@ public: /** * @returns the spanned text. seq must be the original - * tqparent sequence. + * parent sequence. */ virtual TQString text( SequenceElement* /*seq*/ ) const { return m_text; } diff --git a/lib/kformula/encloseelement.cc b/lib/kformula/encloseelement.cc index 05617361..846f6bb2 100644 --- a/lib/kformula/encloseelement.cc +++ b/lib/kformula/encloseelement.cc @@ -21,7 +21,7 @@ KFORMULA_NAMESPACE_BEGIN -EncloseElement::EncloseElement( BasicElement* tqparent ) : SequenceElement( tqparent ) { +EncloseElement::EncloseElement( BasicElement* parent ) : SequenceElement( parent ) { } bool EncloseElement::readAttributesFromMathMLDom(const TQDomElement& element) diff --git a/lib/kformula/encloseelement.h b/lib/kformula/encloseelement.h index b6b16a0d..758e32a4 100644 --- a/lib/kformula/encloseelement.h +++ b/lib/kformula/encloseelement.h @@ -27,7 +27,7 @@ KFORMULA_NAMESPACE_BEGIN class EncloseElement : public SequenceElement { typedef SequenceElement inherited; public: - EncloseElement( BasicElement* tqparent = 0 ); + EncloseElement( BasicElement* parent = 0 ); private: virtual bool readAttributesFromMathMLDom(const TQDomElement& element); diff --git a/lib/kformula/errorelement.cc b/lib/kformula/errorelement.cc index c63cf09c..7a685f86 100644 --- a/lib/kformula/errorelement.cc +++ b/lib/kformula/errorelement.cc @@ -23,12 +23,12 @@ KFORMULA_NAMESPACE_BEGIN -ErrorElement::ErrorElement( BasicElement* tqparent ) : SequenceElement( tqparent ) { +ErrorElement::ErrorElement( BasicElement* parent ) : SequenceElement( parent ) { } /** * 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 ErrorElement::draw( TQPainter& painter, const LuPixelRect& r, diff --git a/lib/kformula/errorelement.h b/lib/kformula/errorelement.h index c7d69fed..cfc2735d 100644 --- a/lib/kformula/errorelement.h +++ b/lib/kformula/errorelement.h @@ -27,11 +27,11 @@ KFORMULA_NAMESPACE_BEGIN class ErrorElement : public SequenceElement { typedef SequenceElement inherited; public: - ErrorElement( BasicElement* tqparent = 0 ); + ErrorElement( BasicElement* parent = 0 ); /** * 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. */ virtual void draw( TQPainter& painter, const LuPixelRect& r, diff --git a/lib/kformula/formulacursor.cc b/lib/kformula/formulacursor.cc index b406a002..9fe3afbd 100644 --- a/lib/kformula/formulacursor.cc +++ b/lib/kformula/formulacursor.cc @@ -325,10 +325,10 @@ void FormulaCursor::remove(TQPtrList<BasicElement>& tqchildren, // If there is no child to remove in the sequence // remove the sequence instead. if (sequence->countChildren() == 0) { - BasicElement* tqparent = sequence->getParent(); - if (tqparent != 0) { - tqparent->selectChild(this, sequence); - tqparent->remove(this, tqchildren, direction); + BasicElement* parent = sequence->getParent(); + if (parent != 0) { + parent->selectChild(this, sequence); + parent->remove(this, tqchildren, direction); return; } } @@ -363,12 +363,12 @@ void FormulaCursor::replaceSelectionWith(BasicElement* element, mainChild->goInside(this); insert(list); /* - BasicElement* tqparent = element->getParent(); + BasicElement* parent = element->getParent(); if (direction == beforeCursor) { - tqparent->moveRight(this, element); + parent->moveRight(this, element); } else { - tqparent->moveLeft(this, element); + parent->moveLeft(this, element); } */ element->selectChild(this, mainChild); @@ -412,10 +412,10 @@ BasicElement* FormulaCursor::replaceByMainChildContent(Direction direction) BasicElement* FormulaCursor::removeEnclosingElement(Direction direction) { assert( !isReadOnly() ); - BasicElement* tqparent = getElement()->getParent(); - if (tqparent != 0) { - if (getElement() == tqparent->getMainChild()) { - tqparent->selectChild(this, getElement()); + BasicElement* parent = getElement()->getParent(); + if (parent != 0) { + if (getElement() == parent->getMainChild()) { + parent->selectChild(this, getElement()); return replaceByMainChildContent(direction); } } diff --git a/lib/kformula/formulaelement.cc b/lib/kformula/formulaelement.cc index 19081093..946e595d 100644 --- a/lib/kformula/formulaelement.cc +++ b/lib/kformula/formulaelement.cc @@ -313,18 +313,18 @@ TQString FormulaElement::toLatex() return inherited::toLatex(); //Consider $$ sorround } -void FormulaElement::writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool oasisFormat ) const +void FormulaElement::writeMathML( TQDomDocument& doc, TQDomNode& parent, bool oasisFormat ) const { TQDomElement de; if ( !oasisFormat ) { de = doc.createElementNS( "http://www.w3.org/1998/Math/MathML", "math" ); - tqparent.appendChild( de ); + parent.appendChild( de ); } else { TQDomElement element = doc.createElement( "math:semantics" ); de = doc.createElement( "math:mrow" ); - tqparent.appendChild( element ); + parent.appendChild( element ); element.appendChild( de ); } for ( uint i = 0; i < countChildren(); ++i ) { diff --git a/lib/kformula/formulaelement.h b/lib/kformula/formulaelement.h index 8f230128..e6702668 100644 --- a/lib/kformula/formulaelement.h +++ b/lib/kformula/formulaelement.h @@ -35,7 +35,7 @@ class SymbolTable; /** * The main element. * A formula consists of a FormulaElement and its tqchildren. - * The only element that has no tqparent. + * The only element that has no parent. */ class FormulaElement : public SequenceElement { typedef SequenceElement inherited; @@ -122,7 +122,7 @@ public: /** * 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. */ virtual void draw( TQPainter& painter, const LuPixelRect& r, @@ -170,7 +170,7 @@ public: virtual KCommand* input( Container* container, TQKeyEvent* event ); - virtual void writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool oasisFormat = false ) const ; + virtual void writeMathML( TQDomDocument& doc, TQDomNode& parent, bool oasisFormat = false ) const ; /** * Appends our attributes to the dom element. diff --git a/lib/kformula/fractionelement.cc b/lib/kformula/fractionelement.cc index fb76a11e..1230bb60 100644 --- a/lib/kformula/fractionelement.cc +++ b/lib/kformula/fractionelement.cc @@ -32,7 +32,7 @@ KFORMULA_NAMESPACE_BEGIN using namespace std; -FractionElement::FractionElement(BasicElement* tqparent) : BasicElement(tqparent), +FractionElement::FractionElement(BasicElement* parent) : BasicElement(parent), m_lineThicknessType( NoSize ), m_numAlign( NoHorizontalAlign ), m_denomAlign( NoHorizontalAlign ), @@ -156,7 +156,7 @@ void FractionElement::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 FractionElement::draw( TQPainter& painter, const LuPixelRect& r, diff --git a/lib/kformula/fractionelement.h b/lib/kformula/fractionelement.h index 18c870fe..cef69c13 100644 --- a/lib/kformula/fractionelement.h +++ b/lib/kformula/fractionelement.h @@ -36,7 +36,7 @@ public: enum { numeratorPos, denominatorPos }; - FractionElement(BasicElement* tqparent = 0); + FractionElement(BasicElement* parent = 0); ~FractionElement(); FractionElement( const FractionElement& ); @@ -79,7 +79,7 @@ public: /** * 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. */ virtual void draw( TQPainter& painter, const LuPixelRect& r, diff --git a/lib/kformula/glyphelement.cc b/lib/kformula/glyphelement.cc index 79421f40..9d0b26e6 100644 --- a/lib/kformula/glyphelement.cc +++ b/lib/kformula/glyphelement.cc @@ -25,7 +25,7 @@ KFORMULA_NAMESPACE_BEGIN -GlyphElement::GlyphElement( BasicElement* tqparent ) : TextElement( ' ', false, tqparent ) { +GlyphElement::GlyphElement( BasicElement* parent ) : TextElement( ' ', false, parent ) { } bool GlyphElement::readAttributesFromMathMLDom( const TQDomElement& element ) @@ -106,7 +106,7 @@ void GlyphElement::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 GlyphElement::draw( TQPainter& painter, const LuPixelRect& /*r*/, diff --git a/lib/kformula/glyphelement.h b/lib/kformula/glyphelement.h index 1d3b6d8d..e3934fce 100644 --- a/lib/kformula/glyphelement.h +++ b/lib/kformula/glyphelement.h @@ -27,7 +27,7 @@ KFORMULA_NAMESPACE_BEGIN class GlyphElement : public TextElement { typedef TextElement inherited; public: - GlyphElement( BasicElement* tqparent = 0 ); + GlyphElement( BasicElement* parent = 0 ); /** * Calculates our width and height and @@ -40,7 +40,7 @@ public: /** * 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. */ virtual void draw( TQPainter& painter, const LuPixelRect& r, diff --git a/lib/kformula/identifierelement.cc b/lib/kformula/identifierelement.cc index 324151d5..41cd2600 100644 --- a/lib/kformula/identifierelement.cc +++ b/lib/kformula/identifierelement.cc @@ -32,13 +32,13 @@ KFORMULA_NAMESPACE_BEGIN -IdentifierElement::IdentifierElement( BasicElement* tqparent ) : TokenElement( tqparent ) {} +IdentifierElement::IdentifierElement( BasicElement* parent ) : TokenElement( parent ) {} /* * Token elements' content has to be of homogeneous type. Every token element * must (TODO: check this) appear inside a non-token sequence, and thus, if * the command asks for a different content, a new element has to be created in - * tqparent sequence. + * parent sequence. */ KCommand* IdentifierElement::buildCommand( Container* container, Request* request ) { @@ -67,21 +67,21 @@ KCommand* IdentifierElement::buildCommand( Container* container, Request* reques } if ( countChildren() == 0 || cursor->getPos() == countChildren() ) { - // We are in the last position, so it's easy, call the tqparent to + // We are in the last position, so it's easy, call the parent to // create a new child - SequenceElement* tqparent = static_cast<SequenceElement*>( getParent() ); - if ( tqparent ) { - uint pos = tqparent->childPos( this ); - cursor->setTo( tqparent, pos + 1); - return tqparent->buildCommand( container, request ); + SequenceElement* parent = static_cast<SequenceElement*>( getParent() ); + if ( parent ) { + uint pos = parent->childPos( this ); + cursor->setTo( parent, pos + 1); + return parent->buildCommand( container, request ); } } if ( cursor->getPos() == 0 ) { - SequenceElement* tqparent = static_cast<SequenceElement*>( getParent() ); - if ( tqparent ) { - uint pos = tqparent->childPos( this ); - cursor->setTo( tqparent, pos ); - return tqparent->buildCommand( container, request ); + SequenceElement* parent = static_cast<SequenceElement*>( getParent() ); + if ( parent ) { + uint pos = parent->childPos( this ); + cursor->setTo( parent, pos ); + return parent->buildCommand( container, request ); } } @@ -89,7 +89,7 @@ KCommand* IdentifierElement::buildCommand( Container* container, Request* reques // a) Cut from mark to the end // b) Create a new token and add an element from key pressed // c) Create a new token and add elements cut previously - // d) Move cursor to tqparent so that it command execution works fine + // d) Move cursor to parent so that it command execution works fine switch( *request ) { case req_addOperator: { @@ -100,9 +100,9 @@ KCommand* IdentifierElement::buildCommand( Container* container, Request* reques command->addCursor( cursor ); command->addToken( op ); command->addContent( op, text ); - SequenceElement* tqparent = static_cast< SequenceElement* >( getParent() ); - if ( tqparent ) { - cursor->setTo( tqparent, tqparent->childPos( this ) + 1 ); + SequenceElement* parent = static_cast< SequenceElement* >( getParent() ); + if ( parent ) { + cursor->setTo( parent, parent->childPos( this ) + 1 ); } return command; } @@ -114,9 +114,9 @@ KCommand* IdentifierElement::buildCommand( Container* container, Request* reques command->addCursor( cursor ); command->addToken( num ); command->addContent( num, text ); - SequenceElement* tqparent = static_cast< SequenceElement* >( getParent() ); - if ( tqparent ) { - cursor->setTo( tqparent, tqparent->childPos( this ) + 1 ); + SequenceElement* parent = static_cast< SequenceElement* >( getParent() ); + if ( parent ) { + cursor->setTo( parent, parent->childPos( this ) + 1 ); } return command; } diff --git a/lib/kformula/identifierelement.h b/lib/kformula/identifierelement.h index 485fc28e..4e137315 100644 --- a/lib/kformula/identifierelement.h +++ b/lib/kformula/identifierelement.h @@ -27,7 +27,7 @@ KFORMULA_NAMESPACE_BEGIN class IdentifierElement : public TokenElement { typedef TokenElement inherited; public: - IdentifierElement( BasicElement* tqparent = 0 ); + IdentifierElement( BasicElement* parent = 0 ); /** * This is called by the container to get a command depending on diff --git a/lib/kformula/indexelement.cc b/lib/kformula/indexelement.cc index a8d3b68a..25b8997a 100644 --- a/lib/kformula/indexelement.cc +++ b/lib/kformula/indexelement.cc @@ -38,7 +38,7 @@ class IndexSequenceElement : public SequenceElement { typedef SequenceElement inherited; public: - IndexSequenceElement( BasicElement* tqparent = 0 ) : SequenceElement( tqparent ) {} + IndexSequenceElement( BasicElement* parent = 0 ) : SequenceElement( parent ) {} virtual IndexSequenceElement* clone() { return new IndexSequenceElement( *this ); } @@ -90,8 +90,8 @@ KCommand* IndexSequenceElement::buildCommand( Container* container, Request* req } -IndexElement::IndexElement(BasicElement* tqparent) - : BasicElement(tqparent), +IndexElement::IndexElement(BasicElement* parent) + : BasicElement(parent), m_subScriptShiftType( NoSize ), m_superScriptShiftType( NoSize ), m_customAccentUnder( false ), @@ -543,7 +543,7 @@ void IndexElement::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 IndexElement::draw( TQPainter& painter, const LuPixelRect& r, @@ -983,9 +983,9 @@ void IndexElement::remove(FormulaCursor* cursor, setToLowerLeft(cursor); break; case contentPos: { - BasicElement* tqparent = getParent(); - tqparent->selectChild(cursor, this); - tqparent->remove(cursor, removedChildren, direction); + BasicElement* parent = getParent(); + parent->selectChild(cursor, this); + parent->remove(cursor, removedChildren, direction); break; } case upperMiddlePos: diff --git a/lib/kformula/indexelement.h b/lib/kformula/indexelement.h index b86f0dc4..f3fc1acb 100644 --- a/lib/kformula/indexelement.h +++ b/lib/kformula/indexelement.h @@ -35,7 +35,7 @@ class IndexElement : public BasicElement { IndexElement& operator=( const IndexElement& ) { return *this; } public: - IndexElement(BasicElement* tqparent = 0); + IndexElement(BasicElement* parent = 0); ~IndexElement(); IndexElement( const IndexElement& ); @@ -86,7 +86,7 @@ public: /** * 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. */ virtual void draw( TQPainter& painter, const LuPixelRect& r, @@ -314,78 +314,78 @@ private: */ class IndexElementIndex : public ElementIndex { public: - IndexElementIndex(IndexElement* p) : tqparent(p) {} - virtual IndexElement* getElement() { return tqparent; } + IndexElementIndex(IndexElement* p) : parent(p) {} + virtual IndexElement* getElement() { return parent; } protected: - IndexElement* tqparent; + IndexElement* parent; }; // We have a (very simple) type for every index. class UpperLeftIndex : public IndexElementIndex { public: - UpperLeftIndex(IndexElement* tqparent) : IndexElementIndex(tqparent) {} + UpperLeftIndex(IndexElement* parent) : IndexElementIndex(parent) {} virtual void moveToIndex(FormulaCursor* cursor, Direction direction) - { tqparent->moveToUpperLeft(cursor, direction); } + { parent->moveToUpperLeft(cursor, direction); } virtual void setToIndex(FormulaCursor* cursor) - { tqparent->setToUpperLeft(cursor); } + { parent->setToUpperLeft(cursor); } virtual bool hasIndex() const - { return tqparent->hasUpperLeft(); } + { return parent->hasUpperLeft(); } }; class LowerLeftIndex : public IndexElementIndex { public: - LowerLeftIndex(IndexElement* tqparent) : IndexElementIndex(tqparent) {} + LowerLeftIndex(IndexElement* parent) : IndexElementIndex(parent) {} virtual void moveToIndex(FormulaCursor* cursor, Direction direction) - { tqparent->moveToLowerLeft(cursor, direction); } + { parent->moveToLowerLeft(cursor, direction); } virtual void setToIndex(FormulaCursor* cursor) - { tqparent->setToLowerLeft(cursor); } + { parent->setToLowerLeft(cursor); } virtual bool hasIndex() const - { return tqparent->hasLowerLeft(); } + { return parent->hasLowerLeft(); } }; class UpperMiddleIndex : public IndexElementIndex { public: - UpperMiddleIndex(IndexElement* tqparent) : IndexElementIndex(tqparent) {} + UpperMiddleIndex(IndexElement* parent) : IndexElementIndex(parent) {} virtual void moveToIndex(FormulaCursor* cursor, Direction direction) - { tqparent->moveToUpperMiddle(cursor, direction); } + { parent->moveToUpperMiddle(cursor, direction); } virtual void setToIndex(FormulaCursor* cursor) - { tqparent->setToUpperMiddle(cursor); } + { parent->setToUpperMiddle(cursor); } virtual bool hasIndex() const - { return tqparent->hasUpperMiddle(); } + { return parent->hasUpperMiddle(); } }; class LowerMiddleIndex : public IndexElementIndex { public: - LowerMiddleIndex(IndexElement* tqparent) : IndexElementIndex(tqparent) {} + LowerMiddleIndex(IndexElement* parent) : IndexElementIndex(parent) {} virtual void moveToIndex(FormulaCursor* cursor, Direction direction) - { tqparent->moveToLowerMiddle(cursor, direction); } + { parent->moveToLowerMiddle(cursor, direction); } virtual void setToIndex(FormulaCursor* cursor) - { tqparent->setToLowerMiddle(cursor); } + { parent->setToLowerMiddle(cursor); } virtual bool hasIndex() const - { return tqparent->hasLowerMiddle(); } + { return parent->hasLowerMiddle(); } }; class UpperRightIndex : public IndexElementIndex { public: - UpperRightIndex(IndexElement* tqparent) : IndexElementIndex(tqparent) {} + UpperRightIndex(IndexElement* parent) : IndexElementIndex(parent) {} virtual void moveToIndex(FormulaCursor* cursor, Direction direction) - { tqparent->moveToUpperRight(cursor, direction); } + { parent->moveToUpperRight(cursor, direction); } virtual void setToIndex(FormulaCursor* cursor) - { tqparent->setToUpperRight(cursor); } + { parent->setToUpperRight(cursor); } virtual bool hasIndex() const - { return tqparent->hasUpperRight(); } + { return parent->hasUpperRight(); } }; class LowerRightIndex : public IndexElementIndex { public: - LowerRightIndex(IndexElement* tqparent) : IndexElementIndex(tqparent) {} + LowerRightIndex(IndexElement* parent) : IndexElementIndex(parent) {} virtual void moveToIndex(FormulaCursor* cursor, Direction direction) - { tqparent->moveToLowerRight(cursor, direction); } + { parent->moveToLowerRight(cursor, direction); } virtual void setToIndex(FormulaCursor* cursor) - { tqparent->setToLowerRight(cursor); } + { parent->setToLowerRight(cursor); } virtual bool hasIndex() const - { return tqparent->hasLowerRight(); } + { return parent->hasLowerRight(); } }; diff --git a/lib/kformula/kformulacommand.cc b/lib/kformula/kformulacommand.cc index 178ec399..267038c4 100644 --- a/lib/kformula/kformulacommand.cc +++ b/lib/kformula/kformulacommand.cc @@ -220,7 +220,7 @@ void KFCAddToken::unexecute() { kdDebug( DEBUGID ) << k_funcinfo << endl; FormulaCursor* cursor = getUnexecuteCursor(); - SequenceElement* tqparent = static_cast<SequenceElement*>(cursor->getElement()->getParent()); + SequenceElement* parent = static_cast<SequenceElement*>(cursor->getElement()->getParent()); for ( int i = 0; i < tokenList.count(); i++ ) { SequenceElement* current = static_cast<SequenceElement*>(cursor->getElement()); @@ -228,12 +228,12 @@ void KFCAddToken::unexecute() for ( uint i = 0; i < current->countChildren(); ++i ) { cursor->remove( list, beforeCursor ); } - if ( tqparent ) { - int pos = tqparent->childPos( current ); - cursor->setTo( tqparent, pos + 1); + if ( parent ) { + int pos = parent->childPos( current ); + cursor->setTo( parent, pos + 1); cursor->remove( list, beforeCursor ); if ( pos > 0 ) { - BasicElement* element = tqparent->getChild( pos - 1 ); + BasicElement* element = parent->getChild( pos - 1 ); if (element) element->moveEnd( cursor ); } @@ -306,9 +306,9 @@ void KFCSplitToken::execute() removeSelection->execute(); } splitCursor = cursor->getCursorData(); - SequenceElement* tqparent = static_cast<SequenceElement*>( cursor->getElement() ); - if ( tqparent ) { - cursor->setMark( tqparent->countChildren() ); + SequenceElement* parent = static_cast<SequenceElement*>( cursor->getElement() ); + if ( parent ) { + cursor->setMark( parent->countChildren() ); cursor->setSelection( true ); } cursor->remove( splitList, afterCursor ); @@ -322,8 +322,8 @@ void KFCSplitToken::execute() } KFCAddToken::execute(); cursor = getExecuteCursor(); - if ( tqparent ) { - BasicElement* child = tqparent->getChild( cursor->getPos() ); + if ( parent ) { + BasicElement* child = parent->getChild( cursor->getPos() ); if ( child ) { child->moveEnd( cursor ); } diff --git a/lib/kformula/kformulacommand.h b/lib/kformula/kformulacommand.h index a63053d7..09001040 100644 --- a/lib/kformula/kformulacommand.h +++ b/lib/kformula/kformulacommand.h @@ -385,7 +385,7 @@ private: /** - * Command to remove the tqparent element. + * Command to remove the parent element. */ class KFCRemoveEnclosing : public Command { @@ -495,7 +495,7 @@ public: void addTextElement( TextElement* element ) { list.append(element); } /** - * Collects all tqparent elements those tqchildren are to be changend. + * Collects all parent elements those tqchildren are to be changend. */ void addElement( BasicElement* element ) { elementList.append( element ); } diff --git a/lib/kformula/kformulaconfigpage.cc b/lib/kformula/kformulaconfigpage.cc index add9c840..21c3b946 100644 --- a/lib/kformula/kformulaconfigpage.cc +++ b/lib/kformula/kformulaconfigpage.cc @@ -54,7 +54,7 @@ KFORMULA_NAMESPACE_BEGIN ConfigurePage::ConfigurePage( Document* document, TQWidget* view, KConfig* config, TQVBox* box, char* name ) - : TQObject( box->tqparent(), name ), m_document( document ), m_view( view ), m_config( config ), m_changed( false ) + : TQObject( box->parent(), name ), m_document( document ), m_view( view ), m_config( config ), m_changed( false ) { const ContextStyle& contextStyle = document->getContextStyle( true ); @@ -167,18 +167,18 @@ ConfigurePage::ConfigurePage( Document* document, TQWidget* view, KConfig* confi } -TQPushButton* ConfigurePage::buildFontLine( TQWidget* tqparent, +TQPushButton* ConfigurePage::buildFontLine( TQWidget* parent, TQGridLayout* tqlayout, int number, TQFont font, TQString name, TQLabel*& fontName ) { - TQLabel* fontTitle = new TQLabel( name, tqparent ); + TQLabel* fontTitle = new TQLabel( name, parent ); TQString labelName = font.family() + ' ' + TQString::number( font.pointSize() ); - fontName = new TQLabel( labelName, tqparent ); + fontName = new TQLabel( labelName, parent ); fontName->setFont( font ); fontName->setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken); - TQPushButton* chooseButton = new TQPushButton( i18n( "Choose..." ), tqparent ); + TQPushButton* chooseButton = new TQPushButton( i18n( "Choose..." ), parent ); tqlayout->addWidget( fontTitle, number, 0 ); tqlayout->addWidget( fontName, number, 1 ); @@ -319,8 +319,8 @@ void ConfigurePage::slotChanged() // class UsedFontItem : public KListViewItem { // public: -// UsedFontItem( MathFontsConfigurePage* page, TQListView* tqparent, TQString font ) -// : KListViewItem( tqparent, font ), m_page( page ) {} +// UsedFontItem( MathFontsConfigurePage* page, TQListView* parent, TQString font ) +// : KListViewItem( parent, font ), m_page( page ) {} // int compare( TQListViewItem* i, int col, bool ascending ) const; @@ -343,7 +343,7 @@ void ConfigurePage::slotChanged() // MathFontsConfigurePage::MathFontsConfigurePage( Document* document, TQWidget* view, // KConfig* config, TQVBox* box, char* name ) -// : TQObject( box->tqparent(), name ), m_document( document ), m_view( view ), m_config( config ) +// : TQObject( box->parent(), name ), m_document( document ), m_view( view ), m_config( config ) // { // TQWidget* fontWidget = new TQWidget( box ); // TQGridLayout* fontLayout = new TQGridLayout( fontWidget, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/lib/kformula/kformuladocument.cc b/lib/kformula/kformuladocument.cc index 228b4017..17d163f0 100644 --- a/lib/kformula/kformuladocument.cc +++ b/lib/kformula/kformuladocument.cc @@ -61,9 +61,9 @@ int FormulaList::compareItems( TQPtrCollection::Item a, TQPtrCollection::Item b } -Document::Document( TQObject *tqparent, const char *name, +Document::Document( TQObject *parent, const char *name, const TQStringList &/*args*/ ) - : TQObject( tqparent, name ), m_wrapper( 0 ), m_formula( 0 ), creationStrategy( 0 ) + : TQObject( parent, name ), m_wrapper( 0 ), m_formula( 0 ), creationStrategy( 0 ) { m_contextStyle = new ContextStyle; setCreationStrategy( "Oasis" ); diff --git a/lib/kformula/kformuladocument.h b/lib/kformula/kformuladocument.h index 62b2dab3..46de5774 100644 --- a/lib/kformula/kformuladocument.h +++ b/lib/kformula/kformuladocument.h @@ -77,7 +77,7 @@ public: /** * Creates a formula document. */ - Document( TQObject *tqparent=0, const char *name=0, + Document( TQObject *parent=0, const char *name=0, const TQStringList &args=TQStringList() ); ~Document(); diff --git a/lib/kformula/kformulawidget.cc b/lib/kformula/kformulawidget.cc index 0de1ad7c..ef5e09a3 100644 --- a/lib/kformula/kformulawidget.cc +++ b/lib/kformula/kformulawidget.cc @@ -35,8 +35,8 @@ #include "kformulawidget.h" -KFormulaWidget::KFormulaWidget(Container* doc, TQWidget* tqparent, const char* name, WFlags f) - : TQWidget(tqparent, name, f | WRepaintNoErase | WResizeNoErase), +KFormulaWidget::KFormulaWidget(Container* doc, TQWidget* parent, const char* name, WFlags f) + : TQWidget(parent, name, f | WRepaintNoErase | WResizeNoErase), formulaView(doc) { connect(doc, TQT_SIGNAL(formulaChanged(int, int)), diff --git a/lib/kformula/kformulawidget.h b/lib/kformula/kformulawidget.h index ead28ddc..1b6d8d98 100644 --- a/lib/kformula/kformulawidget.h +++ b/lib/kformula/kformulawidget.h @@ -50,7 +50,7 @@ class KFormulaWidget : public TQWidget { TQ_OBJECT public: - KFormulaWidget(Container*, TQWidget* tqparent=0, const char* name=0, WFlags f=0); + KFormulaWidget(Container*, TQWidget* parent=0, const char* name=0, WFlags f=0); ~KFormulaWidget(); diff --git a/lib/kformula/main.cc b/lib/kformula/main.cc index dde69731..57344739 100644 --- a/lib/kformula/main.cc +++ b/lib/kformula/main.cc @@ -33,8 +33,8 @@ using namespace KFormula; class TestWidget : public KFormulaWidget { public: - TestWidget(Container* doc, TQWidget* tqparent=0, const char* name=0, WFlags f=0) - : KFormulaWidget(doc, tqparent, name, f) {} + TestWidget(Container* doc, TQWidget* parent=0, const char* name=0, WFlags f=0) + : KFormulaWidget(doc, parent, name, f) {} protected: virtual void keyPressEvent(TQKeyEvent* event); diff --git a/lib/kformula/matrixelement.cc b/lib/kformula/matrixelement.cc index 56062dcd..6b5a5898 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 ); } /** diff --git a/lib/kformula/matrixelement.h b/lib/kformula/matrixelement.h index 04203257..89426659 100644 --- a/lib/kformula/matrixelement.h +++ b/lib/kformula/matrixelement.h @@ -45,7 +45,7 @@ class MatrixElement : public BasicElement { enum SideType { NoSide, LeftSide, RightSide, LeftOverlapSide, RightOverlapSide }; MatrixElement& operator=( const MatrixElement& ) { return *this; } public: - MatrixElement(uint rows = 1, uint columns = 1, BasicElement* tqparent = 0); + MatrixElement(uint rows = 1, uint columns = 1, BasicElement* parent = 0); ~MatrixElement(); MatrixElement( const MatrixElement& ); @@ -89,7 +89,7 @@ public: /** * 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. */ virtual void draw( TQPainter& painter, const LuPixelRect& r, @@ -316,7 +316,7 @@ public: * The container this FormulaElement belongs to must not be 0, * except you really know what you are doing. */ - MultilineElement( BasicElement* tqparent = 0 ); + MultilineElement( BasicElement* parent = 0 ); ~MultilineElement(); MultilineElement( const MultilineElement& ); @@ -384,7 +384,7 @@ public: /** * 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. */ virtual void draw( TQPainter& painter, const LuPixelRect& r, @@ -420,7 +420,7 @@ public: virtual TQString formulaString(); - virtual void writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool oasisFormat = false ) const ; + virtual void writeMathML( TQDomDocument& doc, TQDomNode& parent, bool oasisFormat = false ) const ; protected: diff --git a/lib/kformula/numberelement.cc b/lib/kformula/numberelement.cc index 4532d259..41ddc179 100644 --- a/lib/kformula/numberelement.cc +++ b/lib/kformula/numberelement.cc @@ -31,13 +31,13 @@ KFORMULA_NAMESPACE_BEGIN -NumberElement::NumberElement( BasicElement* tqparent ) : TokenElement( tqparent ) {} +NumberElement::NumberElement( BasicElement* parent ) : TokenElement( parent ) {} /* * Token elements' content has to be of homogeneous type. Every token element * must (TODO: check this) appear inside a non-token sequence, and thus, if * the command asks for a different content, a new element has to be created in - * tqparent sequence. + * parent sequence. */ KCommand* NumberElement::buildCommand( Container* container, Request* request ) { @@ -56,21 +56,21 @@ KCommand* NumberElement::buildCommand( Container* container, Request* request ) } if ( countChildren() == 0 || cursor->getPos() == countChildren() ) { - // We are in the last position, so it's easy, call the tqparent to + // We are in the last position, so it's easy, call the parent to // create a new child - SequenceElement* tqparent = static_cast<SequenceElement*>( getParent() ); - if ( tqparent ) { - uint pos = tqparent->childPos( this ); - cursor->setTo( tqparent, pos + 1); - return tqparent->buildCommand( container, request ); + SequenceElement* parent = static_cast<SequenceElement*>( getParent() ); + if ( parent ) { + uint pos = parent->childPos( this ); + cursor->setTo( parent, pos + 1); + return parent->buildCommand( container, request ); } } if ( cursor->getPos() == 0 ) { - SequenceElement* tqparent = static_cast<SequenceElement*>( getParent() ); - if ( tqparent ) { - uint pos = tqparent->childPos( this ); - cursor->setTo( tqparent, pos ); - return tqparent->buildCommand( container, request ); + SequenceElement* parent = static_cast<SequenceElement*>( getParent() ); + if ( parent ) { + uint pos = parent->childPos( this ); + cursor->setTo( parent, pos ); + return parent->buildCommand( container, request ); } } @@ -78,7 +78,7 @@ KCommand* NumberElement::buildCommand( Container* container, Request* request ) // a) Cut from mark to the end // b) Create a new token and add an element from key pressed // c) Create a new token and add elements cut previously - // d) Move cursor to tqparent so that it command execution works fine + // d) Move cursor to parent so that it command execution works fine switch( *request ) { case req_addTextChar: { @@ -89,9 +89,9 @@ KCommand* NumberElement::buildCommand( Container* container, Request* request ) command->addCursor( cursor ); command->addToken( id ); command->addContent( id, text ); - SequenceElement* tqparent = static_cast< SequenceElement* >( getParent() ); - if ( tqparent ) { - cursor->setTo( tqparent, tqparent->childPos( this ) + 1 ); + SequenceElement* parent = static_cast< SequenceElement* >( getParent() ); + if ( parent ) { + cursor->setTo( parent, parent->childPos( this ) + 1 ); } return command; } @@ -106,9 +106,9 @@ KCommand* NumberElement::buildCommand( Container* container, Request* request ) TextElement* text = creationStrategy->createTextElement( tr->text()[i] ); command->addContent( id, text ); } - SequenceElement* tqparent = static_cast< SequenceElement* >( getParent() ); - if ( tqparent ) { - cursor->setTo( tqparent, tqparent->childPos( this ) + 1 ); + SequenceElement* parent = static_cast< SequenceElement* >( getParent() ); + if ( parent ) { + cursor->setTo( parent, parent->childPos( this ) + 1 ); } return command; } @@ -121,9 +121,9 @@ KCommand* NumberElement::buildCommand( Container* container, Request* request ) command->addCursor( cursor ); command->addToken( op ); command->addContent( op, text ); - SequenceElement* tqparent = static_cast< SequenceElement* >( getParent() ); - if ( tqparent ) { - cursor->setTo( tqparent, tqparent->childPos( this ) + 1 ); + SequenceElement* parent = static_cast< SequenceElement* >( getParent() ); + if ( parent ) { + cursor->setTo( parent, parent->childPos( this ) + 1 ); } return command; } @@ -136,11 +136,11 @@ KCommand* NumberElement::buildCommand( Container* container, Request* request ) case req_addSymbol: case req_addOneByTwoMatrix: case req_addMatrix: { - SequenceElement* tqparent = static_cast<SequenceElement*>( getParent() ); - if ( tqparent ) { - uint pos = tqparent->childPos( this ); - cursor->setTo( tqparent, pos + 1); - return tqparent->buildCommand( container, request ); + SequenceElement* parent = static_cast<SequenceElement*>( getParent() ); + if ( parent ) { + uint pos = parent->childPos( this ); + cursor->setTo( parent, pos + 1); + return parent->buildCommand( container, request ); } } default: diff --git a/lib/kformula/numberelement.h b/lib/kformula/numberelement.h index fe6d92e4..3a8295ad 100644 --- a/lib/kformula/numberelement.h +++ b/lib/kformula/numberelement.h @@ -27,7 +27,7 @@ KFORMULA_NAMESPACE_BEGIN class NumberElement : public TokenElement { typedef TokenElement inherited; public: - NumberElement( BasicElement* tqparent = 0 ); + NumberElement( BasicElement* parent = 0 ); /** * This is called by the container to get a command depending on diff --git a/lib/kformula/operatorelement.cc b/lib/kformula/operatorelement.cc index a9deab3c..66c1fcdc 100644 --- a/lib/kformula/operatorelement.cc +++ b/lib/kformula/operatorelement.cc @@ -39,7 +39,7 @@ KFORMULA_NAMESPACE_BEGIN -OperatorElement::OperatorElement( BasicElement* tqparent ) : TokenElement( tqparent ), +OperatorElement::OperatorElement( BasicElement* parent ) : TokenElement( parent ), m_form( NoForm ), m_lspaceType( ThickMathSpace ), m_rspaceType( ThickMathSpace ), @@ -159,7 +159,7 @@ void OperatorElement::setForm( FormType type ) * Token elements' content has to be of homogeneous type. Every token element * must (TODO: check this) appear inside a non-token sequence, and thus, if * the command asks for a different content, a new element has to be created in - * tqparent sequence. + * parent sequence. */ KCommand* OperatorElement::buildCommand( Container* container, Request* request ) { @@ -178,21 +178,21 @@ KCommand* OperatorElement::buildCommand( Container* container, Request* request } if ( countChildren() == 0 || cursor->getPos() == countChildren() ) { - // We are in the last position, so it's easy, call the tqparent to + // We are in the last position, so it's easy, call the parent to // create a new child - SequenceElement* tqparent = static_cast<SequenceElement*>( getParent() ); - if ( tqparent ) { - uint pos = tqparent->childPos( this ); - cursor->setTo( tqparent, pos + 1); - return tqparent->buildCommand( container, request ); + SequenceElement* parent = static_cast<SequenceElement*>( getParent() ); + if ( parent ) { + uint pos = parent->childPos( this ); + cursor->setTo( parent, pos + 1); + return parent->buildCommand( container, request ); } } if ( cursor->getPos() == 0 ) { - SequenceElement* tqparent = static_cast<SequenceElement*>( getParent() ); - if ( tqparent ) { - uint pos = tqparent->childPos( this ); - cursor->setTo( tqparent, pos ); - return tqparent->buildCommand( container, request ); + SequenceElement* parent = static_cast<SequenceElement*>( getParent() ); + if ( parent ) { + uint pos = parent->childPos( this ); + cursor->setTo( parent, pos ); + return parent->buildCommand( container, request ); } } @@ -200,7 +200,7 @@ KCommand* OperatorElement::buildCommand( Container* container, Request* request // a) Cut from mark to the end // b) Create a new token and add an element from key pressed // c) Create a new token and add elements cut previously - // d) Move cursor to tqparent so that it command execution works fine + // d) Move cursor to parent so that it command execution works fine switch( *request ) { case req_addTextChar: { @@ -211,9 +211,9 @@ KCommand* OperatorElement::buildCommand( Container* container, Request* request command->addCursor( cursor ); command->addToken( id ); command->addContent( id, text ); - SequenceElement* tqparent = static_cast< SequenceElement* >( getParent() ); - if ( tqparent ) { - cursor->setTo( tqparent, tqparent->childPos( this ) + 1 ); + SequenceElement* parent = static_cast< SequenceElement* >( getParent() ); + if ( parent ) { + cursor->setTo( parent, parent->childPos( this ) + 1 ); } return command; } @@ -228,9 +228,9 @@ KCommand* OperatorElement::buildCommand( Container* container, Request* request TextElement* text = creationStrategy->createTextElement( tr->text()[i] ); command->addContent( id, text ); } - SequenceElement* tqparent = static_cast< SequenceElement* >( getParent() ); - if ( tqparent ) { - cursor->setTo( tqparent, tqparent->childPos( this ) + 1 ); + SequenceElement* parent = static_cast< SequenceElement* >( getParent() ); + if ( parent ) { + cursor->setTo( parent, parent->childPos( this ) + 1 ); } return command; } @@ -243,9 +243,9 @@ KCommand* OperatorElement::buildCommand( Container* container, Request* request command->addCursor( cursor ); command->addToken( num ); command->addContent( num, text ); - SequenceElement* tqparent = static_cast< SequenceElement* >( getParent() ); - if ( tqparent ) { - cursor->setTo( tqparent, tqparent->childPos( this ) + 1 ); + SequenceElement* parent = static_cast< SequenceElement* >( getParent() ); + if ( parent ) { + cursor->setTo( parent, parent->childPos( this ) + 1 ); } return command; } diff --git a/lib/kformula/operatorelement.h b/lib/kformula/operatorelement.h index 52c35537..f16f02c4 100644 --- a/lib/kformula/operatorelement.h +++ b/lib/kformula/operatorelement.h @@ -27,7 +27,7 @@ KFORMULA_NAMESPACE_BEGIN class OperatorElement : public TokenElement { typedef TokenElement inherited; public: - OperatorElement( BasicElement* tqparent = 0 ); + OperatorElement( BasicElement* parent = 0 ); void setForm( FormType type ); /** diff --git a/lib/kformula/paddedelement.cc b/lib/kformula/paddedelement.cc index 5270a4f7..f153a339 100644 --- a/lib/kformula/paddedelement.cc +++ b/lib/kformula/paddedelement.cc @@ -22,7 +22,7 @@ KFORMULA_NAMESPACE_BEGIN -PaddedElement::PaddedElement( BasicElement* tqparent ) : SequenceElement( tqparent ), +PaddedElement::PaddedElement( BasicElement* parent ) : SequenceElement( parent ), m_widthType( NoSize ), m_lspaceType( NoSize ), m_heightType( NoSize ), diff --git a/lib/kformula/paddedelement.h b/lib/kformula/paddedelement.h index 811f861e..5df95b74 100644 --- a/lib/kformula/paddedelement.h +++ b/lib/kformula/paddedelement.h @@ -28,7 +28,7 @@ class PaddedElement : public SequenceElement { typedef SequenceElement inherited; enum SizeType { NoSize, RelativeSize, AbsoluteSize, PixelSize, WidthRelativeSize, HeightRelativeSize }; public: - PaddedElement( BasicElement* tqparent = 0 ); + PaddedElement( BasicElement* parent = 0 ); /** * Calculates our width and height and diff --git a/lib/kformula/phantomelement.cc b/lib/kformula/phantomelement.cc index 72b564a6..e2a07fc6 100644 --- a/lib/kformula/phantomelement.cc +++ b/lib/kformula/phantomelement.cc @@ -21,13 +21,13 @@ KFORMULA_NAMESPACE_BEGIN -PhantomElement::PhantomElement( BasicElement* tqparent ) : SequenceElement( tqparent ) +PhantomElement::PhantomElement( BasicElement* parent ) : SequenceElement( parent ) { } /** * 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 PhantomElement::draw( TQPainter&, const LuPixelRect&, const ContextStyle&, diff --git a/lib/kformula/phantomelement.h b/lib/kformula/phantomelement.h index cf89d893..373c3545 100644 --- a/lib/kformula/phantomelement.h +++ b/lib/kformula/phantomelement.h @@ -27,11 +27,11 @@ KFORMULA_NAMESPACE_BEGIN class PhantomElement : public SequenceElement { typedef SequenceElement inherited; public: - PhantomElement( BasicElement* tqparent = 0 ); + PhantomElement( BasicElement* parent = 0 ); /** * 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. */ virtual void draw( TQPainter& painter, const LuPixelRect& r, diff --git a/lib/kformula/prototype/engine.py b/lib/kformula/prototype/engine.py index 0ce870cf..a2a94487 100644 --- a/lib/kformula/prototype/engine.py +++ b/lib/kformula/prototype/engine.py @@ -24,8 +24,8 @@ from qt import * class BasicElement: """The interface for every element.""" - def __init__(self, tqparent): - self.tqparent = tqparent + def __init__(self, parent): + self.parent = parent self.size = QSize() self.pos = QPoint() @@ -47,7 +47,7 @@ class BasicElement: while element != None: x += element.x() y += element.y() - element = element.tqparent + element = element.parent return QPoint(x, y) def elementAt(self, point, startPoint): @@ -79,7 +79,7 @@ class BasicElement: def formula(self): """Returns the FormulaElement we are a child of.""" - return self.tqparent.formula() + return self.parent.formula() def draw(self, painter, styleContext, startPoint): """Draws the whole thing. Including its tqchildren.""" @@ -87,11 +87,11 @@ class BasicElement: def calcSizes(self, styleContext): """Recalculates the size. - position (relative our to tqparent), width and height + position (relative our to parent), width and height will be stored in self.size, the midline offset in self.midline. - Please note: It's up to a tqparent to store its tqchildren's position.""" + Please note: It's up to a parent to store its tqchildren's position.""" pass def mainChild(self): @@ -119,8 +119,8 @@ class SequenceElement (BasicElement): """The element that contains a number of tqchildren. The tqchildren are aligned in one line.""" - def __init__(self, tqparent): - BasicElement.__init__(self, tqparent) + def __init__(self, parent): + BasicElement.__init__(self, parent) self.tqchildren = [] def elementAtCursor(self, cursor): @@ -141,8 +141,8 @@ class SequenceElement (BasicElement): def moveLeft(self, cursor, fromElement): - # Our tqparent asks us for a cursor position. Found. - if fromElement == self.tqparent: + # Our parent asks us for a cursor position. Found. + if fromElement == self.parent: cursor.set(self, len(self.tqchildren)) # We already owned the cursor. Ask next child then. @@ -154,8 +154,8 @@ class SequenceElement (BasicElement): self.tqchildren[cursor.pos()-1].moveLeft(cursor, self) else: # Needed because FormulaElement derives this. - if self.tqparent != None: - self.tqparent.moveLeft(cursor, self) + if self.parent != None: + self.parent.moveLeft(cursor, self) # The cursor came from one of our tqchildren or # something is wrong. @@ -169,8 +169,8 @@ class SequenceElement (BasicElement): def moveRight(self, cursor, fromElement): - # Our tqparent asks us for a cursor position. Found. - if fromElement == self.tqparent: + # Our parent asks us for a cursor position. Found. + if fromElement == self.parent: cursor.set(self, 0) # We already owned the cursor. Ask next child then. @@ -182,8 +182,8 @@ class SequenceElement (BasicElement): self.tqchildren[cursor.pos()].moveRight(cursor, self) else: # Needed because FormulaElement derives this. - if self.tqparent != None: - self.tqparent.moveRight(cursor, self) + if self.parent != None: + self.parent.moveRight(cursor, self) # The cursor came from one of our tqchildren or # something is wrong. @@ -196,27 +196,27 @@ class SequenceElement (BasicElement): def moveUp(self, cursor, fromElement): - if fromElement == self.tqparent: + if fromElement == self.parent: self.moveRight(cursor, self) else: - if self.tqparent != None: - self.tqparent.moveUp(cursor, self) + if self.parent != None: + self.parent.moveUp(cursor, self) def moveDown(self, cursor, fromElement): - if fromElement == self.tqparent: + if fromElement == self.parent: self.moveRight(cursor, self) else: - if self.tqparent != None: - self.tqparent.moveDown(cursor, self) + if self.parent != None: + self.parent.moveDown(cursor, self) def moveHome(self, cursor): if cursor.isSelection(): element = cursor.element() if element != self: - while element.tqparent != self: - element = element.tqparent + while element.parent != self: + element = element.parent cursor.setMarkPos(self.tqchildren.index(element)+1) cursor.set(self, 0) @@ -224,8 +224,8 @@ class SequenceElement (BasicElement): if cursor.isSelection(): element = cursor.element() if element != self: - while element.tqparent != self: - element = element.tqparent + while element.parent != self: + element = element.parent cursor.setMarkPos(self.tqchildren.index(element)) cursor.set(self, len(self.tqchildren)) @@ -279,7 +279,7 @@ class SequenceElement (BasicElement): def setMainChild(self, sequenceElement): if len(self.tqchildren) > 0: self.tqchildren[0] = sequenceElement - sequenceElement.tqparent = self + sequenceElement.parent = self else: self.addChild(sequenceElement) @@ -292,9 +292,9 @@ class SequenceElement (BasicElement): the cursor) with the given element. The replaced sequence becomes the main child of the new element.""" - # it is essential to set up the tqparent pointer for + # it is essential to set up the parent pointer for # the notification to work. - element.tqparent = self + element.parent = self seq = element.makeSequence() if cursor.isSelection(): @@ -319,7 +319,7 @@ class SequenceElement (BasicElement): def replaceElementByMainChild(self, cursor, element): """Replaces the given element with the content of its main child. (The main child is always a SequenceElement.)""" - assert element.tqparent == self + assert element.parent == self self.formula().elementRemoved(element) seq = element.mainChild() @@ -327,7 +327,7 @@ class SequenceElement (BasicElement): self.tqchildren.remove(element) for child in seq.tqchildren: self.tqchildren.insert(pos, child) - child.tqparent = self + child.parent = self pos += 1 cursor.set(self, pos) self.formula().changed() @@ -335,7 +335,7 @@ class SequenceElement (BasicElement): def addChild(self, element): self.tqchildren.append(element) - element.tqparent = self + element.parent = self self.formula().changed() def insertChild(self, cursor, element): @@ -343,7 +343,7 @@ class SequenceElement (BasicElement): The cursor is placed behind the new element.""" pos = cursor.pos() self.tqchildren.insert(pos, element) - element.tqparent = self + element.parent = self cursor.set(self, pos+1) self.formula().changed() @@ -351,7 +351,7 @@ class SequenceElement (BasicElement): """Replaces the element before the cursor with the new one. No range checking. Be careful.""" self.tqchildren[cursor.pos()-1] = element - element.tqparent = self + element.parent = self self.formula().changed() def removeChild(self, cursor, element): @@ -359,8 +359,8 @@ class SequenceElement (BasicElement): cursor.set(self, self.tqchildren.index(element)) self.tqchildren.remove(element) if len(self.tqchildren) == 0: - if self.tqparent != None: - self.tqparent.removeChild(cursor, self) + if self.parent != None: + self.parent.removeChild(cursor, self) return self.formula().changed() @@ -380,8 +380,8 @@ class SequenceElement (BasicElement): self.formula().changed() else: if len(self.tqchildren) == 0: - if self.tqparent != None: - self.tqparent.removeChild(cursor, self) + if self.parent != None: + self.parent.removeChild(cursor, self) def removeChildBefore(self, cursor): pos = cursor.pos()-1 @@ -400,8 +400,8 @@ class SequenceElement (BasicElement): self.formula().changed() else: if len(self.tqchildren) == 0: - if self.tqparent != None: - self.tqparent.removeChild(cursor, self) + if self.parent != None: + self.parent.removeChild(cursor, self) def globalCursorPos(self, pos): @@ -426,7 +426,7 @@ class SequenceElement (BasicElement): class FormulaElement (SequenceElement): """The main element. A formula consists of a FormulaElement and its tqchildren. - The only element that has no tqparent.""" + The only element that has no parent.""" def __init__(self, document): SequenceElement.__init__(self, None) @@ -452,15 +452,15 @@ class FormulaElement (SequenceElement): class TextElement (BasicElement): """One char.""" - def __init__(self, tqparent, char): - BasicElement.__init__(self, tqparent) + def __init__(self, parent, char): + BasicElement.__init__(self, parent) self.char = char def moveLeft(self, cursor, fromElement): - self.tqparent.moveLeft(cursor, self) + self.parent.moveLeft(cursor, self) def moveRight(self, cursor, fromElement): - self.tqparent.moveRight(cursor, self) + self.parent.moveRight(cursor, self) def draw(self, painter, styleContext, startPoint): styleContext.setupPainter(painter) @@ -480,8 +480,8 @@ class IndexElement (BasicElement): def __init__(self, contentElement): if contentElement != None: - BasicElement.__init__(self, contentElement.tqparent) - contentElement.tqparent = self + BasicElement.__init__(self, contentElement.parent) + contentElement.parent = self else: BasicElement.__init__(self, None) @@ -525,9 +525,9 @@ class IndexElement (BasicElement): assert fromElement != None if cursor.isSelection(): - self.tqparent.moveLeft(cursor, self) + self.parent.moveLeft(cursor, self) - elif fromElement == self.tqparent: + elif fromElement == self.parent: if self.lowerRight != None: self.lowerRight.moveLeft(cursor, self) elif self.upperRight != None: @@ -550,25 +550,25 @@ class IndexElement (BasicElement): elif self.upperLeft != None: self.upperLeft.moveLeft(cursor, self) else: - self.tqparent.moveLeft(cursor, self) + self.parent.moveLeft(cursor, self) elif fromElement == self.lowerLeft: if self.upperLeft != None: self.upperLeft.moveLeft(cursor, self) else: - self.tqparent.moveLeft(cursor, self) + self.parent.moveLeft(cursor, self) else: - self.tqparent.moveLeft(cursor, self) + self.parent.moveLeft(cursor, self) def moveRight(self, cursor, fromElement): assert fromElement != None if cursor.isSelection(): - self.tqparent.moveRight(cursor, self) + self.parent.moveRight(cursor, self) - elif fromElement == self.tqparent: + elif fromElement == self.parent: if self.upperLeft != None: self.upperLeft.moveRight(cursor, self) elif self.lowerLeft != None: @@ -591,26 +591,26 @@ class IndexElement (BasicElement): elif self.lowerRight != None: self.lowerRight.moveRight(cursor, self) else: - self.tqparent.moveRight(cursor, self) + self.parent.moveRight(cursor, self) elif fromElement == self.upperRight: if self.lowerRight != None: self.lowerRight.moveRight(cursor, self) else: - self.tqparent.moveRight(cursor, self) + self.parent.moveRight(cursor, self) else: - self.tqparent.moveRight(cursor, self) + self.parent.moveRight(cursor, self) def moveUp(self, cursor, fromElement): assert fromElement != None - if fromElement == self.tqparent: + if fromElement == self.parent: self.content.moveRight(cursor, self) elif fromElement == self.upperLeft or fromElement == self.upperRight: - self.tqparent.moveUp(cursor, self) + self.parent.moveUp(cursor, self) elif fromElement == self.content: if self.upperRight != None: @@ -619,7 +619,7 @@ class IndexElement (BasicElement): #self.upperLeft.moveRight(cursor, self) self.upperLeft.moveLeft(cursor, self) else: - self.tqparent.moveUp(cursor, self) + self.parent.moveUp(cursor, self) elif fromElement == self.lowerLeft: self.content.moveRight(cursor, self) @@ -628,17 +628,17 @@ class IndexElement (BasicElement): self.content.moveLeft(cursor, self) else: # should never happen. - self.tqparent.moveUp(cursor, self) + self.parent.moveUp(cursor, self) def moveDown(self, cursor, fromElement): assert fromElement != None - if fromElement == self.tqparent: + if fromElement == self.parent: self.content.moveRight(cursor, self) elif fromElement == self.lowerLeft or fromElement == self.lowerRight: - self.tqparent.moveDown(cursor, fromElement) + self.parent.moveDown(cursor, fromElement) elif fromElement == self.content: if self.lowerRight != None: @@ -647,7 +647,7 @@ class IndexElement (BasicElement): #self.lowerLeft.moveRight(cursor, self) self.lowerLeft.moveLeft(cursor, self) else: - self.tqparent.moveDown(cursor, self) + self.parent.moveDown(cursor, self) elif fromElement == self.upperLeft: self.content.moveRight(cursor, self) @@ -656,7 +656,7 @@ class IndexElement (BasicElement): self.content.moveLeft(cursor, self) else: # should never happen. - self.tqparent.moveDown(cursor, self) + self.parent.moveDown(cursor, self) def draw(self, painter, styleContext, startPoint): @@ -783,7 +783,7 @@ class IndexElement (BasicElement): def setMainChild(self, sequenceElement): self.content = sequenceElement - self.content.tqparent = self + self.content.parent = self self.formula().changed() def removeChild(self, cursor, element): @@ -804,12 +804,12 @@ class IndexElement (BasicElement): self.content.moveLeft(cursor, self) self.lowerRight = None elif element == self.content: - self.tqparent.removeChild(cursor, self) + self.parent.removeChild(cursor, self) return if self.upperLeft == None and self.lowerLeft == None and \ self.upperRight == None and self.lowerRight == None: - self.tqparent.replaceElementByMainChild(cursor, self) + self.parent.replaceElementByMainChild(cursor, self) else: self.formula().changed() @@ -876,7 +876,7 @@ class Cursor: return self.currentMarkPos def setMarkPos(self, markPos): - """Gets called by elements if the cursor moves up to the tqparent.""" + """Gets called by elements if the cursor moves up to the parent.""" self.selectionFlag = (markPos != -1) self.currentMarkPos = markPos @@ -916,10 +916,10 @@ class Cursor: if isinstance(element, IndexElement): return element if self.pos() == self.sequenceElement.countChildren(): - tqparent = self.sequenceElement.tqparent - if isinstance(tqparent, IndexElement): - if self.sequenceElement == tqparent.mainChild(): - return tqparent + parent = self.sequenceElement.parent + if isinstance(parent, IndexElement): + if self.sequenceElement == parent.mainChild(): + return parent def addUpperRightIndex(self): @@ -929,7 +929,7 @@ class Cursor: self.sequenceElement.replaceCurrentSelection(self, indexElement) index = indexElement.requireUpperRight() - index.moveRight(self, index.tqparent) + index.moveRight(self, index.parent) def addLowerRightIndex(self): @@ -939,7 +939,7 @@ class Cursor: self.sequenceElement.replaceCurrentSelection(self, indexElement) index = indexElement.requireLowerRight() - index.moveRight(self, index.tqparent) + index.moveRight(self, index.parent) def addTextElement(self, char): @@ -1018,8 +1018,8 @@ class Cursor: formula = self.sequenceElement.formula() element = formula.elementAt(mouseEvent.pos(), QPoint(0, 0)) if element != None: - if element.tqparent != None: - element.moveLeft(self, element.tqparent) + if element.parent != None: + element.moveLeft(self, element.parent) self.selectionFlag = 0 self.mouseMarkFlag = 1 self.setMarkPos(self.pos()) @@ -1034,8 +1034,8 @@ class Cursor: formula = self.sequenceElement.formula() element = formula.elementAt(mouseEvent.pos(), QPoint(0, 0)) if element != None: - if element.tqparent != None: - element.tqparent.moveLeft(self, element) + if element.parent != None: + element.parent.moveLeft(self, element) def elementRemoved(self, element): @@ -1046,10 +1046,10 @@ class Cursor: if e == element: # This is meant to catch all cursors that did not # cause the deletion. - e.tqparent.moveRight(self, e) + e.parent.moveRight(self, e) self.sequenceElement.moveHome(self) return - e = e.tqparent + e = e.parent class StyleContext: diff --git a/lib/kformula/prototype/unicode.py b/lib/kformula/prototype/unicode.py index 2265635a..585574cf 100755 --- a/lib/kformula/prototype/unicode.py +++ b/lib/kformula/prototype/unicode.py @@ -5,8 +5,8 @@ from qt import * from xml.sax import saxutils, handler, make_parser class Form1(QWidget): - def __init__(self,tqparent = None,name = None,fl = 0): - QWidget.__init__(self,tqparent,name,fl) + def __init__(self,parent = None,name = None,fl = 0): + QWidget.__init__(self,parent,name,fl) if name == None: self.setName('Form1') diff --git a/lib/kformula/rootelement.cc b/lib/kformula/rootelement.cc index f9331f13..5adeb51c 100644 --- a/lib/kformula/rootelement.cc +++ b/lib/kformula/rootelement.cc @@ -38,7 +38,7 @@ class RootSequenceElement : public SequenceElement { typedef SequenceElement inherited; public: - RootSequenceElement( BasicElement* tqparent = 0 ) : SequenceElement( tqparent ) {} + RootSequenceElement( BasicElement* parent = 0 ) : SequenceElement( parent ) {} virtual RootSequenceElement* clone() { return new RootSequenceElement( *this ); } @@ -92,8 +92,8 @@ KCommand* RootSequenceElement::buildCommand( Container* container, Request* requ } -RootElement::RootElement(BasicElement* tqparent) - : BasicElement(tqparent) +RootElement::RootElement(BasicElement* parent) + : BasicElement(parent) { content = new RootSequenceElement( this ); index = 0; @@ -235,7 +235,7 @@ void RootElement::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 RootElement::draw( TQPainter& painter, const LuPixelRect& r, diff --git a/lib/kformula/rootelement.h b/lib/kformula/rootelement.h index 4908a643..1eacf4d4 100644 --- a/lib/kformula/rootelement.h +++ b/lib/kformula/rootelement.h @@ -38,7 +38,7 @@ public: //enum { contentPos, indexPos }; - RootElement(BasicElement* tqparent = 0); + RootElement(BasicElement* parent = 0); ~RootElement(); RootElement( const RootElement& ); @@ -75,7 +75,7 @@ public: /** * 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. */ virtual void draw( TQPainter& painter, const LuPixelRect& r, @@ -231,16 +231,16 @@ private: class RootElementIndex : public ElementIndex { public: - RootElementIndex(RootElement* p) : tqparent(p) {} + RootElementIndex(RootElement* p) : parent(p) {} virtual void moveToIndex(FormulaCursor* cursor, Direction direction) - { tqparent->moveToIndex(cursor, direction); } + { parent->moveToIndex(cursor, direction); } virtual void setToIndex(FormulaCursor* cursor) - { tqparent->setToIndex(cursor); } + { parent->setToIndex(cursor); } virtual bool hasIndex() const - { return tqparent->hasIndex(); } - virtual RootElement* getElement() { return tqparent; } + { return parent->hasIndex(); } + virtual RootElement* getElement() { return parent; } protected: - RootElement* tqparent; + RootElement* parent; }; diff --git a/lib/kformula/sequenceelement.cc b/lib/kformula/sequenceelement.cc index 78a95d95..93293db7 100644 --- a/lib/kformula/sequenceelement.cc +++ b/lib/kformula/sequenceelement.cc @@ -72,8 +72,8 @@ void SequenceElement::setStyle( StyleElement *st ) style = st; } -SequenceElement::SequenceElement(BasicElement* tqparent) - : BasicElement(tqparent), parseTree(0), textSequence(true),singlePipe(true), style(0) +SequenceElement::SequenceElement(BasicElement* parent) + : BasicElement(parent), parseTree(0), textSequence(true),singlePipe(true), style(0) { assert( creationStrategy != 0 ); tqchildren.setAutoDelete(true); @@ -247,7 +247,7 @@ void SequenceElement::setChildrenPositions() /** * 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 SequenceElement::draw( TQPainter& painter, const LuPixelRect& r, @@ -449,7 +449,7 @@ luPixel SequenceElement::getChildPosition( const ContextStyle& context, uint chi */ void SequenceElement::moveLeft(FormulaCursor* cursor, BasicElement* from) { - // Our tqparent asks us for a cursor position. Found. + // Our parent asks us for a cursor position. Found. if (from == getParent()) { cursor->setTo(this, tqchildren.count()); if ( cursor->isSelectionMode() ) { @@ -502,7 +502,7 @@ void SequenceElement::moveLeft(FormulaCursor* cursor, BasicElement* from) */ void SequenceElement::moveRight(FormulaCursor* cursor, BasicElement* from) { - // Our tqparent asks us for a cursor position. Found. + // Our parent asks us for a cursor position. Found. if (from == getParent()) { cursor->setTo(this, 0); from->entered( this ); @@ -741,8 +741,8 @@ bool SequenceElement::insert( uint index, BasicElement *child ) // tqchildren.remove(pos); // /* // if len(self.tqchildren) == 0: -// if self.tqparent != None: -// self.tqparent.removeChild(cursor, self) +// if self.parent != None: +// self.parent.removeChild(cursor, self) // return // */ // formula()->changed(); @@ -1411,11 +1411,11 @@ void SequenceElement::getChildrenDom( TQDomDocument& doc, TQDomElement elem, /** * Stores the given tqchildrens MathML dom in the element. */ -void SequenceElement::getChildrenMathMLDom( TQDomDocument& doc, TQDomNode& tqparent, +void SequenceElement::getChildrenMathMLDom( TQDomDocument& doc, TQDomNode& parent, uint from, uint to) { for ( uint i = from; i < to; i++ ) { - tqchildren.at( i )->writeMathML( doc, tqparent, false ); + tqchildren.at( i )->writeMathML( doc, parent, false ); } } @@ -1522,7 +1522,7 @@ void SequenceElement::parse() parseTree = parser.parse(tqchildren); // With the IndexElement dynamically changing its text/non-text - // behaviour we need to reparse your tqparent, too. Hacky! + // behaviour we need to reparse your parent, too. Hacky! BasicElement* p = getParent(); if ( p != 0 ) { SequenceElement* seq = dynamic_cast<SequenceElement*>( p->getParent() ); @@ -1600,8 +1600,8 @@ int SequenceElement::childPos( const BasicElement* child ) const } -NameSequence::NameSequence( BasicElement* tqparent ) - : SequenceElement( tqparent ) +NameSequence::NameSequence( BasicElement* parent ) + : SequenceElement( parent ) { } diff --git a/lib/kformula/sequenceelement.h b/lib/kformula/sequenceelement.h index 9696d3ad..4d32153c 100644 --- a/lib/kformula/sequenceelement.h +++ b/lib/kformula/sequenceelement.h @@ -41,7 +41,7 @@ class SequenceElement : public BasicElement { SequenceElement& operator=( const SequenceElement& ) { return *this; } public: - SequenceElement(BasicElement* tqparent = 0); + SequenceElement(BasicElement* parent = 0); ~SequenceElement(); SequenceElement( const SequenceElement& ); @@ -101,7 +101,7 @@ public: /** * 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. */ virtual void draw( TQPainter& painter, const LuPixelRect& r, @@ -493,7 +493,7 @@ class NameSequence : public SequenceElement { typedef SequenceElement inherited; public: - NameSequence( BasicElement* tqparent = 0 ); + NameSequence( BasicElement* parent = 0 ); virtual NameSequence* clone() { return new NameSequence( *this ); diff --git a/lib/kformula/spaceelement.cc b/lib/kformula/spaceelement.cc index f3f43d1c..a7e23464 100644 --- a/lib/kformula/spaceelement.cc +++ b/lib/kformula/spaceelement.cc @@ -33,8 +33,8 @@ KFORMULA_NAMESPACE_BEGIN -SpaceElement::SpaceElement( SpaceWidth space, bool tab, BasicElement* tqparent ) - : BasicElement( tqparent ), +SpaceElement::SpaceElement( SpaceWidth space, bool tab, BasicElement* parent ) + : BasicElement( parent ), m_tab( tab ), m_widthType( NoSize ), m_heightType( NoSize ), diff --git a/lib/kformula/spaceelement.h b/lib/kformula/spaceelement.h index 856af25e..a8c5ec9a 100644 --- a/lib/kformula/spaceelement.h +++ b/lib/kformula/spaceelement.h @@ -48,7 +48,7 @@ class SpaceElement : public BasicElement { SpaceElement operator=( const SpaceElement& ) { return *this; } public: - SpaceElement( SpaceWidth space = THIN, bool tab=false, BasicElement* tqparent = 0 ); + SpaceElement( SpaceWidth space = THIN, bool tab=false, BasicElement* parent = 0 ); SpaceElement( const SpaceElement& ); virtual SpaceElement* clone() { @@ -87,7 +87,7 @@ public: /** * 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. */ virtual void draw( TQPainter& painter, const LuPixelRect& r, diff --git a/lib/kformula/stringelement.cc b/lib/kformula/stringelement.cc index 2f13ad77..e9851033 100644 --- a/lib/kformula/stringelement.cc +++ b/lib/kformula/stringelement.cc @@ -22,7 +22,7 @@ KFORMULA_NAMESPACE_BEGIN -StringElement::StringElement( BasicElement* tqparent ) : TokenElement( tqparent ) +StringElement::StringElement( BasicElement* parent ) : TokenElement( parent ) { } diff --git a/lib/kformula/stringelement.h b/lib/kformula/stringelement.h index 447895db..6195fa45 100644 --- a/lib/kformula/stringelement.h +++ b/lib/kformula/stringelement.h @@ -27,7 +27,7 @@ KFORMULA_NAMESPACE_BEGIN class StringElement : public TokenElement { typedef TokenElement inherited; public: - StringElement( BasicElement* tqparent = 0 ); + StringElement( BasicElement* parent = 0 ); virtual int buildChildrenFromMathMLDom(TQPtrList<BasicElement>& list, TQDomNode n); protected: diff --git a/lib/kformula/styleelement.cc b/lib/kformula/styleelement.cc index fc61386c..3bb6b6b1 100644 --- a/lib/kformula/styleelement.cc +++ b/lib/kformula/styleelement.cc @@ -22,7 +22,7 @@ KFORMULA_NAMESPACE_BEGIN -StyleElement::StyleElement( BasicElement* tqparent ) : TokenStyleElement( tqparent ), +StyleElement::StyleElement( BasicElement* parent ) : TokenStyleElement( parent ), m_scriptMinSizeType( NoSize ), m_veryVeryThinMathSpaceType( NoSize ), m_veryThinMathSpaceType( NoSize ), @@ -88,7 +88,7 @@ bool StyleElement::readAttributesFromMathMLDom( const TQDomElement& element ) } TQString backgroundStr = element.attribute( "background" ); if ( ! backgroundStr.isNull() ) { - // TODO: trantqparent background + // TODO: tranparent background m_customBackground = true; if ( backgroundStr[0] != '#' ) { m_background = TQColor( getHtmlColor( backgroundStr ) ); diff --git a/lib/kformula/styleelement.h b/lib/kformula/styleelement.h index 7751a19a..ffe932b1 100644 --- a/lib/kformula/styleelement.h +++ b/lib/kformula/styleelement.h @@ -29,7 +29,7 @@ class StyleElement : public TokenStyleElement { typedef TokenStyleElement inherited; public: - StyleElement( BasicElement* tqparent = 0 ); + StyleElement( BasicElement* parent = 0 ); protected: diff --git a/lib/kformula/symbolaction.cc b/lib/kformula/symbolaction.cc index 6a80eeec..d5aa3176 100644 --- a/lib/kformula/symbolaction.cc +++ b/lib/kformula/symbolaction.cc @@ -101,16 +101,16 @@ void SymbolComboItem::paint( TQPainter *p ) /* * The symbol action * */ -SymbolAction::SymbolAction( TQObject* tqparent, const char* name ) - : KSelectAction( tqparent, name ) +SymbolAction::SymbolAction( TQObject* parent, const char* name ) + : KSelectAction( parent, name ) { setEditable( FALSE ); } SymbolAction::SymbolAction( const TQString& text, const KShortcut& cut, const TQObject* receiver, const char* slot, - TQObject* tqparent, const char* name ) - : KSelectAction( text, cut, receiver, slot, tqparent, name ) + TQObject* parent, const char* name ) + : KSelectAction( text, cut, receiver, slot, parent, name ) { setEditable( FALSE ); } diff --git a/lib/kformula/symbolaction.h b/lib/kformula/symbolaction.h index a8e7eadf..b3158014 100644 --- a/lib/kformula/symbolaction.h +++ b/lib/kformula/symbolaction.h @@ -32,9 +32,9 @@ KFORMULA_NAMESPACE_BEGIN class SymbolAction : public KSelectAction { public: - SymbolAction( TQObject* tqparent = 0, const char* name = 0 ); + SymbolAction( TQObject* parent = 0, const char* name = 0 ); SymbolAction( const TQString& text, const KShortcut& cut, - const TQObject* receiver, const char* slot, TQObject* tqparent, + const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); int plug( TQWidget*, int index = -1 ); diff --git a/lib/kformula/symbolelement.cc b/lib/kformula/symbolelement.cc index fb2eb69d..a601cea4 100644 --- a/lib/kformula/symbolelement.cc +++ b/lib/kformula/symbolelement.cc @@ -36,7 +36,7 @@ class SymbolSequenceElement : public SequenceElement { typedef SequenceElement inherited; public: - SymbolSequenceElement( BasicElement* tqparent = 0 ) : SequenceElement( tqparent ) {} + SymbolSequenceElement( BasicElement* parent = 0 ) : SequenceElement( parent ) {} /** * This is called by the container to get a command depending on @@ -87,8 +87,8 @@ KCommand* SymbolSequenceElement::buildCommand( Container* container, Request* re } -SymbolElement::SymbolElement(SymbolType type, BasicElement* tqparent) - : BasicElement(tqparent), symbol( 0 ), symbolType( type ) +SymbolElement::SymbolElement(SymbolType type, BasicElement* parent) + : BasicElement(parent), symbol( 0 ), symbolType( type ) { content = new SymbolSequenceElement( this ); upper = 0; @@ -300,7 +300,7 @@ void SymbolElement::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 SymbolElement::draw( TQPainter& painter, const LuPixelRect& r, @@ -586,9 +586,9 @@ void SymbolElement::remove(FormulaCursor* cursor, setToLower(cursor); break; case contentPos: { - BasicElement* tqparent = getParent(); - tqparent->selectChild(cursor, this); - tqparent->remove(cursor, removedChildren, direction); + BasicElement* parent = getParent(); + parent->selectChild(cursor, this); + parent->remove(cursor, removedChildren, direction); break; } } @@ -852,7 +852,7 @@ TQString SymbolElement::formulaString() return sym + ")"; } -void SymbolElement::writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool oasisFormat ) const +void SymbolElement::writeMathML( TQDomDocument& doc, TQDomNode& parent, bool oasisFormat ) const { TQDomElement de = doc.createElement( oasisFormat ? "math:mrow" : "mrow" ); TQDomElement mo = doc.createElement( oasisFormat ? "math:mo" : "mo" ); @@ -900,7 +900,7 @@ void SymbolElement::writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool o de.appendChild( between ); content->writeMathML( doc, de, oasisFormat ); - tqparent.appendChild( de ); + parent.appendChild( de ); } KFORMULA_NAMESPACE_END diff --git a/lib/kformula/symbolelement.h b/lib/kformula/symbolelement.h index 877c4493..0133258e 100644 --- a/lib/kformula/symbolelement.h +++ b/lib/kformula/symbolelement.h @@ -36,7 +36,7 @@ public: //enum { contentPos, upperPos, lowerPos }; - SymbolElement(SymbolType type = EmptyBracket, BasicElement* tqparent = 0); + SymbolElement(SymbolType type = EmptyBracket, BasicElement* parent = 0); ~SymbolElement(); SymbolElement( const SymbolElement& ); @@ -74,7 +74,7 @@ public: /** * 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. */ virtual void draw( TQPainter& painter, const LuPixelRect& r, @@ -227,7 +227,7 @@ public: virtual TQString formulaString(); - virtual void writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool oasisFormat = false ) const ; + virtual void writeMathML( TQDomDocument& doc, TQDomNode& parent, bool oasisFormat = false ) const ; protected: @@ -263,34 +263,34 @@ private: */ class SymbolElementIndex : public ElementIndex { public: - SymbolElementIndex(SymbolElement* p) : tqparent(p) {} - virtual SymbolElement* getElement() { return tqparent; } + SymbolElementIndex(SymbolElement* p) : parent(p) {} + virtual SymbolElement* getElement() { return parent; } protected: - SymbolElement* tqparent; + SymbolElement* parent; }; // We have a (very simple) type for every index. class UpperIndex : public SymbolElementIndex { public: - UpperIndex(SymbolElement* tqparent) : SymbolElementIndex(tqparent) {} + UpperIndex(SymbolElement* parent) : SymbolElementIndex(parent) {} virtual void moveToIndex(FormulaCursor* cursor, Direction direction) - { tqparent->moveToUpper(cursor, direction); } + { parent->moveToUpper(cursor, direction); } virtual void setToIndex(FormulaCursor* cursor) - { tqparent->setToUpper(cursor); } + { parent->setToUpper(cursor); } virtual bool hasIndex() const - { return tqparent->hasUpper(); } + { return parent->hasUpper(); } }; class LowerIndex : public SymbolElementIndex { public: - LowerIndex(SymbolElement* tqparent) : SymbolElementIndex(tqparent) {} + LowerIndex(SymbolElement* parent) : SymbolElementIndex(parent) {} virtual void moveToIndex(FormulaCursor* cursor, Direction direction) - { tqparent->moveToLower(cursor, direction); } + { parent->moveToLower(cursor, direction); } virtual void setToIndex(FormulaCursor* cursor) - { tqparent->setToLower(cursor); } + { parent->setToLower(cursor); } virtual bool hasIndex() const - { return tqparent->hasLower(); } + { return parent->hasLower(); } }; diff --git a/lib/kformula/textelement.cc b/lib/kformula/textelement.cc index c42a6e2f..c9826429 100644 --- a/lib/kformula/textelement.cc +++ b/lib/kformula/textelement.cc @@ -37,8 +37,8 @@ KFORMULA_NAMESPACE_BEGIN -TextElement::TextElement(TQChar ch, bool beSymbol, BasicElement* tqparent) - : BasicElement(tqparent), character(ch), symbol(beSymbol) +TextElement::TextElement(TQChar ch, bool beSymbol, BasicElement* parent) + : BasicElement(parent), character(ch), symbol(beSymbol) { charStyle( anyChar ); charFamily( anyFamily ); @@ -156,7 +156,7 @@ void TextElement::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 TextElement::draw( TQPainter& painter, const LuPixelRect& /*r*/, @@ -351,9 +351,9 @@ const SymbolTable& TextElement::getSymbolTable() const } -void TextElement::writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool ) const +void TextElement::writeMathML( TQDomDocument& doc, TQDomNode& parent, bool ) const { - tqparent.appendChild( doc.createTextNode( getCharacter() ) ); + parent.appendChild( doc.createTextNode( getCharacter() ) ); } /** @@ -501,8 +501,8 @@ TQString TextElement::formulaString() } -EmptyElement::EmptyElement( BasicElement* tqparent ) - : BasicElement( tqparent ) +EmptyElement::EmptyElement( BasicElement* parent ) + : BasicElement( parent ) { } diff --git a/lib/kformula/textelement.h b/lib/kformula/textelement.h index 48eb1d43..99b6e63a 100644 --- a/lib/kformula/textelement.h +++ b/lib/kformula/textelement.h @@ -38,7 +38,7 @@ class TextElement : public BasicElement { TextElement operator=( const TextElement& ) { return *this; } public: - TextElement(TQChar ch = ' ', bool beSymbol = false, BasicElement* tqparent = 0); + TextElement(TQChar ch = ' ', bool beSymbol = false, BasicElement* parent = 0); TextElement( const TextElement& ); virtual TextElement* clone() { @@ -82,7 +82,7 @@ public: /** * 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. */ virtual void draw( TQPainter& painter, const LuPixelRect& r, @@ -129,7 +129,7 @@ public: virtual TQString formulaString(); - virtual void writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool oasisFormat = false ) const ; + virtual void writeMathML( TQDomDocument& doc, TQDomNode& parent, bool oasisFormat = false ) const ; protected: @@ -226,7 +226,7 @@ class EmptyElement : public BasicElement { EmptyElement& operator=( const EmptyElement& ) { return *this; } public: - EmptyElement( BasicElement* tqparent = 0 ); + EmptyElement( BasicElement* parent = 0 ); EmptyElement( const EmptyElement& ); virtual EmptyElement* clone() { @@ -253,7 +253,7 @@ public: /** * 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. */ virtual void draw( TQPainter& painter, const LuPixelRect& r, diff --git a/lib/kformula/tokenelement.cc b/lib/kformula/tokenelement.cc index bb63c05f..272af51f 100644 --- a/lib/kformula/tokenelement.cc +++ b/lib/kformula/tokenelement.cc @@ -38,7 +38,7 @@ KFORMULA_NAMESPACE_BEGIN -TokenElement::TokenElement( BasicElement* tqparent ) : TokenStyleElement( tqparent ), +TokenElement::TokenElement( BasicElement* parent ) : TokenStyleElement( parent ), m_textOnly( true ) { } diff --git a/lib/kformula/tokenelement.h b/lib/kformula/tokenelement.h index 9982225b..571cc247 100644 --- a/lib/kformula/tokenelement.h +++ b/lib/kformula/tokenelement.h @@ -30,7 +30,7 @@ KFORMULA_NAMESPACE_BEGIN class TokenElement : public TokenStyleElement { typedef TokenStyleElement inherited; public: - TokenElement( BasicElement* tqparent = 0 ); + TokenElement( BasicElement* parent = 0 ); virtual int buildChildrenFromMathMLDom(TQPtrList<BasicElement>& list, TQDomNode n); diff --git a/lib/kformula/tokenstyleelement.cc b/lib/kformula/tokenstyleelement.cc index 3b1e6224..c8e4799f 100644 --- a/lib/kformula/tokenstyleelement.cc +++ b/lib/kformula/tokenstyleelement.cc @@ -24,7 +24,7 @@ KFORMULA_NAMESPACE_BEGIN -TokenStyleElement::TokenStyleElement( BasicElement* tqparent ) : SequenceElement( tqparent ), +TokenStyleElement::TokenStyleElement( BasicElement* parent ) : SequenceElement( parent ), m_mathSizeType ( NoSize ), m_charStyle( anyChar ), m_charFamily( anyFamily ), diff --git a/lib/kformula/tokenstyleelement.h b/lib/kformula/tokenstyleelement.h index 3e601ca8..3789a0f4 100644 --- a/lib/kformula/tokenstyleelement.h +++ b/lib/kformula/tokenstyleelement.h @@ -36,7 +36,7 @@ class TokenStyleElement : public SequenceElement { typedef SequenceElement inherited; public: - TokenStyleElement( BasicElement* tqparent = 0 ); + TokenStyleElement( BasicElement* parent = 0 ); virtual void calcSizes( const ContextStyle& context, ContextStyle::TextStyle tstyle, diff --git a/lib/kofficecore/KoChild.cpp b/lib/kofficecore/KoChild.cpp index 8394f59a..41dfee8f 100644 --- a/lib/kofficecore/KoChild.cpp +++ b/lib/kofficecore/KoChild.cpp @@ -50,8 +50,8 @@ public: int m_contentsY; }; -KoChild::KoChild( TQObject *tqparent, const char *name ) -: TQObject( tqparent, name ) +KoChild::KoChild( TQObject *parent, const char *name ) +: TQObject( parent, name ) { d = new KoChildPrivate; diff --git a/lib/kofficecore/KoChild.h b/lib/kofficecore/KoChild.h index 0dbc74be..b7285deb 100644 --- a/lib/kofficecore/KoChild.h +++ b/lib/kofficecore/KoChild.h @@ -26,7 +26,7 @@ /** * KoChild is an abstract base class that represents the tqgeometry * associated with an embedded document. In general it handles its position - * relative to the embedded document's tqparent. + * relative to the embedded document's parent. * * In detail it handles size, matrix operations and can give you * a clip region. It can deal with scaling, rotation etc. because it @@ -56,7 +56,7 @@ public: enum Gadget { NoGadget, TopLeft, TopMid, TopRight, MidLeft, MidRight, BottomLeft, BottomMid, BottomRight, Move }; - KoChild( TQObject *tqparent = 0, const char *name = 0 ); + KoChild( TQObject *parent = 0, const char *name = 0 ); virtual ~KoChild(); /** @@ -69,7 +69,7 @@ public: * @return the rectangle that would be used to display this * child document if the child is not rotated or * subject to some other geometric transformation. - * The rectangle is in the coordinate system of the tqparent, + * The rectangle is in the coordinate system of the parent, * using unzoomed coordinates in points. * * @see #setGeometry @@ -78,7 +78,7 @@ public: /** * @return the region of this child part relative to the - * coordinate system of the tqparent. + * coordinate system of the parent. * The region is transformed with the passed * matrix. */ @@ -86,7 +86,7 @@ public: /** * @return the polygon which surrounds the child part. The points - * are in coordinates of the tqparent. + * are in coordinates of the parent. * The points are transformed with the * passed matrix. */ @@ -94,14 +94,14 @@ public: /** * Tests whether the part contains a certain point. The point is - * in the coordinate system of the tqparent. + * in the coordinate system of the parent. */ //virtual bool contains( const TQPoint& ) const; /** * @return the effective bounding rect after all transformations. * The coordinates of the rectangle are in the coordinate system - * of the tqparent. + * of the parent. */ TQRect boundingRect() const; diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp index efddc96a..23376489 100644 --- a/lib/kofficecore/KoDetailsPane.cpp +++ b/lib/kofficecore/KoDetailsPane.cpp @@ -81,9 +81,9 @@ class KoTemplatesPanePrivate }; -KoTemplatesPane::KoTemplatesPane(TQWidget* tqparent, KInstance* instance, +KoTemplatesPane::KoTemplatesPane(TQWidget* parent, KInstance* instance, KoTemplateGroup *group, KoTemplate* /*defaultTemplate*/) - : KoDetailsPaneBase(tqparent, "TemplatesPane") + : KoDetailsPaneBase(parent, "TemplatesPane") { d = new KoTemplatesPanePrivate; d->m_instance = instance; @@ -268,8 +268,8 @@ class KoRecentDocumentsPanePrivate KInstance* m_instance; }; -KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* tqparent, KInstance* instance) - : KoDetailsPaneBase(tqparent, "RecentDocsPane") +KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* parent, KInstance* instance) + : KoDetailsPaneBase(parent, "RecentDocsPane") { d = new KoRecentDocumentsPanePrivate; d->m_instance = instance; diff --git a/lib/kofficecore/KoDetailsPane.h b/lib/kofficecore/KoDetailsPane.h index bee6f14a..7264cd78 100644 --- a/lib/kofficecore/KoDetailsPane.h +++ b/lib/kofficecore/KoDetailsPane.h @@ -40,7 +40,7 @@ class KoTemplatesPanePrivate; /** * This widget is the right-side part of the template opening widget. - * The tqparent widget is initial widget in the document space of each KOffice component. + * The parent widget is initial widget in the document space of each KOffice component. * This widget shows a list of templates and can show their details or open it. */ class KoTemplatesPane : public KoDetailsPaneBase @@ -50,13 +50,13 @@ class KoTemplatesPane : public KoDetailsPaneBase public: /** * Constructor. - * @param tqparent the tqparent widget + * @param parent the parent widget * @param instance the instance object for the app * @param group the group of templates this widget will show. * @param defaultTemplate pointer to the default template. Used to select a * template when none has been selected before. */ - KoTemplatesPane(TQWidget* tqparent, KInstance* instance, + KoTemplatesPane(TQWidget* parent, KInstance* instance, KoTemplateGroup* group, KoTemplate* defaultTemplate); ~KoTemplatesPane(); @@ -91,7 +91,7 @@ class KoTemplatesPane : public KoDetailsPaneBase /** * This widget is the recent doc part of the template opening widget. - * The tqparent widget is initial widget in the document space of each KOffice component. + * The parent widget is initial widget in the document space of each KOffice component. * This widget shows a list of recent documents and can show their details or open it. */ class KoRecentDocumentsPane : public KoDetailsPaneBase @@ -101,10 +101,10 @@ class KoRecentDocumentsPane : public KoDetailsPaneBase public: /** * Constructor. - * @param tqparent the tqparent widget + * @param parent the parent widget * @param instance the instance object for the app */ - KoRecentDocumentsPane(TQWidget* tqparent, KInstance* instance); + KoRecentDocumentsPane(TQWidget* parent, KInstance* instance); ~KoRecentDocumentsPane(); virtual bool eventFilter(TQObject* watched, TQEvent* e); diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index a579e925..2bd0e3b4 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -165,8 +165,8 @@ public: class KoViewWrapperWidget : public TQWidget { public: - KoViewWrapperWidget( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) + KoViewWrapperWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { KGlobal::locale()->insertCatalogue("koffice"); // Tell the iconloader about share/apps/koffice/icons @@ -211,7 +211,7 @@ KoBrowserExtension::KoBrowserExtension( KoDocument * doc, const char * name ) void KoBrowserExtension::print() { - KoDocument * doc = static_cast<KoDocument *>( tqparent() ); + KoDocument * doc = static_cast<KoDocument *>( parent() ); KoViewWrapperWidget * wrapper = static_cast<KoViewWrapperWidget *>( doc->widget() ); KoView * view = wrapper->koView(); // TODO remove code duplication (KoMainWindow), by moving this to KoView @@ -222,8 +222,8 @@ void KoBrowserExtension::print() view->print( printer ); } -KoDocument::KoDocument( TQWidget * parentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode ) - : KParts::ReadWritePart( tqparent, name ) +KoDocument::KoDocument( TQWidget * parentWidget, const char *widgetName, TQObject* parent, const char* name, bool singleViewMode ) + : KParts::ReadWritePart( parent, name ) { if(s_documentList==0L) s_documentList=new TQPtrList<KoDocument>; @@ -236,12 +236,12 @@ KoDocument::KoDocument( TQWidget * parentWidget, const char *widgetName, TQObjec d->m_bSingleViewMode = singleViewMode; - // the tqparent setting *always* overrides! (Simon) - if ( tqparent ) + // the parent setting *always* overrides! (Simon) + if ( parent ) { - if ( tqparent->inherits( "KoDocument" ) ) - d->m_bSingleViewMode = ((KoDocument *)tqparent)->isSingleViewMode(); - else if ( tqparent->inherits( "KParts::Part" ) ) + if ( parent->inherits( "KoDocument" ) ) + d->m_bSingleViewMode = ((KoDocument *)parent)->isSingleViewMode(); + else if ( parent->inherits( "KParts::Part" ) ) d->m_bSingleViewMode = true; } @@ -309,12 +309,12 @@ bool KoDocument::isSingleViewMode() const bool KoDocument::isEmbedded() const { - return dynamic_cast<KoDocument *>( tqparent() ) != 0; + return dynamic_cast<KoDocument *>( parent() ) != 0; } -KoView *KoDocument::createView( TQWidget *tqparent, const char *name ) +KoView *KoDocument::createView( TQWidget *parent, const char *name ) { - KoView *view=createViewInstance(tqparent, name); + KoView *view=createViewInstance(parent, name); addView(view); return view; } @@ -2056,7 +2056,7 @@ int KoDocument::queryCloseExternalChildren() void KoDocument::setTitleModified( const TQString caption, bool mod ) { //kdDebug(30003)<<k_funcinfo<<" url: "<<url().url()<<" caption: "<<caption<<" mod: "<<mod<<endl; - KoDocument *doc = dynamic_cast<KoDocument *>( tqparent() ); + KoDocument *doc = dynamic_cast<KoDocument *>( parent() ); if ( doc ) { doc->setTitleModified( caption, mod ); @@ -2075,7 +2075,7 @@ void KoDocument::setTitleModified( const TQString caption, bool mod ) void KoDocument::setTitleModified() { //kdDebug(30003)<<k_funcinfo<<" url: "<<url().url()<<" extern: "<<isStoredExtern()<<" current: "<<d->m_current<<endl; - KoDocument *doc = dynamic_cast<KoDocument *>( tqparent() ); + KoDocument *doc = dynamic_cast<KoDocument *>( parent() ); TQString caption; if ( (url().isEmpty() || isStoredExtern()) && d->m_current ) { @@ -2429,7 +2429,7 @@ TQString KoDocument::backupPath()const void KoDocument::setCurrent( bool on ) { //kdDebug(30003)<<k_funcinfo<<" url: "<<url().url()<<" set to: "<<on<<endl; - KoDocument *doc = dynamic_cast<KoDocument *>( tqparent() ); + KoDocument *doc = dynamic_cast<KoDocument *>( parent() ); if ( doc ) { if ( !isStoredExtern() ) @@ -2442,7 +2442,7 @@ void KoDocument::setCurrent( bool on ) d->m_current = on; if ( !on ) { - doc->setCurrent( true ); // let my next external tqparent take over + doc->setCurrent( true ); // let my next external parent take over return; } doc->forceCurrent( false ); // everybody else should keep off @@ -2457,7 +2457,7 @@ void KoDocument::forceCurrent( bool on ) { //kdDebug(30003)<<k_funcinfo<<" url: "<<url().url()<<" force to: "<<on<<endl; d->m_current = on; - KoDocument *doc = dynamic_cast<KoDocument *>( tqparent() ); + KoDocument *doc = dynamic_cast<KoDocument *>( parent() ); if ( doc ) { doc->forceCurrent( false ); @@ -2542,7 +2542,7 @@ TQString KoDocument::unitName() const return KoUnit::unitName( unit() ); } -void KoDocument::showStartUpWidget( KoMainWindow* tqparent, bool alwaysShow ) +void KoDocument::showStartUpWidget( KoMainWindow* parent, bool alwaysShow ) { if(!alwaysShow) { KConfigGroup cfgGrp( instance()->config(), "TemplateChooserDialog" ); @@ -2558,11 +2558,11 @@ void KoDocument::showStartUpWidget( KoMainWindow* tqparent, bool alwaysShow ) if(d->m_startUpWidget){ d->m_startUpWidget->show(); } else { - d->m_startUpWidget = createOpenPane( tqparent->centralWidget(), instance(), templateType() ); + d->m_startUpWidget = createOpenPane( parent->centralWidget(), instance(), templateType() ); } - tqparent->setDocToOpen( this ); - tqparent->factory()->container("mainToolBar", tqparent)->hide(); + parent->setDocToOpen( this ); + parent->factory()->container("mainToolBar", parent)->hide(); } void KoDocument::openExistingFile( const TQString& file ) @@ -2600,10 +2600,10 @@ void KoDocument::startCustomDocument() { deleteOpenPane(); } -KoOpenPane* KoDocument::createOpenPane( TQWidget* tqparent, KInstance* instance, +KoOpenPane* KoDocument::createOpenPane( TQWidget* parent, KInstance* instance, const TQString& templateType ) { - KoOpenPane* openPane = new KoOpenPane( tqparent, instance, templateType ); + KoOpenPane* openPane = new KoOpenPane( parent, instance, templateType ); TQWidget *customDoc = createCustomDocumentWidget(openPane); if(customDoc) { openPane->setCustomDocumentWidget( customDoc ); @@ -2648,13 +2648,13 @@ void KoDocument::deleteOpenPaneDelayed() d->m_startUpWidget = 0; } -TQWidget* KoDocument::createCustomDocumentWidget(TQWidget */*tqparent*/) { +TQWidget* KoDocument::createCustomDocumentWidget(TQWidget */*parent*/) { return 0; } -bool KoDocument::showEmbedInitDialog(TQWidget* tqparent) +bool KoDocument::showEmbedInitDialog(TQWidget* parent) { - KDialogBase dlg(tqparent, "EmbedInitDialog", true, i18n("Embedding Object"), 0, KDialogBase::NoDefault); + KDialogBase dlg(parent, "EmbedInitDialog", true, i18n("Embedding Object"), 0, KDialogBase::NoDefault); KoOpenPane* pane = createOpenPane(&dlg, instance(), templateType()); pane->tqlayout()->setMargin(0); dlg.setMainWidget(pane); diff --git a/lib/kofficecore/KoDocument.h b/lib/kofficecore/KoDocument.h index 4051cca6..ac6de7e8 100644 --- a/lib/kofficecore/KoDocument.h +++ b/lib/kofficecore/KoDocument.h @@ -71,16 +71,16 @@ public: * Constructor. * The first 4 arguments are the same as the ones passed to KParts::Factory::createPart. * - * @param parentWidget the tqparent widget, in case we create a wrapper widget + * @param parentWidget the parent widget, in case we create a wrapper widget * (in single view mode). * Usually the first argument passed by KParts::Factory::createPart. * @param widgetName name of the widget. - * @param tqparent may be another KoDocument, or anything else. + * @param parent may be another KoDocument, or anything else. * Usually the third argument of KParts::Factory::createPart. * @param name is used to identify this document via DCOP so you may want to * pass a meaningful name here which matches the pattern [A-Za-z_][A-Za-z_0-9]*. * @param singleViewMode determines whether the document may only have one view. In this case - * the @p tqparent must be a TQWidget derived class. KoDocument will then create a wrapper widget + * the @p parent must be a TQWidget derived class. KoDocument will then create a wrapper widget * (KoViewWrapperWidget) which is a child of @p parentWidget. * This widget can be retrieved by calling widget(). * @@ -88,7 +88,7 @@ public: */ KoDocument( TQWidget* parentWidget, const char* widgetName, - TQObject* tqparent, + TQObject* parent, const char* name, bool singleViewMode = false ); @@ -328,7 +328,7 @@ public: /** * Create a new view for the document. */ - KoView *createView( TQWidget *tqparent = 0, const char *name = 0 ); + KoView *createView( TQWidget *parent = 0, const char *name = 0 ); /** * Adds a view to the document. @@ -465,11 +465,11 @@ public: /** * Creates and shows the start up widget. - * @param tqparent the KoMainWindow used as tqparent for the widget. + * @param parent the KoMainWindow used as parent for the widget. * @param alwaysShow always show the widget even if the user has configured it to not show. * @since 1.5 */ - virtual void showStartUpWidget(KoMainWindow* tqparent, bool alwaysShow = false); + virtual void showStartUpWidget(KoMainWindow* parent, bool alwaysShow = false); /** * Sets the modified flag on the document. This means that it has @@ -908,10 +908,10 @@ public: /** * Shows the init dialog when embeding - * @param tqparent the tqparent widget + * @param parent the parent widget * @since 1.5 */ - virtual bool showEmbedInitDialog(TQWidget* tqparent); + virtual bool showEmbedInitDialog(TQWidget* parent); public slots: /** @@ -988,7 +988,7 @@ protected: TQString autoSaveFile( const TQString & path ) const; - virtual KoView *createViewInstance( TQWidget *tqparent, const char *name ) = 0; + virtual KoView *createViewInstance( TQWidget *parent, const char *name ) = 0; /** * Loads a document from KReadOnlyPart::m_file (KParts takes care of downloading @@ -1016,9 +1016,9 @@ protected: * implement the logic to implement the document instance correctly. * After initializing the widget should emit a signal called 'documentSelected()' which * will remove the startupWidget and show the document. - * @param tqparent the tqparent of the to be created widget. + * @param parent the parent of the to be created widget. */ - virtual TQWidget* createCustomDocumentWidget(TQWidget *tqparent); + virtual TQWidget* createCustomDocumentWidget(TQWidget *parent); /** * OLD XML method. For OASIS just call KoDocumentChild::loadOasisDocument @@ -1122,12 +1122,12 @@ protected: /** * Creates the open widget showed at application start up. - * @param tqparent the tqparent widget + * @param parent the parent widget * @param instance the KInstance to be used for KConfig data * @param templateType the template-type (group) that should be selected on creation. * @since 1.5 */ - KoOpenPane* createOpenPane( TQWidget* tqparent, KInstance* instance, + KoOpenPane* createOpenPane( TQWidget* parent, KInstance* instance, const TQString& templateType = TQString()); private slots: diff --git a/lib/kofficecore/KoDocumentChild.cpp b/lib/kofficecore/KoDocumentChild.cpp index 38c4439a..0767ab04 100644 --- a/lib/kofficecore/KoDocumentChild.cpp +++ b/lib/kofficecore/KoDocumentChild.cpp @@ -67,11 +67,11 @@ public: bool m_deleted; }; -KoDocumentChild::KoDocumentChild( KoDocument* tqparent, KoDocument* doc, const TQRect& tqgeometry ) - : KoChild( tqparent ) +KoDocumentChild::KoDocumentChild( KoDocument* parent, KoDocument* doc, const TQRect& tqgeometry ) + : KoChild( parent ) { d = new KoDocumentChildPrivate; - d->m_parent = tqparent; + d->m_parent = parent; d->m_doc = doc; setGeometry( tqgeometry ); d->m_deleted = false; @@ -79,11 +79,11 @@ KoDocumentChild::KoDocumentChild( KoDocument* tqparent, KoDocument* doc, const T doc->setStoreInternal( !doc->hasExternURL() ); } -KoDocumentChild::KoDocumentChild( KoDocument* tqparent ) - : KoChild( tqparent ) +KoDocumentChild::KoDocumentChild( KoDocument* parent ) + : KoChild( parent ) { d = new KoDocumentChildPrivate; - d->m_parent = tqparent; + d->m_parent = parent; d->m_doc = 0L; d->m_deleted = false; } @@ -351,14 +351,14 @@ bool KoDocumentChild::loadDocumentInternal( KoStore* store, const KoDocumentEntr // now :-) if ( parentDocument() ) { - KoDocument *tqparent = parentDocument(); + KoDocument *parent = parentDocument(); - if ( tqparent->manager() && tqparent->manager()->parts() ) + if ( parent->manager() && parent->manager()->parts() ) { - KParts::PartManager *manager = tqparent->manager(); + KParts::PartManager *manager = parent->manager(); if ( !manager->parts()->containsRef( d->m_doc ) && - !tqparent->isSingleViewMode() ) + !parent->isSingleViewMode() ) manager->addPart( d->m_doc, false ); } } @@ -395,7 +395,7 @@ bool KoDocumentChild::saveOasis( KoStore* store, KoXmlWriter* manifestWriter ) else { // The name comes from KoDocumentChild (which was set while saving the - // tqparent document). + // parent document). assert( d->m_doc->url().protocol() == INTERNAL_PROTOCOL ); const TQString name = d->m_doc->url().path(); kdDebug() << k_funcinfo << "saving " << name << endl; diff --git a/lib/kofficecore/KoDocumentChild.h b/lib/kofficecore/KoDocumentChild.h index 491f9b2d..de3704c0 100644 --- a/lib/kofficecore/KoDocumentChild.h +++ b/lib/kofficecore/KoDocumentChild.h @@ -45,19 +45,19 @@ class KOFFICECORE_EXPORT KoDocumentChild : public KoChild Q_OBJECT TQ_OBJECT public: - KoDocumentChild( KoDocument* tqparent, KoDocument* doc, const TQRect& tqgeometry ); + KoDocumentChild( KoDocument* parent, KoDocument* doc, const TQRect& tqgeometry ); /** * When using this constructor you must call @ref #setDocument before * you can call any other function of this class. */ - KoDocumentChild( KoDocument* tqparent ); + KoDocumentChild( KoDocument* parent ); virtual ~KoDocumentChild(); /** * Call this function only directly after calling the constructor - * that takes only a tqparent as argument. + * that takes only a parent as argument. */ virtual void setDocument( KoDocument *doc, const TQRect &tqgeometry ); @@ -69,7 +69,7 @@ public: KoDocument *document() const; /** - * @return tqparent document of this child + * @return parent document of this child * * @see KoDocument */ @@ -98,7 +98,7 @@ public: /** * Save an embedded object to OASIS. - * This method sets the attributes for the draw:object element in the tqparent XML document. + * This method sets the attributes for the draw:object element in the parent XML document. * It also prepares the embedded object for being saved into the store at * the end of saving (see saveOasisToStore). * Note that @p name is only used for "internal" documents (not extern). @@ -107,7 +107,7 @@ public: /** * Save an embedded object to an OASIS store. - * This is called automatically by the tqparent KoDocument's saveOasis + * This is called automatically by the parent KoDocument's saveOasis */ virtual bool saveOasis( KoStore* store, KoXmlWriter* manifestWriter ); diff --git a/lib/kofficecore/KoDocumentInfo.cpp b/lib/kofficecore/KoDocumentInfo.cpp index f6a3fe69..cd4ecbaf 100644 --- a/lib/kofficecore/KoDocumentInfo.cpp +++ b/lib/kofficecore/KoDocumentInfo.cpp @@ -42,8 +42,8 @@ * *****************************************/ -KoDocumentInfo::KoDocumentInfo( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +KoDocumentInfo::KoDocumentInfo( TQObject* parent, const char* name ) + : TQObject( parent, name ) { (void)new KoDocumentInfoUserMetadata( this ); (void)new KoDocumentInfoAuthor( this ); @@ -194,8 +194,8 @@ TQString KoDocumentInfo::creator() const * *****************************************/ -KoDocumentInfoPage::KoDocumentInfoPage( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +KoDocumentInfoPage::KoDocumentInfoPage( TQObject* parent, const char* name ) + : TQObject( parent, name ) { } @@ -634,7 +634,7 @@ KoDocumentInfoAbout::KoDocumentInfoAbout( KoDocumentInfo* info ) void KoDocumentInfoAbout::saveParameters() { - KoDocument* doc = dynamic_cast< KoDocument* >( m_docInfo->tqparent() ); + KoDocument* doc = dynamic_cast< KoDocument* >( m_docInfo->parent() ); if ( m_firstSave && doc && !doc->isAutosaving() ) m_editingCycles++; m_modificationDate = TQDateTime::tqcurrentDateTime(); diff --git a/lib/kofficecore/KoDocumentInfo.h b/lib/kofficecore/KoDocumentInfo.h index b94a2de0..454763ac 100644 --- a/lib/kofficecore/KoDocumentInfo.h +++ b/lib/kofficecore/KoDocumentInfo.h @@ -41,7 +41,7 @@ class KOFFICECORE_EXPORT KoDocumentInfo : public TQObject Q_OBJECT TQ_OBJECT public: - KoDocumentInfo( TQObject* tqparent = 0, const char* name = 0 ); + KoDocumentInfo( TQObject* parent = 0, const char* name = 0 ); virtual ~KoDocumentInfo(); bool load( const TQDomDocument& doc ); @@ -67,7 +67,7 @@ public: class KOFFICECORE_EXPORT KoDocumentInfoPage : public TQObject { public: - KoDocumentInfoPage( TQObject *tqparent, const char* name ); + KoDocumentInfoPage( TQObject *parent, const char* name ); virtual bool load( const TQDomElement& e ) = 0; virtual TQDomElement save( TQDomDocument& doc ) = 0; diff --git a/lib/kofficecore/KoDocumentInfoDlg.cpp b/lib/kofficecore/KoDocumentInfoDlg.cpp index 786e3982..f32616dd 100644 --- a/lib/kofficecore/KoDocumentInfoDlg.cpp +++ b/lib/kofficecore/KoDocumentInfoDlg.cpp @@ -79,9 +79,9 @@ public: KDialogBase *m_dialog; }; -KoDocumentInfoDlg::KoDocumentInfoDlg( KoDocumentInfo *docInfo, TQWidget *tqparent, const char *name, +KoDocumentInfoDlg::KoDocumentInfoDlg( KoDocumentInfo *docInfo, TQWidget *parent, const char *name, KDialogBase *dialog ) -: TQObject( tqparent, "docinfodlg" ) +: TQObject( parent, "docinfodlg" ) { d = new KoDocumentInfoDlgPrivate; d->m_info = docInfo; @@ -94,7 +94,7 @@ KoDocumentInfoDlg::KoDocumentInfoDlg( KoDocumentInfo *docInfo, TQWidget *tqparen d->m_dialog = new KDialogBase( KDialogBase::Tabbed, i18n( "Document Information" ), KDialogBase::Ok | KDialogBase::Cancel, - KDialogBase::Ok, tqparent, name, true, false ); + KDialogBase::Ok, parent, name, true, false ); d->m_dialog->setInitialSize( TQSize( 500, 500 ) ); d->m_bDeleteDialog = true; } @@ -257,7 +257,7 @@ void KoDocumentInfoDlg::addAboutPage( KoDocumentInfoAbout *aboutInfo ) TQVBox *page = d->m_dialog->addVBoxPage( i18n( "General" ) ); d->m_aboutWidget = new KoDocumentInfoAboutWidget( page ); d->m_aboutWidget->pbReset->setIconSet( TQIconSet( KGlobal::iconLoader()->loadIcon( "reload", KIcon::Small ) ) ); - KoDocument* doc = dynamic_cast< KoDocument* >( d->m_info->tqparent() ); + KoDocument* doc = dynamic_cast< KoDocument* >( d->m_info->parent() ); if ( doc ) { d->m_aboutWidget->leDocFile->setText( doc->file() ); diff --git a/lib/kofficecore/KoDocumentInfoDlg.h b/lib/kofficecore/KoDocumentInfoDlg.h index d346c4c1..8589b6a0 100644 --- a/lib/kofficecore/KoDocumentInfoDlg.h +++ b/lib/kofficecore/KoDocumentInfoDlg.h @@ -37,7 +37,7 @@ class KOFFICECORE_EXPORT KoDocumentInfoDlg : public TQObject Q_OBJECT TQ_OBJECT public: - KoDocumentInfoDlg( KoDocumentInfo *docInfo, TQWidget *tqparent = 0, const char *name = 0, + KoDocumentInfoDlg( KoDocumentInfo *docInfo, TQWidget *parent = 0, const char *name = 0, KDialogBase *dialog = 0 ); virtual ~KoDocumentInfoDlg(); diff --git a/lib/kofficecore/KoDom.h b/lib/kofficecore/KoDom.h index 688110f0..a88cb22d 100644 --- a/lib/kofficecore/KoDom.h +++ b/lib/kofficecore/KoDom.h @@ -30,7 +30,7 @@ * * To find all child elements with a given name, use * TQDomElement e; - * forEachElement( e, tqparent ) + * forEachElement( e, parent ) * { * if ( e.localName() == "..." && e.namespaceURI() == KoXmlNS::... ) * { @@ -62,8 +62,8 @@ namespace KoDom { } -#define forEachElement( elem, tqparent ) \ - for ( TQDomNode _node = tqparent.firstChild(); !_node.isNull(); _node = _node.nextSibling() ) \ +#define forEachElement( elem, parent ) \ + for ( TQDomNode _node = parent.firstChild(); !_node.isNull(); _node = _node.nextSibling() ) \ if ( !( elem = _node.toElement() ).isNull() ) #endif /* KODOM_H */ diff --git a/lib/kofficecore/KoFactory.cpp b/lib/kofficecore/KoFactory.cpp index 9e6a4a18..cc89ac84 100644 --- a/lib/kofficecore/KoFactory.cpp +++ b/lib/kofficecore/KoFactory.cpp @@ -31,8 +31,8 @@ public: } }; -KoFactory::KoFactory( TQObject *tqparent, const char *name ) - : KParts::Factory( tqparent, name ) +KoFactory::KoFactory( TQObject *parent, const char *name ) + : KParts::Factory( parent, name ) { //d = new KoFactoryPrivate; } diff --git a/lib/kofficecore/KoFactory.h b/lib/kofficecore/KoFactory.h index e0d6b2b7..7a8a5a87 100644 --- a/lib/kofficecore/KoFactory.h +++ b/lib/kofficecore/KoFactory.h @@ -29,7 +29,7 @@ class KOFFICECORE_EXPORT KoFactory : public KParts::Factory Q_OBJECT TQ_OBJECT public: - KoFactory( TQObject *tqparent = 0, const char *name = 0 ); + KoFactory( TQObject *parent = 0, const char *name = 0 ); virtual ~KoFactory(); private: diff --git a/lib/kofficecore/KoFileDialog.cpp b/lib/kofficecore/KoFileDialog.cpp index 9f581a4e..2a7bd315 100644 --- a/lib/kofficecore/KoFileDialog.cpp +++ b/lib/kofficecore/KoFileDialog.cpp @@ -26,9 +26,9 @@ #include <kdebug.h> KoFileDialog::KoFileDialog(const TQString& startDir, const TQString& filter, - TQWidget *tqparent, const char *name, + TQWidget *parent, const char *name, bool modal) - : KFileDialog( startDir, filter, tqparent, name, modal ) + : KFileDialog( startDir, filter, parent, name, modal ) { connect( filterWidget, TQT_SIGNAL( activated( int) ), this, TQT_SLOT( slotChangedfilter( int ) ) ); diff --git a/lib/kofficecore/KoFileDialog.h b/lib/kofficecore/KoFileDialog.h index 1482bf36..7c702cac 100644 --- a/lib/kofficecore/KoFileDialog.h +++ b/lib/kofficecore/KoFileDialog.h @@ -38,7 +38,7 @@ class KoFileDialog : public KFileDialog TQ_OBJECT public: KoFileDialog( const TQString& startDir, const TQString& filter, - TQWidget *tqparent, const char *name, + TQWidget *parent, const char *name, bool modal ); void setSpecialMimeFilter( TQStringList& mimeFilter, const TQString& currentFormat, const int specialOutputFlag, diff --git a/lib/kofficecore/KoFilter.h b/lib/kofficecore/KoFilter.h index 0f087252..77439648 100644 --- a/lib/kofficecore/KoFilter.h +++ b/lib/kofficecore/KoFilter.h @@ -135,7 +135,7 @@ private: * @ref #endInternalEmbedding accordingly. Try to use the previous method if possible. * * If you're using this class you can also setup a signal/slot communication - * between tqparent and child filter. To make that work you simply have to define + * between parent and child filter. To make that work you simply have to define * signals and slots along the following rules: * Signals should be named "commSignal\<name\>" where \<name\> is the name of the signal, * slots should be named "commSlot\<name\>". The connection will be done automatically diff --git a/lib/kofficecore/KoFilterChain.cpp b/lib/kofficecore/KoFilterChain.cpp index e10e624b..471d6098 100644 --- a/lib/kofficecore/KoFilterChain.cpp +++ b/lib/kofficecore/KoFilterChain.cpp @@ -90,13 +90,13 @@ void KoFilterChain::ChainLink::setupCommunication( const KoFilter* const parentF if ( !parentFilter ) return; - const TQMetaObject* const tqparent = parentFilter->tqmetaObject(); + const TQMetaObject* const parent = parentFilter->tqmetaObject(); const TQMetaObject* const child = m_filter->tqmetaObject(); - if ( !tqparent || !child ) + if ( !parent || !child ) return; - setupConnections( parentFilter, tqparent->signalNames(), m_filter, child->slotNames() ); - setupConnections( m_filter, child->signalNames(), parentFilter, tqparent->slotNames() ); + setupConnections( parentFilter, parent->signalNames(), m_filter, child->slotNames() ); + setupConnections( m_filter, child->signalNames(), parentFilter, parent->slotNames() ); } void KoFilterChain::ChainLink::setupConnections( const KoFilter* sender, const TQStrList& sigs, @@ -406,7 +406,7 @@ void KoFilterChain::manageIO() if ( m_outputStorage ) { m_outputStorage->close(); // Don't delete the storage if we're just pointing to the - // storage of the tqparent filter chain + // storage of the parent filter chain if ( !filterManagerParentChain() || m_outputStorage->mode() != KoStore::Write ) delete m_outputStorage; m_outputStorage = 0; @@ -544,7 +544,7 @@ KoStoreDevice* KoFilterChain::storageInitEmbedding( const TQString& name ) m_outputStorage = filterManagerParentChain()->m_outputStorage; if ( !m_outputStorage ) { - // If the storage of the tqparent hasn't been initialized yet, + // If the storage of the parent hasn't been initialized yet, // we have to do that here. Quite nasty... storageInit( filterManagerParentChain()->outputFile(), KoStore::Write, &m_outputStorage ); @@ -600,7 +600,7 @@ KoStoreDevice* KoFilterChain::storageCreateFirstStream( const TQString& streamNa KoStoreDevice* KoFilterChain::storageCleanupHelper( KoStore** storage ) { - // Take care not to delete the storage of the tqparent chain + // Take care not to delete the storage of the parent chain if ( *storage != m_outputStorage || !filterManagerParentChain() || ( *storage )->mode() != KoStore::Write ) delete *storage; diff --git a/lib/kofficecore/KoFilterChain.h b/lib/kofficecore/KoFilterChain.h index 7760a217..d926c613 100644 --- a/lib/kofficecore/KoFilterChain.h +++ b/lib/kofficecore/KoFilterChain.h @@ -123,7 +123,7 @@ public: private: // ### API for KOffice::Graph: // Construct a filter chain belonging to some KoFilterManager. - // The tqparent filter manager may be 0. + // The parent filter manager may be 0. KoFilterChain( const KoFilterManager* manager ); void appendChainLink( KoFilterEntry::Ptr filterEntry, const TQCString& from, const TQCString& to ); diff --git a/lib/kofficecore/KoFilterManager.cpp b/lib/kofficecore/KoFilterManager.cpp index 91522fbb..31a1e43e 100644 --- a/lib/kofficecore/KoFilterManager.cpp +++ b/lib/kofficecore/KoFilterManager.cpp @@ -48,8 +48,8 @@ public: }; -KoFilterChooser::KoFilterChooser (TQWidget *tqparent, const TQStringList &mimeTypes, const TQString &nativeFormat) - : KDialogBase (tqparent, "kofilterchooser", true, i18n ("Choose Filter"), +KoFilterChooser::KoFilterChooser (TQWidget *parent, const TQStringList &mimeTypes, const TQString &nativeFormat) + : KDialogBase (parent, "kofilterchooser", true, i18n ("Choose Filter"), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true), m_mimeTypes (mimeTypes) { diff --git a/lib/kofficecore/KoFilterManager.h b/lib/kofficecore/KoFilterManager.h index de75bf27..5f0641f4 100644 --- a/lib/kofficecore/KoFilterManager.h +++ b/lib/kofficecore/KoFilterManager.h @@ -66,7 +66,7 @@ public: * to specify this information only if the automatic detection will * fail because e.g. you saved an embedded stream to a *.tmp file. * Most likely you do not have to care about that. - * @param parentChain The tqparent filter chain of this filter manager. Used + * @param parentChain The parent filter chain of this filter manager. Used * to allow embedding for filters. Most likely you do not have to care. */ KoFilterManager( const TQString& url, const TQCString& mimetypeHint = "", diff --git a/lib/kofficecore/KoFilterManager_p.h b/lib/kofficecore/KoFilterManager_p.h index 358c25cd..0e8a0762 100644 --- a/lib/kofficecore/KoFilterManager_p.h +++ b/lib/kofficecore/KoFilterManager_p.h @@ -33,7 +33,7 @@ Q_OBJECT TQ_OBJECT public: - KoFilterChooser (TQWidget *tqparent, const TQStringList &mimeTypes, + KoFilterChooser (TQWidget *parent, const TQStringList &mimeTypes, const TQString &nativeFormat = TQString()); ~KoFilterChooser (); diff --git a/lib/kofficecore/KoFrame.cpp b/lib/kofficecore/KoFrame.cpp index f11ba9f0..906e73f4 100644 --- a/lib/kofficecore/KoFrame.cpp +++ b/lib/kofficecore/KoFrame.cpp @@ -48,8 +48,8 @@ public: KoFrame::State m_state; }; -KoFrame::KoFrame( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +KoFrame::KoFrame( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { d = new KoFramePrivate; d->m_state = Inactive; diff --git a/lib/kofficecore/KoFrame.h b/lib/kofficecore/KoFrame.h index fbb40bbb..77b3d1c3 100644 --- a/lib/kofficecore/KoFrame.h +++ b/lib/kofficecore/KoFrame.h @@ -32,7 +32,7 @@ class KoFrame : public TQWidget public: enum State { Inactive, Selected, Active }; - KoFrame( TQWidget *tqparent, const char *name = 0 ); + KoFrame( TQWidget *parent, const char *name = 0 ); virtual ~KoFrame(); virtual void setView( KoView *view ); diff --git a/lib/kofficecore/KoGenStyles.cpp b/lib/kofficecore/KoGenStyles.cpp index 221288df..5c8f680f 100644 --- a/lib/kofficecore/KoGenStyles.cpp +++ b/lib/kofficecore/KoGenStyles.cpp @@ -33,24 +33,24 @@ TQString KoGenStyles::lookup( const KoGenStyle& style, const TQString& name, int { StyleMap::iterator it = m_styleMap.find( style ); if ( it == m_styleMap.end() ) { - // Not found, try if this style is in fact equal to its tqparent (the find above + // Not found, try if this style is in fact equal to its parent (the find above // wouldn't have found it, due to m_parentName being set). if ( !style.parentName().isEmpty() ) { KoGenStyle testStyle( style ); const KoGenStyle* parentStyle = this->style( style.parentName() ); // ## linear search if( !parentStyle ) { - kdDebug(30003) << "KoGenStyles::lookup(" << name << "): tqparent style '" << style.parentName() << "' not found in collection" << endl; + kdDebug(30003) << "KoGenStyles::lookup(" << name << "): parent style '" << style.parentName() << "' not found in collection" << endl; } else { if ( testStyle.m_familyName != parentStyle->m_familyName ) { - kdWarning(30003) << "KoGenStyles::lookup(" << name << ", family=" << testStyle.m_familyName << ") tqparent style '" << style.parentName() << "' has a different family: " << parentStyle->m_familyName << endl; + kdWarning(30003) << "KoGenStyles::lookup(" << name << ", family=" << testStyle.m_familyName << ") parent style '" << style.parentName() << "' has a different family: " << parentStyle->m_familyName << endl; } testStyle.m_parentName = parentStyle->m_parentName; // Exclude the type from the comparison. It's ok for an auto style - // to have a user style as tqparent; they can still be identical + // to have a user style as parent; they can still be identical testStyle.m_type = parentStyle->m_type; - // Also it's ok to not have the display name of the tqparent style + // Also it's ok to not have the display name of the parent style // in the auto style TQMap<TQString, TQString>::const_iterator it = parentStyle->m_attributes.find( "style:display-name" ); if ( it != parentStyle->m_attributes.end() ) @@ -211,13 +211,13 @@ void KoGenStyle::writeStyle( KoXmlWriter* writer, KoGenStyles& styles, const cha if ( !m_parentName.isEmpty() ) { parentStyle = styles.style( m_parentName ); if ( parentStyle && m_familyName.isEmpty() ) { - // get family from tqparent style, just in case + // get family from parent style, just in case // Note: this is saving code, don't convert to attributeNS! const_cast<KoGenStyle *>( this )-> m_familyName = parentStyle->attribute( "style:family" ).latin1(); - //kdDebug(30003) << "Got familyname " << m_familyName << " from tqparent" << endl; + //kdDebug(30003) << "Got familyname " << m_familyName << " from parent" << endl; } - writer->addAttribute( "style:tqparent-style-name", m_parentName ); + writer->addAttribute( "style:parent-style-name", m_parentName ); } } else { // default-style Q_ASSERT( qstrcmp( elementName, "style:default-style" ) == 0 ); @@ -235,13 +235,13 @@ void KoGenStyle::writeStyle( KoXmlWriter* writer, KoGenStyles& styles, const cha kdDebug() << "style: " << name << endl; printDebug(); if ( parentStyle ) { - kdDebug() << " tqparent: " << m_parentName << endl; + kdDebug() << " parent: " << m_parentName << endl; parentStyle->printDebug(); } #endif - // Write attributes [which differ from the tqparent style] - // We only look at the direct tqparent style because we assume + // Write attributes [which differ from the parent style] + // We only look at the direct parent style because we assume // that styles are fully specified, i.e. the inheritance is // only in the final file, not in the caller's code. TQMap<TQString, TQString>::const_iterator it = m_attributes.begin(); diff --git a/lib/kofficecore/KoGenStyles.h b/lib/kofficecore/KoGenStyles.h index 67f46da1..2a54f944 100644 --- a/lib/kofficecore/KoGenStyles.h +++ b/lib/kofficecore/KoGenStyles.h @@ -216,7 +216,7 @@ public: * @param familyName The value for style:family, e.g. text, paragraph, graphic etc. * The family is for style:style elements only; number styles and list styles don't have one. * - * @param parentName If set, name of the tqparent style from which this one inherits. + * @param parentName If set, name of the parent style from which this one inherits. */ explicit KoGenStyle( int type = 0, const char* familyName = 0, const TQString& parentName = TQString() ); @@ -249,7 +249,7 @@ public: /// Return the family name const char* familyName() const { return m_familyName.data(); } - /// Return the name of style's tqparent, if set + /// Return the name of style's parent, if set TQString parentName() const { return m_parentName; } /** @@ -379,7 +379,7 @@ public: /** * @return true if the style has no attributes, no properties, no style map etc. * This can be used by applications which do not save all attributes unconditionally, - * but only those that differ from the tqparent. But note that lookup() can't find this out... + * but only those that differ from the parent. But note that lookup() can't find this out... */ bool isEmpty() const { if ( !m_attributes.isEmpty() || ! m_maps.isEmpty() ) @@ -393,7 +393,7 @@ public: /** * Write the definition of this style to @p writer, using the OASIS format. * @param writer the KoXmlWriter in which @p elementName will be created and filled in - * @param styles the styles collection, used to look up the tqparent style + * @param styles the styles collection, used to look up the parent style * @param elementName the name of the XML element, e.g. "style:style". Don't forget to * pass style:default-style if isDefaultStyle(). * @param name must come from the collection. It will be ignored if isDefaultStyle() is true. diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index 4e30d64a..5e4567de 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -63,15 +63,15 @@ class KoPartManager : public KParts::PartManager { public: - KoPartManager( TQWidget * tqparent, const char * name = 0L ) - : KParts::PartManager( tqparent, name ) + KoPartManager( TQWidget * parent, const char * name = 0L ) + : KParts::PartManager( parent, name ) { setSelectionPolicy( KParts::PartManager::TriState ); setAllowNestedParts( true ); setIgnoreScrollBars( true ); // Allow right-click on embedded objects (without activating them) - // But beware: this means right-click on tqparent, from embedded object, - // doesn't make the tqparent active first... + // But beware: this means right-click on parent, from embedded object, + // doesn't make the parent active first... setActivationButtonMask( Qt::LeftButton | Qt::MidButton ); } virtual bool eventFilter( TQObject *obj, TQEvent *ev ) diff --git a/lib/kofficecore/KoOasisLoadingContext.cpp b/lib/kofficecore/KoOasisLoadingContext.cpp index 3db850e4..3386daf8 100644 --- a/lib/kofficecore/KoOasisLoadingContext.cpp +++ b/lib/kofficecore/KoOasisLoadingContext.cpp @@ -68,9 +68,9 @@ void KoOasisLoadingContext::addStyles( const TQDomElement* style, const char* fa { Q_ASSERT( style ); if ( !style ) return; - // this recursive function is necessary as tqparent styles can have parents themselves - if ( style->hasAttributeNS( KoXmlNS::style, "tqparent-style-name" ) ) { - const TQString parentStyleName = style->attributeNS( KoXmlNS::style, "tqparent-style-name", TQString() ); + // this recursive function is necessary as parent styles can have parents themselves + if ( style->hasAttributeNS( KoXmlNS::style, "parent-style-name" ) ) { + const TQString parentStyleName = style->attributeNS( KoXmlNS::style, "parent-style-name", TQString() ); const TQDomElement* parentStyle = 0; if ( usingStylesAutoStyles ) { // When loading something from styles.xml, look into the styles.xml auto styles first diff --git a/lib/kofficecore/KoOasisLoadingContext.h b/lib/kofficecore/KoOasisLoadingContext.h index 880d4117..c36a0fb1 100644 --- a/lib/kofficecore/KoOasisLoadingContext.h +++ b/lib/kofficecore/KoOasisLoadingContext.h @@ -68,7 +68,7 @@ public: * * Read attribute (nsURI,attrName) from the given dom element, * treat that attribute as a style name, and load that style - * including all its tqparent styles. + * including all its parent styles. * @param element the dom element to read the attribute from * @param nsURI the namespace URI of the attribute to read * @param attrName the name of the attribute to read @@ -77,12 +77,12 @@ public: void fillStyleStack( const TQDomElement& element, const char* nsURI, const char* attrName, const char* family ); /** - * Add @p style to the stack, as well as all its tqparent styles + * Add @p style to the stack, as well as all its parent styles * and the default style for this style family. * * @param style the dom element containing the style to add to the stack - * @param family the family to use when looking up tqparent styles - * @param usingStylesAutoStyles if true, the tqparent styles are looked up + * @param family the family to use when looking up parent styles + * @param usingStylesAutoStyles if true, the parent styles are looked up * in the automatic styles from styles.xml, instead of looking up * in the automatic styles from content.xml as we usually do. * This is useful for loading headers and footers for instance. diff --git a/lib/kofficecore/KoOasisStyles.cpp b/lib/kofficecore/KoOasisStyles.cpp index fe4ee658..fe88a11b 100644 --- a/lib/kofficecore/KoOasisStyles.cpp +++ b/lib/kofficecore/KoOasisStyles.cpp @@ -224,11 +224,11 @@ void KoOasisStyles::insertStyle( const TQDomElement& e, bool styleAutoStyles ) // OO spec 2.5.4. p68. Conversion to TQt format: see qdate.html // OpenCalcImport::loadFormat has similar code, but slower, intermixed with other stuff, // lacking long-textual forms. -void KoOasisStyles::importDataStyle( const TQDomElement& tqparent ) +void KoOasisStyles::importDataStyle( const TQDomElement& parent ) { NumericStyleFormat dataStyle; - const TQString localName = tqparent.localName(); + const TQString localName = parent.localName(); if (localName == "number-style") dataStyle.type = NumericStyleFormat::Number; else if (localName == "currency-style") @@ -255,7 +255,7 @@ void KoOasisStyles::importDataStyle( const TQDomElement& tqparent ) TQDomElement e; TQString prefix; TQString suffix; - forEachElement( e, tqparent ) + forEachElement( e, parent ) { if ( e.namespaceURI() != KoXmlNS::number ) continue; @@ -446,7 +446,7 @@ void KoOasisStyles::importDataStyle( const TQDomElement& tqparent ) } - const TQString styleName = tqparent.attributeNS( KoXmlNS::style, "name", TQString() ); + const TQString styleName = parent.attributeNS( KoXmlNS::style, "name", TQString() ); kdDebug(30003) << "data style: " << styleName << " qt format=" << format << endl; if ( !prefix.isEmpty() ) { diff --git a/lib/kofficecore/KoOasisStyles.h b/lib/kofficecore/KoOasisStyles.h index 9a8e64e4..dfa9e468 100644 --- a/lib/kofficecore/KoOasisStyles.h +++ b/lib/kofficecore/KoOasisStyles.h @@ -137,7 +137,7 @@ private: private: void insertOfficeStyles( const TQDomElement& styles ); void insertStyle( const TQDomElement& style, bool styleAutoStyles ); - void importDataStyle( const TQDomElement& tqparent ); + void importDataStyle( const TQDomElement& parent ); static bool saveOasisTimeFormat( KoXmlWriter &elementWriter, TQString & format, TQString & text, bool &antislash ); static void parseOasisDateKlocale(KoXmlWriter &elementWriter, TQString & format, TQString & text ); static bool saveOasisKlocaleTimeFormat( KoXmlWriter &elementWriter, TQString & format, TQString & text ); diff --git a/lib/kofficecore/KoOpenPane.cpp b/lib/kofficecore/KoOpenPane.cpp index 6c7cbb86..83978239 100644 --- a/lib/kofficecore/KoOpenPane.cpp +++ b/lib/kofficecore/KoOpenPane.cpp @@ -94,8 +94,8 @@ class KoOpenPanePrivate KInstance* m_instance; }; -KoOpenPane::KoOpenPane(TQWidget *tqparent, KInstance* instance, const TQString& templateType) - : KoOpenPaneBase(tqparent, "OpenPane") +KoOpenPane::KoOpenPane(TQWidget *parent, KInstance* instance, const TQString& templateType) + : KoOpenPaneBase(parent, "OpenPane") { d = new KoOpenPanePrivate; d->m_instance = instance; diff --git a/lib/kofficecore/KoOpenPane.h b/lib/kofficecore/KoOpenPane.h index 818c6e81..64f799d8 100644 --- a/lib/kofficecore/KoOpenPane.h +++ b/lib/kofficecore/KoOpenPane.h @@ -39,11 +39,11 @@ class KoOpenPane : public KoOpenPaneBase public: /** * Constructor - * @param tqparent the tqparent widget + * @param parent the parent widget * @param instance the KInstance to be used for KConfig data * @param templateType the template-type (group) that should be selected on creation. */ - KoOpenPane(TQWidget *tqparent, KInstance* instance, const TQString& templateType = TQString()); + KoOpenPane(TQWidget *parent, KInstance* instance, const TQString& templateType = TQString()); virtual ~KoOpenPane(); TQListViewItem* addPane(const TQString& title, const TQString& icon, TQWidget* widget, int sortWeight); diff --git a/lib/kofficecore/KoPicture.h b/lib/kofficecore/KoPicture.h index 3fa355f8..63dd9c59 100644 --- a/lib/kofficecore/KoPicture.h +++ b/lib/kofficecore/KoPicture.h @@ -179,8 +179,8 @@ public: * Download and set the key for a possibly remote file. * * @param url the url to download from - * @param window the tqparent widget for the download. You can pass - * NULL (0) if you absolutely cannot find a tqparent + * @param window the parent widget for the download. You can pass + * NULL (0) if you absolutely cannot find a parent * widget to use. */ bool setKeyAndDownloadPicture(const KURL& url, TQWidget *window); @@ -204,7 +204,7 @@ public: void setAlphaBuffer(bool enable); /** - * Creates an alpha tqmask for the picture + * Creates an alpha mask for the picture * (first you have to call @ref #setAlphaBuffer). * * @see hasAlphaBuffer() setAlphaBuffer() diff --git a/lib/kofficecore/KoPictureCollection.h b/lib/kofficecore/KoPictureCollection.h index 8071d564..8d96761c 100644 --- a/lib/kofficecore/KoPictureCollection.h +++ b/lib/kofficecore/KoPictureCollection.h @@ -71,7 +71,7 @@ public: * If this file is really remote, it is always downloaded. * If the file is local, it acts as @ref #loadPicture. * @param url the URL to download from - * @param window the tqparent window for the download. You can pass NULL (0) + * @param window the parent window for the download. You can pass NULL (0) * if you absolutely cannot find anything to use. */ KoPicture downloadPicture(const KURL& url, TQWidget *window); diff --git a/lib/kofficecore/KoQueryTrader.cpp b/lib/kofficecore/KoQueryTrader.cpp index e164aa1a..0003d00d 100644 --- a/lib/kofficecore/KoQueryTrader.cpp +++ b/lib/kofficecore/KoQueryTrader.cpp @@ -48,7 +48,7 @@ KoDocumentEntry::KoDocumentEntry( KService::Ptr service ) { } -KoDocument* KoDocumentEntry::createDoc( KoDocument* tqparent, const char* name ) const +KoDocument* KoDocumentEntry::createDoc( KoDocument* parent, const char* name ) const { KLibFactory* factory = KLibLoader::self()->factory( TQFile::encodeName(m_service->library()) ); @@ -59,10 +59,10 @@ KoDocument* KoDocumentEntry::createDoc( KoDocument* tqparent, const char* name ) TQObject* obj; if ( factory->inherits( "KParts::Factory" ) ) - obj = static_cast<KParts::Factory *>(factory)->createPart( 0L, "", tqparent, name, "KoDocument" ); + obj = static_cast<KParts::Factory *>(factory)->createPart( 0L, "", parent, name, "KoDocument" ); else { kdWarning(30003) << "factory doesn't inherit KParts::Factory ! It is a " << factory->className() << endl; // This shouldn't happen... - obj = factory->create( tqparent, name, "KoDocument" ); + obj = factory->create( parent, name, "KoDocument" ); } if ( !obj || !obj->inherits( "KoDocument" ) ) @@ -192,7 +192,7 @@ TQValueList<KoFilterEntry::Ptr> KoFilterEntry::query( const TQString & _constr ) return lst; } -KoFilter* KoFilterEntry::createFilter( KoFilterChain* chain, TQObject* tqparent, const char* name ) +KoFilter* KoFilterEntry::createFilter( KoFilterChain* chain, TQObject* parent, const char* name ) { KLibFactory* factory = KLibLoader::self()->factory( TQFile::encodeName( m_service->library() ) ); @@ -201,7 +201,7 @@ KoFilter* KoFilterEntry::createFilter( KoFilterChain* chain, TQObject* tqparent, return 0; } - TQObject* obj = factory->create( tqparent, name, "KoFilter" ); + TQObject* obj = factory->create( parent, name, "KoFilter" ); if ( !obj || !obj->inherits( "KoFilter" ) ) { delete obj; diff --git a/lib/kofficecore/KoQueryTrader.h b/lib/kofficecore/KoQueryTrader.h index 54fa811e..c945d5a6 100644 --- a/lib/kofficecore/KoQueryTrader.h +++ b/lib/kofficecore/KoQueryTrader.h @@ -70,7 +70,7 @@ public: * Uses the factory of the component to create * a document. If that is not possible, 0 is returned. */ - KoDocument* createDoc( KoDocument* tqparent = 0, const char* name = 0 ) const; + KoDocument* createDoc( KoDocument* parent = 0, const char* name = 0 ) const; /** * This function will query ksycoca to find all available components. @@ -126,7 +126,7 @@ public: KoFilterEntry( KService::Ptr service ); ~KoFilterEntry() { } - KoFilter* createFilter( KoFilterChain* chain, TQObject* tqparent = 0, const char* name = 0 ); + KoFilter* createFilter( KoFilterChain* chain, TQObject* parent = 0, const char* name = 0 ); /** * The imported mimetype(s). diff --git a/lib/kofficecore/KoStyleStack.cpp b/lib/kofficecore/KoStyleStack.cpp index 9920c289..1f64c4d6 100644 --- a/lib/kofficecore/KoStyleStack.cpp +++ b/lib/kofficecore/KoStyleStack.cpp @@ -171,7 +171,7 @@ bool KoStyleStack::hasAttributeNS( const char* nsURI, const char* name, const ch return false; } -// Font size is a bit special. "115%" applies to "the fontsize of the tqparent style". +// Font size is a bit special. "115%" applies to "the fontsize of the parent style". // This can be generalized though (hasAttributeThatCanBePercentOfParent() ? :) // Although, if we also add support for fo:font-size-rel here then it's not general anymore. double KoStyleStack::fontSize() const @@ -258,9 +258,9 @@ bool KoStyleStack::isUserStyle( const TQDomElement& e, const TQString& family ) { if ( e.attributeNS( m_styleNSURI, "family", TQString() ) != family ) return false; - const TQDomElement tqparent = e.parentNode().toElement(); - //kdDebug(30003) << k_funcinfo << "tagName=" << e.tagName() << " tqparent-tagName=" << tqparent.tagName() << endl; - return tqparent.localName() == "styles" /*&& tqparent.namespaceURI() == KoXmlNS::office*/; + const TQDomElement parent = e.parentNode().toElement(); + //kdDebug(30003) << k_funcinfo << "tagName=" << e.tagName() << " parent-tagName=" << parent.tagName() << endl; + return parent.localName() == "styles" /*&& parent.namespaceURI() == KoXmlNS::office*/; } TQString KoStyleStack::userStyleName( const TQString& family ) const diff --git a/lib/kofficecore/KoStyleStack.h b/lib/kofficecore/KoStyleStack.h index 4fbc1793..6c188989 100644 --- a/lib/kofficecore/KoStyleStack.h +++ b/lib/kofficecore/KoStyleStack.h @@ -36,7 +36,7 @@ * There can be several styles that are valid for one object. For example * a textobject on a page has styles 'pr3' and 'P7' and a paragraph in * that textobject has styles 'P1' and 'T3'. And some styles even have - * tqparent-styles... + * parent-styles... * * If you want to know if there is, for example, the attribute 'fo:font-family' * for this paragraph, you have to look into style 'T3', 'P1', 'P7' and 'pr3'. @@ -54,7 +54,7 @@ * * In general though, you wouldn't use push/pop directly, but KoOasisLoadingContext::fillStyleStack * or KoOasisLoadingContext::addStyles to automatically push a style and all its - * tqparent styles onto the stack. + * parent styles onto the stack. */ class KOFFICECORE_EXPORT KoStyleStack { diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp index e2b9775e..debb9f7c 100644 --- a/lib/kofficecore/KoView.cpp +++ b/lib/kofficecore/KoView.cpp @@ -106,8 +106,8 @@ public: bool m_inOperation; //in the middle of an operation (no screen refreshing)? }; -KoView::KoView( KoDocument *document, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +KoView::KoView( KoDocument *document, TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { Q_ASSERT( document ); @@ -538,7 +538,7 @@ void KoView::slotChildActivated( bool a ) if ( n == (TQObject *)view ) return; else - n = n->tqparent(); + n = n->parent(); d->m_tempActiveWidget = activeWidget; diff --git a/lib/kofficecore/KoView.h b/lib/kofficecore/KoView.h index 42d78fb6..93eb8971 100644 --- a/lib/kofficecore/KoView.h +++ b/lib/kofficecore/KoView.h @@ -68,12 +68,12 @@ public: * * @param document is the document which should be displayed in this view. This pointer * must not be zero. - * @param tqparent tqparent widget for this view. + * @param parent parent widget for this view. * @param name Name of the view. The name is used in DCOP, so the name should * match the pattern [A-Za-z_][A-Za-z_0-9]*. * */ - KoView( KoDocument *document, TQWidget *tqparent = 0, const char *name = 0 ); + KoView( KoDocument *document, TQWidget *parent = 0, const char *name = 0 ); /** * Destroys the view and unregisters at the document. */ diff --git a/lib/kofficecore/KoXmlReader.cpp b/lib/kofficecore/KoXmlReader.cpp index 52e6d8ae..3b2d3efb 100644 --- a/lib/kofficecore/KoXmlReader.cpp +++ b/lib/kofficecore/KoXmlReader.cpp @@ -173,7 +173,7 @@ public: TQString nodeName() const; // for tree and linked-list - KoXmlNodeData* tqparent; + KoXmlNodeData* parent; KoXmlNodeData* prev; KoXmlNodeData* next; KoXmlNodeData* first; @@ -295,7 +295,7 @@ KoXmlNodeData::KoXmlNodeData() textData = TQString(); count = 1; - tqparent = 0; + parent = 0; prev = next = 0; first = last = 0; @@ -333,7 +333,7 @@ void KoXmlNodeData::clear() attr.clear(); attrNS.clear(); - tqparent = 0; + parent = 0; prev = next = 0; first = last = 0; @@ -389,15 +389,15 @@ KoXmlNodeData* KoXmlNodeData::ownerDocument() { KoXmlNodeData* owner = this; - while( owner->tqparent ) - owner = owner->tqparent; + while( owner->parent ) + owner = owner->parent; return (owner->nodeType==KoXmlNode::DocumentNode) ? owner : 0; } void KoXmlNodeData::appendChild( KoXmlNodeData* node ) { - node->tqparent = this; + node->parent = this; if( !last ) first = last = node; else @@ -678,7 +678,7 @@ const TQString& name, const TQXmlAttributes& atts ) // construct a new element element = new KoXmlNodeData; element->nodeType = KoXmlNode::ElementNode; - element->tqparent = currentNode; + element->parent = currentNode; element->namespaceURI = nsURI; element->prefix = nodePrefix; element->localName = nodeLocalName; @@ -744,7 +744,7 @@ const TQString& name, const TQXmlAttributes& atts ) // construct a new element element = new KoXmlNodeData; element->nodeType = KoXmlNode::ElementNode; - element->tqparent = currentNode; + element->parent = currentNode; element->namespaceURI = TQString(); element->prefix = TQString(); element->localName = TQString(); @@ -810,7 +810,7 @@ const TQString& qName ) // sanity check if( !currentNode ) return false; - if( !currentNode->tqparent ) return false; + if( !currentNode->parent ) return false; // see comments in startElement about first element and on-demand loading if( rootNode->nodeType == KoXmlNode::DocumentNode ) @@ -826,7 +826,7 @@ const TQString& qName ) // go up one level if( elementDepth <= maxDepth ) - currentNode = currentNode->tqparent; + currentNode = currentNode->parent; // we are going up one level elementDepth--; @@ -856,7 +856,7 @@ bool KoXmlHandler::characters( const TQString& str ) { KoXmlNodeData* cdata = new KoXmlNodeData; cdata->nodeType = KoXmlNode::CDATASectionNode; - cdata->tqparent = currentNode; + cdata->parent = currentNode; cdata->setData( str ); currentNode->appendChild( cdata ); } @@ -871,7 +871,7 @@ bool KoXmlHandler::characters( const TQString& str ) { KoXmlNodeData* text = new KoXmlNodeData; text->nodeType = KoXmlNode::TextNode; - text->tqparent = currentNode; + text->parent = currentNode; text->setData( str ); currentNode->appendChild( text ); } @@ -893,7 +893,7 @@ const TQString& data ) KoXmlNodeData* instruction = new KoXmlNodeData; instruction->nodeType = KoXmlNode::ProcessingInstructionNode; - instruction->tqparent = currentNode; + instruction->parent = currentNode; instruction->tagName = target; instruction->setData( data ); @@ -1101,7 +1101,7 @@ TQString KoXmlNode::localName() const KoXmlDocument KoXmlNode::ownerDocument() const { KoXmlNodeData* node = d; - while( node->tqparent ) node = node->tqparent; + while( node->parent ) node = node->parent; if( node->nodeType != DocumentNode ) return KoXmlDocument(); return KoXmlDocument( node ); @@ -1109,7 +1109,7 @@ KoXmlDocument KoXmlNode::ownerDocument() const KoXmlNode KoXmlNode::parentNode() const { - return d->tqparent ? KoXmlNode( d->tqparent ) : KoXmlNode(); + return d->parent ? KoXmlNode( d->parent ) : KoXmlNode(); } bool KoXmlNode::hasChildNodes() const diff --git a/lib/kofficecore/KoXmlReader.h b/lib/kofficecore/KoXmlReader.h index d4505398..cdce2938 100644 --- a/lib/kofficecore/KoXmlReader.h +++ b/lib/kofficecore/KoXmlReader.h @@ -54,7 +54,7 @@ class KoXmlNodeData; * KoXmlNode is a base class for KoXmlElement, KoXmlText. * Often, these subclasses are used for getting the data instead of KoXmlNode. * However, as base class, KoXmlNode is very helpful when for example iterating - * all child nodes within one tqparent node. + * all child nodes within one parent node. * * KoXmlNode implements an explicit sharing, a node shares its data with * other copies (if exist). @@ -267,7 +267,7 @@ private: * * To find all child elements with a given name, use * TQDomElement e; - * forEachElement( e, tqparent ) + * forEachElement( e, parent ) * { * if ( e.localName() == "..." && e.namespaceURI() == KoXmlNS::... ) * { @@ -312,8 +312,8 @@ namespace KoXml { } -#define forEachElement( elem, tqparent ) \ - for ( KoXmlNode _node = tqparent.firstChild(); !_node.isNull(); _node = _node.nextSibling() ) \ +#define forEachElement( elem, parent ) \ + for ( KoXmlNode _node = parent.firstChild(); !_node.isNull(); _node = _node.nextSibling() ) \ if ( !( elem = _node.toElement() ).isNull() ) diff --git a/lib/kofficecore/Koversiondialog.cpp b/lib/kofficecore/Koversiondialog.cpp index a9fc2182..188d5888 100644 --- a/lib/kofficecore/Koversiondialog.cpp +++ b/lib/kofficecore/Koversiondialog.cpp @@ -38,8 +38,8 @@ #include "Koversiondialog.h" -KoVersionDialog::KoVersionDialog( TQWidget* tqparent, const char* name ) - : KDialogBase( tqparent, name, true, i18n("Version"), Ok|Cancel ) +KoVersionDialog::KoVersionDialog( TQWidget* parent, const char* name ) + : KDialogBase( parent, name, true, i18n("Version"), Ok|Cancel ) { TQWidget* page = new TQWidget( this ); setMainWidget( page ); @@ -121,8 +121,8 @@ void KoVersionDialog::slotOk() accept(); } -KoVersionModifyDialog::KoVersionModifyDialog( TQWidget* tqparent, const TQString &/*comment*/, const char* name ) - : KDialogBase( tqparent, name, true, i18n("Comment"), Ok|Cancel ) +KoVersionModifyDialog::KoVersionModifyDialog( TQWidget* parent, const TQString &/*comment*/, const char* name ) + : KDialogBase( parent, name, true, i18n("Comment"), Ok|Cancel ) { TQWidget* page = new TQWidget( this ); setMainWidget( page ); diff --git a/lib/kofficecore/Koversiondialog.h b/lib/kofficecore/Koversiondialog.h index e357e964..547e518a 100644 --- a/lib/kofficecore/Koversiondialog.h +++ b/lib/kofficecore/Koversiondialog.h @@ -32,7 +32,7 @@ class KoVersionDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - KoVersionDialog( TQWidget* tqparent, const char* name = 0L ); + KoVersionDialog( TQWidget* parent, const char* name = 0L ); ~KoVersionDialog(); public slots: @@ -59,7 +59,7 @@ class KoVersionModifyDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - KoVersionModifyDialog( TQWidget* tqparent, const TQString &_comment = TQString() , const char* name = 0L ); + KoVersionModifyDialog( TQWidget* parent, const TQString &_comment = TQString() , const char* name = 0L ); TQString comment() const; diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp index dccc913a..9535c14a 100644 --- a/lib/kofficecore/kkbdaccessextensions.cpp +++ b/lib/kofficecore/kkbdaccessextensions.cpp @@ -157,18 +157,18 @@ class KKbdAccessExtensionsPrivate KMainWindow* mainWindow; }; -KKbdAccessExtensions::KKbdAccessExtensions(KMainWindow* tqparent, const char* name) : - TQObject(tqparent, name) +KKbdAccessExtensions::KKbdAccessExtensions(KMainWindow* parent, const char* name) : + TQObject(parent, name) { // kdDebug() << "KKbdAccessExtensions::KKbdAccessExtensions: running." << endl; d = new KKbdAccessExtensionsPrivate; - d->mainWindow = tqparent; + d->mainWindow = parent; d->fwdAction = new KAction(i18n("Resize Panel Forward"), KShortcut("F8"), - 0, 0, tqparent->actionCollection(), "resize_panel_forward"); + 0, 0, parent->actionCollection(), "resize_panel_forward"); d->revAction = new KAction(i18n("Resize Panel Reverse"), KShortcut("Shift+F8"), - 0, 0, tqparent->actionCollection(), "resize_panel_reverse"); + 0, 0, parent->actionCollection(), "resize_panel_reverse"); d->accessKeysAction = new KAction(i18n("Access Keys"), KShortcut("Alt+F8"), - 0, 0, tqparent->actionCollection(), "access_keys"); + 0, 0, parent->actionCollection(), "access_keys"); // "Disable" the shortcuts so we can see them in eventFilter. d->fwdAction->setEnabled(false); d->revAction->setEnabled(false); diff --git a/lib/kofficecore/kkbdaccessextensions.h b/lib/kofficecore/kkbdaccessextensions.h index bc68cb28..e520b1ec 100644 --- a/lib/kofficecore/kkbdaccessextensions.h +++ b/lib/kofficecore/kkbdaccessextensions.h @@ -114,10 +114,10 @@ class KOFFICECORE_EXPORT KKbdAccessExtensions : public TQObject public: /** Constructor. - * @param tqparent KMainWindow of the application. Required. + * @param parent KMainWindow of the application. Required. * @param name (optional) Name of this object. */ - KKbdAccessExtensions(KMainWindow* tqparent, const char* name = 0); + KKbdAccessExtensions(KMainWindow* parent, const char* name = 0); /** Destructor. */ virtual ~KKbdAccessExtensions(); diff --git a/lib/kofficecore/priorityqueue.h b/lib/kofficecore/priorityqueue.h index a9a5c770..b657ab73 100644 --- a/lib/kofficecore/priorityqueue.h +++ b/lib/kofficecore/priorityqueue.h @@ -86,7 +86,7 @@ namespace KOffice { private: // Note: We have to use a 1-based index here, and we get/return 0-based ones - int tqparent( int i ) { return ( ( i + 1 ) >> 1 ) - 1; } + int parent( int i ) { return ( ( i + 1 ) >> 1 ) - 1; } int left( int i ) { return ( ( i + 1 ) << 1 ) - 1; } int right( int i ) { return ( i + 1 ) << 1; } @@ -190,14 +190,14 @@ namespace KOffice { template<class T> void PriorityQueue<T>::bubbleUp( T* item, int i ) { - int p = tqparent( i ); + int p = parent( i ); while ( i > 0 && m_vector[ p ]->key() > item->key() ) { // update the index first m_vector[ p ]->setIndex( i ); // then move it there m_vector[ i ] = m_vector[ p ]; i = p; - p = tqparent( i ); + p = parent( i ); } item->setIndex( i ); m_vector[ i ] = item; diff --git a/lib/kofficecore/tests/kogenstylestest.cpp b/lib/kofficecore/tests/kogenstylestest.cpp index ef9150f6..165d0ce9 100644 --- a/lib/kofficecore/tests/kogenstylestest.cpp +++ b/lib/kofficecore/tests/kogenstylestest.cpp @@ -66,8 +66,8 @@ int testLookup() KoGenStyle third( KoGenStyle::STYLE_AUTO, "paragraph", secondName ); // inherited style third.addProperty( "style:margin-left", "1.249cm" ); - third.addProperty( "style:page-number", "0" ); // same as tqparent - third.addProperty( "style:foobar", "3", KoGenStyle::TextType ); // different from tqparent + third.addProperty( "style:page-number", "0" ); // same as parent + third.addProperty( "style:foobar", "3", KoGenStyle::TextType ); // different from parent assert( third.parentName() == secondName ); TQString thirdName = coll.lookup( third, "P" ); @@ -88,7 +88,7 @@ int testLookup() sameAsParent.addStyleMap( map1 ); sameAsParent.addStyleMap( map2 ); TQString sapName = coll.lookup( sameAsParent, "foobar" ); - kdDebug() << "The 'same as tqparent' style got assigned the name " << sapName << endl; + kdDebug() << "The 'same as parent' style got assigned the name " << sapName << endl; assert( sapName == secondName ); assert( coll.styles().count() == 3 ); @@ -119,7 +119,7 @@ int testLookup() TEST_BEGIN( 0, 0 ); third.writeStyle( &writer, coll, "style:style", thirdName, "style:paragraph-properties" ); - TEST_END( "XML for third style", "<r>\n <style:style style:name=\"P1\" style:tqparent-style-name=\"A1\" style:family=\"paragraph\">\n <style:paragraph-properties style:margin-left=\"1.249cm\"/>\n <style:text-properties style:foobar=\"3\"/>\n </style:style>\n</r>\n" ); + TEST_END( "XML for third style", "<r>\n <style:style style:name=\"P1\" style:parent-style-name=\"A1\" style:family=\"paragraph\">\n <style:paragraph-properties style:margin-left=\"1.249cm\"/>\n <style:text-properties style:foobar=\"3\"/>\n </style:style>\n</r>\n" ); coll.markStyleForStylesXml( firstName ); { @@ -166,11 +166,11 @@ int testDefaultStyle() // The kspread case: not writing out all properties, only if they differ // from the default style. - // KoGenStyles doesn't fetch info from the tqparent style when testing - // for equality, so KSpread uses isEmpty() to check for equality-to-tqparent. + // KoGenStyles doesn't fetch info from the parent style when testing + // for equality, so KSpread uses isEmpty() to check for equality-to-parent. KoGenStyle dataStyle( KoGenStyle::STYLE_AUTO, "paragraph", defaultStyleName ); assert( dataStyle.isEmpty() ); - // and then it doesn't look up the auto style, but rather uses the tqparent style directly. + // and then it doesn't look up the auto style, but rather uses the parent style directly. return 0; } @@ -201,13 +201,13 @@ int testUserStyles() // And now, what if the data uses that style? // This is like sameAsParent in the other test, but this time the - // tqparent is a STYLE_USER... + // parent is a STYLE_USER... KoGenStyle dataStyle( KoGenStyle::STYLE_AUTO, "paragraph", user2StyleName ); dataStyle.addProperty( "myfont", "isBold" ); TQString dataStyleName = coll.lookup( dataStyle, "DataStyle" ); kdDebug() << "The auto style got assigned the name " << dataStyleName << endl; - assert( dataStyleName == "User2" ); // it found the tqparent as equal + assert( dataStyleName == "User2" ); // it found the parent as equal // Let's do the opposite test, just to make sure KoGenStyle dataStyle2( KoGenStyle::STYLE_AUTO, "paragraph", user2StyleName ); diff --git a/lib/kofficeui/KoCharSelectDia.cpp b/lib/kofficeui/KoCharSelectDia.cpp index a7f09b3f..c8b104a9 100644 --- a/lib/kofficeui/KoCharSelectDia.cpp +++ b/lib/kofficeui/KoCharSelectDia.cpp @@ -29,8 +29,8 @@ /* class KoCharSelectDia */ /******************************************************************/ -KoCharSelectDia::KoCharSelectDia( TQWidget *tqparent, const char *name, const TQChar &_chr, const TQString &_font, bool _enableFont , bool _modal) - : KDialogBase( Plain, i18n("Select Character"), Ok | Cancel, Ok , tqparent, name, _modal ) +KoCharSelectDia::KoCharSelectDia( TQWidget *parent, const char *name, const TQChar &_chr, const TQString &_font, bool _enableFont , bool _modal) + : KDialogBase( Plain, i18n("Select Character"), Ok | Cancel, Ok , parent, name, _modal ) { initDialog(_chr,_font,_enableFont); @@ -40,8 +40,8 @@ KoCharSelectDia::KoCharSelectDia( TQWidget *tqparent, const char *name, const TQ setButtonOK( okItem ); } -KoCharSelectDia::KoCharSelectDia( TQWidget *tqparent, const char *name, const TQString &_font, const TQChar &_chr, bool _modal ) - : KDialogBase( Plain, i18n("Select Character"), User1 | Close, User1 , tqparent, name, _modal ) +KoCharSelectDia::KoCharSelectDia( TQWidget *parent, const char *name, const TQString &_font, const TQChar &_chr, bool _modal ) + : KDialogBase( Plain, i18n("Select Character"), User1 | Close, User1 , parent, name, _modal ) { initDialog(_chr,_font,true); @@ -77,11 +77,11 @@ void KoCharSelectDia::closeDialog() KDialogBase::close(); } -bool KoCharSelectDia::selectChar( TQString &_font, TQChar &_chr, bool _enableFont, TQWidget* tqparent, const char* name ) +bool KoCharSelectDia::selectChar( TQString &_font, TQChar &_chr, bool _enableFont, TQWidget* parent, const char* name ) { bool res = false; - KoCharSelectDia *dlg = new KoCharSelectDia( tqparent, name, _chr, _font, _enableFont ); + KoCharSelectDia *dlg = new KoCharSelectDia( parent, name, _chr, _font, _enableFont ); dlg->setFocus(); if ( dlg->exec() == Accepted ) { diff --git a/lib/kofficeui/KoCharSelectDia.h b/lib/kofficeui/KoCharSelectDia.h index 507c0704..b281cd12 100644 --- a/lib/kofficeui/KoCharSelectDia.h +++ b/lib/kofficeui/KoCharSelectDia.h @@ -41,15 +41,15 @@ class KOFFICEUI_EXPORT KoCharSelectDia : public KDialogBase public: // constructor - destructor - KoCharSelectDia( TQWidget *tqparent, const char *name, const TQChar &_chr, + KoCharSelectDia( TQWidget *parent, const char *name, const TQChar &_chr, const TQString &_font, bool _enableFont, bool _modal=true ); //constructor when you want to insert multi char - KoCharSelectDia( TQWidget *tqparent, const char *name, const TQString &_font, + KoCharSelectDia( TQWidget *parent, const char *name, const TQString &_font, const TQChar &_chr, bool _modal=true ); ~KoCharSelectDia(); // select char dialog - KOFFICEUI_EXPORT static bool selectChar( TQString &_font, TQChar &_chr, bool _enableFont = true, TQWidget* tqparent = 0, const char* name = 0); + KOFFICEUI_EXPORT static bool selectChar( TQString &_font, TQChar &_chr, bool _enableFont = true, TQWidget* parent = 0, const char* name = 0); // internal TQChar chr() const; diff --git a/lib/kofficeui/KoCommandHistory.cpp b/lib/kofficeui/KoCommandHistory.cpp index cfde2802..27c51e79 100644 --- a/lib/kofficeui/KoCommandHistory.cpp +++ b/lib/kofficeui/KoCommandHistory.cpp @@ -33,8 +33,8 @@ #include "KoCommandHistory.h" -KoListBox::KoListBox( TQWidget *tqparent , const char *name , WFlags f) - : TQListBox( tqparent, name, f) +KoListBox::KoListBox( TQWidget *parent , const char *name , WFlags f) + : TQListBox( parent, name, f) { setVScrollBarMode( AlwaysOn ); } diff --git a/lib/kofficeui/KoCommandHistory.h b/lib/kofficeui/KoCommandHistory.h index 34fd1b50..8522da3b 100644 --- a/lib/kofficeui/KoCommandHistory.h +++ b/lib/kofficeui/KoCommandHistory.h @@ -36,7 +36,7 @@ class KoListBox : public TQListBox { Q_OBJECT TQ_OBJECT public: - KoListBox( TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0 ); + KoListBox( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); protected: virtual void contentsMouseMoveEvent ( TQMouseEvent * ); virtual TQSize tqsizeHint() const; diff --git a/lib/kofficeui/KoContextCelp.cpp b/lib/kofficeui/KoContextCelp.cpp index c2a237bd..82f786e8 100644 --- a/lib/kofficeui/KoContextCelp.cpp +++ b/lib/kofficeui/KoContextCelp.cpp @@ -34,8 +34,8 @@ #include <kapplication.h> #include <tqstring.h> -KoVerticalLabel::KoVerticalLabel( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name, TQt::WRepaintNoErase ) +KoVerticalLabel::KoVerticalLabel( TQWidget* parent, const char* name ) + : TQWidget( parent, name, TQt::WRepaintNoErase ) { TQFont f( font() ); f.setPointSize( f.pointSize() + 2 ); @@ -74,8 +74,8 @@ void KoVerticalLabel::paintEvent( TQPaintEvent* ) static unsigned char upbits[] = { 0xc, 0x1e, 0x3f, 0x3f }; static unsigned char downbits[] = { 0x3f, 0x3f, 0x1e, 0xc }; -KoHelpNavButton::KoHelpNavButton( NavDirection d, TQWidget* tqparent ) - : TQWidget( tqparent ) +KoHelpNavButton::KoHelpNavButton( NavDirection d, TQWidget* parent ) + : TQWidget( parent ) { m_pressed = false; m_bitmap = TQBitmap( 8, 4, ( d == Up ? upbits : downbits ), true ); @@ -117,8 +117,8 @@ static unsigned char notstickybits[] = { 0x8, 0x1e, 0xc, 0xa, 0x1 }; static unsigned char stickybits[] = { 0xe, 0x11, 0x15, 0x11, 0xe }; static unsigned char closebits[] = { 0x11, 0xa, 0x4, 0xa, 0x11 }; -KoTinyButton::KoTinyButton( Action a, TQWidget* tqparent ) - : TQWidget( tqparent ), m_action( a ) +KoTinyButton::KoTinyButton( Action a, TQWidget* parent ) + : TQWidget( parent ), m_action( a ) { m_pressed = false; m_toggled = false; @@ -179,12 +179,12 @@ void KoTinyButton::mouseReleaseEvent( TQMouseEvent* ) } } // KoTinyButton::mouseReleaseEvent -KoHelpView::KoHelpView( TQWidget* tqparent ) - : TQWidget( tqparent ) +KoHelpView::KoHelpView( TQWidget* parent ) + : TQWidget( parent ) { currentText = 0L; setBackgroundMode( PaletteLight ); - tqparent->installEventFilter( this ); + parent->installEventFilter( this ); setMouseTracking( true ); } // KoHelpView::KoHelpView @@ -268,8 +268,8 @@ void KoHelpView::paintEvent( TQPaintEvent* ) currentText->draw( &p, 0, 0, TQRect(), tqcolorGroup() ); } // KoHelpView::paintEvent -KoHelpWidget::KoHelpWidget( TQString help, TQWidget* tqparent ) - : TQWidget( tqparent ) +KoHelpWidget::KoHelpWidget( TQString help, TQWidget* parent ) + : TQWidget( parent ) { TQGridLayout* tqlayout = new TQGridLayout( this, 3, 3 ); tqlayout->setMargin( 2 ); @@ -367,8 +367,8 @@ void KoHelpWidget::stopScrolling() TQT_TQOBJECT(this)->killTimers(); } // KoHelpWidget::stopScrolling -KoContextHelpPopup::KoContextHelpPopup( TQWidget* tqparent ) - : TQWidget( tqparent, "", WType_Dialog | WStyle_Customize | WStyle_NoBorder ) +KoContextHelpPopup::KoContextHelpPopup( TQWidget* parent ) + : TQWidget( parent, "", WType_Dialog | WStyle_Customize | WStyle_NoBorder ) { TQGridLayout* tqlayout = new TQGridLayout( this ); TQHBoxLayout* buttonLayout; @@ -418,9 +418,9 @@ void KoContextHelpPopup::mouseMoveEvent( TQMouseEvent* e ) void KoContextHelpPopup::resizeEvent( TQResizeEvent* ) { - TQBitmap tqmask( width(), height() ); + TQBitmap mask( width(), height() ); TQPointArray a; - TQPainter p( &tqmask ); + TQPainter p( &mask ); p.fillRect( 0, 0, width(), height(), color1 ); p.setPen( color0 ); p.setBrush( color0 ); @@ -444,7 +444,7 @@ void KoContextHelpPopup::resizeEvent( TQResizeEvent* ) p.drawRect( width() - 2, 0, width() - 1, height() - 1 ); p.drawRect( width() - 4, height() - 4, width() - 2, height() - 2 ); p.end(); - setMask( TQRegion( tqmask ) ); + setMask( TQRegion( mask ) ); } // KoContextHelpPopup::resizeEvent void KoContextHelpPopup::paintEvent( TQPaintEvent* ) @@ -507,8 +507,8 @@ void KoContextHelpPopup::keyReleaseEvent( TQKeyEvent* e ) } } // KoContextHelpPopup::keyPressEvent -KoContextHelpAction::KoContextHelpAction( KActionCollection* tqparent, TQWidget* /*popupParent*/ ) - : KToggleAction( i18n( "Context Help" ), BarIcon( "help" ), KShortcut( "CTRL+SHIFT+F1" ), 0, 0, tqparent, "help_context" ) +KoContextHelpAction::KoContextHelpAction( KActionCollection* parent, TQWidget* /*popupParent*/ ) + : KToggleAction( i18n( "Context Help" ), BarIcon( "help" ), KShortcut( "CTRL+SHIFT+F1" ), 0, 0, parent, "help_context" ) { m_popup = new KoContextHelpPopup( 0L ); connect( m_popup, TQT_SIGNAL( wantsToBeClosed() ), this, TQT_SLOT( closePopup() ) ); @@ -533,8 +533,8 @@ void KoContextHelpAction::closePopup() } // KoContextHelpAction::closePopup -KoContextHelpWidget::KoContextHelpWidget( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +KoContextHelpWidget::KoContextHelpWidget( TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { setCaption( i18n( "Context Help" ) ); TQGridLayout* tqlayout = new TQGridLayout( this ); @@ -562,8 +562,8 @@ void KoContextHelpWidget::setContextHelp( const TQString& title, const TQString& } // KoContextHelpWidget::updateHelp -KoContextHelpDocker::KoContextHelpDocker( TQWidget* tqparent, const char* name ) - : TQDockWindow( tqparent, name ) +KoContextHelpDocker::KoContextHelpDocker( TQWidget* parent, const char* name ) + : TQDockWindow( parent, name ) { setCaption( i18n( "Context Help" ) ); TQWidget* mainWidget = new TQWidget( this ); diff --git a/lib/kofficeui/KoContextCelp.h b/lib/kofficeui/KoContextCelp.h index b21eba5b..889e006d 100644 --- a/lib/kofficeui/KoContextCelp.h +++ b/lib/kofficeui/KoContextCelp.h @@ -36,7 +36,7 @@ class KoVerticalLabel : public TQWidget TQ_OBJECT public: - KoVerticalLabel( TQWidget* tqparent = 0, const char* name = 0 ); + KoVerticalLabel( TQWidget* parent = 0, const char* name = 0 ); ~KoVerticalLabel(); public slots: @@ -60,7 +60,7 @@ class KoHelpNavButton : public TQWidget Down }; - KoHelpNavButton( NavDirection d, TQWidget* tqparent ); + KoHelpNavButton( NavDirection d, TQWidget* parent ); signals: void pressed(); @@ -87,7 +87,7 @@ class KoTinyButton : public TQWidget Sticky }; - KoTinyButton( Action a, TQWidget* tqparent ); + KoTinyButton( Action a, TQWidget* parent ); signals: void clicked(); @@ -111,7 +111,7 @@ class KoHelpView : public TQWidget TQ_OBJECT public: - KoHelpView( TQWidget* tqparent ); + KoHelpView( TQWidget* parent ); ~KoHelpView(); void setText( const TQString& text ); @@ -137,7 +137,7 @@ class KoHelpWidget : public TQWidget TQ_OBJECT public: - KoHelpWidget( TQString help, TQWidget* tqparent ); + KoHelpWidget( TQString help, TQWidget* parent ); void setText( TQString text ); void timerEvent( TQTimerEvent* ); @@ -174,7 +174,7 @@ class KoContextHelpPopup : public TQWidget TQ_OBJECT public: - KoContextHelpPopup( TQWidget* tqparent = 0 ); + KoContextHelpPopup( TQWidget* parent = 0 ); ~KoContextHelpPopup(); public slots: @@ -220,7 +220,7 @@ class KOFFICEUI_EXPORT KoContextHelpAction : public KToggleAction TQ_OBJECT public: - KoContextHelpAction( KActionCollection* parentCollection, TQWidget* tqparent = 0 ); + KoContextHelpAction( KActionCollection* parentCollection, TQWidget* parent = 0 ); virtual ~KoContextHelpAction(); public slots: @@ -243,7 +243,7 @@ class KoContextHelpWidget : public TQWidget TQ_OBJECT public: - KoContextHelpWidget( TQWidget* tqparent = 0, const char* name = 0 ); + KoContextHelpWidget( TQWidget* parent = 0, const char* name = 0 ); ~KoContextHelpWidget(); public slots: @@ -267,7 +267,7 @@ class KoContextHelpDocker : public TQDockWindow TQ_OBJECT public: - KoContextHelpDocker( TQWidget* tqparent = 0, const char* name = 0 ); + KoContextHelpDocker( TQWidget* parent = 0, const char* name = 0 ); ~KoContextHelpDocker(); public slots: diff --git a/lib/kofficeui/KoEditPath.cpp b/lib/kofficeui/KoEditPath.cpp index f84431c7..963ee7e8 100644 --- a/lib/kofficeui/KoEditPath.cpp +++ b/lib/kofficeui/KoEditPath.cpp @@ -32,8 +32,8 @@ #include <tqcheckbox.h> #include <tqlabel.h> -KoEditPathDia::KoEditPathDia( const TQString & _path, TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name , true, "", Ok|Cancel, Ok, true ) +KoEditPathDia::KoEditPathDia( const TQString & _path, TQWidget *parent, const char *name ) + : KDialogBase( parent, name , true, "", Ok|Cancel, Ok, true ) { setCaption( i18n("Edit Path") ); TQWidget *page = new TQWidget( this ); @@ -67,8 +67,8 @@ TQString KoEditPathDia::newPath()const } -KoChangePathDia::KoChangePathDia( const TQString & _path, TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name , true, "", Ok|Cancel, Ok, true ) +KoChangePathDia::KoChangePathDia( const TQString & _path, TQWidget *parent, const char *name ) + : KDialogBase( parent, name , true, "", Ok|Cancel, Ok, true ) { setCaption( i18n("Edit Path") ); diff --git a/lib/kofficeui/KoEditPath.h b/lib/kofficeui/KoEditPath.h index 0b56ccad..2b45009c 100644 --- a/lib/kofficeui/KoEditPath.h +++ b/lib/kofficeui/KoEditPath.h @@ -32,7 +32,7 @@ class KOFFICEUI_EXPORT KoEditPathDia : public KDialogBase Q_OBJECT TQ_OBJECT public: - KoEditPathDia( const TQString & _path, TQWidget *tqparent, const char *name ); + KoEditPathDia( const TQString & _path, TQWidget *parent, const char *name ); TQString newPath()const; private: @@ -45,7 +45,7 @@ class KOFFICEUI_EXPORT KoChangePathDia : public KDialogBase Q_OBJECT TQ_OBJECT public: - KoChangePathDia( const TQString & _path, TQWidget *tqparent, const char *name ); + KoChangePathDia( const TQString & _path, TQWidget *parent, const char *name ); TQString newPath()const; private slots: void slotChangeDefaultValue( bool ); diff --git a/lib/kofficeui/KoGuideLineDia.cpp b/lib/kofficeui/KoGuideLineDia.cpp index f91627ec..a889b3d8 100644 --- a/lib/kofficeui/KoGuideLineDia.cpp +++ b/lib/kofficeui/KoGuideLineDia.cpp @@ -32,9 +32,9 @@ #include <KoUnitWidgets.h> -KoGuideLineDia::KoGuideLineDia( TQWidget *tqparent, double pos, double minPos, double maxPos, +KoGuideLineDia::KoGuideLineDia( TQWidget *parent, double pos, double minPos, double maxPos, KoUnit::Unit unit, const char *name ) -: KDialogBase( tqparent, name , true, "", Ok | Cancel, Ok, true ) +: KDialogBase( parent, name , true, "", Ok | Cancel, Ok, true ) , m_hButton( 0 ) , m_vButton( 0 ) { @@ -46,9 +46,9 @@ KoGuideLineDia::KoGuideLineDia( TQWidget *tqparent, double pos, double minPos, d } -KoGuideLineDia::KoGuideLineDia( TQWidget *tqparent, KoPoint &pos, KoRect &rect, +KoGuideLineDia::KoGuideLineDia( TQWidget *parent, KoPoint &pos, KoRect &rect, KoUnit::Unit unit, const char *name ) -: KDialogBase( tqparent, name , true, "", Ok | Cancel, Ok, true ) +: KDialogBase( parent, name , true, "", Ok | Cancel, Ok, true ) , m_rect( rect ) , m_pos( pos ) , m_positionChanged( false ) diff --git a/lib/kofficeui/KoGuideLineDia.h b/lib/kofficeui/KoGuideLineDia.h index 7dc9e0f8..0f2fcecf 100644 --- a/lib/kofficeui/KoGuideLineDia.h +++ b/lib/kofficeui/KoGuideLineDia.h @@ -42,14 +42,14 @@ public: /** * @brief Constructor * - * @param tqparent The tqparent widget + * @param parent The parent widget * @param pos the actual position of the guide line * @param minPos the minimal position of the guide line * @param maxPos the maximal position of the guide line * @param unit The unit used in the document * @param name The name is send to the TQObject constructor */ - KoGuideLineDia( TQWidget *tqparent, double pos, double minPos, double maxPos, + KoGuideLineDia( TQWidget *parent, double pos, double minPos, double maxPos, KoUnit::Unit unit, const char *name = 0L ); /** @@ -59,13 +59,13 @@ public: * and the orientation of the guide line is changed the value will be set to pos.x() * or pos.y() according to the orientation. * - * @param tqparent the tqparent widget + * @param parent the parent widget * @param pos the actual position of cursor * @param rect the rect in where the guide can be placed * @param unit the unit used in the document * @param name the name is send to the TQObject constructor */ - KoGuideLineDia( TQWidget *tqparent, KoPoint &pos, KoRect &rect, + KoGuideLineDia( TQWidget *parent, KoPoint &pos, KoRect &rect, KoUnit::Unit unit, const char *name = 0L ); /** * @brief the position diff --git a/lib/kofficeui/KoInsertLink.cpp b/lib/kofficeui/KoInsertLink.cpp index 4c863935..342889c4 100644 --- a/lib/kofficeui/KoInsertLink.cpp +++ b/lib/kofficeui/KoInsertLink.cpp @@ -36,10 +36,10 @@ using namespace KOfficePrivate; -KoInsertLinkDia::KoInsertLinkDia( TQWidget *tqparent, const char *name, bool displayBookmarkLink ) +KoInsertLinkDia::KoInsertLinkDia( TQWidget *parent, const char *name, bool displayBookmarkLink ) : KDialogBase( KDialogBase::IconList, i18n("Insert Link"), KDialogBase::Ok | KDialogBase::Cancel, - KDialogBase::Ok, tqparent, name ) + KDialogBase::Ok, parent, name ) { bookmarkLink = 0L; TQVBox *page=addVBoxPage(i18n("Internet"), TQString(),BarIcon("html",KIcon::SizeMedium)); @@ -98,11 +98,11 @@ void KoInsertLinkDia::slotTextChanged ( ) currentText = linkName(); } -bool KoInsertLinkDia::createLinkDia(TQString & _linkName, TQString & _hrefName, const TQStringList& bkmlist, bool displayBookmarkLink, TQWidget* tqparent, const char* name) +bool KoInsertLinkDia::createLinkDia(TQString & _linkName, TQString & _hrefName, const TQStringList& bkmlist, bool displayBookmarkLink, TQWidget* parent, const char* name) { bool res = false; - KoInsertLinkDia *dlg = new KoInsertLinkDia( tqparent, name, displayBookmarkLink ); + KoInsertLinkDia *dlg = new KoInsertLinkDia( parent, name, displayBookmarkLink ); dlg->setHrefLinkName(_hrefName,_linkName, bkmlist); if ( dlg->exec() == Accepted ) { @@ -217,8 +217,8 @@ void KoInsertLinkDia::slotOk() } -internetLinkPage::internetLinkPage( TQWidget *tqparent , char *name ) - : TQWidget(tqparent,name) +internetLinkPage::internetLinkPage( TQWidget *parent , char *name ) + : TQWidget(parent,name) { TQVBoxLayout *lay1 = new TQVBoxLayout( this ); lay1->setSpacing( KDialog::spacingHint() ); @@ -290,8 +290,8 @@ void internetLinkPage::textChanged ( const TQString & ) emit textChanged(); } -bookmarkLinkPage::bookmarkLinkPage( TQWidget *tqparent , char *name ) - : TQWidget(tqparent,name) +bookmarkLinkPage::bookmarkLinkPage( TQWidget *parent , char *name ) + : TQWidget(parent,name) { TQVBoxLayout *lay1 = new TQVBoxLayout( this ); lay1->setSpacing( KDialog::spacingHint() ); @@ -372,8 +372,8 @@ void bookmarkLinkPage::textChanged ( const TQString & ) emit textChanged(); } -mailLinkPage::mailLinkPage( TQWidget *tqparent , char *name ) - : TQWidget(tqparent,name) +mailLinkPage::mailLinkPage( TQWidget *parent , char *name ) + : TQWidget(parent,name) { TQVBoxLayout *lay1 = new TQVBoxLayout( this ); lay1->setSpacing( KDialog::spacingHint() ); @@ -442,8 +442,8 @@ void mailLinkPage::textChanged ( const TQString & ) emit textChanged(); } -fileLinkPage::fileLinkPage( TQWidget *tqparent , char *name ) - : TQWidget(tqparent,name) +fileLinkPage::fileLinkPage( TQWidget *parent , char *name ) + : TQWidget(parent,name) { TQVBoxLayout *lay1 = new TQVBoxLayout( this ); lay1->setSpacing( KDialog::spacingHint() ); diff --git a/lib/kofficeui/KoInsertLink.h b/lib/kofficeui/KoInsertLink.h index cb10a7f0..d71263aa 100644 --- a/lib/kofficeui/KoInsertLink.h +++ b/lib/kofficeui/KoInsertLink.h @@ -34,7 +34,7 @@ class internetLinkPage : public TQWidget Q_OBJECT TQ_OBJECT public: - internetLinkPage( TQWidget *tqparent = 0, char *name = 0 ); + internetLinkPage( TQWidget *parent = 0, char *name = 0 ); TQString linkName()const; TQString hrefName(); void setLinkName(const TQString & _name); @@ -56,7 +56,7 @@ class bookmarkLinkPage : public TQWidget Q_OBJECT TQ_OBJECT public: - bookmarkLinkPage( TQWidget *tqparent = 0, char *name = 0 ); + bookmarkLinkPage( TQWidget *parent = 0, char *name = 0 ); TQString linkName()const; TQString hrefName(); void setLinkName(const TQString & _name); @@ -80,7 +80,7 @@ class mailLinkPage : public TQWidget Q_OBJECT TQ_OBJECT public: - mailLinkPage( TQWidget *tqparent = 0, char *name = 0 ); + mailLinkPage( TQWidget *parent = 0, char *name = 0 ); TQString linkName()const; TQString hrefName(); void setLinkName(const TQString & _name); @@ -103,7 +103,7 @@ class fileLinkPage : public TQWidget Q_OBJECT TQ_OBJECT public: - fileLinkPage( TQWidget *tqparent = 0, char *name = 0 ); + fileLinkPage( TQWidget *parent = 0, char *name = 0 ); TQString linkName()const; TQString hrefName(); void setLinkName(const TQString & _name); @@ -129,9 +129,9 @@ class KOFFICEUI_EXPORT KoInsertLinkDia : public KDialogBase Q_OBJECT TQ_OBJECT public: - KoInsertLinkDia( TQWidget *tqparent, const char *name = 0,bool displayBookmarkLink=true ); + KoInsertLinkDia( TQWidget *parent, const char *name = 0,bool displayBookmarkLink=true ); static bool createLinkDia(TQString & linkName, TQString & hrefName, const TQStringList& bkmlist, bool displayBookmarkLink = true, - TQWidget* tqparent = 0, const char* name = 0); + TQWidget* parent = 0, const char* name = 0); //internal TQString linkName() const; diff --git a/lib/kofficeui/KoPageLayoutColumns.cpp b/lib/kofficeui/KoPageLayoutColumns.cpp index 60057c88..8ea3b0b9 100644 --- a/lib/kofficeui/KoPageLayoutColumns.cpp +++ b/lib/kofficeui/KoPageLayoutColumns.cpp @@ -25,8 +25,8 @@ #include <tqlabel.h> #include <tqlayout.h> -KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *tqparent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout) - : KoPageLayoutColumnsBase(tqparent) { +KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout) + : KoPageLayoutColumnsBase(parent) { m_columns = columns; TQHBoxLayout *lay = new TQHBoxLayout(previewPane); m_preview = new KoPagePreview( previewPane, "Preview", tqlayout ); diff --git a/lib/kofficeui/KoPageLayoutColumns.h b/lib/kofficeui/KoPageLayoutColumns.h index 09bad9d5..8ebac1b2 100644 --- a/lib/kofficeui/KoPageLayoutColumns.h +++ b/lib/kofficeui/KoPageLayoutColumns.h @@ -40,12 +40,12 @@ class KoPageLayoutColumns : public KoPageLayoutColumnsBase { public: /** * Contructor - * @param tqparent the tqparent widget + * @param parent the parent widget * @param columns the KoColumns data structure that this dialog should be initialzed with * @param unit the unit-type (mm/cm/inch) that the dialog should show * @param tqlayout the page tqlayout that the preview should be initialzed with. */ - KoPageLayoutColumns(TQWidget *tqparent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout); + KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout); /** * Update the page preview widget with the param tqlayout. diff --git a/lib/kofficeui/KoPageLayoutDia.cpp b/lib/kofficeui/KoPageLayoutDia.cpp index 1f07358a..0b410bf1 100644 --- a/lib/kofficeui/KoPageLayoutDia.cpp +++ b/lib/kofficeui/KoPageLayoutDia.cpp @@ -49,8 +49,8 @@ /******************************************************************/ /*===================== constrcutor ==============================*/ -KoPagePreview::KoPagePreview( TQWidget* tqparent, const char *name, const KoPageLayout& tqlayout ) - : TQGroupBox( i18n( "Page Preview" ), tqparent, name ) +KoPagePreview::KoPagePreview( TQWidget* parent, const char *name, const KoPageLayout& tqlayout ) + : TQGroupBox( i18n( "Page Preview" ), parent, name ) { setPageLayout( tqlayout ); columns = 1; @@ -128,12 +128,12 @@ void KoPagePreview::drawContents( TQPainter *painter ) /******************************************************************/ /*==================== constructor ===============================*/ -KoPageLayoutDia::KoPageLayoutDia( TQWidget* tqparent, const char* name, +KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name, const KoPageLayout& tqlayout, const KoHeadFoot& hf, int tabs, KoUnit::Unit unit, bool modal ) : KDialogBase( KDialogBase::Tabbed, i18n("Page Layout"), KDialogBase::Ok | KDialogBase::Cancel, - KDialogBase::Ok, tqparent, name, modal) + KDialogBase::Ok, parent, name, modal) { flags = tabs; @@ -153,14 +153,14 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* tqparent, const char* name, } /*==================== constructor ===============================*/ -KoPageLayoutDia::KoPageLayoutDia( TQWidget* tqparent, const char* name, +KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name, const KoPageLayout& tqlayout, const KoHeadFoot& hf, const KoColumns& columns, const KoKWHeaderFooter& kwhf, int tabs, KoUnit::Unit unit ) : KDialogBase( KDialogBase::Tabbed, i18n("Page Layout"), KDialogBase::Ok | KDialogBase::Cancel, - KDialogBase::Ok, tqparent, name, true) + KDialogBase::Ok, parent, name, true) { flags = tabs; @@ -186,10 +186,10 @@ KoPageLayoutDia::~KoPageLayoutDia() } /*======================= show dialog ============================*/ -bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* tqparent ) +bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* parent ) { bool res = false; - KoPageLayoutDia *dlg = new KoPageLayoutDia( tqparent, "PageLayout", tqlayout, hf, tabs, unit ); + KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, tabs, unit ); if ( dlg->exec() == TQDialog::Accepted ) { res = true; @@ -205,10 +205,10 @@ bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int ta /*======================= show dialog ============================*/ bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, KoColumns& columns, - KoKWHeaderFooter &_kwhf, int tabs, KoUnit::Unit& unit, TQWidget* tqparent ) + KoKWHeaderFooter &_kwhf, int tabs, KoUnit::Unit& unit, TQWidget* parent ) { bool res = false; - KoPageLayoutDia *dlg = new KoPageLayoutDia( tqparent, "PageLayout", tqlayout, hf, columns, _kwhf, tabs, unit ); + KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, columns, _kwhf, tabs, unit ); if ( dlg->exec() == TQDialog::Accepted ) { res = true; diff --git a/lib/kofficeui/KoPageLayoutDia.h b/lib/kofficeui/KoPageLayoutDia.h index 05f8f3db..21fe7df3 100644 --- a/lib/kofficeui/KoPageLayoutDia.h +++ b/lib/kofficeui/KoPageLayoutDia.h @@ -90,7 +90,7 @@ public: /** * Constructor. * - * @param tqparent The tqparent of the dialog. + * @param parent The parent of the dialog. * @param name The name of the dialog. * @param tqlayout The tqlayout. * @param headfoot The header and the footer. @@ -98,7 +98,7 @@ public: * @param unit The unit to use for displaying the values to the user. * @param modal Whether the dialog is modal or not. */ - KoPageLayoutDia( TQWidget* tqparent, const char* name, + KoPageLayoutDia( TQWidget* parent, const char* name, const KoPageLayout& tqlayout, const KoHeadFoot& headfoot, int flags, KoUnit::Unit unit, bool modal=true ); @@ -106,7 +106,7 @@ public: /** * Constructor. * - * @param tqparent The tqparent of the dialog. + * @param parent The parent of the dialog. * @param name The name of the dialog. * @param tqlayout The tqlayout. * @param headfoot The header and the footer. @@ -115,7 +115,7 @@ public: * @param tabs The number of tabs. * @param unit The unit to use for displaying the values to the user */ - KoPageLayoutDia( TQWidget* tqparent, const char* name, + KoPageLayoutDia( TQWidget* parent, const char* name, const KoPageLayout& tqlayout, const KoHeadFoot& headfoot, const KoColumns& columns, @@ -131,13 +131,13 @@ public: * Show page tqlayout dialog. * See constructor for documentation on the parameters */ - static bool pageLayout( KoPageLayout&, KoHeadFoot&, int tabs, KoUnit::Unit& unit, TQWidget* tqparent = 0 ); + static bool pageLayout( KoPageLayout&, KoHeadFoot&, int tabs, KoUnit::Unit& unit, TQWidget* parent = 0 ); /** * Show page tqlayout dialog. * See constructor for documentation on the parameters */ - static bool pageLayout( KoPageLayout&, KoHeadFoot&, KoColumns&, KoKWHeaderFooter&, int tabs, KoUnit::Unit& unit, TQWidget* tqparent = 0 ); + static bool pageLayout( KoPageLayout&, KoHeadFoot&, KoColumns&, KoKWHeaderFooter&, int tabs, KoUnit::Unit& unit, TQWidget* parent = 0 ); /** * Retrieves a standard page tqlayout. * Deprecated: better use KoPageLayout::standardLayout() diff --git a/lib/kofficeui/KoPageLayoutHeader.cpp b/lib/kofficeui/KoPageLayoutHeader.cpp index b436447b..00296957 100644 --- a/lib/kofficeui/KoPageLayoutHeader.cpp +++ b/lib/kofficeui/KoPageLayoutHeader.cpp @@ -23,8 +23,8 @@ #include <tqlayout.h> #include <tqcheckbox.h> -KoPageLayoutHeader::KoPageLayoutHeader(TQWidget *tqparent, KoUnit::Unit unit, const KoKWHeaderFooter &kwhf) - : KoPageLayoutHeaderBase(tqparent) { +KoPageLayoutHeader::KoPageLayoutHeader(TQWidget *parent, KoUnit::Unit unit, const KoKWHeaderFooter &kwhf) + : KoPageLayoutHeaderBase(parent) { m_headerFooters = kwhf; TQHBoxLayout *lay = new TQHBoxLayout(headerSpacingPane); m_headerSpacing = new KoUnitDoubleSpinBox( headerSpacingPane, 0.0, 999.0, 0.5, kwhf.ptHeaderBodySpacing, unit ); diff --git a/lib/kofficeui/KoPageLayoutHeader.h b/lib/kofficeui/KoPageLayoutHeader.h index da97f34c..5473403b 100644 --- a/lib/kofficeui/KoPageLayoutHeader.h +++ b/lib/kofficeui/KoPageLayoutHeader.h @@ -37,11 +37,11 @@ class KoPageLayoutHeader : public KoPageLayoutHeaderBase { public: /** * Contructor - * @param tqparent the tqparent widget + * @param parent the parent widget * @param unit the unit-type (mm/cm/inch) that the dialog should show * @param kwhf the data that this widget will be filled with initially */ - KoPageLayoutHeader(TQWidget *tqparent, KoUnit::Unit unit, const KoKWHeaderFooter &kwhf); + KoPageLayoutHeader(TQWidget *parent, KoUnit::Unit unit, const KoKWHeaderFooter &kwhf); /** * @return the altered data as it is currently set by the user. */ diff --git a/lib/kofficeui/KoPageLayoutSize.cpp b/lib/kofficeui/KoPageLayoutSize.cpp index c191f565..6ddf9409 100644 --- a/lib/kofficeui/KoPageLayoutSize.cpp +++ b/lib/kofficeui/KoPageLayoutSize.cpp @@ -34,8 +34,8 @@ #include <tqvgroupbox.h> #include <tqhbuttongroup.h> -KoPageLayoutSize::KoPageLayoutSize(TQWidget *tqparent, const KoPageLayout& tqlayout, KoUnit::Unit unit,const KoColumns& columns, bool unitChooser, bool enableBorders) - : TQWidget(tqparent), m_blockSignals(false) { +KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, KoUnit::Unit unit,const KoColumns& columns, bool unitChooser, bool enableBorders) + : TQWidget(parent), m_blockSignals(false) { m_layout = tqlayout; m_unit = unit; diff --git a/lib/kofficeui/KoPageLayoutSize.h b/lib/kofficeui/KoPageLayoutSize.h index f1f4f358..d917b349 100644 --- a/lib/kofficeui/KoPageLayoutSize.h +++ b/lib/kofficeui/KoPageLayoutSize.h @@ -41,14 +41,14 @@ class KoPageLayoutSize : public TQWidget { public: /** * Contructor - * @param tqparent the tqparent widget + * @param parent the parent widget * @param tqlayout the page tqlayout that this widget should be initialzed with. * @param unit the unit-type (mm/cm/inch) that the dialog should show * @param columns the KoColumns (amout of columns) that the preview should be initialized with * @param unitChooser if true a combobox with the unit-type is shown for the user to change * @param enableBorders if true enable the user to change the margins (aka borders) of the page */ - KoPageLayoutSize(TQWidget *tqparent, const KoPageLayout& tqlayout, KoUnit::Unit unit, + KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, KoUnit::Unit unit, const KoColumns& columns, bool unitChooser, bool enableBorders); /** diff --git a/lib/kofficeui/KoPartSelectAction.cpp b/lib/kofficeui/KoPartSelectAction.cpp index d563e906..ca24b89a 100644 --- a/lib/kofficeui/KoPartSelectAction.cpp +++ b/lib/kofficeui/KoPartSelectAction.cpp @@ -21,23 +21,23 @@ #include <kdebug.h> -KoPartSelectAction::KoPartSelectAction( const TQString& text, TQObject* tqparent, const char* name ) - : KActionMenu( text, tqparent, name ) +KoPartSelectAction::KoPartSelectAction( const TQString& text, TQObject* parent, const char* name ) + : KActionMenu( text, parent, name ) { init(); } KoPartSelectAction::KoPartSelectAction( const TQString& text, const TQString& icon, - TQObject* tqparent, const char* name ) - : KActionMenu( text, icon, tqparent, name ) + TQObject* parent, const char* name ) + : KActionMenu( text, icon, parent, name ) { init(); } KoPartSelectAction::KoPartSelectAction( const TQString& text, const TQString& icon, TQObject* receiver, const char* slot, - TQObject* tqparent, const char* name ) - : KActionMenu( text, icon, tqparent, name ) + TQObject* parent, const char* name ) + : KActionMenu( text, icon, parent, name ) { if (receiver) connect( this, TQT_SIGNAL( activated() ), receiver, slot ); diff --git a/lib/kofficeui/KoPartSelectAction.h b/lib/kofficeui/KoPartSelectAction.h index f6a69e73..9e9dd30f 100644 --- a/lib/kofficeui/KoPartSelectAction.h +++ b/lib/kofficeui/KoPartSelectAction.h @@ -33,11 +33,11 @@ class KOFFICEUI_EXPORT KoPartSelectAction : public KActionMenu TQ_OBJECT public: - KoPartSelectAction( const TQString& text, TQObject* tqparent = 0, const char* name = 0 ); + KoPartSelectAction( const TQString& text, TQObject* parent = 0, const char* name = 0 ); KoPartSelectAction( const TQString& text, const TQString& icon, - TQObject* tqparent = 0, const char* name = 0 ); + TQObject* parent = 0, const char* name = 0 ); KoPartSelectAction( const TQString& text, const TQString& icon, - TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 ); + TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); KoDocumentEntry documentEntry() const { return m_documentEntry; } diff --git a/lib/kofficeui/KoPartSelectDia.cpp b/lib/kofficeui/KoPartSelectDia.cpp index 4c3e376e..b5271b97 100644 --- a/lib/kofficeui/KoPartSelectDia.cpp +++ b/lib/kofficeui/KoPartSelectDia.cpp @@ -29,8 +29,8 @@ * ****************************************************/ -KoPartSelectDia::KoPartSelectDia( TQWidget* tqparent, const char* name ) : - KDialogBase( tqparent, name, TRUE, i18n("Insert Object"), KDialogBase::Ok | KDialogBase::Cancel ) +KoPartSelectDia::KoPartSelectDia( TQWidget* parent, const char* name ) : + KDialogBase( parent, name, TRUE, i18n("Insert Object"), KDialogBase::Ok | KDialogBase::Cancel ) { listview = new TQListView( this ); listview->addColumn( i18n( "Object" ) ); @@ -76,11 +76,11 @@ KoDocumentEntry KoPartSelectDia::entry() return KoDocumentEntry(); } -KoDocumentEntry KoPartSelectDia::selectPart( TQWidget *tqparent ) +KoDocumentEntry KoPartSelectDia::selectPart( TQWidget *parent ) { KoDocumentEntry e; - KoPartSelectDia *dlg = new KoPartSelectDia( tqparent, "PartSelect" ); + KoPartSelectDia *dlg = new KoPartSelectDia( parent, "PartSelect" ); dlg->setFocus(); if (dlg->exec() == TQDialog::Accepted) e = dlg->entry(); diff --git a/lib/kofficeui/KoPartSelectDia.h b/lib/kofficeui/KoPartSelectDia.h index f131a857..6a13084b 100644 --- a/lib/kofficeui/KoPartSelectDia.h +++ b/lib/kofficeui/KoPartSelectDia.h @@ -43,7 +43,7 @@ public: /** * Constructor. */ - KoPartSelectDia( TQWidget* tqparent = 0, const char* name = 0 ); + KoPartSelectDia( TQWidget* parent = 0, const char* name = 0 ); /** * Retrieves the result of the part selection. @@ -58,7 +58,7 @@ public: * @returns the KoDocumentEntry of the selected KOffice components * or an empty entry. */ - static KoDocumentEntry selectPart( TQWidget *tqparent = 0L ); + static KoDocumentEntry selectPart( TQWidget *parent = 0L ); private slots: void selectionChanged( TQListViewItem * ); diff --git a/lib/kofficeui/KoPictureFilePreview.cpp b/lib/kofficeui/KoPictureFilePreview.cpp index 3f44f1e9..7baed8f9 100644 --- a/lib/kofficeui/KoPictureFilePreview.cpp +++ b/lib/kofficeui/KoPictureFilePreview.cpp @@ -41,8 +41,8 @@ class KoPictureFilePreviewWidget : public TQScrollView { public: - KoPictureFilePreviewWidget( TQWidget *tqparent ) - : TQScrollView( tqparent ) { viewport()->setBackgroundMode( PaletteBase ); } + KoPictureFilePreviewWidget( TQWidget *parent ) + : TQScrollView( parent ) { viewport()->setBackgroundMode( PaletteBase ); } bool setPicture( const KURL& url ) { @@ -88,8 +88,8 @@ private: TQSize m_size; }; -KoPictureFilePreview::KoPictureFilePreview( TQWidget *tqparent ) - : KPreviewWidgetBase( tqparent ) +KoPictureFilePreview::KoPictureFilePreview( TQWidget *parent ) + : KPreviewWidgetBase( parent ) { TQVBoxLayout *vb = new TQVBoxLayout( this, KDialog::marginHint() ); m_widget = new KoPictureFilePreviewWidget( this ); diff --git a/lib/kofficeui/KoPictureFilePreview.h b/lib/kofficeui/KoPictureFilePreview.h index 820f9b10..3922cd74 100644 --- a/lib/kofficeui/KoPictureFilePreview.h +++ b/lib/kofficeui/KoPictureFilePreview.h @@ -36,7 +36,7 @@ class KOFFICEUI_EXPORT KoPictureFilePreview : public KPreviewWidgetBase TQ_OBJECT public: - KoPictureFilePreview( TQWidget *tqparent ); + KoPictureFilePreview( TQWidget *parent ); /** * @return a list of patterns of all supported clipart formats. diff --git a/lib/kofficeui/KoSelectAction.cpp b/lib/kofficeui/KoSelectAction.cpp index 9fd10314..2742ff11 100644 --- a/lib/kofficeui/KoSelectAction.cpp +++ b/lib/kofficeui/KoSelectAction.cpp @@ -52,7 +52,7 @@ class KoSelectAction::KoSelectActionPrivate }; KoSelectAction::KoSelectAction(const TQString &text, const TQString& icon, - TQObject* tqparent, const char* name) : KAction(text, icon, 0, tqparent, name) + TQObject* parent, const char* name) : KAction(text, icon, 0, parent, name) { d = new KoSelectActionPrivate; setShowCurrentSelection(true); @@ -61,7 +61,7 @@ KoSelectAction::KoSelectAction(const TQString &text, const TQString& icon, } KoSelectAction::KoSelectAction(const TQString &text, const TQString& icon, const TQObject* receiver, - const char* slot, TQObject* tqparent, const char* name) : KAction(text, icon, 0, tqparent, name) + const char* slot, TQObject* parent, const char* name) : KAction(text, icon, 0, parent, name) { d = new KoSelectActionPrivate; diff --git a/lib/kofficeui/KoSelectAction.h b/lib/kofficeui/KoSelectAction.h index 4bad1005..a6d3b006 100644 --- a/lib/kofficeui/KoSelectAction.h +++ b/lib/kofficeui/KoSelectAction.h @@ -36,20 +36,20 @@ class KOFFICEUI_EXPORT KoSelectAction : public KAction /** Constructs a KoSelectAction with a text and an icon. * @param text The text that will be displayed. * @param icon The dynamically loaded icon that goes with this action. - * @param tqparent This action's tqparent. + * @param parent This action's parent. * @param name An internal name for this action. */ - KoSelectAction(const TQString& text, const TQString& icon, TQObject* tqparent = 0, const char* name = 0); + KoSelectAction(const TQString& text, const TQString& icon, TQObject* parent = 0, const char* name = 0); /** Same as above, but it also connects a slot to the selectionChanged(int) signal. * @param text The text that will be displayed. * @param icon The dynamically loaded icon that goes with this action. - * @param receiver The SLOT's tqparent. + * @param receiver The SLOT's parent. * @param slot The TQT_SLOT to invoke when a selectionChanged(int) signal is emited. - * @param tqparent This action's tqparent. + * @param parent This action's parent. * @param name An internal name for this action. */ KoSelectAction(const TQString& text, const TQString& icon, const TQObject* receiver, - const char* slot, TQObject* tqparent, const char* name = 0); + const char* slot, TQObject* parent, const char* name = 0); ~KoSelectAction(); /** Returns a pointer to the popup menu. */ diff --git a/lib/kofficeui/KoTabBar.cpp b/lib/kofficeui/KoTabBar.cpp index 7c0beeeb..e33ce12c 100644 --- a/lib/kofficeui/KoTabBar.cpp +++ b/lib/kofficeui/KoTabBar.cpp @@ -347,8 +347,8 @@ void KoTabBarPrivate::updateButtons() } // creates a new tabbar -KoTabBar::KoTabBar( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name, TQt::WResizeNoErase | TQt::WRepaintNoErase ) +KoTabBar::KoTabBar( TQWidget* parent, const char* name ) + : TQWidget( parent, name, TQt::WResizeNoErase | TQt::WRepaintNoErase ) { d = new KoTabBarPrivate; d->tabbar = this; diff --git a/lib/kofficeui/KoTabBar.h b/lib/kofficeui/KoTabBar.h index 1ab9d6dc..39cf03b8 100644 --- a/lib/kofficeui/KoTabBar.h +++ b/lib/kofficeui/KoTabBar.h @@ -73,7 +73,7 @@ public: /** * Creates a new tabbar. */ - KoTabBar( TQWidget* tqparent = 0, const char *name = 0 ); + KoTabBar( TQWidget* parent = 0, const char *name = 0 ); /** * Destroy the tabbar. diff --git a/lib/kofficeui/KoTabChooser.cpp b/lib/kofficeui/KoTabChooser.cpp index 71a12342..ed891e89 100644 --- a/lib/kofficeui/KoTabChooser.cpp +++ b/lib/kofficeui/KoTabChooser.cpp @@ -43,8 +43,8 @@ public: /******************************************************************/ /*================================================================*/ -KoTabChooser::KoTabChooser( TQWidget *tqparent, int _flags ) - : TQFrame( tqparent, "" ) +KoTabChooser::KoTabChooser( TQWidget *parent, int _flags ) + : TQFrame( parent, "" ) { setFrameStyle( MenuBarPanel ); flags = _flags; diff --git a/lib/kofficeui/KoTabChooser.h b/lib/kofficeui/KoTabChooser.h index f479ff94..31ad0f85 100644 --- a/lib/kofficeui/KoTabChooser.h +++ b/lib/kofficeui/KoTabChooser.h @@ -44,7 +44,7 @@ public: TAB_DEC_PNT = 8, TAB_ALL = TAB_LEFT | TAB_CENTER | TAB_RIGHT | TAB_DEC_PNT }; - KoTabChooser( TQWidget *tqparent, int _flags ); + KoTabChooser( TQWidget *parent, int _flags ); ~KoTabChooser(); int getCurrTabType() { return currType; } diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp index 280a875c..3d1609ed 100644 --- a/lib/kofficeui/KoTemplateChooseDia.cpp +++ b/lib/kofficeui/KoTemplateChooseDia.cpp @@ -62,10 +62,10 @@ class MyFileDialog : public KFileDialog MyFileDialog( const TQString& startDir=0, const TQString& filter =0, - TQWidget *tqparent=0, + TQWidget *parent=0, const char *name=0, bool modal=0) - : KFileDialog (startDir, filter, tqparent, name, modal), + : KFileDialog (startDir, filter, parent, name, modal), m_slotOkCalled( false ) {} KURL currentURL() @@ -178,13 +178,13 @@ class KoTemplateChooseDiaPrivate { /******************************************************************/ /*================================================================*/ -KoTemplateChooseDia::KoTemplateChooseDia(TQWidget *tqparent, const char *name, KInstance* instance, +KoTemplateChooseDia::KoTemplateChooseDia(TQWidget *parent, const char *name, KInstance* instance, const TQCString &format, const TQString &nativeName, const TQStringList &extraNativeMimeTypes, const DialogType &dialogType, const TQCString& templateType) : - KDialogBase(tqparent, name, true, i18n("Open Document"), KDialogBase::Ok | KDialogBase::Cancel, + KDialogBase(parent, name, true, i18n("Open Document"), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok) { d = new KoTemplateChooseDiaPrivate( @@ -230,7 +230,7 @@ static bool cancelQuits() { KoTemplateChooseDia::ReturnType KoTemplateChooseDia::choose(KInstance* instance, TQString &file, const KoTemplateChooseDia::DialogType &dialogType, const TQCString& templateType, - TQWidget* tqparent) + TQWidget* parent) { const TQString nativeName = instance->aboutData()->programName(); const TQCString format = KoDocument::readNativeFormatMimeType( instance ); @@ -238,7 +238,7 @@ KoTemplateChooseDia::ReturnType KoTemplateChooseDia::choose(KInstance* instance, // Maybe the above two can be combined into one call, for speed: //KoDocument::getNativeMimeTypeInfo( instance, nativeName, extraNativeMimeTypes ); return choose( instance, file, format, nativeName, extraNativeMimeTypes, - dialogType, templateType, tqparent ); + dialogType, templateType, parent ); } KoTemplateChooseDia::ReturnType KoTemplateChooseDia::choose(KInstance* instance, TQString &file, @@ -247,10 +247,10 @@ KoTemplateChooseDia::ReturnType KoTemplateChooseDia::choose(KInstance* instance, const TQStringList& extraNativeMimeTypes, const DialogType &dialogType, const TQCString& templateType, - TQWidget* tqparent ) + TQWidget* parent ) { KoTemplateChooseDia *dlg = new KoTemplateChooseDia( - tqparent, "Choose", instance, format, + parent, "Choose", instance, format, nativeName, extraNativeMimeTypes, dialogType, templateType ); KoTemplateChooseDia::ReturnType rt = Cancel; diff --git a/lib/kofficeui/KoTemplateChooseDia.h b/lib/kofficeui/KoTemplateChooseDia.h index 98188ad1..677c11b1 100644 --- a/lib/kofficeui/KoTemplateChooseDia.h +++ b/lib/kofficeui/KoTemplateChooseDia.h @@ -45,8 +45,8 @@ class KoTCDIconCanvas : public KIconCanvas Q_OBJECT TQ_OBJECT public: - KoTCDIconCanvas( TQWidget *tqparent = 0, const char *name = 0L ) - : KIconCanvas( tqparent, name ) {} + KoTCDIconCanvas( TQWidget *parent = 0, const char *name = 0L ) + : KIconCanvas( parent, name ) {} bool isCurrentValid() { return currentItem(); } TQIconViewItem * load(KoTemplateGroup *group, const TQString& name, KInstance* instance); @@ -64,13 +64,13 @@ class KoTCDIconCanvas : public KIconCanvas class KoTCDIconViewItem : public KIconViewItem { public: - KoTCDIconViewItem(TQIconView *tqparent=0) - : KIconViewItem ( tqparent ) + KoTCDIconViewItem(TQIconView *parent=0) + : KIconViewItem ( parent ) {} - KoTCDIconViewItem(TQIconView *tqparent=0, const TQString &text=0, const TQPixmap &icon=0, + KoTCDIconViewItem(TQIconView *parent=0, const TQString &text=0, const TQPixmap &icon=0, const TQString &descr=0, const TQString &fullname=0) - : KIconViewItem(tqparent, text, icon) + : KIconViewItem(parent, text, icon) { m_descr = descr; m_full = fullname; @@ -96,8 +96,8 @@ class KoTCDRecentFilesIconView : public KFileIconView { Q_OBJECT TQ_OBJECT public: - KoTCDRecentFilesIconView( TQWidget* tqparent, const char* name ) : - KFileIconView( tqparent, name ), toolTip(0) + KoTCDRecentFilesIconView( TQWidget* parent, const char* name ) : + KFileIconView( parent, name ), toolTip(0) { connect( this, TQT_SIGNAL( onItem( TQIconViewItem * ) ), TQT_SLOT( showToolTip( TQIconViewItem * ) ) ); @@ -168,13 +168,13 @@ public: * @param dialogType the type of the dialog * @param templateType the template type of your application (see kword or * kpresenter for details) - * @param tqparent pointer to tqparent widget + * @param parent pointer to parent widget * @return The return type (see above) */ static ReturnType choose(KInstance* instance, TQString &file, const DialogType &dialogType, const TQCString& templateType, - TQWidget* tqparent); + TQWidget* parent); private: /// Ditto, with extraNativeMimeTypes added @@ -184,7 +184,7 @@ private: const TQStringList& extraNativeMimeTypes, const DialogType &dialogType=Everything, const TQCString& templateType="", - TQWidget* tqparent = 0); + TQWidget* parent = 0); public: /** @@ -213,7 +213,7 @@ protected slots: private: /** * - * @param tqparent tqparent the tqparent of the dialog + * @param parent parent the parent of the dialog * @param name the TQt internal name * @param instance the KInstance of your app * @param format is the mimetype of the app (e.g. application/x-kspread) @@ -224,7 +224,7 @@ private: * * @return The return type (see above) */ - KoTemplateChooseDia(TQWidget *tqparent, const char *name, KInstance* instance, + KoTemplateChooseDia(TQWidget *parent, const char *name, KInstance* instance, const TQCString &format, const TQString &nativeName, const TQStringList &extraNativeMimeTypes, diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp index 213e694f..6243b9dc 100644 --- a/lib/kofficeui/KoTemplateCreateDia.cpp +++ b/lib/kofficeui/KoTemplateCreateDia.cpp @@ -55,7 +55,7 @@ class KoTemplateCreateDiaPrivate { public: - KoTemplateCreateDiaPrivate( TQWidget* /*tqparent*/, KInstance * instance) + KoTemplateCreateDiaPrivate( TQWidget* /*parent*/, KInstance * instance) : m_instance( instance ), m_tempFile( TQString(), ".png" ) { m_tree=0L; @@ -98,11 +98,11 @@ public: ****************************************************************************/ KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, KInstance *instance, - const TQString &file, const TQPixmap &pix, TQWidget *tqparent ) : - KDialogBase( tqparent, "template create dia", true, i18n( "Create Template" ), + const TQString &file, const TQPixmap &pix, TQWidget *parent ) : + KDialogBase( parent, "template create dia", true, i18n( "Create Template" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok ), m_file(file), m_pixmap(pix) { - d=new KoTemplateCreateDiaPrivate( tqparent, instance ); + d=new KoTemplateCreateDiaPrivate( parent, instance ); TQFrame *mainwidget=makeMainWidget(); TQHBoxLayout *mbox=new TQHBoxLayout(mainwidget, 0, KDialogBase::spacingHint()); @@ -201,9 +201,9 @@ void KoTemplateCreateDia::slotSelectionChanged() } void KoTemplateCreateDia::createTemplate( const TQCString &templateType, KInstance *instance, - const TQString &file, const TQPixmap &pix, TQWidget *tqparent ) { + const TQString &file, const TQPixmap &pix, TQWidget *parent ) { - KoTemplateCreateDia *dia = new KoTemplateCreateDia( templateType, instance, file, pix, tqparent ); + KoTemplateCreateDia *dia = new KoTemplateCreateDia( templateType, instance, file, pix, parent ); dia->exec(); delete dia; } @@ -221,7 +221,7 @@ void KoTemplateCreateDia::slotOk() { } // is it a group or a template? anyway - get the group :) if(item->depth()!=0) - item=item->tqparent(); + item=item->parent(); if(!item) { // *very* safe :P d->m_tree->writeTemplateTree(); KDialogBase::slotCancel(); diff --git a/lib/kofficeui/KoTemplateCreateDia.h b/lib/kofficeui/KoTemplateCreateDia.h index 659a9f99..821d2f27 100644 --- a/lib/kofficeui/KoTemplateCreateDia.h +++ b/lib/kofficeui/KoTemplateCreateDia.h @@ -46,11 +46,11 @@ class KOFFICEUI_EXPORT KoTemplateCreateDia : public KDialogBase public: KoTemplateCreateDia( const TQCString &templateType, KInstance *instance, - const TQString &file, const TQPixmap &pix, TQWidget *tqparent=0L ); + const TQString &file, const TQPixmap &pix, TQWidget *parent=0L ); ~KoTemplateCreateDia(); static void createTemplate( const TQCString &templateType, KInstance *instance, - const TQString &file, const TQPixmap &pix, TQWidget *tqparent=0L ); + const TQString &file, const TQPixmap &pix, TQWidget *parent=0L ); protected: void slotOk(); diff --git a/lib/kofficeui/KoToolBox.cpp b/lib/kofficeui/KoToolBox.cpp index eea6a290..db4d6467 100644 --- a/lib/kofficeui/KoToolBox.cpp +++ b/lib/kofficeui/KoToolBox.cpp @@ -91,9 +91,9 @@ void KoToolBox::registerTool( KAction *tool, int toolType, TQ_UINT32 priority ) (*tl)[prio] = tool; } -TQToolButton *KoToolBox::createButton(TQWidget * tqparent, const char* iconName, TQString tooltip) +TQToolButton *KoToolBox::createButton(TQWidget * parent, const char* iconName, TQString tooltip) { - TQToolButton *button = new TQToolButton(tqparent); + TQToolButton *button = new TQToolButton(parent); if ( iconName && *iconName ) { TQPixmap pixmap = BarIcon( iconName, m_instance ); @@ -193,8 +193,8 @@ void KoToolBox::slotSetTool(const TQString & toolname) // class ToolArea -ToolArea::ToolArea(TQWidget *tqparent) - : TQWidget(tqparent), m_left(true) +ToolArea::ToolArea(TQWidget *parent) + : TQWidget(parent), m_left(true) { m_layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight, 0, 0, 0); TQWidget *w = new TQWidget(this); diff --git a/lib/kofficeui/KoToolBox.h b/lib/kofficeui/KoToolBox.h index 9a04986e..764ce4c1 100644 --- a/lib/kofficeui/KoToolBox.h +++ b/lib/kofficeui/KoToolBox.h @@ -74,7 +74,7 @@ public slots: private: - TQToolButton * createButton(TQWidget * tqparent, const char* iconName, TQString tooltip); + TQToolButton * createButton(TQWidget * parent, const char* iconName, TQString tooltip); private: @@ -95,7 +95,7 @@ private: class ToolArea : public TQWidget { public: - ToolArea(TQWidget *tqparent); + ToolArea(TQWidget *parent); ~ToolArea(); void setOrientation ( Qt::Orientation o ); diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp index 9f500bb1..7260bbea 100644 --- a/lib/kofficeui/KoTooluButton.cpp +++ b/lib/kofficeui/KoTooluButton.cpp @@ -41,8 +41,8 @@ namespace { int ARROW_WIDTH = 12; } -KoColorPanel::KoColorPanel( TQWidget* tqparent, const char* name ) : - TQWidget( tqparent, name, WStaticContents | WRepaintNoErase | WResizeNoErase ) +KoColorPanel::KoColorPanel( TQWidget* parent, const char* name ) : + TQWidget( parent, name, WStaticContents | WRepaintNoErase | WResizeNoErase ) { setMouseTracking( true ); setAcceptDrops( true ); @@ -65,9 +65,9 @@ TQSize KoColorPanel::tqminimumSizeHint() const TQPopupMenu* KoColorPanel::createColorPopup( KoColorPanel::MenuStyle style, const TQColor& defaultColor, const TQObject* receiver, const char* slot, - TQWidget* tqparent, const char* name ) + TQWidget* parent, const char* name ) { - TQPopupMenu* menu = new TQPopupMenu( tqparent, name ); + TQPopupMenu* menu = new TQPopupMenu( parent, name ); KoColorPopupProxy* proxy = 0; if ( defaultColor.isValid() ) { @@ -613,8 +613,8 @@ bool operator<( const KoColorPanel::Position& lhs, const KoColorPanel::Position& } -KoColorPopupProxy::KoColorPopupProxy( const TQColor& defaultColor, KoColorPanel* recentColors, TQObject* tqparent, const char* name ) : - TQObject( tqparent, name ), m_defaultColor( defaultColor ), m_recentColors( recentColors ) +KoColorPopupProxy::KoColorPopupProxy( const TQColor& defaultColor, KoColorPanel* recentColors, TQObject* parent, const char* name ) : + TQObject( parent, name ), m_defaultColor( defaultColor ), m_recentColors( recentColors ) { } @@ -635,8 +635,8 @@ void KoColorPopupProxy::slotMoreColors() TQColor newColor; TQWidget* p = 0; - if ( tqparent() && tqparent()->isWidgetType() ) - p = TQT_TQWIDGET( tqparent() ); + if ( parent() && parent()->isWidgetType() ) + p = TQT_TQWIDGET( parent() ); if ( KColorDialog::getColor( newColor, p ) == TQDialog::Accepted ) { m_recentColors->insertColor( newColor ); @@ -645,16 +645,16 @@ void KoColorPopupProxy::slotMoreColors() } -KoToolButton::KoToolButton( const TQString& icon, int id, TQWidget* tqparent, +KoToolButton::KoToolButton( const TQString& icon, int id, TQWidget* parent, const char* name, const TQString& txt, KInstance* _instance ) : - KToolBarButton( icon, id, tqparent, name, txt, _instance ), m_arrowPressed( false ) + KToolBarButton( icon, id, parent, name, txt, _instance ), m_arrowPressed( false ) { init(); } -KoToolButton::KoToolButton( const TQPixmap& pixmap, int id, TQWidget* tqparent, +KoToolButton::KoToolButton( const TQPixmap& pixmap, int id, TQWidget* parent, const char* name, const TQString& txt ) : - KToolBarButton( pixmap, id, tqparent, name, txt ), m_arrowPressed( false ) + KToolBarButton( pixmap, id, parent, name, txt ), m_arrowPressed( false ) { init(); } diff --git a/lib/kofficeui/KoTooluButton.h b/lib/kofficeui/KoTooluButton.h index d4c33944..1374f6d2 100644 --- a/lib/kofficeui/KoTooluButton.h +++ b/lib/kofficeui/KoTooluButton.h @@ -31,7 +31,7 @@ class KoColorPanel : public TQWidget Q_OBJECT TQ_OBJECT public: - KoColorPanel( TQWidget* tqparent = 0, const char* name = 0 ); + KoColorPanel( TQWidget* parent = 0, const char* name = 0 ); virtual ~KoColorPanel(); virtual TQSize tqsizeHint() const; @@ -40,7 +40,7 @@ public: enum MenuStyle { Plain, CustomColors }; static TQPopupMenu* createColorPopup( MenuStyle style, const TQColor& defaultColor, const TQObject* receiver, const char* slot, - TQWidget* tqparent, const char* name ); + TQWidget* parent, const char* name ); public slots: void clear(); @@ -108,7 +108,7 @@ class KoColorPopupProxy : public TQObject Q_OBJECT TQ_OBJECT public: - KoColorPopupProxy( const TQColor& defaultColor, KoColorPanel* recentColors, TQObject* tqparent, const char* name ); + KoColorPopupProxy( const TQColor& defaultColor, KoColorPanel* recentColors, TQObject* parent, const char* name ); virtual ~KoColorPopupProxy() {} void setRecentColorPanel( KoColorPanel* recentColors ); @@ -139,11 +139,11 @@ public: * * @param icon Name of icon to load (may be absolute or relative) * @param id Id of this button - * @param tqparent This button's tqparent + * @param parent This button's parent * @param name This button's internal name * @param txt This button's text (in a tooltip or otherwise) */ - KoToolButton( const TQString& icon, int id, TQWidget* tqparent, + KoToolButton( const TQString& icon, int id, TQWidget* parent, const char* name = 0L, const TQString& txt = TQString(), KInstance* _instance = KGlobal::instance() ); @@ -154,11 +154,11 @@ public: * * @param icon Name of icon to load (may be absolute or relative) * @param id Id of this button - * @param tqparent This button's tqparent + * @param parent This button's parent * @param name This button's internal name * @param txt This button's text (in a tooltip or otherwise) */ - KoToolButton( const TQPixmap& pixmap, int id, TQWidget* tqparent, + KoToolButton( const TQPixmap& pixmap, int id, TQWidget* parent, const char* name = 0L, const TQString& txt = TQString() ); virtual ~KoToolButton(); diff --git a/lib/kofficeui/KoUnitWidgets.cpp b/lib/kofficeui/KoUnitWidgets.cpp index a9b4fbcf..476e35b3 100644 --- a/lib/kofficeui/KoUnitWidgets.cpp +++ b/lib/kofficeui/KoUnitWidgets.cpp @@ -31,8 +31,8 @@ // Support classes -KoUnitDoubleValidator::KoUnitDoubleValidator( KoUnitDoubleBase *base, TQObject *tqparent, const char *name ) -: KDoubleValidator( tqparent, name ), m_base( base ) +KoUnitDoubleValidator::KoUnitDoubleValidator( KoUnitDoubleBase *base, TQObject *parent, const char *name ) +: KDoubleValidator( parent, name ), m_base( base ) { } @@ -117,8 +117,8 @@ double KoUnitDoubleBase::toDouble( const TQString& str, bool* ok ) const // Widget classes -KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *tqparent, const char *name ) - : KDoubleSpinBox( tqparent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ) +KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *parent, const char *name ) + : KDoubleSpinBox( parent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ) , m_lowerInPoints( -9999 ) , m_upperInPoints( 9999 ) , m_stepInPoints( 1 ) @@ -133,14 +133,14 @@ KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *tqparent, const char *name ) } -KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *tqparent, +KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *parent, double lower, double upper, double step, double value, KoUnit::Unit unit, unsigned int precision, const char *name ) - : KDoubleSpinBox( lower, upper, step, value, precision, tqparent, name ), + : KDoubleSpinBox( lower, upper, step, value, precision, parent, name ), KoUnitDoubleBase( unit, precision ), m_lowerInPoints( lower ), m_upperInPoints( upper ), m_stepInPoints( step ) { @@ -219,8 +219,8 @@ void KoUnitDoubleSpinBox::setMinMaxStep( double min, double max, double step ) // ---------------------------------------------------------------- -KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *tqparent, const char *name ) - : KLineEdit( tqparent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ), +KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *parent, const char *name ) + : KLineEdit( parent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ), m_lowerInPoints( 0.0 ), m_upperInPoints( 9999.99 ) { tqsetAlignment( TQt::AlignRight ); @@ -230,9 +230,9 @@ KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *tqparent, const char *name changeValue( KoUnit::ptToUnit( 0.0, KoUnit::U_PT ) ); } -KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *tqparent, double lower, double upper, double value, KoUnit::Unit unit, +KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *parent, double lower, double upper, double value, KoUnit::Unit unit, unsigned int precision, const char *name ) - : KLineEdit( tqparent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ), + : KLineEdit( parent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ), m_lowerInPoints( lower ), m_upperInPoints( upper ) { tqsetAlignment( TQt::AlignRight ); @@ -284,8 +284,8 @@ double KoUnitDoubleLineEdit::value( void ) const // ---------------------------------------------------------------- -KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *tqparent, const char *name ) - : KComboBox( true, tqparent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ), m_lowerInPoints( 0.0 ), m_upperInPoints( 9999.99 ) +KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, const char *name ) + : KComboBox( true, parent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ), m_lowerInPoints( 0.0 ), m_upperInPoints( 9999.99 ) { lineEdit()->tqsetAlignment( TQt::AlignRight ); m_validator = new KoUnitDoubleValidator( this, TQT_TQOBJECT(this) ); @@ -295,9 +295,9 @@ KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *tqparent, const char *name connect( this, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivated( int ) ) ); } -KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *tqparent, double lower, double upper, double value, KoUnit::Unit unit, +KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, double lower, double upper, double value, KoUnit::Unit unit, unsigned int precision, const char *name ) - : KComboBox( true, tqparent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ), + : KComboBox( true, parent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ), m_lowerInPoints( lower ), m_upperInPoints( upper ) { lineEdit()->tqsetAlignment( TQt::AlignRight ); @@ -376,8 +376,8 @@ double KoUnitDoubleComboBox::value( void ) const // ---------------------------------------------------------------- -KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent ), m_step( 1.0 ) +KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, const char *name ) + : TQWidget( parent ), m_step( 1.0 ) { TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 ); //tqlayout->setMargin( 2 ); @@ -399,9 +399,9 @@ KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *tqparent, const ch tqlayout->addMultiCellWidget( m_combo, 0, 1, 2, 2 ); } -KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *tqparent, double lower, double upper, double step, double value, +KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, double lower, double upper, double step, double value, KoUnit::Unit unit, unsigned int precision, const char *name ) - : TQWidget( tqparent ), m_step( step )//, m_lowerInPoints( lower ), m_upperInPoints( upper ) + : TQWidget( parent ), m_step( step )//, m_lowerInPoints( lower ), m_upperInPoints( upper ) { TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 ); //tqlayout->setMargin( 2 ); diff --git a/lib/kofficeui/KoUnitWidgets.h b/lib/kofficeui/KoUnitWidgets.h index dbdcb9c0..80db554d 100644 --- a/lib/kofficeui/KoUnitWidgets.h +++ b/lib/kofficeui/KoUnitWidgets.h @@ -44,7 +44,7 @@ class KoUnitDoubleBase; class KOFFICEUI_EXPORT KoUnitDoubleValidator : public KDoubleValidator { public: - KoUnitDoubleValidator( KoUnitDoubleBase *base, TQObject *tqparent, const char *name = 0 ); + KoUnitDoubleValidator( KoUnitDoubleBase *base, TQObject *parent, const char *name = 0 ); virtual TQValidator::State validate( TQString &, int & ) const; @@ -109,9 +109,9 @@ class KOFFICEUI_EXPORT KoUnitDoubleSpinBox : public KDoubleSpinBox, public KoUni Q_OBJECT TQ_OBJECT public: - KoUnitDoubleSpinBox( TQWidget *tqparent = 0L, const char *name = 0L ); + KoUnitDoubleSpinBox( TQWidget *parent = 0L, const char *name = 0L ); // lower, upper, step and value are in pt - KoUnitDoubleSpinBox( TQWidget *tqparent, double lower, double upper, double step, double value = 0.0, + KoUnitDoubleSpinBox( TQWidget *parent, double lower, double upper, double step, double value = 0.0, KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 ); // added so the class can be used in .ui files(by Tymoteusz Majewski, maju7@o2.pl) virtual void changeValue( double ); @@ -136,7 +136,7 @@ public: void setMinMaxStep( double min, double max, double step ); signals: - /// emitted like valueChanged in the tqparent, but this one emits the point value + /// emitted like valueChanged in the parent, but this one emits the point value void valueChangedPt( double ); @@ -160,8 +160,8 @@ class KOFFICEUI_EXPORT KoUnitDoubleLineEdit : public KLineEdit, public KoUnitDou Q_OBJECT TQ_OBJECT public: - KoUnitDoubleLineEdit( TQWidget *tqparent = 0L, const char *name = 0L ); - KoUnitDoubleLineEdit( TQWidget *tqparent, double lower, double upper, double value = 0.0, KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 ); + KoUnitDoubleLineEdit( TQWidget *parent = 0L, const char *name = 0L ); + KoUnitDoubleLineEdit( TQWidget *parent, double lower, double upper, double value = 0.0, KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 ); virtual void changeValue( double ); virtual void setUnit( KoUnit::Unit = KoUnit::U_PT ); @@ -189,8 +189,8 @@ class KOFFICEUI_EXPORT KoUnitDoubleComboBox : public KComboBox, public KoUnitDou Q_OBJECT TQ_OBJECT public: - KoUnitDoubleComboBox( TQWidget *tqparent = 0L, const char *name = 0L ); - KoUnitDoubleComboBox( TQWidget *tqparent, double lower, double upper, double value = 0.0, KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 ); + KoUnitDoubleComboBox( TQWidget *parent = 0L, const char *name = 0L ); + KoUnitDoubleComboBox( TQWidget *parent, double lower, double upper, double value = 0.0, KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 ); virtual void changeValue( double ); void updateValue( double ); @@ -226,8 +226,8 @@ class KOFFICEUI_EXPORT KoUnitDoubleSpinComboBox : public TQWidget Q_OBJECT TQ_OBJECT public: - KoUnitDoubleSpinComboBox( TQWidget *tqparent = 0L, const char *name = 0L ); - KoUnitDoubleSpinComboBox( TQWidget *tqparent, double lower, double upper, double step, double value = 0.0, KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 ); + KoUnitDoubleSpinComboBox( TQWidget *parent = 0L, const char *name = 0L ); + KoUnitDoubleSpinComboBox( TQWidget *parent, double lower, double upper, double step, double value = 0.0, KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 ); void insertItem( double, int index = -1 ); void updateValue( double ); diff --git a/lib/kofficeui/KoZoomAction.cpp b/lib/kofficeui/KoZoomAction.cpp index bebe7055..7f9e4139 100644 --- a/lib/kofficeui/KoZoomAction.cpp +++ b/lib/kofficeui/KoZoomAction.cpp @@ -26,15 +26,15 @@ #include <klocale.h> KoZoomAction::KoZoomAction( const TQString& text, const TQIconSet& pix, - const KShortcut& cut, TQObject* tqparent, const char* name ): - KSelectAction( text, pix, cut, tqparent, name ) + const KShortcut& cut, TQObject* parent, const char* name ): + KSelectAction( text, pix, cut, parent, name ) { init(); } KoZoomAction::KoZoomAction( const TQString& text, const TQString& pix, - const KShortcut& cut, TQObject* tqparent, const char* name ): - KSelectAction( text, pix, cut, tqparent, name ) + const KShortcut& cut, TQObject* parent, const char* name ): + KSelectAction( text, pix, cut, parent, name ) { init(); diff --git a/lib/kofficeui/KoZoomAction.h b/lib/kofficeui/KoZoomAction.h index d714259a..932c409a 100644 --- a/lib/kofficeui/KoZoomAction.h +++ b/lib/kofficeui/KoZoomAction.h @@ -39,13 +39,13 @@ public: * Creates a new zoom action. */ KoZoomAction( const TQString& text, const TQIconSet& pix, - const KShortcut& cut = KShortcut(), TQObject* tqparent = 0, const char* name = 0 ); + const KShortcut& cut = KShortcut(), TQObject* parent = 0, const char* name = 0 ); /** * Creates a new zoom action. */ KoZoomAction( const TQString& text, const TQString& pix, - const KShortcut& cut = KShortcut(), TQObject* tqparent = 0, const char* name = 0 ); + const KShortcut& cut = KShortcut(), TQObject* parent = 0, const char* name = 0 ); public slots: diff --git a/lib/kofficeui/Kolinestyleaction.cpp b/lib/kofficeui/Kolinestyleaction.cpp index 0ef47518..5fa296f0 100644 --- a/lib/kofficeui/Kolinestyleaction.cpp +++ b/lib/kofficeui/Kolinestyleaction.cpp @@ -43,7 +43,7 @@ class KoLineStyleAction::KoLineStyleActionPrivate }; KoLineStyleAction::KoLineStyleAction(const TQString &text, const TQString& icon, - TQObject* tqparent, const char* name) : KoSelectAction(text, icon, tqparent, name) + TQObject* parent, const char* name) : KoSelectAction(text, icon, parent, name) { d = new KoLineStyleActionPrivate; @@ -51,7 +51,7 @@ KoLineStyleAction::KoLineStyleAction(const TQString &text, const TQString& icon, } KoLineStyleAction::KoLineStyleAction(const TQString &text, const TQString& icon, const TQObject* receiver, - const char* slot, TQObject* tqparent, const char* name) : KoSelectAction(text, icon, receiver, slot, tqparent, name) + const char* slot, TQObject* parent, const char* name) : KoSelectAction(text, icon, receiver, slot, parent, name) { d = new KoLineStyleActionPrivate; @@ -66,7 +66,7 @@ KoLineStyleAction::~KoLineStyleAction() void KoLineStyleAction::createMenu() { KPopupMenu* popup = popupMenu(); - TQBitmap tqmask; + TQBitmap mask; TQPixmap pix(70, 21); TQPainter p(&pix, popup); int cindex = 0; @@ -79,8 +79,8 @@ void KoLineStyleAction::createMenu() pen.setStyle(static_cast<Qt::PenStyle>(i)); p.setPen(pen); p.drawLine(0, 10, pix.width(), 10); - tqmask = pix; - pix.setMask(tqmask); + mask = pix; + pix.setMask(mask); popup->insertItem(pix,cindex++); } } diff --git a/lib/kofficeui/Kolinestyleaction.h b/lib/kofficeui/Kolinestyleaction.h index 6d8d9e91..63be979c 100644 --- a/lib/kofficeui/Kolinestyleaction.h +++ b/lib/kofficeui/Kolinestyleaction.h @@ -31,20 +31,20 @@ class KOFFICEUI_EXPORT KoLineStyleAction : public KoSelectAction /** Constructs a KoLineStyleAction with a text and an icon. * @param text The text that will be displayed. * @param icon The dynamically loaded icon that goes with this action. - * @param tqparent This action's tqparent. + * @param parent This action's parent. * @param name An internal name for this action. */ - KoLineStyleAction(const TQString& text, const TQString& icon, TQObject* tqparent = 0, const char* name = 0); + KoLineStyleAction(const TQString& text, const TQString& icon, TQObject* parent = 0, const char* name = 0); /** Same as above, but it also connects a slot to the selectionChanged(int) signal. * @param text The text that will be displayed. * @param icon The dynamically loaded icon that goes with this action. - * @param receiver The SLOT's tqparent. + * @param receiver The SLOT's parent. * @param slot The TQT_SLOT to invoke when a selectionChanged(int) signal is emited. - * @param tqparent This action's tqparent. + * @param parent This action's parent. * @param name An internal name for this action. */ KoLineStyleAction(const TQString& text, const TQString& icon, const TQObject* receiver, - const char* slot, TQObject* tqparent, const char* name = 0); + const char* slot, TQObject* parent, const char* name = 0); ~KoLineStyleAction(); protected: diff --git a/lib/kofficeui/Kolinewidthaction.cpp b/lib/kofficeui/Kolinewidthaction.cpp index 6b693d3c..c812c1c6 100644 --- a/lib/kofficeui/Kolinewidthaction.cpp +++ b/lib/kofficeui/Kolinewidthaction.cpp @@ -56,7 +56,7 @@ class KoLineWidthAction::KoLineWidthActionPrivate }; KoLineWidthAction::KoLineWidthAction(const TQString &text, const TQString& icon, - TQObject* tqparent, const char* name) : KoSelectAction(text, icon, tqparent, name) + TQObject* parent, const char* name) : KoSelectAction(text, icon, parent, name) { d = new KoLineWidthActionPrivate; @@ -64,7 +64,7 @@ KoLineWidthAction::KoLineWidthAction(const TQString &text, const TQString& icon, } KoLineWidthAction::KoLineWidthAction(const TQString &text, const TQString& icon, const TQObject* receiver, - const char* slot, TQObject* tqparent, const char* name) : KoSelectAction(text, icon, tqparent, name) + const char* slot, TQObject* parent, const char* name) : KoSelectAction(text, icon, parent, name) { d = new KoLineWidthActionPrivate; @@ -81,7 +81,7 @@ KoLineWidthAction::~KoLineWidthAction() void KoLineWidthAction::createMenu() { KPopupMenu* popup = popupMenu(); - TQBitmap tqmask; + TQBitmap mask; TQPixmap pix(70, 21); TQPainter p(&pix, popup); int cindex = 0; @@ -92,8 +92,8 @@ void KoLineWidthAction::createMenu() pen.setWidth(tqRound(i * POINT_TO_INCH(static_cast<double>(KoGlobal::dpiY())))); p.setPen(pen); p.drawLine(0, 10, pix.width(), 10); - tqmask = pix; - pix.setMask(tqmask); + mask = pix; + pix.setMask(mask); popup->insertItem(pix,cindex++); } @@ -162,8 +162,8 @@ class KoLineWidthChooser::KoLineWidthChooserPrivate KoUnitDoubleSpinBox* m_lineWidthUSBox; }; -KoLineWidthChooser::KoLineWidthChooser(TQWidget* tqparent, const char* name) - : KDialogBase(tqparent, name, true, i18n("Custom Line Width"), Ok|Cancel, Ok) +KoLineWidthChooser::KoLineWidthChooser(TQWidget* parent, const char* name) + : KDialogBase(parent, name, true, i18n("Custom Line Width"), Ok|Cancel, Ok) { d = new KoLineWidthChooserPrivate; diff --git a/lib/kofficeui/Kolinewidthaction.h b/lib/kofficeui/Kolinewidthaction.h index 31991fb4..a2b1dfe4 100644 --- a/lib/kofficeui/Kolinewidthaction.h +++ b/lib/kofficeui/Kolinewidthaction.h @@ -35,20 +35,20 @@ class KOFFICEUI_EXPORT KoLineWidthAction : public KoSelectAction /** Constructs a KoLineWidthAction with a text and an icon. * @param text The text that will be displayed. * @param icon The dynamically loaded icon that goes with this action. - * @param tqparent This action's tqparent. + * @param parent This action's parent. * @param name An internal name for this action. */ - KoLineWidthAction(const TQString& text, const TQString& icon, TQObject* tqparent = 0, const char* name = 0); + KoLineWidthAction(const TQString& text, const TQString& icon, TQObject* parent = 0, const char* name = 0); /** Same as above, but it also connects a slot to the selectionChanged(int) signal. * @param text The text that will be displayed. * @param icon The dynamically loaded icon that goes with this action. - * @param receiver The SLOT's tqparent. + * @param receiver The SLOT's parent. * @param slot The TQT_SLOT to invoke when a lineWidthChanged(double) signal is emited. - * @param tqparent This action's tqparent. + * @param parent This action's parent. * @param name An internal name for this action. */ KoLineWidthAction(const TQString& text, const TQString& icon, const TQObject* receiver, - const char* slot, TQObject* tqparent, const char* name = 0); + const char* slot, TQObject* parent, const char* name = 0); ~KoLineWidthAction(); /** Returns the currently selected line width */ @@ -90,7 +90,7 @@ class KoLineWidthChooser : public KDialogBase Q_OBJECT TQ_OBJECT public: - KoLineWidthChooser(TQWidget* tqparent = 0, const char* name = 0); + KoLineWidthChooser(TQWidget* parent = 0, const char* name = 0); ~KoLineWidthChooser(); /** Returns the selected line width in points. */ diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp index 2a9b383e..c0da86e9 100644 --- a/lib/kofficeui/kcoloractions.cpp +++ b/lib/kofficeui/kcoloractions.cpp @@ -29,41 +29,41 @@ #include <kdebug.h> KColorAction::KColorAction( const TQString& text, int accel, - TQObject* tqparent, const char* name ) - : KAction( text, accel, tqparent, name ) + TQObject* parent, const char* name ) + : KAction( text, accel, parent, name ) { typ = TextColor; init(); } KColorAction::KColorAction( const TQString& text, int accel, - TQObject* receiver, const char* slot, TQObject* tqparent, + TQObject* receiver, const char* slot, TQObject* parent, const char* name ) - : KAction( text, accel, receiver, slot, tqparent, name ) + : KAction( text, accel, receiver, slot, parent, name ) { typ = TextColor; init(); } KColorAction::KColorAction( const TQString& text, Type type, int accel, - TQObject* tqparent, const char* name ) - : KAction( text, accel, tqparent, name ) + TQObject* parent, const char* name ) + : KAction( text, accel, parent, name ) { typ = type; init(); } KColorAction::KColorAction( const TQString& text, Type type, int accel, - TQObject* receiver, const char* slot, TQObject* tqparent, + TQObject* receiver, const char* slot, TQObject* parent, const char* name ) - : KAction( text, accel, receiver, slot, tqparent, name ) + : KAction( text, accel, receiver, slot, parent, name ) { typ = type; init(); } -KColorAction::KColorAction( TQObject* tqparent, const char* name ) - : KAction( tqparent, name ) +KColorAction::KColorAction( TQObject* parent, const char* name ) + : KAction( parent, name ) { typ = TextColor; init(); @@ -218,8 +218,8 @@ void KColorAction::createPixmap() KSelectColorAction::KSelectColorAction( const TQString& text, Type type, const TQObject* receiver, const char* slot, - KActionCollection* tqparent, const char* name ) : - KAction( text, KShortcut(), receiver, slot, tqparent, name ), m_type( type ), + KActionCollection* parent, const char* name ) : + KAction( text, KShortcut(), receiver, slot, parent, name ), m_type( type ), m_color( TQt::black ) { } diff --git a/lib/kofficeui/kcoloractions.h b/lib/kofficeui/kcoloractions.h index 22910672..8f2c713b 100644 --- a/lib/kofficeui/kcoloractions.h +++ b/lib/kofficeui/kcoloractions.h @@ -39,16 +39,16 @@ public: }; // Create default (text) color action - KColorAction( const TQString& text, int accel = 0, TQObject* tqparent = 0, const char* name = 0 ); + KColorAction( const TQString& text, int accel = 0, TQObject* parent = 0, const char* name = 0 ); KColorAction( const TQString& text, int accel, - TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 ); - KColorAction( TQObject* tqparent = 0, const char* name = 0 ); + TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); + KColorAction( TQObject* parent = 0, const char* name = 0 ); // Create a color action of a given type KColorAction( const TQString& text, Type type, int accel = 0, - TQObject* tqparent = 0, const char* name = 0 ); + TQObject* parent = 0, const char* name = 0 ); KColorAction( const TQString& text, Type type, int accel, - TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 ); + TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); virtual void setColor( const TQColor &c ); TQColor color() const; @@ -78,7 +78,7 @@ public: KSelectColorAction( const TQString& text, Type type, const TQObject* receiver, const char* slot, - KActionCollection* tqparent, const char* name ); + KActionCollection* parent, const char* name ); virtual ~KSelectColorAction(); virtual int plug( TQWidget* w, int index = -1 ); diff --git a/lib/kofficeui/tests/coloraction_test.cpp b/lib/kofficeui/tests/coloraction_test.cpp index 1ce9f42a..729285bb 100644 --- a/lib/kofficeui/tests/coloraction_test.cpp +++ b/lib/kofficeui/tests/coloraction_test.cpp @@ -34,7 +34,7 @@ #include <time.h> -TopLevel::TopLevel( TQWidget* tqparent, const char* name) : TQMainWindow( tqparent, name ) +TopLevel::TopLevel( TQWidget* parent, const char* name) : TQMainWindow( parent, name ) { setCaption( TQString::tqfromLatin1( "KColorAction test application" ) ); diff --git a/lib/kofficeui/tests/coloraction_test.h b/lib/kofficeui/tests/coloraction_test.h index a2f0f2cf..d0847493 100644 --- a/lib/kofficeui/tests/coloraction_test.h +++ b/lib/kofficeui/tests/coloraction_test.h @@ -30,7 +30,7 @@ class TopLevel : public TQMainWindow Q_OBJECT TQ_OBJECT public: - TopLevel( TQWidget* tqparent = 0, const char* name = 0 ); + TopLevel( TQWidget* parent = 0, const char* name = 0 ); public slots: void insertRandomColor(); diff --git a/lib/kofficeui/tkaction.cpp b/lib/kofficeui/tkaction.cpp index 4af7d8d9..6a7d198a 100644 --- a/lib/kofficeui/tkaction.cpp +++ b/lib/kofficeui/tkaction.cpp @@ -41,8 +41,8 @@ } \ } -TKAction::TKAction(TQObject* tqparent, const char* name) -: KAction( "", 0, tqparent, name ) +TKAction::TKAction(TQObject* parent, const char* name) +: KAction( "", 0, parent, name ) { m_imode = TK::IconOnly; } @@ -120,9 +120,9 @@ void TKAction::updateLayout() } } -TQWidget* TKAction::createLayout(TQWidget* tqparent, TQWidget* tqchildren) +TQWidget* TKAction::createLayout(TQWidget* parent, TQWidget* tqchildren) { - TQWidget* base = new TQWidget(tqparent,"KTToolBarLayout"); + TQWidget* base = new TQWidget(parent,"KTToolBarLayout"); TQLabel* textLabel = new TQLabel(base,"text"); textLabel->setMinimumHeight(1); TQLabel* pixLabel = new TQLabel(base,"pixmap"); @@ -171,8 +171,8 @@ void TKAction::updateLayout(TQWidget* base) (pixLabel->isVisible() ? pixLabel->tqsizeHint().width():0) ); } /******************************************************************************/ -TKBaseSelectAction::TKBaseSelectAction( TQObject* tqparent, const char* name ) -: TKAction(tqparent,name) +TKBaseSelectAction::TKBaseSelectAction( TQObject* parent, const char* name ) +: TKAction(parent,name) { m_current = 0; m_editable = false; @@ -248,8 +248,8 @@ void TKBaseSelectAction::activate(int id) emit activated(id); } /******************************************************************************/ -TKSelectAction::TKSelectAction( TQObject* tqparent, const char* name ) -: TKBaseSelectAction(tqparent,name) +TKSelectAction::TKSelectAction( TQObject* parent, const char* name ) +: TKBaseSelectAction(parent,name) { } diff --git a/lib/kofficeui/tkaction.h b/lib/kofficeui/tkaction.h index 119fbc85..26b4069d 100644 --- a/lib/kofficeui/tkaction.h +++ b/lib/kofficeui/tkaction.h @@ -34,7 +34,7 @@ class KOFFICEUI_EXPORT TKAction : public KAction { Q_OBJECT TQ_OBJECT public: - TKAction(TQObject* tqparent, const char* name); + TKAction(TQObject* parent, const char* name); ~TKAction(); virtual int plug(TQWidget* widget, int index = -1); @@ -44,7 +44,7 @@ public: protected: virtual void initToolBarButton(TKToolBarButton*); - TQWidget* createLayout(TQWidget* tqparent, TQWidget* tqchildren); + TQWidget* createLayout(TQWidget* parent, TQWidget* tqchildren); void updateLayout(); virtual void updateLayout(TQWidget*); @@ -64,7 +64,7 @@ class KOFFICEUI_EXPORT TKBaseSelectAction : public TKAction TQ_OBJECT friend class TKSelectAction; public: - TKBaseSelectAction(TQObject* tqparent, const char* name); + TKBaseSelectAction(TQObject* parent, const char* name); ~TKBaseSelectAction(); virtual int plug(TQWidget* widget, int index = -1); @@ -98,7 +98,7 @@ class KOFFICEUI_EXPORT TKSelectAction : public TKBaseSelectAction { Q_OBJECT TQ_OBJECT public: - TKSelectAction(TQObject* tqparent, const char* name); + TKSelectAction(TQObject* parent, const char* name); ~TKSelectAction(); TQStringList items() const; diff --git a/lib/kofficeui/tkcoloractions.cpp b/lib/kofficeui/tkcoloractions.cpp index 1f17efb6..1449d0fb 100644 --- a/lib/kofficeui/tkcoloractions.cpp +++ b/lib/kofficeui/tkcoloractions.cpp @@ -32,8 +32,8 @@ #include <kdebug.h> #include <tqapplication.h> -TKColorPopupMenu::TKColorPopupMenu( TQWidget* tqparent, const char* name ) -: KPopupMenu(tqparent,name) +TKColorPopupMenu::TKColorPopupMenu( TQWidget* parent, const char* name ) +: KPopupMenu(parent,name) { } @@ -57,8 +57,8 @@ public: }; -TKSelectColorAction::TKSelectColorAction( const TQString& text, Type type, TQObject* tqparent, const char* name, bool menuDefaultColor ) -: TKAction(tqparent,name) +TKSelectColorAction::TKSelectColorAction( const TQString& text, Type type, TQObject* parent, const char* name, bool menuDefaultColor ) +: TKAction(parent,name) { d=new TKSelectColorActionPrivate(); d->defaultColorMenu=menuDefaultColor; @@ -70,8 +70,8 @@ TKSelectColorAction::TKSelectColorAction( const TQString& text, Type type, TQObj TKSelectColorAction::TKSelectColorAction( const TQString& text, Type type, TQObject* receiver, const char* slot, - TQObject* tqparent, const char* name, bool menuDefaultColor) -: TKAction(tqparent,name) + TQObject* parent, const char* name, bool menuDefaultColor) +: TKAction(parent,name) { d=new TKSelectColorActionPrivate(); d->defaultColorMenu=menuDefaultColor; @@ -297,8 +297,8 @@ public: }; /****************************************************************************************/ -TKColorPanel::TKColorPanel( TQWidget* tqparent, const char* name ) -: TQWidget(tqparent,name) +TKColorPanel::TKColorPanel( TQWidget* parent, const char* name ) +: TQWidget(parent,name) { d = new TKColorPanel::TKColorPanelPrivate(); m_activeColor = black; @@ -574,8 +574,8 @@ void TKColorPanel::fillPanel() } /****************************************************************************************/ -TKColorPanelButton::TKColorPanelButton( const TQColor& color, TQWidget* tqparent, const char* name ) -: TQFrame(tqparent,name), m_Color(color), m_bActive(false) +TKColorPanelButton::TKColorPanelButton( const TQColor& color, TQWidget* parent, const char* name ) +: TQFrame(parent,name), m_Color(color), m_bActive(false) { setFixedSize(16,16); setFrameStyle( NoFrame ); diff --git a/lib/kofficeui/tkcoloractions.h b/lib/kofficeui/tkcoloractions.h index 0c5ccb1a..b478e2dd 100644 --- a/lib/kofficeui/tkcoloractions.h +++ b/lib/kofficeui/tkcoloractions.h @@ -34,7 +34,7 @@ class TKColorPopupMenu : public KPopupMenu { Q_OBJECT TQ_OBJECT public: - TKColorPopupMenu( TQWidget* tqparent = 0, const char* name = 0 ); + TKColorPopupMenu( TQWidget* parent = 0, const char* name = 0 ); ~TKColorPopupMenu(); public slots: @@ -52,10 +52,10 @@ public: Color }; - TKSelectColorAction( const TQString& text, Type type, TQObject* tqparent, const char* name, bool menuDefaultColor=false); + TKSelectColorAction( const TQString& text, Type type, TQObject* parent, const char* name, bool menuDefaultColor=false); TKSelectColorAction( const TQString& text, Type type, TQObject* receiver, const char* slot, - TQObject* tqparent, const char* name,bool menuDefaultColor=false ); + TQObject* parent, const char* name,bool menuDefaultColor=false ); virtual ~TKSelectColorAction(); @@ -102,7 +102,7 @@ class TKColorPanelButton : public TQFrame { Q_OBJECT TQ_OBJECT public: - TKColorPanelButton( const TQColor&, TQWidget* tqparent, const char* name = 0 ); + TKColorPanelButton( const TQColor&, TQWidget* parent, const char* name = 0 ); ~TKColorPanelButton(); void setActive( bool ); @@ -131,7 +131,7 @@ class TKColorPanel : public TQWidget TQ_OBJECT public: - TKColorPanel( TQWidget* tqparent = 0L, const char* name = 0 ); + TKColorPanel( TQWidget* parent = 0L, const char* name = 0 ); ~TKColorPanel(); void setActiveColor( const TQColor& ); diff --git a/lib/kofficeui/tkcombobox.cpp b/lib/kofficeui/tkcombobox.cpp index 903f394e..d1cb7ac2 100644 --- a/lib/kofficeui/tkcombobox.cpp +++ b/lib/kofficeui/tkcombobox.cpp @@ -26,14 +26,14 @@ #include <kapplication.h> -TKComboBox::TKComboBox(TQWidget* tqparent, const char* name) -: TQComboBox(false,tqparent,name) +TKComboBox::TKComboBox(TQWidget* parent, const char* name) +: TQComboBox(false,parent,name) { } -TKComboBox::TKComboBox( bool isEditable, TQWidget* tqparent, const char* name ) -: TQComboBox(isEditable,tqparent,name) +TKComboBox::TKComboBox( bool isEditable, TQWidget* parent, const char* name ) +: TQComboBox(isEditable,parent,name) { } diff --git a/lib/kofficeui/tkcombobox.h b/lib/kofficeui/tkcombobox.h index 5ddcc563..066e9b93 100644 --- a/lib/kofficeui/tkcombobox.h +++ b/lib/kofficeui/tkcombobox.h @@ -25,8 +25,8 @@ class TKComboBox : public TQComboBox { Q_OBJECT TQ_OBJECT public: - TKComboBox(TQWidget* tqparent=0, const char* name=0); - TKComboBox(bool isEditable, TQWidget* tqparent=0, const char* name=0); + TKComboBox(TQWidget* parent=0, const char* name=0); + TKComboBox(bool isEditable, TQWidget* parent=0, const char* name=0); ~TKComboBox(); void activate(); diff --git a/lib/kofficeui/tktoolbarbutton.cpp b/lib/kofficeui/tktoolbarbutton.cpp index fa36390e..9b2cb29c 100644 --- a/lib/kofficeui/tktoolbarbutton.cpp +++ b/lib/kofficeui/tktoolbarbutton.cpp @@ -89,9 +89,9 @@ public: }; TKToolBarButton::TKToolBarButton( const TQString& icon, const TQString& txt, - TQWidget* tqparent, const char* name, + TQWidget* parent, const char* name, KInstance *instance ) -: TQToolButton(tqparent,name) +: TQToolButton(parent,name) { d = new TKToolBarButtonPrivate; d->m_text = txt; @@ -109,8 +109,8 @@ TKToolBarButton::TKToolBarButton( const TQString& icon, const TQString& txt, modeChange(); } -TKToolBarButton::TKToolBarButton( const TQPixmap& pixmap, const TQString& txt, TQWidget* tqparent, const char* name ) -: TQToolButton(tqparent,name ) +TKToolBarButton::TKToolBarButton( const TQPixmap& pixmap, const TQString& txt, TQWidget* parent, const char* name ) +: TQToolButton(parent,name ) { d = new TKToolBarButtonPrivate; d->m_text = txt; diff --git a/lib/kofficeui/tktoolbarbutton.h b/lib/kofficeui/tktoolbarbutton.h index 680c19b1..3cec2f57 100644 --- a/lib/kofficeui/tktoolbarbutton.h +++ b/lib/kofficeui/tktoolbarbutton.h @@ -36,10 +36,10 @@ class TKToolBarButton : public TQToolButton TQ_OBJECT public: TKToolBarButton(const TQString& icon, const TQString& txt, - TQWidget* tqparent = 0, const char *name=0L, + TQWidget* parent = 0, const char *name=0L, KInstance *_instance = KGlobal::instance()); - TKToolBarButton(const TQPixmap&, const TQString&, TQWidget* tqparent=0, const char* name=0); + TKToolBarButton(const TQPixmap&, const TQString&, TQWidget* parent=0, const char* name=0); ~TKToolBarButton(); void setIconMode(TK::IconMode); diff --git a/lib/kopainter/koColorChooser.cc b/lib/kopainter/koColorChooser.cc index 7f2a7d58..e2406a79 100644 --- a/lib/kopainter/koColorChooser.cc +++ b/lib/kopainter/koColorChooser.cc @@ -32,7 +32,7 @@ #include <koFrameButton.h> #include <koColorSlider.h> -KoColorChooser::KoColorChooser(TQWidget *tqparent, const char *name) : TQWidget(tqparent, name) +KoColorChooser::KoColorChooser(TQWidget *parent, const char *name) : TQWidget(parent, name) { m_current = 0; m_tab = new TQTabWidget(this, "KoColorChooser tab"); @@ -95,7 +95,7 @@ void KoColorChooser::slotChangeColor(const KoColor &c) } /* RGBWidget */ -RGBWidget::RGBWidget(TQWidget *tqparent) : ColorWidget(tqparent) +RGBWidget::RGBWidget(TQWidget *parent) : ColorWidget(parent) { TQGridLayout *mGrid = new TQGridLayout(this, 4, 5); @@ -160,7 +160,7 @@ RGBWidget::RGBWidget(TQWidget *tqparent) : ColorWidget(tqparent) connect(mBIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotBInChanged(int))); } -ColorWidget::ColorWidget(TQWidget *tqparent) : TQWidget(tqparent) +ColorWidget::ColorWidget(TQWidget *parent) : TQWidget(parent) { } @@ -276,7 +276,7 @@ void RGBWidget::slotPatchChanged(const TQColor& clr) /* HSVWidget */ -HSVWidget::HSVWidget(TQWidget *tqparent): ColorWidget(tqparent) +HSVWidget::HSVWidget(TQWidget *parent): ColorWidget(parent) { TQGridLayout *mGrid = new TQGridLayout(this, 3, 3); @@ -437,7 +437,7 @@ void HSVWidget::slotPatchChanged(const TQColor& clr) /* GreyWidget */ -GreyWidget::GreyWidget(TQWidget *tqparent): ColorWidget(tqparent) +GreyWidget::GreyWidget(TQWidget *parent): ColorWidget(parent) { TQGridLayout *mGrid = new TQGridLayout(this, 3, 3); @@ -511,7 +511,7 @@ void GreyWidget::slotPatchChanged(const TQColor& clr) emit colorChanged(mColor); } -LABWidget::LABWidget(TQWidget *tqparent) : ColorWidget(tqparent) +LABWidget::LABWidget(TQWidget *parent) : ColorWidget(parent) { TQGridLayout *mGrid = new TQGridLayout(this, 4, 5); diff --git a/lib/kopainter/koColorChooser.h b/lib/kopainter/koColorChooser.h index c6d72113..4f948496 100644 --- a/lib/kopainter/koColorChooser.h +++ b/lib/kopainter/koColorChooser.h @@ -45,7 +45,7 @@ class KoColorChooser : public TQWidget Q_OBJECT TQ_OBJECT public: - KoColorChooser(TQWidget *tqparent = 0L, const char *name = 0L); + KoColorChooser(TQWidget *parent = 0L, const char *name = 0L); const KoColor &color() const {return mColor; } @@ -86,7 +86,7 @@ class ColorWidget : public TQWidget { TQ_OBJECT public: - ColorWidget(TQWidget *tqparent = 0); + ColorWidget(TQWidget *parent = 0); virtual ~ColorWidget(); public slots: @@ -103,7 +103,7 @@ class RGBWidget : public ColorWidget Q_OBJECT TQ_OBJECT public: - RGBWidget(TQWidget *tqparent = 0L); + RGBWidget(TQWidget *parent = 0L); virtual ~RGBWidget() {} public slots: @@ -141,7 +141,7 @@ class HSVWidget : public ColorWidget Q_OBJECT TQ_OBJECT public: - HSVWidget(TQWidget *tqparent = 0L); + HSVWidget(TQWidget *parent = 0L); virtual ~HSVWidget() {} public slots: @@ -179,7 +179,7 @@ class GreyWidget : public ColorWidget Q_OBJECT TQ_OBJECT public: - GreyWidget(TQWidget *tqparent = 0L); + GreyWidget(TQWidget *parent = 0L); virtual ~GreyWidget() {} public slots: @@ -205,7 +205,7 @@ class LABWidget : public ColorWidget Q_OBJECT TQ_OBJECT public: - LABWidget(TQWidget *tqparent = 0L); + LABWidget(TQWidget *parent = 0L); virtual ~LABWidget() {} public slots: diff --git a/lib/kopainter/koColorSlider.cc b/lib/kopainter/koColorSlider.cc index 46f4d249..6c1f8230 100644 --- a/lib/kopainter/koColorSlider.cc +++ b/lib/kopainter/koColorSlider.cc @@ -26,8 +26,8 @@ #include <kdebug.h> #include <kpixmapeffect.h> -KoColorFrame::KoColorFrame(TQWidget *tqparent): -TQFrame(tqparent) +KoColorFrame::KoColorFrame(TQWidget *parent): +TQFrame(parent) { setFrameStyle(Panel | Sunken); setBackgroundMode(NoBackground); @@ -167,8 +167,8 @@ void KoColorFrame::mouseMoveEvent(TQMouseEvent *e) /***********************************************************************************/ -KoSliderWidget::KoSliderWidget(TQWidget *tqparent): -TQWidget(tqparent) +KoSliderWidget::KoSliderWidget(TQWidget *parent): +TQWidget(parent) { mDragging = false; setFixedHeight(6); @@ -235,8 +235,8 @@ void KoSliderWidget::mouseMoveEvent(TQMouseEvent *e) /***********************************************************************************/ -KoColorSlider::KoColorSlider(TQWidget *tqparent): -TQWidget(tqparent) +KoColorSlider::KoColorSlider(TQWidget *parent): +TQWidget(parent) { mColorFrame = new KoColorFrame(this); mSlider = new KoSliderWidget(this); diff --git a/lib/kopainter/koColorSlider.h b/lib/kopainter/koColorSlider.h index e556bcf2..afd7f7a9 100644 --- a/lib/kopainter/koColorSlider.h +++ b/lib/kopainter/koColorSlider.h @@ -33,7 +33,7 @@ class KOPAINTER_EXPORT KoColorFrame : public TQFrame Q_OBJECT TQ_OBJECT public: - KoColorFrame(TQWidget *tqparent = 0L); + KoColorFrame(TQWidget *parent = 0L); const TQColor colorAt(const TQPoint &p); @@ -66,7 +66,7 @@ class KOPAINTER_EXPORT KoSliderWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - KoSliderWidget(TQWidget *tqparent = 0L); + KoSliderWidget(TQWidget *parent = 0L); protected: void mousePressEvent(TQMouseEvent *e); @@ -87,7 +87,7 @@ class KOPAINTER_EXPORT KoColorSlider : public TQWidget Q_OBJECT TQ_OBJECT public: - KoColorSlider(TQWidget *tqparent = 0L); + KoColorSlider(TQWidget *parent = 0L); virtual ~KoColorSlider(); int minValue(); diff --git a/lib/kopainter/koFrameButton.cc b/lib/kopainter/koFrameButton.cc index 80610422..c87fe230 100644 --- a/lib/kopainter/koFrameButton.cc +++ b/lib/kopainter/koFrameButton.cc @@ -20,8 +20,8 @@ #include "koFrameButton.h" -KoFrameButton::KoFrameButton(TQWidget *tqparent, const char *name): -TQLabel(tqparent, name) +KoFrameButton::KoFrameButton(TQWidget *parent, const char *name): +TQLabel(parent, name) { setAutoResize(true); setFrameStyle(Panel | Raised); @@ -31,8 +31,8 @@ TQLabel(tqparent, name) mToggle = false; } -KoFrameButton::KoFrameButton(const TQString &text, TQWidget *tqparent, const char *name): -TQLabel(tqparent, name) +KoFrameButton::KoFrameButton(const TQString &text, TQWidget *parent, const char *name): +TQLabel(parent, name) { setFrameStyle(Panel | Raised); setLineWidth(1); @@ -42,8 +42,8 @@ TQLabel(tqparent, name) mToggle = false; } -KoFrameButton::KoFrameButton(const TQPixmap &pixmap, TQWidget *tqparent, const char *name): -TQLabel(tqparent, name) +KoFrameButton::KoFrameButton(const TQPixmap &pixmap, TQWidget *parent, const char *name): +TQLabel(parent, name) { setFrameStyle(Panel | Raised); setLineWidth(1); diff --git a/lib/kopainter/koFrameButton.h b/lib/kopainter/koFrameButton.h index d05e1d1f..41f33837 100644 --- a/lib/kopainter/koFrameButton.h +++ b/lib/kopainter/koFrameButton.h @@ -31,9 +31,9 @@ class KoFrameButton : public TQLabel Q_OBJECT TQ_OBJECT public: - KoFrameButton(TQWidget *tqparent = 0, const char *name = 0); - KoFrameButton(const TQString &text, TQWidget *tqparent = 0, const char *name = 0); - KoFrameButton(const TQPixmap &pixmap, TQWidget *tqparent = 0, const char *name = 0); + KoFrameButton(TQWidget *parent = 0, const char *name = 0); + KoFrameButton(const TQString &text, TQWidget *parent = 0, const char *name = 0); + KoFrameButton(const TQPixmap &pixmap, TQWidget *parent = 0, const char *name = 0); bool isOn() {return mActive; } void setOn(bool v); diff --git a/lib/kopainter/koIconChooser.cc b/lib/kopainter/koIconChooser.cc index 06efc8cf..4604bbbd 100644 --- a/lib/kopainter/koIconChooser.cc +++ b/lib/kopainter/koIconChooser.cc @@ -29,8 +29,8 @@ #include <tqlayout.h> #include <kdebug.h> -KoPixmapWidget::KoPixmapWidget(const TQPixmap &aPixmap, TQWidget *tqparent, const char *name): -TQFrame(tqparent, name, WType_Popup) +KoPixmapWidget::KoPixmapWidget(const TQPixmap &aPixmap, TQWidget *parent, const char *name): +TQFrame(parent, name, WType_Popup) { kdDebug() << "Popup created: " << name << "\n"; setFrameStyle(TQFrame::WinPanel | TQFrame::Raised); @@ -61,8 +61,8 @@ void KoPixmapWidget::mouseReleaseEvent(TQMouseEvent *) } -KoIconChooser::KoIconChooser(TQSize aIconSize, TQWidget *tqparent, const char *name, bool sort): -TQGridView(tqparent, name) +KoIconChooser::KoIconChooser(TQSize aIconSize, TQWidget *parent, const char *name, bool sort): +TQGridView(parent, name) { TQGridView::setBackgroundColor(TQt::white); @@ -431,8 +431,8 @@ int KoIconChooser::sortInsertionIndex(const KoIconItem *item) return index; } -KoPatternChooser::KoPatternChooser( const TQPtrList<KoIconItem> &list, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +KoPatternChooser::KoPatternChooser( const TQPtrList<KoIconItem> &list, TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { // only serves as beautifier for the iconchooser //frame = new TQHBox( this ); diff --git a/lib/kopainter/koIconChooser.h b/lib/kopainter/koIconChooser.h index 59057f2e..84c15e13 100644 --- a/lib/kopainter/koIconChooser.h +++ b/lib/kopainter/koIconChooser.h @@ -48,7 +48,7 @@ public: class KoPixmapWidget : public TQFrame { public: - KoPixmapWidget(const TQPixmap &aPixmap, TQWidget *tqparent = 0L, const char *name = 0L); + KoPixmapWidget(const TQPixmap &aPixmap, TQWidget *parent = 0L, const char *name = 0L); ~KoPixmapWidget(); protected: @@ -65,7 +65,7 @@ class KOPAINTER_EXPORT KoIconChooser: public TQGridView TQ_OBJECT public: // To make the items sorted, set 'sort' to true and override KoIconItem::compare(). - KoIconChooser(TQSize iconSize, TQWidget *tqparent = 0L, const char *name = 0L, bool sort = false); + KoIconChooser(TQSize iconSize, TQWidget *parent = 0L, const char *name = 0L, bool sort = false); virtual ~KoIconChooser(); bool autoDelete() const {return mIconList.autoDelete(); } @@ -126,7 +126,7 @@ class KOPAINTER_EXPORT KoPatternChooser : public TQWidget Q_OBJECT TQ_OBJECT public: - KoPatternChooser( const TQPtrList<KoIconItem> &list, TQWidget *tqparent, const char *name = 0 ); + KoPatternChooser( const TQPtrList<KoIconItem> &list, TQWidget *parent, const char *name = 0 ); ~KoPatternChooser(); KoIconItem *currentPattern(); diff --git a/lib/kopainter/ko_cmyk_widget.cc b/lib/kopainter/ko_cmyk_widget.cc index 5dee7ec5..1eb9eece 100644 --- a/lib/kopainter/ko_cmyk_widget.cc +++ b/lib/kopainter/ko_cmyk_widget.cc @@ -38,7 +38,7 @@ #include <kcolordialog.h> #include <kdualcolorbutton.h> -KoCMYKWidget::KoCMYKWidget(TQWidget *tqparent, const char *name) : super(tqparent, name) +KoCMYKWidget::KoCMYKWidget(TQWidget *parent, const char *name) : super(parent, name) { m_ColorButton = new KDualColorButton(this); m_ColorButton -> setFixedSize(m_ColorButton->tqsizeHint()); diff --git a/lib/kopainter/ko_cmyk_widget.h b/lib/kopainter/ko_cmyk_widget.h index b65f6645..bf4ca658 100644 --- a/lib/kopainter/ko_cmyk_widget.h +++ b/lib/kopainter/ko_cmyk_widget.h @@ -48,7 +48,7 @@ class KoCMYKWidget typedef TQWidget super; public: - KoCMYKWidget(TQWidget *tqparent = 0L, const char *name = 0); + KoCMYKWidget(TQWidget *parent = 0L, const char *name = 0); virtual ~KoCMYKWidget() {} public slots: diff --git a/lib/kopainter/ko_color_wheel.cc b/lib/kopainter/ko_color_wheel.cc index 17a93c7b..0c268849 100644 --- a/lib/kopainter/ko_color_wheel.cc +++ b/lib/kopainter/ko_color_wheel.cc @@ -27,7 +27,7 @@ #define pi 3.14159265 -KoColorWheel::KoColorWheel( TQWidget *tqparent, const char *name ): KXYSelector( tqparent, name ) +KoColorWheel::KoColorWheel( TQWidget *parent, const char *name ): KXYSelector( parent, name ) { } diff --git a/lib/kopainter/ko_color_wheel.h b/lib/kopainter/ko_color_wheel.h index d12fa1bc..861440b2 100644 --- a/lib/kopainter/ko_color_wheel.h +++ b/lib/kopainter/ko_color_wheel.h @@ -32,7 +32,7 @@ class KoColorWheel : public KXYSelector TQ_OBJECT public: - KoColorWheel( TQWidget *tqparent=0, const char *name=0 ); + KoColorWheel( TQWidget *parent=0, const char *name=0 ); signals: void valueChanged(const KoColor& c); diff --git a/lib/kopainter/ko_gray_widget.cc b/lib/kopainter/ko_gray_widget.cc index bf7503df..e40031b5 100644 --- a/lib/kopainter/ko_gray_widget.cc +++ b/lib/kopainter/ko_gray_widget.cc @@ -31,7 +31,7 @@ #include <koColorSlider.h> #include <kcolordialog.h> -KoGrayWidget::KoGrayWidget(TQWidget *tqparent, const char *name) : super(tqparent, name) +KoGrayWidget::KoGrayWidget(TQWidget *parent, const char *name) : super(parent, name) { m_ColorButton = new KDualColorButton(this); Q_CHECK_PTR(m_ColorButton); diff --git a/lib/kopainter/ko_gray_widget.h b/lib/kopainter/ko_gray_widget.h index 6f950201..2c008c84 100644 --- a/lib/kopainter/ko_gray_widget.h +++ b/lib/kopainter/ko_gray_widget.h @@ -40,7 +40,7 @@ class KoGrayWidget typedef TQWidget super; public: - KoGrayWidget(TQWidget *tqparent = 0L, const char *name = 0); + KoGrayWidget(TQWidget *parent = 0L, const char *name = 0); virtual ~KoGrayWidget() {} public slots: diff --git a/lib/kopainter/ko_hsv_widget.cc b/lib/kopainter/ko_hsv_widget.cc index 1633fbc8..c870248a 100644 --- a/lib/kopainter/ko_hsv_widget.cc +++ b/lib/kopainter/ko_hsv_widget.cc @@ -34,7 +34,7 @@ #include <kdebug.h> #include <klocale.h> -KoHSVWidget::KoHSVWidget(TQWidget *tqparent, const char *name) : super(tqparent, name) +KoHSVWidget::KoHSVWidget(TQWidget *parent, const char *name) : super(parent, name) { m_ColorButton = new KDualColorButton(this); m_ColorButton -> setFixedSize(m_ColorButton->tqsizeHint()); diff --git a/lib/kopainter/ko_hsv_widget.h b/lib/kopainter/ko_hsv_widget.h index 529e5af2..c9652fc9 100644 --- a/lib/kopainter/ko_hsv_widget.h +++ b/lib/kopainter/ko_hsv_widget.h @@ -43,7 +43,7 @@ class KoHSVWidget typedef TQWidget super; public: - KoHSVWidget(TQWidget *tqparent = 0L, const char *name = 0); + KoHSVWidget(TQWidget *parent = 0L, const char *name = 0); virtual ~KoHSVWidget() {} public slots: diff --git a/lib/kopainter/ko_rgb_widget.cc b/lib/kopainter/ko_rgb_widget.cc index 22df059b..5eaef38e 100644 --- a/lib/kopainter/ko_rgb_widget.cc +++ b/lib/kopainter/ko_rgb_widget.cc @@ -35,7 +35,7 @@ #include <koColorSlider.h> #include <kcolordialog.h> -KoRGBWidget::KoRGBWidget(TQWidget *tqparent, const char *name) : super(tqparent, name) +KoRGBWidget::KoRGBWidget(TQWidget *parent, const char *name) : super(parent, name) { m_ColorButton = new KDualColorButton(this); m_ColorButton -> setFixedSize(m_ColorButton->tqsizeHint()); diff --git a/lib/kopainter/ko_rgb_widget.h b/lib/kopainter/ko_rgb_widget.h index c7d657a4..b9779513 100644 --- a/lib/kopainter/ko_rgb_widget.h +++ b/lib/kopainter/ko_rgb_widget.h @@ -42,7 +42,7 @@ class KoRGBWidget typedef TQWidget super; public: - KoRGBWidget(TQWidget *tqparent = 0L, const char *name = 0); + KoRGBWidget(TQWidget *parent = 0L, const char *name = 0); virtual ~KoRGBWidget() {} public slots: diff --git a/lib/kopalette/kopalette.cc b/lib/kopalette/kopalette.cc index 1c6fb960..c9d6cb2b 100644 --- a/lib/kopalette/kopalette.cc +++ b/lib/kopalette/kopalette.cc @@ -39,8 +39,8 @@ #include "kopalette.h" -KoPalette::KoPalette(TQWidget * tqparent, const char * name) - : TQDockWindow(tqparent, name) +KoPalette::KoPalette(TQWidget * parent, const char * name) + : TQDockWindow(parent, name) { #if KDE_VERSION >= KDE_MAKE_VERSION(3,3,90) diff --git a/lib/kopalette/kopalette.h b/lib/kopalette/kopalette.h index 6f5654ee..48d9cb3c 100644 --- a/lib/kopalette/kopalette.h +++ b/lib/kopalette/kopalette.h @@ -43,7 +43,7 @@ Q_OBJECT public: - KoPalette(TQWidget * tqparent, const char * name); + KoPalette(TQWidget * parent, const char * name); virtual ~KoPalette(); public: diff --git a/lib/kopalette/kotabpalette.cc b/lib/kopalette/kotabpalette.cc index c1b7a8a2..0e798842 100644 --- a/lib/kopalette/kotabpalette.cc +++ b/lib/kopalette/kotabpalette.cc @@ -27,8 +27,8 @@ #include <kotabpalette.h> #include "kopalettemanager.h" -KoTabPalette::KoTabPalette(TQWidget * tqparent, const char * name) - : KoPalette(tqparent, name) +KoTabPalette::KoTabPalette(TQWidget * parent, const char * name) + : KoPalette(parent, name) { m_page = new KTabWidget(this); m_page->setTabShape(TQTabWidget::Triangular); @@ -48,7 +48,7 @@ void KoTabPalette::plug(TQWidget * w, const TQString & /*name*/, int position) { if (!w) return; - w -> unsetFont(); // Use the tqparent font + w -> unsetFont(); // Use the parent font m_page -> insertTab(w, w -> caption(), position); show(); diff --git a/lib/kopalette/kotabpalette.h b/lib/kopalette/kotabpalette.h index 18d46806..a33d58a2 100644 --- a/lib/kopalette/kotabpalette.h +++ b/lib/kopalette/kotabpalette.h @@ -41,7 +41,7 @@ Q_OBJECT public: - KoTabPalette(TQWidget * tqparent, const char * name); + KoTabPalette(TQWidget * parent, const char * name); virtual ~KoTabPalette(); public: diff --git a/lib/kopalette/kotoolboxpalette.cc b/lib/kopalette/kotoolboxpalette.cc index 2ba9f3bb..e4c2bd63 100644 --- a/lib/kopalette/kotoolboxpalette.cc +++ b/lib/kopalette/kotoolboxpalette.cc @@ -24,8 +24,8 @@ #include <kopalettemanager.h> #include <kotoolboxpalette.h> -KoToolBoxPalette::KoToolBoxPalette(TQWidget * tqparent, const char * name) - : KoPalette(tqparent, name) +KoToolBoxPalette::KoToolBoxPalette(TQWidget * parent, const char * name) + : KoPalette(parent, name) { m_page = new TQToolBox(this); m_page->unsetFont(); diff --git a/lib/kopalette/kotoolboxpalette.h b/lib/kopalette/kotoolboxpalette.h index b4c8290f..1d15ef62 100644 --- a/lib/kopalette/kotoolboxpalette.h +++ b/lib/kopalette/kotoolboxpalette.h @@ -34,7 +34,7 @@ Q_OBJECT public: - KoToolBoxPalette(TQWidget * tqparent, const char * name); + KoToolBoxPalette(TQWidget * parent, const char * name); ~KoToolBoxPalette(); public: diff --git a/lib/koproperty/customproperty.cpp b/lib/koproperty/customproperty.cpp index f2c17808..c5a33ef6 100644 --- a/lib/koproperty/customproperty.cpp +++ b/lib/koproperty/customproperty.cpp @@ -30,8 +30,8 @@ using namespace KoProperty; -CustomProperty::CustomProperty(Property *tqparent) - : m_property(tqparent) +CustomProperty::CustomProperty(Property *parent) + : m_property(parent) { } @@ -80,15 +80,15 @@ SizeCustomProperty::setValue(const TQVariant &value, bool rememberOldValue) if(!m_property) return; - if(m_property->tqparent()) { - TQSize s = m_property->tqparent()->value().toSize(); + if(m_property->parent()) { + TQSize s = m_property->parent()->value().toSize(); if(m_property->type() == Size_Height) s.setHeight(value.toInt()); else if(m_property->type() == Size_Width) s.setWidth(value.toInt()); - m_property->tqparent()->setValue(s, true, false); + m_property->parent()->setValue(s, true, false); } else{ TQSize s = value.toSize(); @@ -100,13 +100,13 @@ SizeCustomProperty::setValue(const TQVariant &value, bool rememberOldValue) TQVariant SizeCustomProperty::value() const { - if(!m_property || !m_property->tqparent()) + if(!m_property || !m_property->parent()) return TQVariant(); if(m_property->type() == Size_Height) - return m_property->tqparent()->value().toSize().height(); + return m_property->parent()->value().toSize().height(); else if(m_property->type() == Size_Width) - return m_property->tqparent()->value().toSize().width(); + return m_property->parent()->value().toSize().width(); return TQVariant(); } @@ -146,15 +146,15 @@ PointCustomProperty::setValue(const TQVariant &value, bool rememberOldValue) if(!m_property) return; - if(m_property->tqparent()) { - TQPoint p = m_property->tqparent()->value().toPoint(); + if(m_property->parent()) { + TQPoint p = m_property->parent()->value().toPoint(); if(m_property->type() == Point_X) p.setX(value.toInt()); else if(m_property->type() == Point_Y) p.setY(value.toInt()); - m_property->tqparent()->setValue(p, true, false); + m_property->parent()->setValue(p, true, false); } else { TQPoint p = value.toPoint(); @@ -166,13 +166,13 @@ PointCustomProperty::setValue(const TQVariant &value, bool rememberOldValue) TQVariant PointCustomProperty::value() const { - if(!m_property || !m_property->tqparent()) + if(!m_property || !m_property->parent()) return TQVariant(); if(m_property->type() == Point_X) - return m_property->tqparent()->value().toPoint().x(); + return m_property->parent()->value().toPoint().x(); else if(m_property->type() == Point_Y) - return m_property->tqparent()->value().toPoint().y(); + return m_property->parent()->value().toPoint().y(); return TQVariant(); } @@ -214,8 +214,8 @@ RectCustomProperty::setValue(const TQVariant &value, bool rememberOldValue) if(!m_property) return; - if(m_property->tqparent()) { - TQRect r = m_property->tqparent()->value().toRect(); + if(m_property->parent()) { + TQRect r = m_property->parent()->value().toRect(); if(m_property->type() == Rect_X) { //changing x component of Rect shouldn't change width @@ -234,7 +234,7 @@ RectCustomProperty::setValue(const TQVariant &value, bool rememberOldValue) else if(m_property->type() == Rect_Height) r.setHeight(value.toInt()); - m_property->tqparent()->setValue(r, true, false); + m_property->parent()->setValue(r, true, false); } else { TQRect r = value.toRect(); @@ -248,17 +248,17 @@ RectCustomProperty::setValue(const TQVariant &value, bool rememberOldValue) TQVariant RectCustomProperty::value() const { - if(!m_property || !m_property->tqparent()) + if(!m_property || !m_property->parent()) return TQVariant(); if(m_property->type() == Rect_X) - return m_property->tqparent()->value().toRect().x(); + return m_property->parent()->value().toRect().x(); else if(m_property->type() == Rect_Y) - return m_property->tqparent()->value().toRect().y(); + return m_property->parent()->value().toRect().y(); else if(m_property->type() == Rect_Width) - return m_property->tqparent()->value().toRect().width(); + return m_property->parent()->value().toRect().width(); else if(m_property->type() == Rect_Height) - return m_property->tqparent()->value().toRect().height(); + return m_property->parent()->value().toRect().height(); return TQVariant(); } @@ -334,8 +334,8 @@ SizePolicyCustomProperty::setValue(const TQVariant &value, bool rememberOldValue if(!m_property) return; - if(m_property->tqparent()) { - TQSizePolicy v = m_property->tqparent()->value().toSizePolicy(); + if(m_property->parent()) { + TQSizePolicy v = m_property->parent()->value().toSizePolicy(); if(m_property->type() == SizePolicy_HorData) v.setHorData(TQSizePolicy::SizeType(value.toInt())); @@ -346,7 +346,7 @@ SizePolicyCustomProperty::setValue(const TQVariant &value, bool rememberOldValue else if(m_property->type() == SizePolicy_VerStretch) v.setVerStretch(value.toInt()); - m_property->tqparent()->setValue(v, true, false); + m_property->parent()->setValue(v, true, false); } else { TQSizePolicy v = value.toSizePolicy(); @@ -360,17 +360,17 @@ SizePolicyCustomProperty::setValue(const TQVariant &value, bool rememberOldValue TQVariant SizePolicyCustomProperty::value() const { - if(!m_property || !m_property->tqparent()) + if(!m_property || !m_property->parent()) return TQVariant(); if(m_property->type() == SizePolicy_HorData) - return m_property->tqparent()->value().toSizePolicy().horData(); + return m_property->parent()->value().toSizePolicy().horData(); else if(m_property->type() == SizePolicy_VerData) - return m_property->tqparent()->value().toSizePolicy().verData(); + return m_property->parent()->value().toSizePolicy().verData(); else if(m_property->type() == SizePolicy_HorStretch) - return m_property->tqparent()->value().toSizePolicy().horStretch(); + return m_property->parent()->value().toSizePolicy().horStretch(); else if(m_property->type() == SizePolicy_VerStretch) - return m_property->tqparent()->value().toSizePolicy().verStretch(); + return m_property->parent()->value().toSizePolicy().verStretch(); return TQVariant(); } diff --git a/lib/koproperty/customproperty.h b/lib/koproperty/customproperty.h index 60584ca3..45107eb3 100644 --- a/lib/koproperty/customproperty.h +++ b/lib/koproperty/customproperty.h @@ -40,20 +40,20 @@ class Property; class KOPROPERTY_EXPORT CustomProperty { public: - CustomProperty(Property *tqparent); + CustomProperty(Property *parent); virtual ~CustomProperty(); /*! This function is called by \ref Property::setValue() when a custom property is set. You don't have to modify the property value, it is done by Property class. - You just have to update child or tqparent properties value (m_property->tqparent()->setValue()). + You just have to update child or parent properties value (m_property->parent()->setValue()). Note that, when calling Property::setValue, you <b>need</b> to set useCustomProperty (3rd parameter) to false, or there will be infinite recursion. */ virtual void setValue(const TQVariant &value, bool rememberOldValue) = 0; /*! This function is called by \ref Property::value() when a custom property is set and \ref handleValue() is true. - You should return property's value, taken from tqparent's value.*/ + You should return property's value, taken from parent's value.*/ virtual TQVariant value() const = 0; /*! Tells whether CustomProperty should be used to get the property's value. @@ -66,7 +66,7 @@ class KOPROPERTY_EXPORT CustomProperty Property *m_property; /*! This method emits the \a Set::propertyChanged() signal for all - sets our tqparent-property is registered in. */ + sets our parent-property is registered in. */ void emitPropertyChanged(); }; @@ -74,7 +74,7 @@ class KOPROPERTY_EXPORT CustomProperty class KOPROPERTY_EXPORT SizeCustomProperty : public CustomProperty { public: - SizeCustomProperty(Property *tqparent); + SizeCustomProperty(Property *parent); ~SizeCustomProperty(); void setValue(const TQVariant &value, bool rememberOldValue); @@ -86,7 +86,7 @@ class KOPROPERTY_EXPORT SizeCustomProperty : public CustomProperty class KOPROPERTY_EXPORT PointCustomProperty : public CustomProperty { public: - PointCustomProperty(Property *tqparent); + PointCustomProperty(Property *parent); ~PointCustomProperty(); void setValue(const TQVariant &value, bool rememberOldValue); @@ -98,7 +98,7 @@ class KOPROPERTY_EXPORT PointCustomProperty : public CustomProperty class KOPROPERTY_EXPORT RectCustomProperty : public CustomProperty { public: - RectCustomProperty(Property *tqparent); + RectCustomProperty(Property *parent); ~RectCustomProperty(); void setValue(const TQVariant &value, bool rememberOldValue); @@ -110,7 +110,7 @@ class KOPROPERTY_EXPORT RectCustomProperty : public CustomProperty class KOPROPERTY_EXPORT SizePolicyCustomProperty : public CustomProperty { public: - SizePolicyCustomProperty(Property *tqparent); + SizePolicyCustomProperty(Property *parent); ~SizePolicyCustomProperty(); void setValue(const TQVariant &value, bool rememberOldValue); diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp index f15cab20..7d6c809e 100644 --- a/lib/koproperty/editor.cpp +++ b/lib/koproperty/editor.cpp @@ -49,14 +49,14 @@ namespace KoProperty { //! @internal static bool kofficeAppDirAdded = false; -//! \return true if \a o has tqparent \a par. +//! \return true if \a o has parent \a par. //! @internal inline bool hasParent(TQObject* par, TQObject* o) { if (!o || !par) return false; while (o && o != par) - o = o->tqparent(); + o = o->parent(); return o == par; } @@ -119,8 +119,8 @@ class EditorPrivate using namespace KoProperty; -Editor::Editor(TQWidget *tqparent, bool autoSync, const char *name) - : KListView(tqparent, name) +Editor::Editor(TQWidget *parent, bool autoSync, const char *name) + : KListView(parent, name) { d = new EditorPrivate(this); d->itemDict.setAutoDelete(false); @@ -248,7 +248,7 @@ Editor::fill() } void -Editor::addItem(const TQCString &name, EditorItem *tqparent) +Editor::addItem(const TQCString &name, EditorItem *parent) { if(!d->set || !d->set->contains(name)) return; @@ -258,13 +258,13 @@ Editor::addItem(const TQCString &name, EditorItem *tqparent) // kopropertydbg << "Property is not visible: " << name << endl; return; } - TQListViewItem *last = tqparent ? tqparent->firstChild() : d->topItem->firstChild(); + TQListViewItem *last = parent ? parent->firstChild() : d->topItem->firstChild(); while(last && last->nextSibling()) last = last->nextSibling(); EditorItem *item=0; - if(tqparent) - item = new EditorItem(this, tqparent, property, last); + if(parent) + item = new EditorItem(this, parent, property, last); else item = new EditorItem(this, d->topItem, property, last); d->itemDict.insert(name, item); @@ -456,8 +456,8 @@ Editor::slotPropertyChanged(Set& set, Property& property) else { // prop not in the dict, might be a child property: EditorItem *item = d->itemDict[property.name()]; - if(!item && property.tqparent()) - item = d->itemDict[property.tqparent()->name()]; + if(!item && property.parent()) + item = d->itemDict[property.parent()->name()]; if (item) { repaintItem(item); for(TQListViewItem *it = item->firstChild(); it; it = it->nextSibling()) @@ -467,14 +467,14 @@ Editor::slotPropertyChanged(Set& set, Property& property) //! @todo should we move this somewhere? #if 0 - if (property.tqparent() && property.tqparent()->type()==Rect) { + if (property.parent() && property.parent()->type()==Rect) { const int delta = property.value().toInt()-previousValue.toInt(); if (property.type()==Rect_X) { //|| property.type()==Rect_Y) - property.tqparent()->child("width")->setValue(delta, false); + property.parent()->child("width")->setValue(delta, false); } -/* if (widget->property() && (TQWidget*)d->currentWidget==widget && d->currentItem->tqparent()) { - EditorItem *parentItem = static_cast<EditorItem*>(d->currentItem->tqparent()); +/* if (widget->property() && (TQWidget*)d->currentWidget==widget && d->currentItem->parent()) { + EditorItem *parentItem = static_cast<EditorItem*>(d->currentItem->parent()); const int thisType = ; && parentItem->property()->type()==Rect) { //changing x or y components of Rect type shouldn't change width or height, respectively @@ -504,8 +504,8 @@ Editor::slotPropertyReset(Set& set, Property& property) else { EditorItem *item = d->itemDict[property.name()]; // prop not in the dict, might be a child prop. - if(!item && property.tqparent()) - item = d->itemDict[property.tqparent()->name()]; + if(!item && property.parent()) + item = d->itemDict[property.parent()->name()]; if (item) { repaintItem(item); for(TQListViewItem *it = item->firstChild(); it; it = it->nextSibling()) @@ -801,8 +801,8 @@ Editor::slotCollapsed(TQListViewItem *item) return; //unselect child item and hide editor if a group item has been collapsed if (dynamic_cast<EditorGroupItem*>(item)) { - for (TQListViewItem *i = selectedItem(); i; i = i->tqparent()) { - if (i->tqparent()==item) { + for (TQListViewItem *i = selectedItem(); i; i = i->parent()) { + if (i->parent()==item) { d->previouslyCollapsedGroupItem = item; d->childFormPreviouslyCollapsedGroupItem = selectedItem(); hideEditor(); diff --git a/lib/koproperty/editor.h b/lib/koproperty/editor.h index 677208de..c3ab0c2e 100644 --- a/lib/koproperty/editor.h +++ b/lib/koproperty/editor.h @@ -66,14 +66,14 @@ class KOPROPERTY_EXPORT Editor : public KListView TQ_OBJECT public: - /*! Creates an empty Editor with \a tqparent as tqparent widget. + /*! Creates an empty Editor with \a parent as parent widget. If \a autoSync == true, properties values are automatically synced as soon as editor contents change (eg the user types text, etc.) and the values are written in the property set. Otherwise, property set is updated only when selected item changes or user presses Enter key. Each property can overwrite this if its autoSync() == 0 or 1. */ - Editor(TQWidget *tqparent=0, bool autoSync=true, const char *name=0); + Editor(TQWidget *parent=0, bool autoSync=true, const char *name=0); virtual ~Editor(); @@ -160,7 +160,7 @@ class KOPROPERTY_EXPORT Editor : public KListView void clearWidgetCache(); void fill(); - void addItem(const TQCString &name, EditorItem *tqparent); + void addItem(const TQCString &name, EditorItem *parent); void showUndoButton( bool show ); diff --git a/lib/koproperty/editoritem.cpp b/lib/koproperty/editoritem.cpp index 1c0e1b72..653cbe0a 100644 --- a/lib/koproperty/editoritem.cpp +++ b/lib/koproperty/editoritem.cpp @@ -93,8 +93,8 @@ static void paintListViewExpander(TQPainter* p, TQWidget* w, int height, const T class GroupWidgetBase : public TQWidget { public: - GroupWidgetBase(TQWidget* tqparent) - : TQWidget(tqparent) + GroupWidgetBase(TQWidget* parent) + : TQWidget(parent) , m_isOpen(true) , m_mouseDown(false) { @@ -204,8 +204,8 @@ class GroupContainer::Private using namespace KoProperty; -GroupContainer::GroupContainer(const TQString& title, TQWidget* tqparent) -: TQWidget(tqparent) +GroupContainer::GroupContainer(const TQString& title, TQWidget* parent) +: TQWidget(parent) , d(new Private()) { tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 1)); @@ -254,8 +254,8 @@ bool GroupContainer::event( TQEvent * e ) { ////////////////////////////////////////////////////// -EditorItem::EditorItem(Editor *editor, EditorItem *tqparent, Property *property, TQListViewItem *after) - : KListViewItem(tqparent, after, +EditorItem::EditorItem(Editor *editor, EditorItem *parent, Property *property, TQListViewItem *after) + : KListViewItem(parent, after, property->captionForDisplaying().isEmpty() ? property->name() : property->captionForDisplaying()) { d = new EditorItemPrivate(); @@ -280,8 +280,8 @@ EditorItem::EditorItem(Editor *editor, EditorItem *tqparent, Property *property, */ } -EditorItem::EditorItem(KListView *tqparent) - : KListViewItem(tqparent) +EditorItem::EditorItem(KListView *parent) + : KListViewItem(parent) { d = new EditorItemPrivate(); d->property = 0; @@ -289,8 +289,8 @@ EditorItem::EditorItem(KListView *tqparent) setMultiLinesEnabled(true); } -EditorItem::EditorItem(EditorItem *tqparent, const TQString &text) - : KListViewItem(tqparent, text) +EditorItem::EditorItem(EditorItem *parent, const TQString &text) + : KListViewItem(parent, text) { d = new EditorItemPrivate(); d->property = 0; @@ -298,8 +298,8 @@ EditorItem::EditorItem(EditorItem *tqparent, const TQString &text) setMultiLinesEnabled(true); } -EditorItem::EditorItem(EditorItem *tqparent, EditorItem *after, const TQString &text) - : KListViewItem(tqparent, after, text) +EditorItem::EditorItem(EditorItem *parent, EditorItem *after, const TQString &text) + : KListViewItem(parent, after, text) { d = new EditorItemPrivate(); d->property = 0; @@ -334,18 +334,18 @@ EditorItem::paintCell(TQPainter *p, const TQColorGroup & cg, int column, int wid p->setBrush(cg.highlight()); p->setPen(cg.highlightedText()); KListViewItem::paintCell(p, cg, column, width, align); - p->fillRect(tqparent() ? 0 : 50, 0, width, height()-1, + p->fillRect(parent() ? 0 : 50, 0, width, height()-1, TQBrush(isSelected() ? cg.highlight() : backgroundColor())); p->setPen(isSelected() ? cg.highlightedText() : cg.text()); int delta = -20+KPROPEDITOR_ITEM_MARGIN; - if ((firstChild() && dynamic_cast<EditorGroupItem*>(tqparent()))) { + if ((firstChild() && dynamic_cast<EditorGroupItem*>(parent()))) { delta = -KPROPEDITOR_ITEM_MARGIN-1; } - if (dynamic_cast<EditorDummyItem*>(tqparent())) { + if (dynamic_cast<EditorDummyItem*>(parent())) { delta = KPROPEDITOR_ITEM_MARGIN*2; } - else if (tqparent() && dynamic_cast<EditorDummyItem*>(tqparent()->tqparent())) { - if (dynamic_cast<EditorGroupItem*>(tqparent())) + else if (parent() && dynamic_cast<EditorDummyItem*>(parent()->parent())) { + if (dynamic_cast<EditorGroupItem*>(parent())) delta += KPROPEDITOR_ITEM_MARGIN*2; else delta += KPROPEDITOR_ITEM_MARGIN*5; @@ -359,7 +359,7 @@ EditorItem::paintCell(TQPainter *p, const TQColorGroup & cg, int column, int wid p->drawLine(0, -1, width-1, -1); p->setPen( KPROPEDITOR_ITEM_BORDER_COLOR ); //! \todo custom color? - if (dynamic_cast<EditorDummyItem*>(tqparent())) + if (dynamic_cast<EditorDummyItem*>(parent())) p->drawLine(0, 0, 0, height()-1 ); } else if(column == 1) @@ -408,21 +408,21 @@ EditorItem::paintBranches(TQPainter *p, const TQColorGroup &cg, int w, int y, in int delta = 0; int fillWidth = w; int x = 0; - if (dynamic_cast<EditorGroupItem*>(item->tqparent())) { + if (dynamic_cast<EditorGroupItem*>(item->parent())) { delta = 0;//-19; fillWidth += 19; } else { - if (dynamic_cast<EditorGroupItem*>(item) || /*for flat mode*/ dynamic_cast<EditorDummyItem*>(item->tqparent())) + if (dynamic_cast<EditorGroupItem*>(item) || /*for flat mode*/ dynamic_cast<EditorDummyItem*>(item->parent())) x = 19; else x = -19; fillWidth += 19; } - if (dynamic_cast<EditorDummyItem*>(item->tqparent())) { + if (dynamic_cast<EditorDummyItem*>(item->parent())) { x = 19; } - else if (item->tqparent() && dynamic_cast<EditorDummyItem*>(item->tqparent()->tqparent())) { + else if (item->parent() && dynamic_cast<EditorDummyItem*>(item->parent()->parent())) { x = 0; } p->fillRect(x+1, 0, fillWidth-1, item->height()-1, TQBrush(backgroundColor)); @@ -434,7 +434,7 @@ EditorItem::paintBranches(TQPainter *p, const TQColorGroup &cg, int w, int y, in // for (int i=0; i<10000000; i++) // ; // if(item->isSelected()) { -// p->fillRect(tqparent() ? 0 : 50, 0, w, item->height()-1, TQBrush(cg.highlight())); +// p->fillRect(parent() ? 0 : 50, 0, w, item->height()-1, TQBrush(cg.highlight())); // p->fillRect(-50,0,50, item->height(), TQBrush(cg.highlight())); // } @@ -443,20 +443,20 @@ EditorItem::paintBranches(TQPainter *p, const TQColorGroup &cg, int w, int y, in || (static_cast<EditorItem*>(item)->property() && static_cast<EditorItem*>(item)->property()->isModified()) ); p->setFont(font); p->setPen(item->isSelected() ? cg.highlightedText() : cg.text()); - if (item->firstChild() && dynamic_cast<EditorGroupItem*>(item->tqparent())) { + if (item->firstChild() && dynamic_cast<EditorGroupItem*>(item->parent())) { delta = 19-KPROPEDITOR_ITEM_MARGIN-1; } - else if (dynamic_cast<EditorDummyItem*>(item->tqparent())) { + else if (dynamic_cast<EditorDummyItem*>(item->parent())) { delta = 19; } - if (item->tqparent() && dynamic_cast<EditorDummyItem*>(item->tqparent()->tqparent())) { - if (dynamic_cast<EditorGroupItem*>(item->tqparent())) + if (item->parent() && dynamic_cast<EditorDummyItem*>(item->parent()->parent())) { + if (dynamic_cast<EditorGroupItem*>(item->parent())) delta += KPROPEDITOR_ITEM_MARGIN*2; else delta += KPROPEDITOR_ITEM_MARGIN*5; } - if (!dynamic_cast<EditorDummyItem*>(item->tqparent())) + if (!dynamic_cast<EditorDummyItem*>(item->parent())) p->drawText(TQRect(delta+1,0, w+listView()->columnWidth(1), item->height()), TQt::AlignLeft | TQt::AlignVCenter /*| TQt::SingleLine*/, item->text(0)); @@ -512,16 +512,16 @@ EditorItem::setHeight( int height ) ////////////////////////////////////////////////////// -EditorGroupItem::EditorGroupItem(EditorItem *tqparent, EditorItem *after, const TQString &text, const TQString &icon, int sortOrder) - : EditorItem(tqparent, after, text) +EditorGroupItem::EditorGroupItem(EditorItem *parent, EditorItem *after, const TQString &text, const TQString &icon, int sortOrder) + : EditorItem(parent, after, text) , m_label(0) , m_sortOrder(sortOrder) { init(icon); } -EditorGroupItem::EditorGroupItem(EditorItem *tqparent, const TQString &text, const TQString &icon, int sortOrder) - : EditorItem(tqparent, text) +EditorGroupItem::EditorGroupItem(EditorItem *parent, const TQString &text, const TQString &icon, int sortOrder) + : EditorItem(parent, text) , m_label(0) , m_sortOrder(sortOrder) { diff --git a/lib/koproperty/editoritem.h b/lib/koproperty/editoritem.h index a3993d86..9f2c75c2 100644 --- a/lib/koproperty/editoritem.h +++ b/lib/koproperty/editoritem.h @@ -49,16 +49,16 @@ class EditorItem : public KListViewItem public: typedef TQAsciiDict<EditorItem> Dict; - /*! Creates an EditorItem child of \a tqparent, associated to \a property. + /*! Creates an EditorItem child of \a parent, associated to \a property. It \a property has not desctiption set, its name (i.e. not i18n'ed) is reused. */ - EditorItem(Editor *editor, EditorItem *tqparent, Property *property, + EditorItem(Editor *editor, EditorItem *parent, Property *property, TQListViewItem *after=0); //! Two helper contructors for subclass - EditorItem(KListView *tqparent); - EditorItem(EditorItem *tqparent, const TQString &text); - EditorItem(EditorItem *tqparent, EditorItem *after, const TQString &text); + EditorItem(KListView *parent); + EditorItem(EditorItem *parent, const TQString &text); + EditorItem(EditorItem *parent, EditorItem *after, const TQString &text); virtual ~EditorItem(); @@ -90,9 +90,9 @@ class EditorItem : public KListViewItem class EditorGroupItem : public EditorItem { public: - EditorGroupItem(EditorItem *tqparent, EditorItem *after, const TQString &text, + EditorGroupItem(EditorItem *parent, EditorItem *after, const TQString &text, const TQString &icon, int sortOrder); - EditorGroupItem(EditorItem *tqparent, const TQString &text, + EditorGroupItem(EditorItem *parent, const TQString &text, const TQString &icon, int sortOrder); virtual ~EditorGroupItem(); @@ -115,7 +115,7 @@ class EditorGroupItem : public EditorItem class EditorDummyItem : public EditorItem { public: - EditorDummyItem(KListView *tqparent); + EditorDummyItem(KListView *parent); virtual ~EditorDummyItem(); protected: diff --git a/lib/koproperty/editors/booledit.cpp b/lib/koproperty/editors/booledit.cpp index 5c347c02..886f20d8 100644 --- a/lib/koproperty/editors/booledit.cpp +++ b/lib/koproperty/editors/booledit.cpp @@ -35,8 +35,8 @@ using namespace KoProperty; -BoolEdit::BoolEdit(Property *property, TQWidget *tqparent, const char *name) - : Widget(property, tqparent, name) +BoolEdit::BoolEdit(Property *property, TQWidget *parent, const char *name) + : Widget(property, parent, name) , m_yesIcon( SmallIcon("button_ok") ) , m_noIcon( SmallIcon("button_no") ) { @@ -150,8 +150,8 @@ BoolEdit::setReadOnlyInternal(bool readOnly) //-------------------------------------------------- -ThreeStateBoolEdit::ThreeStateBoolEdit(Property *property, TQWidget *tqparent, const char *name) - : ComboBox(property, tqparent, name) +ThreeStateBoolEdit::ThreeStateBoolEdit(Property *property, TQWidget *parent, const char *name) + : ComboBox(property, parent, name) , m_yesIcon( SmallIcon("button_ok") ) , m_noIcon( SmallIcon("button_no") ) { diff --git a/lib/koproperty/editors/booledit.h b/lib/koproperty/editors/booledit.h index 0cfbf48e..f93e4daa 100644 --- a/lib/koproperty/editors/booledit.h +++ b/lib/koproperty/editors/booledit.h @@ -36,7 +36,7 @@ class KOPROPERTY_EXPORT BoolEdit : public Widget TQ_OBJECT public: - BoolEdit(Property *property, TQWidget *tqparent=0, const char *name=0); + BoolEdit(Property *property, TQWidget *parent=0, const char *name=0); virtual ~BoolEdit(); virtual TQVariant value() const; @@ -63,7 +63,7 @@ class KOPROPERTY_EXPORT ThreeStateBoolEdit : public ComboBox TQ_OBJECT public: - ThreeStateBoolEdit(Property *property, TQWidget *tqparent=0, const char *name=0); + ThreeStateBoolEdit(Property *property, TQWidget *parent=0, const char *name=0); virtual ~ThreeStateBoolEdit(); virtual TQVariant value() const; diff --git a/lib/koproperty/editors/coloredit.cpp b/lib/koproperty/editors/coloredit.cpp index d8504686..a9ab1f1a 100644 --- a/lib/koproperty/editors/coloredit.cpp +++ b/lib/koproperty/editors/coloredit.cpp @@ -29,8 +29,8 @@ using namespace KoProperty; -ColorButton::ColorButton(Property *property, TQWidget *tqparent, const char *name) - : Widget(property, tqparent, name) +ColorButton::ColorButton(Property *property, TQWidget *parent, const char *name) + : Widget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KColorCombo(this); diff --git a/lib/koproperty/editors/coloredit.h b/lib/koproperty/editors/coloredit.h index d869dc00..000e6e82 100644 --- a/lib/koproperty/editors/coloredit.h +++ b/lib/koproperty/editors/coloredit.h @@ -33,7 +33,7 @@ class KOPROPERTY_EXPORT ColorButton : public Widget TQ_OBJECT public: - ColorButton(Property *property, TQWidget *tqparent=0, const char *name=0); + ColorButton(Property *property, TQWidget *parent=0, const char *name=0); virtual ~ColorButton(); virtual TQVariant value() const; diff --git a/lib/koproperty/editors/combobox.cpp b/lib/koproperty/editors/combobox.cpp index 661aa1e0..343a9ed9 100644 --- a/lib/koproperty/editors/combobox.cpp +++ b/lib/koproperty/editors/combobox.cpp @@ -31,8 +31,8 @@ using namespace KoProperty; -ComboBox::ComboBox(Property *property, TQWidget *tqparent, const char *name) - : Widget(property, tqparent, name) +ComboBox::ComboBox(Property *property, TQWidget *parent, const char *name) + : Widget(property, parent, name) , m_setValueEnabled(true) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); diff --git a/lib/koproperty/editors/combobox.h b/lib/koproperty/editors/combobox.h index dda5d067..709d07d6 100644 --- a/lib/koproperty/editors/combobox.h +++ b/lib/koproperty/editors/combobox.h @@ -33,7 +33,7 @@ class KOPROPERTY_EXPORT ComboBox : public Widget TQ_OBJECT public: - ComboBox(Property *property, TQWidget *tqparent=0, const char *name=0); + ComboBox(Property *property, TQWidget *parent=0, const char *name=0); virtual ~ComboBox(); virtual TQVariant value() const; diff --git a/lib/koproperty/editors/cursoredit.cpp b/lib/koproperty/editors/cursoredit.cpp index efcc0e44..61d44499 100644 --- a/lib/koproperty/editors/cursoredit.cpp +++ b/lib/koproperty/editors/cursoredit.cpp @@ -35,8 +35,8 @@ using namespace KoProperty; Property::ListData *m_cursorListData = 0; -CursorEdit::CursorEdit(Property *property, TQWidget *tqparent, const char *name) -: ComboBox(property, tqparent, name) +CursorEdit::CursorEdit(Property *property, TQWidget *parent, const char *name) +: ComboBox(property, parent, name) { /* if(!m_spValues) { diff --git a/lib/koproperty/editors/cursoredit.h b/lib/koproperty/editors/cursoredit.h index 850653df..c6c76e0e 100644 --- a/lib/koproperty/editors/cursoredit.h +++ b/lib/koproperty/editors/cursoredit.h @@ -33,7 +33,7 @@ class KOPROPERTY_EXPORT CursorEdit : public ComboBox TQ_OBJECT public: - CursorEdit(Property *property, TQWidget *tqparent=0, const char *name=0); + CursorEdit(Property *property, TQWidget *parent=0, const char *name=0); virtual ~CursorEdit(); virtual TQVariant value() const; diff --git a/lib/koproperty/editors/dateedit.cpp b/lib/koproperty/editors/dateedit.cpp index b72fd7ce..0df8532a 100644 --- a/lib/koproperty/editors/dateedit.cpp +++ b/lib/koproperty/editors/dateedit.cpp @@ -32,8 +32,8 @@ using namespace KoProperty; -DateEdit::DateEdit(Property *property, TQWidget *tqparent, const char *name) - : Widget(property, tqparent, name) +DateEdit::DateEdit(Property *property, TQWidget *parent, const char *name) + : Widget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQDateEdit(this); diff --git a/lib/koproperty/editors/dateedit.h b/lib/koproperty/editors/dateedit.h index f36e7b65..dde21f0c 100644 --- a/lib/koproperty/editors/dateedit.h +++ b/lib/koproperty/editors/dateedit.h @@ -34,7 +34,7 @@ class KOPROPERTY_EXPORT DateEdit : public Widget TQ_OBJECT public: - DateEdit(Property *property, TQWidget *tqparent=0, const char *name=0); + DateEdit(Property *property, TQWidget *parent=0, const char *name=0); virtual ~DateEdit(); virtual TQVariant value() const; diff --git a/lib/koproperty/editors/datetimeedit.cpp b/lib/koproperty/editors/datetimeedit.cpp index 7f88cb14..6e12641a 100644 --- a/lib/koproperty/editors/datetimeedit.cpp +++ b/lib/koproperty/editors/datetimeedit.cpp @@ -32,8 +32,8 @@ using namespace KoProperty; -DateTimeEdit::DateTimeEdit(Property *property, TQWidget *tqparent, const char *name) - : Widget(property, tqparent, name) +DateTimeEdit::DateTimeEdit(Property *property, TQWidget *parent, const char *name) + : Widget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQDateTimeEdit(this); diff --git a/lib/koproperty/editors/datetimeedit.h b/lib/koproperty/editors/datetimeedit.h index b8745b01..1ee321b9 100644 --- a/lib/koproperty/editors/datetimeedit.h +++ b/lib/koproperty/editors/datetimeedit.h @@ -34,7 +34,7 @@ class KOPROPERTY_EXPORT DateTimeEdit : public Widget TQ_OBJECT public: - DateTimeEdit(Property *property, TQWidget *tqparent=0, const char *name=0); + DateTimeEdit(Property *property, TQWidget *parent=0, const char *name=0); virtual ~DateTimeEdit(); virtual TQVariant value() const; diff --git a/lib/koproperty/editors/dummywidget.cpp b/lib/koproperty/editors/dummywidget.cpp index e9fbe3c9..71c3c74e 100644 --- a/lib/koproperty/editors/dummywidget.cpp +++ b/lib/koproperty/editors/dummywidget.cpp @@ -24,8 +24,8 @@ using namespace KoProperty; -DummyWidget::DummyWidget(Property *property, TQWidget *tqparent, const char *name) - : Widget(property, tqparent, name) +DummyWidget::DummyWidget(Property *property, TQWidget *parent, const char *name) + : Widget(property, parent, name) {} DummyWidget::~DummyWidget() diff --git a/lib/koproperty/editors/dummywidget.h b/lib/koproperty/editors/dummywidget.h index ef90ba8f..b06c571a 100644 --- a/lib/koproperty/editors/dummywidget.h +++ b/lib/koproperty/editors/dummywidget.h @@ -33,7 +33,7 @@ class KOPROPERTY_EXPORT DummyWidget: public Widget TQ_OBJECT public: - DummyWidget(Property *property, TQWidget *tqparent=0, const char *name=0); + DummyWidget(Property *property, TQWidget *parent=0, const char *name=0); virtual ~DummyWidget(); virtual TQVariant value() const; diff --git a/lib/koproperty/editors/fontedit.cpp b/lib/koproperty/editors/fontedit.cpp index 65ae80cf..0f3d438c 100644 --- a/lib/koproperty/editors/fontedit.cpp +++ b/lib/koproperty/editors/fontedit.cpp @@ -44,8 +44,8 @@ namespace KoProperty { class FontEditRequester : public KFontRequester { public: - FontEditRequester(TQWidget* tqparent) - : KFontRequester(tqparent) + FontEditRequester(TQWidget* parent) + : KFontRequester(parent) { label()->setPaletteBackgroundColor(tqpalette().active().base()); label()->setMinimumWidth(0); @@ -79,8 +79,8 @@ class FontEditRequester : public KFontRequester using namespace KoProperty; -FontEdit::FontEdit(Property *property, TQWidget *tqparent, const char *name) - : Widget(property, tqparent, name) +FontEdit::FontEdit(Property *property, TQWidget *parent, const char *name) + : Widget(property, parent, name) { m_edit = new FontEditRequester(this); m_edit->setMinimumHeight(5); diff --git a/lib/koproperty/editors/fontedit.h b/lib/koproperty/editors/fontedit.h index 6c3a46a4..091fafd0 100644 --- a/lib/koproperty/editors/fontedit.h +++ b/lib/koproperty/editors/fontedit.h @@ -34,7 +34,7 @@ class KOPROPERTY_EXPORT FontEdit : public Widget TQ_OBJECT public: - FontEdit(Property *property, TQWidget *tqparent=0, const char *name=0); + FontEdit(Property *property, TQWidget *parent=0, const char *name=0); virtual ~FontEdit(); virtual TQVariant value() const; diff --git a/lib/koproperty/editors/linestyledit.cpp b/lib/koproperty/editors/linestyledit.cpp index 91783e20..e7f5b2f8 100644 --- a/lib/koproperty/editors/linestyledit.cpp +++ b/lib/koproperty/editors/linestyledit.cpp @@ -135,8 +135,8 @@ using namespace KoProperty; "................................................"}; -LineStyleEdit::LineStyleEdit(Property *property, TQWidget *tqparent, const char *name) - : Widget(property, tqparent, name) +LineStyleEdit::LineStyleEdit(Property *property, TQWidget *parent, const char *name) + : Widget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQComboBox(this); diff --git a/lib/koproperty/editors/linestyleedit.h b/lib/koproperty/editors/linestyleedit.h index 8388b897..d5d386b5 100644 --- a/lib/koproperty/editors/linestyleedit.h +++ b/lib/koproperty/editors/linestyleedit.h @@ -33,7 +33,7 @@ class KOPROPERTY_EXPORT LineStyleEdit : public Widget TQ_OBJECT public: - LineStyleEdit(Property *property, TQWidget *tqparent=0, const char *name=0); + LineStyleEdit(Property *property, TQWidget *parent=0, const char *name=0); virtual ~LineStyleEdit(); virtual TQVariant value() const; diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp index edc19c80..92ab746d 100644 --- a/lib/koproperty/editors/pixmapedit.cpp +++ b/lib/koproperty/editors/pixmapedit.cpp @@ -51,8 +51,8 @@ using namespace KoProperty; -PixmapEdit::PixmapEdit(Property *property, TQWidget *tqparent, const char *name) - : Widget(property, tqparent, name) +PixmapEdit::PixmapEdit(Property *property, TQWidget *parent, const char *name) + : Widget(property, parent, name) { setHasBorders(false); diff --git a/lib/koproperty/editors/pixmapedit.h b/lib/koproperty/editors/pixmapedit.h index 61f75fba..3b6a6cd5 100644 --- a/lib/koproperty/editors/pixmapedit.h +++ b/lib/koproperty/editors/pixmapedit.h @@ -37,7 +37,7 @@ class KOPROPERTY_EXPORT PixmapEdit : public Widget TQ_OBJECT public: - PixmapEdit(Property *property, TQWidget *tqparent=0, const char *name=0); + PixmapEdit(Property *property, TQWidget *parent=0, const char *name=0); virtual ~PixmapEdit(); virtual TQVariant value() const; diff --git a/lib/koproperty/editors/pointedit.cpp b/lib/koproperty/editors/pointedit.cpp index d251e969..6983dd68 100644 --- a/lib/koproperty/editors/pointedit.cpp +++ b/lib/koproperty/editors/pointedit.cpp @@ -34,8 +34,8 @@ using namespace KoProperty; -PointEdit::PointEdit(Property *property, TQWidget *tqparent, const char *name) - : Widget(property, tqparent, name) +PointEdit::PointEdit(Property *property, TQWidget *parent, const char *name) + : Widget(property, parent, name) { setHasBorders(false); m_edit = new KActiveLabel(this); diff --git a/lib/koproperty/editors/pointedit.h b/lib/koproperty/editors/pointedit.h index 22c9a36a..ce7fc423 100644 --- a/lib/koproperty/editors/pointedit.h +++ b/lib/koproperty/editors/pointedit.h @@ -35,7 +35,7 @@ class KOPROPERTY_EXPORT PointEdit : public Widget TQ_OBJECT public: - PointEdit(Property *property, TQWidget *tqparent=0, const char *name=0); + PointEdit(Property *property, TQWidget *parent=0, const char *name=0); virtual ~PointEdit(); virtual TQVariant value() const; diff --git a/lib/koproperty/editors/rectedit.cpp b/lib/koproperty/editors/rectedit.cpp index 313e4e53..ba6fec49 100644 --- a/lib/koproperty/editors/rectedit.cpp +++ b/lib/koproperty/editors/rectedit.cpp @@ -33,8 +33,8 @@ using namespace KoProperty; -RectEdit::RectEdit(Property *property, TQWidget *tqparent, const char *name) - : Widget(property, tqparent, name) +RectEdit::RectEdit(Property *property, TQWidget *parent, const char *name) + : Widget(property, parent, name) { setHasBorders(false); m_edit = new KActiveLabel(this); diff --git a/lib/koproperty/editors/rectedit.h b/lib/koproperty/editors/rectedit.h index 261bf7d5..5ab25408 100644 --- a/lib/koproperty/editors/rectedit.h +++ b/lib/koproperty/editors/rectedit.h @@ -35,7 +35,7 @@ class KOPROPERTY_EXPORT RectEdit : public Widget TQ_OBJECT public: - RectEdit(Property *property, TQWidget *tqparent=0, const char *name=0); + RectEdit(Property *property, TQWidget *parent=0, const char *name=0); virtual ~RectEdit(); virtual TQVariant value() const; diff --git a/lib/koproperty/editors/sizeedit.cpp b/lib/koproperty/editors/sizeedit.cpp index db8fb44f..05422119 100644 --- a/lib/koproperty/editors/sizeedit.cpp +++ b/lib/koproperty/editors/sizeedit.cpp @@ -34,8 +34,8 @@ using namespace KoProperty; -SizeEdit::SizeEdit(Property *property, TQWidget *tqparent, const char *name) - : Widget(property, tqparent, name) +SizeEdit::SizeEdit(Property *property, TQWidget *parent, const char *name) + : Widget(property, parent, name) { setHasBorders(false); m_edit = new KActiveLabel(this); diff --git a/lib/koproperty/editors/sizeedit.h b/lib/koproperty/editors/sizeedit.h index 743f630f..87b1c2dd 100644 --- a/lib/koproperty/editors/sizeedit.h +++ b/lib/koproperty/editors/sizeedit.h @@ -35,7 +35,7 @@ class KOPROPERTY_EXPORT SizeEdit : public Widget TQ_OBJECT public: - SizeEdit(Property *property, TQWidget *tqparent=0, const char *name=0); + SizeEdit(Property *property, TQWidget *parent=0, const char *name=0); virtual ~SizeEdit(); virtual TQVariant value() const; diff --git a/lib/koproperty/editors/sizepolicyedit.cpp b/lib/koproperty/editors/sizepolicyedit.cpp index 0c616665..125e0a26 100644 --- a/lib/koproperty/editors/sizepolicyedit.cpp +++ b/lib/koproperty/editors/sizepolicyedit.cpp @@ -34,8 +34,8 @@ using namespace KoProperty; TQMap<TQString, TQVariant> *SizePolicyEdit::m_spValues = 0; -SizePolicyEdit::SizePolicyEdit(Property *property, TQWidget *tqparent, const char *name) - : Widget(property, tqparent, name) +SizePolicyEdit::SizePolicyEdit(Property *property, TQWidget *parent, const char *name) + : Widget(property, parent, name) { setHasBorders(false); // TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); diff --git a/lib/koproperty/editors/sizepolicyedit.h b/lib/koproperty/editors/sizepolicyedit.h index 81ffab40..a33ef731 100644 --- a/lib/koproperty/editors/sizepolicyedit.h +++ b/lib/koproperty/editors/sizepolicyedit.h @@ -37,7 +37,7 @@ class KOPROPERTY_EXPORT SizePolicyEdit : public Widget TQ_OBJECT public: - SizePolicyEdit(Property *property, TQWidget *tqparent=0, const char *name=0); + SizePolicyEdit(Property *property, TQWidget *parent=0, const char *name=0); virtual ~SizePolicyEdit(); virtual TQVariant value() const; diff --git a/lib/koproperty/editors/spinbox.cpp b/lib/koproperty/editors/spinbox.cpp index 8ae4e30a..8e890419 100644 --- a/lib/koproperty/editors/spinbox.cpp +++ b/lib/koproperty/editors/spinbox.cpp @@ -33,8 +33,8 @@ using namespace KoProperty; -IntSpinBox::IntSpinBox(int lower, int upper, int step, int value, int base, IntEdit *tqparent, const char *name) -: KIntSpinBox(lower, upper, step, value, base, tqparent, name) +IntSpinBox::IntSpinBox(int lower, int upper, int step, int value, int base, IntEdit *parent, const char *name) +: KIntSpinBox(lower, upper, step, value, base, parent, name) { editor()->tqsetAlignment(TQt::AlignLeft); installEventFilter(editor()); @@ -71,7 +71,7 @@ IntSpinBox::eventFilter(TQObject *o, TQEvent *e) } } } - if ((TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(editor()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(o->tqparent()) == TQT_BASE_OBJECT(this)) + if ((TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(editor()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(o->parent()) == TQT_BASE_OBJECT(this)) && e->type() == TQEvent::Wheel && static_cast<IntEdit*>(parentWidget())->isReadOnly()) { return true; //avoid value changes for read-only widget @@ -83,8 +83,8 @@ IntSpinBox::eventFilter(TQObject *o, TQEvent *e) ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// -IntEdit::IntEdit(Property *property, TQWidget *tqparent, const char *name) - : Widget(property, tqparent, name) +IntEdit::IntEdit(Property *property, TQWidget *parent, const char *name) + : Widget(property, parent, name) { TQVariant minVal( property ? property->option("min") : 0 ); TQVariant maxVal( property ? property->option("max") : TQVariant() ); @@ -176,8 +176,8 @@ IntEdit::setReadOnlyInternal(bool readOnly) ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// -DoubleSpinBox::DoubleSpinBox (double lower, double upper, double step, double value, int precision, DoubleEdit *tqparent) -: KDoubleSpinBox(lower, upper, step, value, precision, tqparent) +DoubleSpinBox::DoubleSpinBox (double lower, double upper, double step, double value, int precision, DoubleEdit *parent) +: KDoubleSpinBox(lower, upper, step, value, precision, parent) { editor()->tqsetAlignment(TQt::AlignLeft); installEventFilter(editor()); @@ -204,7 +204,7 @@ DoubleSpinBox::eventFilter(TQObject *o, TQEvent *e) } } } - if ((TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(editor()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(o->tqparent()) == TQT_BASE_OBJECT(this)) + if ((TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(editor()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(o->parent()) == TQT_BASE_OBJECT(this)) && e->type() == TQEvent::Wheel && static_cast<IntEdit*>(parentWidget())->isReadOnly()) { return true; //avoid value changes for read-only widget @@ -226,8 +226,8 @@ void DoubleSpinBox::setValue( const TQVariant& value ) ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// -DoubleEdit::DoubleEdit(Property *property, TQWidget *tqparent, const char *name) - : Widget(property, tqparent, name) +DoubleEdit::DoubleEdit(Property *property, TQWidget *parent, const char *name) + : Widget(property, parent, name) { TQVariant minVal( property ? property->option("min") : 0 ); TQVariant maxVal( property ? property->option("max") : TQVariant() ); diff --git a/lib/koproperty/editors/spinbox.h b/lib/koproperty/editors/spinbox.h index d16cc3e9..668b7b2b 100644 --- a/lib/koproperty/editors/spinbox.h +++ b/lib/koproperty/editors/spinbox.h @@ -39,7 +39,7 @@ class IntSpinBox : public KIntSpinBox public: IntSpinBox(int lower, int upper, int step, int value, int base=10, - IntEdit *tqparent=0, const char *name=0); + IntEdit *parent=0, const char *name=0); virtual ~IntSpinBox() {;} virtual void setValue(const TQVariant &value); @@ -54,7 +54,7 @@ class KOPROPERTY_EXPORT IntEdit : public Widget TQ_OBJECT public: - IntEdit(Property *property, TQWidget *tqparent=0, const char *name=0); + IntEdit(Property *property, TQWidget *parent=0, const char *name=0); virtual ~IntEdit(); virtual TQVariant value() const; @@ -82,7 +82,7 @@ class DoubleSpinBox : public KDoubleSpinBox public: //! \todo Support setting precision limits, step, etc. DoubleSpinBox(double lower, double upper, double step, double value=0, - int precision=2, DoubleEdit *tqparent=0); + int precision=2, DoubleEdit *parent=0); virtual ~DoubleSpinBox() {;} virtual bool eventFilter(TQObject *o, TQEvent *e); @@ -98,7 +98,7 @@ class KOPROPERTY_EXPORT DoubleEdit : public Widget TQ_OBJECT public: - DoubleEdit(Property *property, TQWidget *tqparent=0, const char *name=0); + DoubleEdit(Property *property, TQWidget *parent=0, const char *name=0); virtual ~DoubleEdit(); virtual TQVariant value() const; diff --git a/lib/koproperty/editors/stringedit.cpp b/lib/koproperty/editors/stringedit.cpp index d878efa1..55d8b3ed 100644 --- a/lib/koproperty/editors/stringedit.cpp +++ b/lib/koproperty/editors/stringedit.cpp @@ -26,8 +26,8 @@ using namespace KoProperty; -StringEdit::StringEdit(Property *property, TQWidget *tqparent, const char *name) - : Widget(property, tqparent, name) +StringEdit::StringEdit(Property *property, TQWidget *parent, const char *name) + : Widget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQLineEdit(this); diff --git a/lib/koproperty/editors/stringedit.h b/lib/koproperty/editors/stringedit.h index fff36609..1e5e3c5c 100644 --- a/lib/koproperty/editors/stringedit.h +++ b/lib/koproperty/editors/stringedit.h @@ -33,7 +33,7 @@ class KOPROPERTY_EXPORT StringEdit : public Widget TQ_OBJECT public: - StringEdit(Property *property, TQWidget *tqparent=0, const char *name=0); + StringEdit(Property *property, TQWidget *parent=0, const char *name=0); virtual ~StringEdit(); virtual TQVariant value() const; diff --git a/lib/koproperty/editors/stringlistedit.cpp b/lib/koproperty/editors/stringlistedit.cpp index eb4dd659..56bf1145 100644 --- a/lib/koproperty/editors/stringlistedit.cpp +++ b/lib/koproperty/editors/stringlistedit.cpp @@ -37,8 +37,8 @@ using namespace KoProperty; -StringListEdit::StringListEdit(Property *property, TQWidget *tqparent, const char *name) - : Widget(property, tqparent, name) +StringListEdit::StringListEdit(Property *property, TQWidget *parent, const char *name) + : Widget(property, parent, name) { setHasBorders(false); TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); diff --git a/lib/koproperty/editors/stringlistedit.h b/lib/koproperty/editors/stringlistedit.h index 846e2362..994b186b 100644 --- a/lib/koproperty/editors/stringlistedit.h +++ b/lib/koproperty/editors/stringlistedit.h @@ -36,7 +36,7 @@ class KOPROPERTY_EXPORT StringListEdit : public Widget TQ_OBJECT public: - StringListEdit(Property *property, TQWidget *tqparent=0, const char *name=0); + StringListEdit(Property *property, TQWidget *parent=0, const char *name=0); virtual ~StringListEdit(); virtual TQVariant value() const; diff --git a/lib/koproperty/editors/symbolcombo.cpp b/lib/koproperty/editors/symbolcombo.cpp index 289badbb..53394d54 100644 --- a/lib/koproperty/editors/symbolcombo.cpp +++ b/lib/koproperty/editors/symbolcombo.cpp @@ -32,8 +32,8 @@ using namespace KoProperty; -SymbolCombo::SymbolCombo(Property *property, TQWidget *tqparent, const char *name) - : Widget(property, tqparent, name) +SymbolCombo::SymbolCombo(Property *property, TQWidget *parent, const char *name) + : Widget(property, parent, name) { setHasBorders(false); TQHBoxLayout *l = new TQHBoxLayout(this); diff --git a/lib/koproperty/editors/symbolcombo.h b/lib/koproperty/editors/symbolcombo.h index 7f3e89e1..50ffcf96 100644 --- a/lib/koproperty/editors/symbolcombo.h +++ b/lib/koproperty/editors/symbolcombo.h @@ -34,7 +34,7 @@ class KOPROPERTY_EXPORT SymbolCombo : public Widget TQ_OBJECT public: - SymbolCombo(Property *property, TQWidget *tqparent=0, const char *name=0); + SymbolCombo(Property *property, TQWidget *parent=0, const char *name=0); virtual ~SymbolCombo(); virtual TQVariant value() const; diff --git a/lib/koproperty/editors/timeedit.cpp b/lib/koproperty/editors/timeedit.cpp index 25972f0b..674d2c89 100644 --- a/lib/koproperty/editors/timeedit.cpp +++ b/lib/koproperty/editors/timeedit.cpp @@ -33,8 +33,8 @@ using namespace KoProperty; -TimeEdit::TimeEdit(Property *property, TQWidget *tqparent, const char *name) - : Widget(property, tqparent, name) +TimeEdit::TimeEdit(Property *property, TQWidget *parent, const char *name) + : Widget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQTimeEdit(this); diff --git a/lib/koproperty/editors/timeedit.h b/lib/koproperty/editors/timeedit.h index 1dbec46b..642f4101 100644 --- a/lib/koproperty/editors/timeedit.h +++ b/lib/koproperty/editors/timeedit.h @@ -33,7 +33,7 @@ class KOPROPERTY_EXPORT TimeEdit : public Widget TQ_OBJECT public: - TimeEdit(Property *property, TQWidget *tqparent=0, const char *name=0); + TimeEdit(Property *property, TQWidget *parent=0, const char *name=0); virtual ~TimeEdit(); virtual TQVariant value() const; diff --git a/lib/koproperty/editors/urledit.cpp b/lib/koproperty/editors/urledit.cpp index fc16268f..8c150de2 100644 --- a/lib/koproperty/editors/urledit.cpp +++ b/lib/koproperty/editors/urledit.cpp @@ -31,8 +31,8 @@ using namespace KoProperty; -URLEdit::URLEdit(Property *property, TQWidget *tqparent, const char *name) - : Widget(property, tqparent, name) +URLEdit::URLEdit(Property *property, TQWidget *parent, const char *name) + : Widget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KURLRequester(this); diff --git a/lib/koproperty/editors/urledit.h b/lib/koproperty/editors/urledit.h index 167738df..bba72091 100644 --- a/lib/koproperty/editors/urledit.h +++ b/lib/koproperty/editors/urledit.h @@ -33,7 +33,7 @@ class KOPROPERTY_EXPORT URLEdit : public Widget TQ_OBJECT public: - URLEdit(Property *property, TQWidget *tqparent=0, const char *name=0); + URLEdit(Property *property, TQWidget *parent=0, const char *name=0); virtual ~URLEdit(); virtual TQVariant value() const; diff --git a/lib/koproperty/factory.cpp b/lib/koproperty/factory.cpp index 864d4895..03d466f4 100644 --- a/lib/koproperty/factory.cpp +++ b/lib/koproperty/factory.cpp @@ -53,8 +53,8 @@ static KoProperty::FactoryManager* m_manager = 0; namespace KoProperty { -CustomPropertyFactory::CustomPropertyFactory(TQObject *tqparent) - : TQObject(tqparent) +CustomPropertyFactory::CustomPropertyFactory(TQObject *parent) + : TQObject(parent) { } @@ -241,23 +241,23 @@ FactoryManager::registerFactoryForProperties(const TQValueList<int> &propertyTyp } CustomProperty* -FactoryManager::createCustomProperty(Property *tqparent) +FactoryManager::createCustomProperty(Property *parent) { - const int type = tqparent->type(); + const int type = parent->type(); CustomPropertyFactory *factory = d->registeredWidgets.find(type); if (factory) - return factory->createCustomProperty(tqparent); + return factory->createCustomProperty(parent); switch(type) { case Size: case Size_Width: case Size_Height: - return new SizeCustomProperty(tqparent); + return new SizeCustomProperty(parent); case Point: case Point_X: case Point_Y: - return new PointCustomProperty(tqparent); + return new PointCustomProperty(parent); case Rect: case Rect_X: case Rect_Y: case Rect_Width: case Rect_Height: - return new RectCustomProperty(tqparent); + return new RectCustomProperty(parent); case SizePolicy: case SizePolicy_HorStretch: case SizePolicy_VerStretch: case SizePolicy_HorData: case SizePolicy_VerData: - return new SizePolicyCustomProperty(tqparent); + return new SizePolicyCustomProperty(parent); default: return 0; } diff --git a/lib/koproperty/factory.h b/lib/koproperty/factory.h index 8abc93b3..8aca5538 100644 --- a/lib/koproperty/factory.h +++ b/lib/koproperty/factory.h @@ -43,17 +43,17 @@ class FactoryManagerPrivate; class KOPROPERTY_EXPORT CustomPropertyFactory : public TQObject { public: - CustomPropertyFactory(TQObject *tqparent); + CustomPropertyFactory(TQObject *parent); virtual ~CustomPropertyFactory(); - /*! \return a new instance of custom property for \a tqparent. + /*! \return a new instance of custom property for \a parent. Implement this for property types you want to support. - Use tqparent->type() to get type of the property. */ - virtual CustomProperty* createCustomProperty(Property *tqparent) = 0; + Use parent->type() to get type of the property. */ + virtual CustomProperty* createCustomProperty(Property *parent) = 0; /*! \return a new instance of custom property for \a property. Implement this for property editor types you want to support. - Use tqparent->type() to get type of the property. */ + Use parent->type() to get type of the property. */ virtual Widget* createCustomWidget(Property *property) = 0; }; @@ -81,12 +81,12 @@ class KOPROPERTY_EXPORT CustomPropertyFactory : public TQObject \section custom_prop_composed Using Custom Properties to create composed properties Use a composed property when you need more than one editor for a property. Examples are rect, size or point properties. - If you create a composed property, both tqparent and tqchildren properties must have custom + If you create a composed property, both parent and tqchildren properties must have custom (different) types. - Child properties are created in CustomProperty constructor of the <b>tqparent</b> type, - by adding CustomProperty::property() as tqparent in Property constructor.\n + Child properties are created in CustomProperty constructor of the <b>parent</b> type, + by adding CustomProperty::property() as parent in Property constructor.\n Child properties should return handleValue() == true and in CustomProperty::setValue(), - tqparent's Property::setValue() should be called, making sure that useCustomProperty argument is set + parent's Property::setValue() should be called, making sure that useCustomProperty argument is set to false.\n Parent's handleValue() should be set to false, unless you cannot store the property in a TQVariant. You just need to update tqchildren's value, making sure that useCustomProperty argument is set @@ -116,7 +116,7 @@ class KOPROPERTY_EXPORT FactoryManager : public TQObject /*! Registers a custom factory \a factory for handling property editor for \a editorType. This custom factory will be used before defaults when widgetForProperty() is called. \a creator is not owned by this Factory object, but it's good idea - to instantiate CustomPropertyFactory object itself as a child of Factory tqparent. For example: + to instantiate CustomPropertyFactory object itself as a child of Factory parent. For example: \code MyCustomPropertyFactory *f = new MyCustomPropertyFactory(KoProperty::Factory::self()); KoProperty::Factory::self()->registerEditor( MyCustomType, f ); @@ -133,7 +133,7 @@ class KOPROPERTY_EXPORT FactoryManager : public TQObject CustomPropertyFactory *factoryForEditorType(int type); /*! Creates and returns the editor for given property type. - Warning: editor and viewer widgets won't have tqparent widget. Property editor + Warning: editor and viewer widgets won't have parent widget. Property editor cares about reparenting and deletion of returned widgets in machines. If \a createWidget is false, just create child properties, not widget.*/ Widget* createWidgetForProperty(Property *property); @@ -150,7 +150,7 @@ class KOPROPERTY_EXPORT FactoryManager : public TQObject /*! This function is called in Property::Property() to create (optional) custom property. It creates the custom property for built-in types, or calls one of createCustomProperty function previously registered for other types. */ - CustomProperty* createCustomProperty(Property *tqparent); + CustomProperty* createCustomProperty(Property *parent); /*! \return a pointer to a property factory instance.*/ static FactoryManager* self(); diff --git a/lib/koproperty/property.cpp b/lib/koproperty/property.cpp index 0add7b91..49ca2b6c 100644 --- a/lib/koproperty/property.cpp +++ b/lib/koproperty/property.cpp @@ -43,7 +43,7 @@ class PropertyPrivate : caption(0), listData(0), changed(false), storable(true), readOnly(false), visible(true), autosync(-1), custom(0), useCustomProperty(true), - sets(0), tqparent(0), tqchildren(0), relatedProperties(0), + sets(0), parent(0), tqchildren(0), relatedProperties(0), sortingKey(0) { } @@ -98,7 +98,7 @@ class PropertyPrivate TQPtrDict< TQGuardedPtr<Set> > *sets; // TQValueList<Set*> sets; - Property *tqparent; + Property *parent; TQValueList<Property*> *tqchildren; //! list of properties with the same name (when intersecting buffers) TQValueList<Property*> *relatedProperties; @@ -172,7 +172,7 @@ KoProperty::createValueListFromStringLists(const TQStringList &keys, const TQStr Property::Property(const TQCString &name, const TQVariant &value, const TQString &caption, const TQString &description, - int type, Property* tqparent) + int type, Property* parent) : d( new PropertyPrivate() ) { d->name = name; @@ -186,14 +186,14 @@ Property::Property(const TQCString &name, const TQVariant &value, d->custom = FactoryManager::self()->createCustomProperty(this); - if (tqparent) - tqparent->addChild(this); + if (parent) + parent->addChild(this); setValue(value, false); } Property::Property(const TQCString &name, const TQStringList &keys, const TQStringList &strings, const TQVariant &value, const TQString &caption, const TQString &description, - int type, Property* tqparent) + int type, Property* parent) : d( new PropertyPrivate() ) { d->name = name; @@ -204,14 +204,14 @@ Property::Property(const TQCString &name, const TQStringList &keys, const TQStri d->custom = FactoryManager::self()->createCustomProperty(this); - if (tqparent) - tqparent->addChild(this); + if (parent) + parent->addChild(this); setValue(value, false); } Property::Property(const TQCString &name, ListData* listData, const TQVariant &value, const TQString &caption, const TQString &description, - int type, Property* tqparent) + int type, Property* parent) : d( new PropertyPrivate() ) { d->name = name; @@ -222,8 +222,8 @@ Property::Property(const TQCString &name, ListData* listData, d->custom = FactoryManager::self()->createCustomProperty(this); - if (tqparent) - tqparent->addChild(this); + if (parent) + parent->addChild(this); setValue(value, false); } @@ -408,9 +408,9 @@ Property::resetValue() if (cleared) return; //property set has been cleared: no further actions make sense as 'this' is dead - // maybe tqparent prop is also unchanged now - if(d->tqparent && d->tqparent->value() == d->tqparent->oldValue()) - d->tqparent->d->changed = false; + // maybe parent prop is also unchanged now + if(d->parent && d->parent->value() == d->parent->oldValue()) + d->parent->d->changed = false; if (d->sets) { for (TQPtrDictIterator< TQGuardedPtr<Set> > it(*d->sets); it.current(); ++it) { @@ -648,9 +648,9 @@ Property::child(const TQCString &name) } Property* -Property::tqparent() const +Property::parent() const { - return d->tqparent; + return d->parent; } void @@ -664,7 +664,7 @@ Property::addChild(Property *prop) d->tqchildren = new TQValueList<Property*>(); d->tqchildren->append(prop); prop->setSortingKey(d->tqchildren->count()); - prop->d->tqparent = this; + prop->d->parent = this; } else { kopropertywarn << "Property::addChild(): property \"" << name() diff --git a/lib/koproperty/property.h b/lib/koproperty/property.h index 8d7f01d6..bc8a503e 100644 --- a/lib/koproperty/property.h +++ b/lib/koproperty/property.h @@ -222,20 +222,20 @@ class KOPROPERTY_EXPORT Property (with newline, if any) for displaying within a property editor. */ Property(const TQCString &name, const TQVariant &value = TQVariant(), const TQString &caption = TQString(), const TQString &description = TQString(), - int type = Auto, Property* tqparent = 0); + int type = Auto, Property* parent = 0); /*! Constructs property of \ref ValueFromList type. */ Property(const TQCString &name, const TQStringList &keys, const TQStringList &strings, const TQVariant &value = TQVariant(), const TQString &caption = TQString(), const TQString &description = TQString(), - int type = ValueFromList, Property* tqparent = 0); + int type = ValueFromList, Property* parent = 0); /*! Constructs property of \ref ValueFromList type. This is overload of the above ctor added for convenience. */ Property(const TQCString &name, ListData* listData, const TQVariant &value = TQVariant(), const TQString &caption = TQString(), const TQString &description = TQString(), - int type = ValueFromList, Property* tqparent = 0); + int type = ValueFromList, Property* parent = 0); /*! Constructs a deep copy of \a prop property. */ Property(const Property &prop); @@ -313,8 +313,8 @@ class KOPROPERTY_EXPORT Property /*! \return a child property for \a name, or NULL if there is no property with that name. */ Property* child(const TQCString &name); - /*! \return tqparent property for this property, or NULL if there is no tqparent property. */ - Property* tqparent() const; + /*! \return parent property for this property, or NULL if there is no parent property. */ + Property* parent() const; /*! \return the custom property for this property.or NULL if there was no custom property defined. */ diff --git a/lib/koproperty/set.cpp b/lib/koproperty/set.cpp index d508fc0a..5845365f 100644 --- a/lib/koproperty/set.cpp +++ b/lib/koproperty/set.cpp @@ -129,8 +129,8 @@ Set::Iterator::current() const ////////////////////////////////////////////// -Set::Set(TQObject *tqparent, const TQString &typeName) -: TQObject(tqparent, typeName.latin1()) +Set::Set(TQObject *parent, const TQString &typeName) +: TQObject(parent, typeName.latin1()) { d = new SetPrivate(); d->ownProperty = true; @@ -140,7 +140,7 @@ Set::Set(TQObject *tqparent, const TQString &typeName) Set::Set(const Set &set) - : TQObject(0 /* implicit sharing the tqparent is dangerous */, set.name()) + : TQObject(0 /* implicit sharing the parent is dangerous */, set.name()) { d = new SetPrivate(); *this = set; diff --git a/lib/koproperty/set.h b/lib/koproperty/set.h index 9004c2c4..efb90cd9 100644 --- a/lib/koproperty/set.h +++ b/lib/koproperty/set.h @@ -65,10 +65,10 @@ class KOPROPERTY_EXPORT Set : public TQObject friend class Set; }; - explicit Set(TQObject *tqparent=0, const TQString &typeName=TQString()); + explicit Set(TQObject *parent=0, const TQString &typeName=TQString()); /*! Constructs a deep copy of \a set. - The new object will not have a TQObject tqparent even if \a set has such tqparent. */ + The new object will not have a TQObject parent even if \a set has such parent. */ explicit Set(const Set& set); virtual ~Set(); diff --git a/lib/koproperty/utils.h b/lib/koproperty/utils.h index ad77bf90..c731624c 100644 --- a/lib/koproperty/utils.h +++ b/lib/koproperty/utils.h @@ -30,7 +30,7 @@ namespace KoProperty { class KOPROPERTY_EXPORT GroupContainer : public TQWidget { public: - GroupContainer(const TQString& title, TQWidget* tqparent); + GroupContainer(const TQString& title, TQWidget* parent); ~GroupContainer(); void setContents( TQWidget* contents ); diff --git a/lib/koproperty/widget.cpp b/lib/koproperty/widget.cpp index dd44c2b0..b0169a96 100644 --- a/lib/koproperty/widget.cpp +++ b/lib/koproperty/widget.cpp @@ -55,8 +55,8 @@ class WidgetPrivate }; } -Widget::Widget(Property *property, TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +Widget::Widget(Property *property, TQWidget *parent, const char *name) + : TQWidget(parent, name) { d = new WidgetPrivate(); d->property = property; diff --git a/lib/koproperty/widget.h b/lib/koproperty/widget.h index 9646ecc9..5ed85885 100644 --- a/lib/koproperty/widget.h +++ b/lib/koproperty/widget.h @@ -39,7 +39,7 @@ class KOPROPERTY_EXPORT Widget : public TQWidget TQ_OBJECT public: - Widget(Property *property, TQWidget *tqparent, const char *name="property_editor"); + Widget(Property *property, TQWidget *parent, const char *name="property_editor"); virtual ~Widget(); /*! \return the value currently entered in the item editor widget.*/ diff --git a/lib/koproperty/widgetproxy.cpp b/lib/koproperty/widgetproxy.cpp index 94656038..a4558319 100644 --- a/lib/koproperty/widgetproxy.cpp +++ b/lib/koproperty/widgetproxy.cpp @@ -44,8 +44,8 @@ class WidgetProxyPrivate using namespace KoProperty; -WidgetProxy::WidgetProxy(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +WidgetProxy::WidgetProxy(TQWidget *parent, const char *name) + : TQWidget(parent, name) { d = new WidgetProxyPrivate(); d->property = new Property(); diff --git a/lib/koproperty/widgetproxy.h b/lib/koproperty/widgetproxy.h index 4724eb61..f63cbdd1 100644 --- a/lib/koproperty/widgetproxy.h +++ b/lib/koproperty/widgetproxy.h @@ -40,7 +40,7 @@ class KOPROPERTY_EXPORT WidgetProxy : public TQWidget TQ_OBJECT public: - WidgetProxy(TQWidget *tqparent, const char *name=0); + WidgetProxy(TQWidget *parent, const char *name=0); WidgetProxy(); void setPropertyType(int propertyType); diff --git a/lib/kotext/DateFormatWidget.cpp b/lib/kotext/DateFormatWidget.cpp index 0c1b3575..c93807a3 100644 --- a/lib/kotext/DateFormatWidget.cpp +++ b/lib/kotext/DateFormatWidget.cpp @@ -15,11 +15,11 @@ #include <KoVariable.h> /* - * Constructs a DateFormatWidget which is a child of 'tqparent', with the + * Constructs a DateFormatWidget which is a child of 'parent', with the * name 'name' and widget flags set to 'fl' */ -DateFormatWidget::DateFormatWidget( TQWidget* tqparent, const char* name, WFlags fl ) - : TimeDateFormatWidgetPrototype( tqparent, name, fl ) +DateFormatWidget::DateFormatWidget( TQWidget* parent, const char* name, WFlags fl ) + : TimeDateFormatWidgetPrototype( parent, name, fl ) { setCaption( i18n( "DateFormat", "Format of Date Variable" ) ); TQStringList listDateFormat = KoVariableDateFormat::staticTranslatedFormatPropsList(); diff --git a/lib/kotext/DateFormatWidget.h b/lib/kotext/DateFormatWidget.h index 5f006d36..df028180 100644 --- a/lib/kotext/DateFormatWidget.h +++ b/lib/kotext/DateFormatWidget.h @@ -8,7 +8,7 @@ class DateFormatWidget : public TimeDateFormatWidgetPrototype TQ_OBJECT public: - DateFormatWidget( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + DateFormatWidget( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~DateFormatWidget(); TQString resultString(); int correctValue(); diff --git a/lib/kotext/KFontDialog_local.cpp b/lib/kotext/KFontDialog_local.cpp index 6dbb498f..beaeb9f9 100644 --- a/lib/kotext/KFontDialog_local.cpp +++ b/lib/kotext/KFontDialog_local.cpp @@ -92,11 +92,11 @@ public: TQPalette m_palette; }; -KFontChooser_local::KFontChooser_local(TQWidget *tqparent, const char *name, +KFontChooser_local::KFontChooser_local(TQWidget *parent, const char *name, bool onlyFixed, const TQStringList &fontList, bool makeFrame, int visibleListSize, bool diff, TQButton::ToggleState *sizeIsRelativeState ) - : TQWidget(tqparent, name), usingFixed(onlyFixed) + : TQWidget(parent, name), usingFixed(onlyFixed) { charsetsCombo = 0; @@ -743,11 +743,11 @@ void KFontChooser_local::showXLFDArea(bool show) /////////////////////////////////////////////////////////////////////////////// -KFontDialog_local::KFontDialog_local( TQWidget *tqparent, const char* name, +KFontDialog_local::KFontDialog_local( TQWidget *parent, const char* name, bool onlyFixed, bool modal, const TQStringList &fontList, bool makeFrame, bool diff, TQButton::ToggleState *sizeIsRelativeState ) - : KDialogBase( tqparent, name, modal, i18n("Select Font"), Ok|Cancel, Ok ) + : KDialogBase( parent, name, modal, i18n("Select Font"), Ok|Cancel, Ok ) { chooser = new KFontChooser_local( this, "fontChooser", onlyFixed, fontList, makeFrame, 8, @@ -757,10 +757,10 @@ KFontDialog_local::KFontDialog_local( TQWidget *tqparent, const char* name, int KFontDialog_local::getFontDiff( TQFont &theFont, int &diffFlags, bool onlyFixed, - TQWidget *tqparent, bool makeFrame, + TQWidget *parent, bool makeFrame, TQButton::ToggleState *sizeIsRelativeState ) { - KFontDialog_local dlg( tqparent, "Font Selector", onlyFixed, true, TQStringList(), + KFontDialog_local dlg( parent, "Font Selector", onlyFixed, true, TQStringList(), makeFrame, true, sizeIsRelativeState ); dlg.setFont( theFont, onlyFixed ); @@ -776,10 +776,10 @@ int KFontDialog_local::getFontDiff( TQFont &theFont, int &diffFlags, bool onlyFi } int KFontDialog_local::getFont( TQFont &theFont, bool onlyFixed, - TQWidget *tqparent, bool makeFrame, + TQWidget *parent, bool makeFrame, TQButton::ToggleState *sizeIsRelativeState ) { - KFontDialog_local dlg( tqparent, "Font Selector", onlyFixed, true, TQStringList(), + KFontDialog_local dlg( parent, "Font Selector", onlyFixed, true, TQStringList(), makeFrame, false, sizeIsRelativeState ); dlg.setFont( theFont, onlyFixed ); @@ -795,11 +795,11 @@ int KFontDialog_local::getFont( TQFont &theFont, bool onlyFixed, int KFontDialog_local::getFontAndText( TQFont &theFont, TQString &theString, - bool onlyFixed, TQWidget *tqparent, + bool onlyFixed, TQWidget *parent, bool makeFrame, TQButton::ToggleState *sizeIsRelativeState ) { - KFontDialog_local dlg( tqparent, "Font and Text Selector", onlyFixed, true, + KFontDialog_local dlg( parent, "Font and Text Selector", onlyFixed, true, TQStringList(), makeFrame, false, sizeIsRelativeState ); dlg.setFont( theFont, onlyFixed ); diff --git a/lib/kotext/KFontDialog_local.h b/lib/kotext/KFontDialog_local.h index bb69cf57..921946af 100644 --- a/lib/kotext/KFontDialog_local.h +++ b/lib/kotext/KFontDialog_local.h @@ -89,7 +89,7 @@ public: * <p> * The above creates a font chooser dialog with only SmoothScaleble fonts. * - * @param tqparent The tqparent widget. + * @param parent The parent widget. * @param name The widget name. * @param onlyFixed Only display fonts which have fixed-width * character sizes. @@ -109,7 +109,7 @@ public: * *sizeIsRelativeState, user choice may be retrieved by * calling sizeIsRelative(). */ - KFontChooser_local(TQWidget *tqparent = 0L, const char *name = 0L, + KFontChooser_local(TQWidget *parent = 0L, const char *name = 0L, bool onlyFixed = false, const TQStringList &fontList = TQStringList(), bool makeFrame = true, int visibleListSize=8, @@ -143,7 +143,7 @@ public: void setFont( const TQFont &font, bool onlyFixed = false ); /** - * @return The bittqmask corresponding to the attributes the user + * @return The bitmask corresponding to the attributes the user * wishes to change. */ int fontDiffFlags(); @@ -356,7 +356,7 @@ public: /** * Constructs a font selection dialog. * - * @param tqparent The tqparent widget of the dialog, if any. + * @param parent The parent widget of the dialog, if any. * @param name The name of the dialog. * @param modal Specifies whether the dialog is modal or not. * @param onlyFixed only display fonts which have fixed-width @@ -375,7 +375,7 @@ public: * calling sizeIsRelative(). * */ - KFontDialog_local( TQWidget *tqparent = 0L, const char *name = 0, + KFontDialog_local( TQWidget *parent = 0L, const char *name = 0, bool onlyFixed = false, bool modal = false, const TQStringList &fontlist = TQStringList(), bool makeFrame = true, bool diff = false, @@ -419,7 +419,7 @@ public: * @param theFont a reference to the font to write the chosen font * into. * @param onlyFixed if true, only select from fixed-width fonts. - * @param tqparent Parent widget of the dialog. Specifying a widget different + * @param parent Parent widget of the dialog. Specifying a widget different * from 0 (Null) improves centering (looks better). * @param makeFrame Draws a frame with titles around the contents. * @param sizeIsRelativeState If not zero the widget will show a @@ -432,7 +432,7 @@ public: * @return TQDialog::result(). */ static int getFont( TQFont &theFont, bool onlyFixed = false, - TQWidget *tqparent = 0L, bool makeFrame = true, + TQWidget *parent = 0L, bool makeFrame = true, TQButton::ToggleState *sizeIsRelativeState = 0L ); /** @@ -444,8 +444,8 @@ public: * @param theFont a reference to the font to write the chosen font * into. * @param diffFlags a reference to the int into which the chosen - * difference selection bittqmask should be written. - * Check the returned bittqmask like: + * difference selection bitmask should be written. + * Check the returned bitmask like: * \code * if ( diffFlags & KFontChooser_local::FontDiffFamily ) * [...] @@ -455,7 +455,7 @@ public: * [...] * \endcode * @param onlyFixed if true, only select from fixed-width fonts. - * @param tqparent Parent widget of the dialog. Specifying a widget different + * @param parent Parent widget of the dialog. Specifying a widget different * from 0 (Null) improves centering (looks better). * @param makeFrame Draws a frame with titles around the contents. * @param sizeIsRelativeState If not zero the widget will show a @@ -468,7 +468,7 @@ public: * @returns TQDialog::result(). */ static int getFontDiff( TQFont &theFont, int &diffFlags, bool onlyFixed = false, - TQWidget *tqparent = 0L, bool makeFrame = true, + TQWidget *parent = 0L, bool makeFrame = true, TQButton::ToggleState *sizeIsRelativeState = 0L ); /** @@ -479,7 +479,7 @@ public: * into. * @param theString a reference to the example text that was typed. * @param onlyFixed if true, only select from fixed-width fonts. - * @param tqparent Parent widget of the dialog. Specifying a widget different + * @param parent Parent widget of the dialog. Specifying a widget different * from 0 (Null) improves centering (looks better). * @param makeFrame Draws a frame with titles around the contents. * @param sizeIsRelativeState If not zero the widget will show a @@ -491,7 +491,7 @@ public: * @return The result of the dialog. */ static int getFontAndText( TQFont &theFont, TQString &theString, - bool onlyFixed = false, TQWidget *tqparent = 0L, + bool onlyFixed = false, TQWidget *parent = 0L, bool makeFrame = true, TQButton::ToggleState *sizeIsRelativeState = 0L ); diff --git a/lib/kotext/KoAutoFormat.cpp b/lib/kotext/KoAutoFormat.cpp index dfe6c6df..c45c0481 100644 --- a/lib/kotext/KoAutoFormat.cpp +++ b/lib/kotext/KoAutoFormat.cpp @@ -48,8 +48,8 @@ #include <tqregexp.h> -KoCompletionBox::KoCompletionBox( TQWidget * tqparent, const char * name, WFlags f) - : TQLabel(tqparent,name,f) +KoCompletionBox::KoCompletionBox( TQWidget * parent, const char * name, WFlags f) + : TQLabel(parent,name,f) { setBackgroundColor(TQColor("#FFFFE6")); setFocusPolicy(TQ_NoFocus); diff --git a/lib/kotext/KoAutoFormat.h b/lib/kotext/KoAutoFormat.h index 8f4199a2..2f61cb18 100644 --- a/lib/kotext/KoAutoFormat.h +++ b/lib/kotext/KoAutoFormat.h @@ -51,7 +51,7 @@ class KoCompletionBox : public TQLabel Q_OBJECT TQ_OBJECT public: - KoCompletionBox( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 ); + KoCompletionBox( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); ~KoCompletionBox(); TQString& lastWord(); void setLastWord(TQString const &); diff --git a/lib/kotext/KoAutoFormatDia.cpp b/lib/kotext/KoAutoFormatDia.cpp index 90b1a97d..e6dce371 100644 --- a/lib/kotext/KoAutoFormatDia.cpp +++ b/lib/kotext/KoAutoFormatDia.cpp @@ -37,8 +37,8 @@ #include <tqdir.h> #include <tqapplication.h> -KoAutoFormatLineEdit::KoAutoFormatLineEdit ( TQWidget * tqparent, const char * name ) - : TQLineEdit(tqparent,name) +KoAutoFormatLineEdit::KoAutoFormatLineEdit ( TQWidget * parent, const char * name ) + : TQLineEdit(parent,name) { } @@ -58,8 +58,8 @@ void KoAutoFormatLineEdit::keyPressEvent ( TQKeyEvent *ke ) /* Class: KoAutoFormatExceptionWidget */ /******************************************************************/ -KoAutoFormatExceptionWidget::KoAutoFormatExceptionWidget(TQWidget *tqparent, const TQString &name,const TQStringList &_list, bool _autoInclude, bool _abreviation) - :TQWidget( tqparent ) +KoAutoFormatExceptionWidget::KoAutoFormatExceptionWidget(TQWidget *parent, const TQString &name,const TQStringList &_list, bool _autoInclude, bool _abreviation) + :TQWidget( parent ) { m_bAbbreviation=_abreviation; m_listException=_list; @@ -166,10 +166,10 @@ void KoAutoFormatExceptionWidget::slotExceptionListSelected() /* Class: KoAutoFormatDia */ /******************************************************************/ -KoAutoFormatDia::KoAutoFormatDia( TQWidget *tqparent, const char *name, +KoAutoFormatDia::KoAutoFormatDia( TQWidget *parent, const char *name, KoAutoFormat * autoFormat ) : KDialogBase( Tabbed, i18n("Autocorrection"), Ok | Cancel | User1, Ok, - tqparent, name, true, true, KGuiItem( i18n( "&Reset" ), "undo" )), + parent, name, true, true, KGuiItem( i18n( "&Reset" ), "undo" )), oSimpleBegin( autoFormat->getConfigTypographicSimpleQuotes().begin ), oSimpleEnd( autoFormat->getConfigTypographicSimpleQuotes().end ), oDoubleBegin( autoFormat->getConfigTypographicDoubleQuotes().begin ), diff --git a/lib/kotext/KoAutoFormatDia.h b/lib/kotext/KoAutoFormatDia.h index 3e8020e7..14084af5 100644 --- a/lib/kotext/KoAutoFormatDia.h +++ b/lib/kotext/KoAutoFormatDia.h @@ -37,7 +37,7 @@ class KoAutoFormatLineEdit : public TQLineEdit Q_OBJECT TQ_OBJECT public: - KoAutoFormatLineEdit ( TQWidget * tqparent, const char * name=0 ); + KoAutoFormatLineEdit ( TQWidget * parent, const char * name=0 ); protected: virtual void keyPressEvent ( TQKeyEvent * ); @@ -85,7 +85,7 @@ class KOTEXT_EXPORT KoAutoFormatDia : public KDialogBase TQ_OBJECT public: - KoAutoFormatDia( TQWidget *tqparent, const char *name, KoAutoFormat * autoFormat ); + KoAutoFormatDia( TQWidget *parent, const char *name, KoAutoFormat * autoFormat ); ~KoAutoFormatDia(); void addEntryList(const TQString &key, KoAutoFormatEntry *_autoEntry); void editEntryList(const TQString &key,const TQString &newFindString, KoAutoFormatEntry *_autoEntry); diff --git a/lib/kotext/KoBgSpellCheck.cpp b/lib/kotext/KoBgSpellCheck.cpp index ae2f3668..13ca9457 100644 --- a/lib/kotext/KoBgSpellCheck.cpp +++ b/lib/kotext/KoBgSpellCheck.cpp @@ -59,9 +59,9 @@ public: static const int delayAfterMarked = 10; -KoBgSpellCheck::KoBgSpellCheck( const Broker::Ptr& broker, TQObject *tqparent, +KoBgSpellCheck::KoBgSpellCheck( const Broker::Ptr& broker, TQObject *parent, const char *name ) - : TQObject( tqparent, name ) + : TQObject( parent, name ) { #ifdef DEBUG_BGSPELLCHECKING kdDebug(32500) << "KoBgSpellCheck::KoBgSpellCheck " << this << endl; diff --git a/lib/kotext/KoBgSpellCheck.h b/lib/kotext/KoBgSpellCheck.h index 08f47272..9d96d84b 100644 --- a/lib/kotext/KoBgSpellCheck.h +++ b/lib/kotext/KoBgSpellCheck.h @@ -34,7 +34,7 @@ class KOTEXT_EXPORT KoBgSpellCheck : public TQObject Q_OBJECT TQ_OBJECT public: - KoBgSpellCheck( const KSpell2::Broker::Ptr& broker, TQObject *tqparent =0, + KoBgSpellCheck( const KSpell2::Broker::Ptr& broker, TQObject *parent =0, const char *name =0 ); virtual ~KoBgSpellCheck(); diff --git a/lib/kotext/KoChangeCaseDia.cpp b/lib/kotext/KoChangeCaseDia.cpp index 1d2409b3..8f7c2515 100644 --- a/lib/kotext/KoChangeCaseDia.cpp +++ b/lib/kotext/KoChangeCaseDia.cpp @@ -27,8 +27,8 @@ #include "KoChangeCaseDia.h" -KoChangeCaseDia::KoChangeCaseDia( TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name , true, "", Ok|Cancel, Ok, true ) +KoChangeCaseDia::KoChangeCaseDia( TQWidget *parent, const char *name ) + : KDialogBase( parent, name , true, "", Ok|Cancel, Ok, true ) { setCaption( i18n("Change Case") ); diff --git a/lib/kotext/KoChangeCaseDia.h b/lib/kotext/KoChangeCaseDia.h index 52b85e72..ace24d5a 100644 --- a/lib/kotext/KoChangeCaseDia.h +++ b/lib/kotext/KoChangeCaseDia.h @@ -31,7 +31,7 @@ class KOTEXT_EXPORT KoChangeCaseDia : public KDialogBase Q_OBJECT TQ_OBJECT public: - KoChangeCaseDia( TQWidget *tqparent, const char *name ); + KoChangeCaseDia( TQWidget *parent, const char *name ); enum TypeOfCase { UpperCase =0, LowerCase=1, TitleCase=2, ToggleCase=3, SentenceCase=4}; TypeOfCase getTypeOfCase(); diff --git a/lib/kotext/KoCommentDia.cpp b/lib/kotext/KoCommentDia.cpp index 1e264012..a6c8b2bb 100644 --- a/lib/kotext/KoCommentDia.cpp +++ b/lib/kotext/KoCommentDia.cpp @@ -28,8 +28,8 @@ #include <tqlabel.h> #include <kdebug.h> -KoCommentDia::KoCommentDia( TQWidget *tqparent, const TQString &_note, const TQString & _authorName, const TQString &_createNote, const char *name ) - : KDialogBase( tqparent, name , true, "", Ok|Cancel, Ok, true ) +KoCommentDia::KoCommentDia( TQWidget *parent, const TQString &_note, const TQString & _authorName, const TQString &_createNote, const char *name ) + : KDialogBase( parent, name , true, "", Ok|Cancel, Ok, true ) { setCaption( i18n("Edit Comment") ); authorName = _authorName; diff --git a/lib/kotext/KoCommentDia.h b/lib/kotext/KoCommentDia.h index a925e802..3f9465d6 100644 --- a/lib/kotext/KoCommentDia.h +++ b/lib/kotext/KoCommentDia.h @@ -30,7 +30,7 @@ class KOTEXT_EXPORT KoCommentDia : public KDialogBase Q_OBJECT TQ_OBJECT public: - KoCommentDia( TQWidget *tqparent, const TQString &_note=TQString(), const TQString & _authorName=TQString(), const TQString &_createNote=TQString(), const char *name=0L ); + KoCommentDia( TQWidget *parent, const TQString &_note=TQString(), const TQString & _authorName=TQString(), const TQString &_createNote=TQString(), const char *name=0L ); TQString commentText(); private slots: diff --git a/lib/kotext/KoCompletionDia.cpp b/lib/kotext/KoCompletionDia.cpp index 6289675d..66d8d374 100644 --- a/lib/kotext/KoCompletionDia.cpp +++ b/lib/kotext/KoCompletionDia.cpp @@ -34,8 +34,8 @@ #include <tqgroupbox.h> #include <tqwhatsthis.h> -KoCompletionDia::KoCompletionDia( TQWidget *tqparent, const char *name, KoAutoFormat * autoFormat ) - : KDialogBase( tqparent, name , true, i18n( "Completion" ), Ok|Cancel|User1, +KoCompletionDia::KoCompletionDia( TQWidget *parent, const char *name, KoAutoFormat * autoFormat ) + : KDialogBase( parent, name , true, i18n( "Completion" ), Ok|Cancel|User1, Ok, true, KGuiItem( i18n( "&Reset" ), "undo" ) ) { TQVBox *page = makeVBoxMainWidget(); @@ -53,7 +53,7 @@ void KoCompletionDia::slotOk() KDialogBase::slotOk(); } -KoCompletion::KoCompletion(TQWidget *tqparent, KoAutoFormat *autoFormat) : KoCompletionBase(tqparent), +KoCompletion::KoCompletion(TQWidget *parent, KoAutoFormat *autoFormat) : KoCompletionBase(parent), m_autoFormat( *autoFormat ), m_docAutoFormat( autoFormat ) { diff --git a/lib/kotext/KoCompletionDia.h b/lib/kotext/KoCompletionDia.h index c29135aa..1aefb39a 100644 --- a/lib/kotext/KoCompletionDia.h +++ b/lib/kotext/KoCompletionDia.h @@ -31,7 +31,7 @@ class KoCompletion : public KoCompletionBase { TQ_OBJECT public: - KoCompletion(TQWidget *tqparent, KoAutoFormat *autoFormat ); + KoCompletion(TQWidget *parent, KoAutoFormat *autoFormat ); void saveSettings(); protected slots: @@ -56,7 +56,7 @@ class KOTEXT_EXPORT KoCompletionDia : public KDialogBase { TQ_OBJECT public: - KoCompletionDia( TQWidget *tqparent, const char *name, KoAutoFormat * autoFormat ); + KoCompletionDia( TQWidget *parent, const char *name, KoAutoFormat * autoFormat ); protected slots: virtual void slotOk(); diff --git a/lib/kotext/KoComplexText.cpp b/lib/kotext/KoComplexText.cpp index 4239bf47..54599d07 100644 --- a/lib/kotext/KoComplexText.cpp +++ b/lib/kotext/KoComplexText.cpp @@ -55,14 +55,14 @@ KoBidiContext::KoBidiContext( uchar l, TQChar::Direction e, KoBidiContext *p, bo { if ( p ) p->ref(); - tqparent = p; + parent = p; count = 0; } KoBidiContext::~KoBidiContext() { - if( tqparent && tqparent->deref() ) - delete tqparent; + if( parent && parent->deref() ) + delete parent; } static TQChar *tqshapeBuffer = 0; @@ -924,8 +924,8 @@ TQPtrList<KoTextRun> *KoComplexText::bidiReorderLine( KoBidiControl *control, co TQChar::Direction dirCurrent; if(current == (int)text.length()) { KoBidiContext *c = context; - while ( c->tqparent ) - c = c->tqparent; + while ( c->parent ) + c = c->parent; dirCurrent = c->dir; } else if ( current == last ) { dirCurrent = ( basicDir != TQChar::DirON ? basicDir : basicDirection( text, current ) ); @@ -1008,7 +1008,7 @@ TQPtrList<KoTextRun> *KoComplexText::bidiReorderLine( KoBidiControl *control, co } case TQChar::DirPDF: { - KoBidiContext *c = context->tqparent; + KoBidiContext *c = context->parent; if(c) { runs->append( new KoTextRun(sor, eor, context, dir) ); ++eor; sor = eor; dir = TQChar::DirON; status.eor = TQChar::DirON; diff --git a/lib/kotext/KoComplexText.h b/lib/kotext/KoComplexText.h index f4f4253f..72abfbed 100644 --- a/lib/kotext/KoComplexText.h +++ b/lib/kotext/KoComplexText.h @@ -74,15 +74,15 @@ struct TQ_EXPORT KoBiditqStatus { }; struct TQ_EXPORT KoBidiContext : public TQShared { - // ### ref and deref tqparent? - KoBidiContext( uchar level, TQChar::Direction embedding, KoBidiContext *tqparent = 0, bool override = FALSE ); + // ### ref and deref parent? + KoBidiContext( uchar level, TQChar::Direction embedding, KoBidiContext *parent = 0, bool override = FALSE ); ~KoBidiContext(); unsigned char level; bool override : 1; TQChar::Direction dir : 5; - KoBidiContext *tqparent; + KoBidiContext *parent; }; struct TQ_EXPORT KoBidiControl { diff --git a/lib/kotext/KoCreateStyleDia.cpp b/lib/kotext/KoCreateStyleDia.cpp index 648dc252..e4b9f339 100644 --- a/lib/kotext/KoCreateStyleDia.cpp +++ b/lib/kotext/KoCreateStyleDia.cpp @@ -25,8 +25,8 @@ #include "KoCreateStyleDia.h" #include <kmessagebox.h> -KoCreateStyleDia::KoCreateStyleDia( const TQStringList & _list, TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name , true, "", Ok|Cancel, Ok, true ) +KoCreateStyleDia::KoCreateStyleDia( const TQStringList & _list, TQWidget *parent, const char *name ) + : KDialogBase( parent, name , true, "", Ok|Cancel, Ok, true ) { styleList=_list; setCaption( i18n("Create New Style") ); diff --git a/lib/kotext/KoCreateStyleDia.h b/lib/kotext/KoCreateStyleDia.h index b4c6a5c5..ea94e9fa 100644 --- a/lib/kotext/KoCreateStyleDia.h +++ b/lib/kotext/KoCreateStyleDia.h @@ -30,7 +30,7 @@ class KOTEXT_EXPORT KoCreateStyleDia : public KDialogBase Q_OBJECT TQ_OBJECT public: - KoCreateStyleDia( const TQStringList & _list, TQWidget *tqparent, const char *name ); + KoCreateStyleDia( const TQStringList & _list, TQWidget *parent, const char *name ); TQString nameOfNewStyle()const; protected slots: diff --git a/lib/kotext/KoCustomVariablesDia.cpp b/lib/kotext/KoCustomVariablesDia.cpp index fd28bfe6..aa74d133 100644 --- a/lib/kotext/KoCustomVariablesDia.cpp +++ b/lib/kotext/KoCustomVariablesDia.cpp @@ -37,15 +37,15 @@ * ******************************************************************/ -KoVariableNameDia::KoVariableNameDia( TQWidget *tqparent ) - : KDialogBase( tqparent, "", TRUE,i18n( "Entry Name" ),Ok|Cancel ) +KoVariableNameDia::KoVariableNameDia( TQWidget *parent ) + : KDialogBase( parent, "", TRUE,i18n( "Entry Name" ),Ok|Cancel ) { init(); } -KoVariableNameDia::KoVariableNameDia( TQWidget *tqparent, const TQPtrList<KoVariable>& vars ) - : KDialogBase( tqparent, "", TRUE, i18n( "Variable Name" ), Ok|Cancel ) +KoVariableNameDia::KoVariableNameDia( TQWidget *parent, const TQPtrList<KoVariable>& vars ) + : KDialogBase( parent, "", TRUE, i18n( "Variable Name" ), Ok|Cancel ) { init(); @@ -97,8 +97,8 @@ void KoVariableNameDia::textChanged ( const TQString &_text ) * ******************************************************************/ -KoCustomVariablesListItem::KoCustomVariablesListItem( TQListView *tqparent ) - : TQListViewItem( tqparent ) +KoCustomVariablesListItem::KoCustomVariablesListItem( TQListView *parent ) + : TQListViewItem( parent ) { editWidget = new KLineEdit( listView()->viewport() ); listView()->addChild( editWidget ); @@ -158,8 +158,8 @@ int KoCustomVariablesListItem::width( const TQFontMetrics & fm, const TQListView * ******************************************************************/ -KoCustomVariablesList::KoCustomVariablesList( TQWidget *tqparent ) - : KListView( tqparent ) +KoCustomVariablesList::KoCustomVariablesList( TQWidget *parent ) + : KListView( parent ) { header()->setMovingEnabled( FALSE ); addColumn( i18n( "Variable" ) ); @@ -204,8 +204,8 @@ void KoCustomVariablesList::updateItems() * ******************************************************************/ -KoCustomVariablesDia::KoCustomVariablesDia( TQWidget *tqparent, const TQPtrList<KoVariable> &variables ) - : KDialogBase( tqparent, "", TRUE,i18n( "Variable Value Editor" ), Ok|Cancel ) +KoCustomVariablesDia::KoCustomVariablesDia( TQWidget *parent, const TQPtrList<KoVariable> &variables ) + : KDialogBase( parent, "", TRUE,i18n( "Variable Value Editor" ), Ok|Cancel ) { back = makeVBoxMainWidget(); @@ -248,8 +248,8 @@ void KoCustomVariablesDia::slotOk() * ******************************************************************/ -KoCustomVarDialog::KoCustomVarDialog( TQWidget *tqparent ) - : KDialogBase( tqparent, "", TRUE,i18n( "Add Variable" ), Ok|Cancel ) +KoCustomVarDialog::KoCustomVarDialog( TQWidget *parent ) + : KDialogBase( parent, "", TRUE,i18n( "Add Variable" ), Ok|Cancel ) { init(); m_name->setFocus(); @@ -268,8 +268,8 @@ KoCustomVarDialog::KoCustomVarDialog( TQWidget *tqparent ) } // edit existing variable -KoCustomVarDialog::KoCustomVarDialog( TQWidget *tqparent, KoCustomVariable *var ) - : KDialogBase( tqparent, "", TRUE,i18n( "Edit Variable" ), Ok|Cancel ) +KoCustomVarDialog::KoCustomVarDialog( TQWidget *parent, KoCustomVariable *var ) + : KDialogBase( parent, "", TRUE,i18n( "Edit Variable" ), Ok|Cancel ) { m_var = var; init(); diff --git a/lib/kotext/KoCustomVariablesDia.h b/lib/kotext/KoCustomVariablesDia.h index b5883ddb..e2116045 100644 --- a/lib/kotext/KoCustomVariablesDia.h +++ b/lib/kotext/KoCustomVariablesDia.h @@ -46,9 +46,9 @@ class KoVariableNameDia : public KDialogBase public: // For KWMailMergeVariableInsertDia - KoVariableNameDia( TQWidget *tqparent ); + KoVariableNameDia( TQWidget *parent ); // For kwview - KoVariableNameDia( TQWidget *tqparent, const TQPtrList<KoVariable> &vars ); + KoVariableNameDia( TQWidget *parent, const TQPtrList<KoVariable> &vars ); TQString getName() const; protected slots: @@ -68,7 +68,7 @@ protected: class KoCustomVariablesListItem : public TQListViewItem { public: - KoCustomVariablesListItem( TQListView *tqparent ); + KoCustomVariablesListItem( TQListView *parent ); void setVariable( KoCustomVariable *v ); KoCustomVariable *getVariable() const; @@ -96,7 +96,7 @@ class KoCustomVariablesList : public KListView TQ_OBJECT public: - KoCustomVariablesList( TQWidget *tqparent ); + KoCustomVariablesList( TQWidget *parent ); void setValues(); void updateItems(); @@ -120,7 +120,7 @@ class KOTEXT_EXPORT KoCustomVariablesDia : public KDialogBase TQ_OBJECT public: - KoCustomVariablesDia( TQWidget *tqparent, const TQPtrList<KoVariable> &variables ); + KoCustomVariablesDia( TQWidget *parent, const TQPtrList<KoVariable> &variables ); protected slots: void slotOk(); @@ -144,11 +144,11 @@ public: /** * Add new variable */ - KoCustomVarDialog( TQWidget *tqparent ); + KoCustomVarDialog( TQWidget *parent ); /** * Edit existing variable @p var */ - KoCustomVarDialog( TQWidget *tqparent, KoCustomVariable *var ); + KoCustomVarDialog( TQWidget *parent, KoCustomVariable *var ); virtual TQString name(); virtual TQString value(); diff --git a/lib/kotext/KoDecorationTab.cpp b/lib/kotext/KoDecorationTab.cpp index 8fb82755..73e0789e 100644 --- a/lib/kotext/KoDecorationTab.cpp +++ b/lib/kotext/KoDecorationTab.cpp @@ -29,8 +29,8 @@ #include "KoDecorationTab.moc" -KoDecorationTab::KoDecorationTab( TQWidget* tqparent, const char* name, WFlags fl ) - : KoDecorationTabBase( tqparent, name, fl ) +KoDecorationTab::KoDecorationTab( TQWidget* parent, const char* name, WFlags fl ) + : KoDecorationTabBase( parent, name, fl ) { shadowDistanceKDoubleNumInput->setRange(0, 9, 0.5, false); diff --git a/lib/kotext/KoDecorationTab.h b/lib/kotext/KoDecorationTab.h index be5222fc..6b396a88 100644 --- a/lib/kotext/KoDecorationTab.h +++ b/lib/kotext/KoDecorationTab.h @@ -30,7 +30,7 @@ class KoDecorationTab : public KoDecorationTabBase TQ_OBJECT public: - KoDecorationTab( TQWidget* tqparent=0, const char* name=0, WFlags fl=0 ); + KoDecorationTab( TQWidget* parent=0, const char* name=0, WFlags fl=0 ); ~KoDecorationTab(); TQColor getTextColor() const; diff --git a/lib/kotext/KoFontDia.cpp b/lib/kotext/KoFontDia.cpp index 93f3a21e..258ea98d 100644 --- a/lib/kotext/KoFontDia.cpp +++ b/lib/kotext/KoFontDia.cpp @@ -45,8 +45,8 @@ #include <kiconloader.h> KoFontDia::KoFontDia( const KoTextFormat& initialFormat, - KSpell2::Broker::Ptr broker, TQWidget* tqparent, const char* name ) - : KDialogBase( tqparent, name, true, + KSpell2::Broker::Ptr broker, TQWidget* parent, const char* name ) + : KDialogBase( parent, name, true, i18n("Select Font"), Ok|Cancel|User1|Apply, Ok ), m_initialFormat(initialFormat), m_changedFlags(KoTextFormat::NoFlags) diff --git a/lib/kotext/KoFontDia.h b/lib/kotext/KoFontDia.h index ebd4a93f..7f739d19 100644 --- a/lib/kotext/KoFontDia.h +++ b/lib/kotext/KoFontDia.h @@ -49,7 +49,7 @@ public: /// so that the font dialog can show which languages are supported for spellchecking. KoFontDia( const KoTextFormat& initialFormat, KSpell2::Broker::Ptr broker = 0, - TQWidget* tqparent = 0, const char* name = 0 ); + TQWidget* parent = 0, const char* name = 0 ); int changedFlags() const { return m_changedFlags; } diff --git a/lib/kotext/KoFontDiaPreview.cpp b/lib/kotext/KoFontDiaPreview.cpp index 04d56e4c..f61306b0 100644 --- a/lib/kotext/KoFontDiaPreview.cpp +++ b/lib/kotext/KoFontDiaPreview.cpp @@ -35,8 +35,8 @@ #include "KoFontDiaPreview.moc" -KoFontDiaPreview::KoFontDiaPreview( TQWidget* tqparent, const char* name , WFlags fl ) - : TQFrame( tqparent, name, fl ) +KoFontDiaPreview::KoFontDiaPreview( TQWidget* parent, const char* name , WFlags fl ) + : TQFrame( parent, name, fl ) ,m_text( i18n( "The quick brown dog jumps over the lazy cat." ) ) ,displayText( i18n( "The quick brown dog jumps over the lazy cat." ) ) ,m_font( KoGlobal::defaultFont() ) diff --git a/lib/kotext/KoFontDiaPreview.h b/lib/kotext/KoFontDiaPreview.h index 5cba0fbc..48bd459e 100644 --- a/lib/kotext/KoFontDiaPreview.h +++ b/lib/kotext/KoFontDiaPreview.h @@ -37,7 +37,7 @@ public: /** * Constructor */ - KoFontDiaPreview( TQWidget* tqparent =0, const char* name = 0, WFlags fl = 0 ); + KoFontDiaPreview( TQWidget* parent =0, const char* name = 0, WFlags fl = 0 ); ~KoFontDiaPreview(); void setText( const TQString &text ); diff --git a/lib/kotext/KoFontTab.cpp b/lib/kotext/KoFontTab.cpp index fe8f1621..da0b524e 100644 --- a/lib/kotext/KoFontTab.cpp +++ b/lib/kotext/KoFontTab.cpp @@ -19,8 +19,8 @@ #include "KoFontTab.h" -KoFontTab::KoFontTab( uint fontListCriteria, TQWidget* tqparent, const char* name, WFlags fl ) - : KoFontTabBase( tqparent, name, fl ) +KoFontTab::KoFontTab( uint fontListCriteria, TQWidget* parent, const char* name, WFlags fl ) + : KoFontTabBase( parent, name, fl ) { TQStringList list; KFontChooser_local::getFontList(list, fontListCriteria); diff --git a/lib/kotext/KoFontTab.h b/lib/kotext/KoFontTab.h index 5cb1d3bb..5333e46a 100644 --- a/lib/kotext/KoFontTab.h +++ b/lib/kotext/KoFontTab.h @@ -29,7 +29,7 @@ class KoFontTab : public KoFontTabBase TQ_OBJECT public: - KoFontTab( uint fontListCriteria=0, TQWidget* tqparent=0, const char* name=0, WFlags fl=0 ); + KoFontTab( uint fontListCriteria=0, TQWidget* parent=0, const char* name=0, WFlags fl=0 ); ~KoFontTab(); TQFont getSelection(); diff --git a/lib/kotext/KoHighlightingTab.cpp b/lib/kotext/KoHighlightingTab.cpp index b2f829d1..ab7b0577 100644 --- a/lib/kotext/KoHighlightingTab.cpp +++ b/lib/kotext/KoHighlightingTab.cpp @@ -31,8 +31,8 @@ #include "KoHighlightingTab.moc" -KoHighlightingTab::KoHighlightingTab( TQWidget* tqparent, const char* name, WFlags fl ) - : KoHighlightingTabBase( tqparent, name, fl ) +KoHighlightingTab::KoHighlightingTab( TQWidget* parent, const char* name, WFlags fl ) + : KoHighlightingTabBase( parent, name, fl ) { underlineStyleKComboBox->insertStringList( KoTextFormat::underlineTypeList() ); underlineLineStyleKComboBox->insertStringList( KoTextFormat::underlineStyleList() ); diff --git a/lib/kotext/KoHighlightingTab.h b/lib/kotext/KoHighlightingTab.h index b60b6582..d8ebc1d7 100644 --- a/lib/kotext/KoHighlightingTab.h +++ b/lib/kotext/KoHighlightingTab.h @@ -31,7 +31,7 @@ class KoHighlightingTab : public KoHighlightingTabBase TQ_OBJECT public: - KoHighlightingTab( TQWidget* tqparent=0, const char* name=0, WFlags fl=0 ); + KoHighlightingTab( TQWidget* parent=0, const char* name=0, WFlags fl=0 ); ~KoHighlightingTab(); KoTextFormat::UnderlineType getUnderline() const; diff --git a/lib/kotext/KoImportStyleDia.cpp b/lib/kotext/KoImportStyleDia.cpp index 99ff15b4..327dbe53 100644 --- a/lib/kotext/KoImportStyleDia.cpp +++ b/lib/kotext/KoImportStyleDia.cpp @@ -28,8 +28,8 @@ #include <kdebug.h> #include <tqlabel.h> -KoImportStyleDia::KoImportStyleDia( KoStyleCollection* currentCollection, TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name , true, "", Ok|Cancel|User1, Ok, true ) +KoImportStyleDia::KoImportStyleDia( KoStyleCollection* currentCollection, TQWidget *parent, const char *name ) + : KDialogBase( parent, name , true, "", Ok|Cancel|User1, Ok, true ) { setCaption( i18n("Import Styles") ); m_currentCollection = currentCollection; diff --git a/lib/kotext/KoImportStyleDia.h b/lib/kotext/KoImportStyleDia.h index eaf24f5c..ea2ccf91 100644 --- a/lib/kotext/KoImportStyleDia.h +++ b/lib/kotext/KoImportStyleDia.h @@ -34,7 +34,7 @@ class KOTEXT_EXPORT KoImportStyleDia : public KDialogBase public: /// @param currentCollection collection of styles already present in the document /// (this is used to avoid conflicts in the style names and displayNames) - KoImportStyleDia( KoStyleCollection* currentCollection, TQWidget *tqparent, const char *name ); + KoImportStyleDia( KoStyleCollection* currentCollection, TQWidget *parent, const char *name ); ~KoImportStyleDia(); const KoStyleCollection& importedStyles() const { return m_styleList; } diff --git a/lib/kotext/KoLanguageTab.cpp b/lib/kotext/KoLanguageTab.cpp index 2ec9fede..cf7b261b 100644 --- a/lib/kotext/KoLanguageTab.cpp +++ b/lib/kotext/KoLanguageTab.cpp @@ -28,8 +28,8 @@ #include "KoLanguageTab.moc" -KoLanguageTab::KoLanguageTab( KSpell2::Broker::Ptr broker, TQWidget* tqparent, const char* name, WFlags fl ) - : KoLanguageTabBase( tqparent, name, fl ) +KoLanguageTab::KoLanguageTab( KSpell2::Broker::Ptr broker, TQWidget* parent, const char* name, WFlags fl ) + : KoLanguageTabBase( parent, name, fl ) { const TQStringList langNames = KoGlobal::listOfLanguages(); const TQStringList langTags = KoGlobal::listTagOfLanguages(); diff --git a/lib/kotext/KoLanguageTab.h b/lib/kotext/KoLanguageTab.h index f33c85e6..76e4ddef 100644 --- a/lib/kotext/KoLanguageTab.h +++ b/lib/kotext/KoLanguageTab.h @@ -30,7 +30,7 @@ class KoLanguageTab : public KoLanguageTabBase TQ_OBJECT public: - KoLanguageTab( KSpell2::Broker::Ptr broker = 0, TQWidget* tqparent=0, const char* name=0, WFlags fl=0 ); + KoLanguageTab( KSpell2::Broker::Ptr broker = 0, TQWidget* parent=0, const char* name=0, WFlags fl=0 ); ~KoLanguageTab(); TQString getLanguage() const; diff --git a/lib/kotext/KoLayoutTab.cpp b/lib/kotext/KoLayoutTab.cpp index 2ec9da69..9a2d4e18 100644 --- a/lib/kotext/KoLayoutTab.cpp +++ b/lib/kotext/KoLayoutTab.cpp @@ -28,8 +28,8 @@ #include "KoLayoutTab.moc" -KoLayoutTab::KoLayoutTab( bool withSubSuperScript, TQWidget* tqparent, const char* name, WFlags fl ) - : KoLayoutTabBase( tqparent, name, fl ) +KoLayoutTab::KoLayoutTab( bool withSubSuperScript, TQWidget* parent, const char* name, WFlags fl ) + : KoLayoutTabBase( parent, name, fl ) { if ( !withSubSuperScript ) positionButtonGroup->hide(); diff --git a/lib/kotext/KoLayoutTab.h b/lib/kotext/KoLayoutTab.h index 611e3afa..6b629eef 100644 --- a/lib/kotext/KoLayoutTab.h +++ b/lib/kotext/KoLayoutTab.h @@ -29,7 +29,7 @@ class KoLayoutTab : public KoLayoutTabBase TQ_OBJECT public: - KoLayoutTab( bool withSubSuperScript, TQWidget* tqparent=0, const char* name=0, WFlags fl=0 ); + KoLayoutTab( bool withSubSuperScript, TQWidget* parent=0, const char* name=0, WFlags fl=0 ); ~KoLayoutTab(); KoTextFormat::VerticalAlignment getSubSuperScript() const; diff --git a/lib/kotext/KoParagCounter.cpp b/lib/kotext/KoParagCounter.cpp index b5058f1b..6126d6c5 100644 --- a/lib/kotext/KoParagCounter.cpp +++ b/lib/kotext/KoParagCounter.cpp @@ -88,7 +88,7 @@ void KoParagCounter::tqinvalidate() m_cache.number = -1; m_cache.text = TQString(); m_cache.width = -1; - m_cache.tqparent = INVALID_PARAG; + m_cache.parent = INVALID_PARAG; m_cache.counterFormat = 0; } @@ -345,7 +345,7 @@ int KoParagCounter::number( const KoTextParag *paragraph ) } // Go looking for another paragraph at the same level or higher level. - // (This code shares logic with tqparent()) + // (This code shares logic with parent()) KoTextParag *otherParagraph = paragraph->prev(); KoParagCounter *otherCounter; @@ -434,11 +434,11 @@ KoParagCounter::Numbering KoParagCounter::numbering() const } // Go looking for another paragraph at a higher level. -KoTextParag *KoParagCounter::tqparent( const KoTextParag *paragraph ) +KoTextParag *KoParagCounter::parent( const KoTextParag *paragraph ) { // Return cached value if possible. - if ( m_cache.tqparent != INVALID_PARAG ) - return m_cache.tqparent; + if ( m_cache.parent != INVALID_PARAG ) + return m_cache.parent; KoTextParag *otherParagraph = paragraph->prev(); KoParagCounter *otherCounter; @@ -489,8 +489,8 @@ KoTextParag *KoParagCounter::tqparent( const KoTextParag *paragraph ) } break; } - m_cache.tqparent = otherParagraph; - return m_cache.tqparent; + m_cache.parent = otherParagraph; + return m_cache.parent; } TQString KoParagCounter::prefix() const @@ -714,7 +714,7 @@ TQString KoParagCounter::text( const KoTextParag *paragraph ) // If necessary, grab the text of the preceding levels. if ( m_displayLevels > 1 && m_numbering != NUM_NONE ) { - KoTextParag* p = tqparent( paragraph ); + KoTextParag* p = parent( paragraph ); int displayLevels = TQMIN( m_displayLevels, m_depth+1 ); // can't be >depth+1 for ( int level = 1 ; level < displayLevels ; ++level ) { //kdDebug() << "additional level=" << level << "/" << displayLevels-1 << endl; @@ -740,7 +740,7 @@ TQString KoParagCounter::text( const KoTextParag *paragraph ) m_cache.text.prepend( str ); // Prepare next iteration if ( level < displayLevels ) // no need to calc it if we won't use it - p = counter->tqparent( p ); + p = counter->parent( p ); } else // toplevel parents are missing { diff --git a/lib/kotext/KoParagCounter.h b/lib/kotext/KoParagCounter.h index 4f32df58..dbedb3e8 100644 --- a/lib/kotext/KoParagCounter.h +++ b/lib/kotext/KoParagCounter.h @@ -197,10 +197,10 @@ public: private: - /** Return our tqparent paragraph, if there is such a thing. For a paragraph "1.1.", - * the tqparent is the paragraph numbered "1.". + /** Return our parent paragraph, if there is such a thing. For a paragraph "1.1.", + * the parent is the paragraph numbered "1.". */ - KoTextParag *tqparent( const KoTextParag *paragraph ); + KoTextParag *parent( const KoTextParag *paragraph ); Numbering m_numbering:3; // Numbering (maximum value: 8) bool m_restartCounter:1; @@ -227,7 +227,7 @@ private: * number of this counter -1 * text of this counter TQString() * width of the label -1 - * tqparent (KoTextParag *)-1 + * parent (KoTextParag *)-1 * the format that was used to calculate the width 0 */ struct @@ -235,7 +235,7 @@ private: int number; TQString text; int width; - KoTextParag *tqparent; + KoTextParag *parent; KoTextFormat * counterFormat; } m_cache; }; diff --git a/lib/kotext/KoParagDia.cpp b/lib/kotext/KoParagDia.cpp index 3ee02617..4f687956 100644 --- a/lib/kotext/KoParagDia.cpp +++ b/lib/kotext/KoParagDia.cpp @@ -54,8 +54,8 @@ #include <tqapplication.h> #include <tqwidgetstack.h> -KoCounterStyleWidget::KoCounterStyleWidget( bool displayDepth, bool onlyStyleTypeLetter, bool disableAll, TQWidget * tqparent, const char* name ) - :TQWidget( tqparent, name ), +KoCounterStyleWidget::KoCounterStyleWidget( bool displayDepth, bool onlyStyleTypeLetter, bool disableAll, TQWidget * parent, const char* name ) + :TQWidget( parent, name ), stylesList() { noSignals = true; @@ -405,8 +405,8 @@ void KoCounterStyleWidget::numStyleChanged() { -KoSpinBox::KoSpinBox( TQWidget * tqparent, const char * name ) - : TQSpinBox(tqparent,name) +KoSpinBox::KoSpinBox( TQWidget * parent, const char * name ) + : TQSpinBox(parent,name) { m_Etype=NONE; //max value supported by roman number @@ -417,9 +417,9 @@ KoSpinBox::~KoSpinBox( ) } KoSpinBox::KoSpinBox( int minValue, int maxValue, int step , - TQWidget * tqparent , const char * name ) + TQWidget * parent , const char * name ) : TQSpinBox(minValue, maxValue,step , - tqparent , name) + parent , name) { m_Etype=NONE; } @@ -497,8 +497,8 @@ int KoSpinBox::mapTextToValue( bool * ok ) /* class KPagePreview */ /******************************************************************/ -KPagePreview::KPagePreview( TQWidget* tqparent, const char* name ) - : TQGroupBox( i18n( "Preview" ), tqparent, name ) +KPagePreview::KPagePreview( TQWidget* parent, const char* name ) + : TQGroupBox( i18n( "Preview" ), parent, name ) { left = 0; right = 0; @@ -571,8 +571,8 @@ int KPagePreview::convert(double input) { /* class KPagePreview2 */ /******************************************************************/ -KPagePreview2::KPagePreview2( TQWidget* tqparent, const char* name ) - : TQGroupBox( i18n( "Preview" ), tqparent, name ) +KPagePreview2::KPagePreview2( TQWidget* parent, const char* name ) + : TQGroupBox( i18n( "Preview" ), parent, name ) { align = TQt::AlignLeft; } @@ -650,8 +650,8 @@ void KPagePreview2::drawContents( TQPainter* p ) /******************************************************************/ -KoBorderPreview::KoBorderPreview( TQWidget* tqparent, const char* name ) - :TQFrame(tqparent,name) +KoBorderPreview::KoBorderPreview( TQWidget* parent, const char* name ) + :TQFrame(parent,name) { } @@ -776,8 +776,8 @@ TQPen KoBorderPreview::setBorderPen( KoBorder _brd ) /******************************************************************/ class MyFlow : public KoTextFlow { public: - MyFlow(TQWidget *tqparent, KoTextZoomHandler *zoom) { - m_parent = tqparent; + MyFlow(TQWidget *parent, KoTextZoomHandler *zoom) { + m_parent = parent; m_zoomHandler = zoom; } int availableHeight() const { @@ -788,8 +788,8 @@ class MyFlow : public KoTextFlow { KoTextZoomHandler *m_zoomHandler; }; -KoStylePreview::KoStylePreview( const TQString& title, const TQString& text, TQWidget* tqparent, const char* name ) - : TQGroupBox( title, tqparent, name ) +KoStylePreview::KoStylePreview( const TQString& title, const TQString& text, TQWidget* parent, const char* name ) + : TQGroupBox( title, parent, name ) { setMinimumHeight(80); m_zoomHandler = new KoTextZoomHandler; @@ -860,8 +860,8 @@ void KoStylePreview::drawContents( TQPainter *painter ) painter->restore(); } -KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameWidth,TQWidget * tqparent, const char * name ) - : KoParagLayoutWidget( KoParagDia::PD_SPACING, tqparent, name ), m_unit( unit ) +KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameWidth,TQWidget * parent, const char * name ) + : KoParagLayoutWidget( KoParagDia::PD_SPACING, parent, name ), m_unit( unit ) { TQString unitName = KoUnit::unitName( m_unit ); TQGridLayout *mainGrid = new TQGridLayout( this, 3, 2, KDialog::marginHint(), KDialog::spacingHint() ); @@ -1205,8 +1205,8 @@ void KoIndentSpacingWidget::afterChanged( double _val ) } -KoParagAlignWidget::KoParagAlignWidget( bool breakLine, TQWidget * tqparent, const char * name ) - : KoParagLayoutWidget( KoParagDia::PD_ALIGN, tqparent, name ) +KoParagAlignWidget::KoParagAlignWidget( bool breakLine, TQWidget * parent, const char * name ) + : KoParagLayoutWidget( KoParagDia::PD_ALIGN, parent, name ) { TQGridLayout *grid = new TQGridLayout( this, 3, 2, KDialog::marginHint(), KDialog::spacingHint() ); @@ -1359,9 +1359,9 @@ void KoParagAlignWidget::clearAligns() //////////////////////////////////////////////////////////////////////////////// -KoParagDecorationWidget::KoParagDecorationWidget( TQWidget * tqparent, +KoParagDecorationWidget::KoParagDecorationWidget( TQWidget * parent, const char * name ) - : KoParagLayoutWidget( KoParagDia::PD_DECORATION, tqparent, name ) + : KoParagLayoutWidget( KoParagDia::PD_DECORATION, parent, name ) { TQVBoxLayout *tabLayout = new TQVBoxLayout( this ); wDeco = new KoParagDecorationTab( this ); @@ -1594,8 +1594,8 @@ void KoParagDecorationWidget::brdJoinToggled( bool _on ) { //////////////////////////////////////////////////////////////////////////////// -KoParagCounterWidget::KoParagCounterWidget( bool disableAll, TQWidget * tqparent, const char * name ) - : KoParagLayoutWidget( KoParagDia::PD_NUMBERING, tqparent, name ) +KoParagCounterWidget::KoParagCounterWidget( bool disableAll, TQWidget * parent, const char * name ) + : KoParagLayoutWidget( KoParagDia::PD_NUMBERING, parent, name ) { TQVBoxLayout *Form1Layout = new TQVBoxLayout( this ); @@ -1720,8 +1720,8 @@ void KoParagCounterWidget::save( KoParagLayout & lay ) { lay.counter = new KoParagCounter( m_counter ); } -KoTabulatorsLineEdit::KoTabulatorsLineEdit( TQWidget *tqparent, double lower, double upper, double step, double value /*= 0.0*/, KoUnit::Unit unit /*= KoUnit::U_PT*/, unsigned int precision /*= 2*/, const char *name /*= 0*/ ) - : KoUnitDoubleSpinBox ( tqparent, lower, upper, step, value, unit, precision, name ) +KoTabulatorsLineEdit::KoTabulatorsLineEdit( TQWidget *parent, double lower, double upper, double step, double value /*= 0.0*/, KoUnit::Unit unit /*= KoUnit::U_PT*/, unsigned int precision /*= 2*/, const char *name /*= 0*/ ) + : KoUnitDoubleSpinBox ( parent, lower, upper, step, value, unit, precision, name ) { setRange( 0, 9999, 1, false); } @@ -1737,8 +1737,8 @@ void KoTabulatorsLineEdit::keyPressEvent ( TQKeyEvent *ke ) KoUnitDoubleSpinBox::keyPressEvent (ke); } -KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double frameWidth,TQWidget * tqparent, const char * name ) - : KoParagLayoutWidget( KoParagDia::PD_TABS, tqparent, name ), m_unit(unit) { +KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double frameWidth,TQWidget * parent, const char * name ) + : KoParagLayoutWidget( KoParagDia::PD_TABS, parent, name ), m_unit(unit) { TQString length; if(frameWidth==-1) { frameWidth=9999; @@ -2147,9 +2147,9 @@ TQString KoParagTabulatorsWidget::tabName() { /******************************************************************/ /* Class: KoParagDia */ /******************************************************************/ -KoParagDia::KoParagDia( TQWidget* tqparent, const char* name, +KoParagDia::KoParagDia( TQWidget* parent, const char* name, int flags, KoUnit::Unit unit, double _frameWidth, bool breakLine, bool disableAll ) - : KDialogBase(Tabbed, TQString(), Ok | Cancel | User1 | Apply, Ok, tqparent, name, true ) + : KDialogBase(Tabbed, TQString(), Ok | Cancel | User1 | Apply, Ok, parent, name, true ) { m_decorationsWidget = 0; m_flags = flags; diff --git a/lib/kotext/KoParagDia.h b/lib/kotext/KoParagDia.h index 6de8115e..c4bbed92 100644 --- a/lib/kotext/KoParagDia.h +++ b/lib/kotext/KoParagDia.h @@ -74,9 +74,9 @@ class KOTEXT_EXPORT KoParagLayoutWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - // Constructor: tqparent widget, flag (PD_SOMETHING) and name - KoParagLayoutWidget( int flag, TQWidget * tqparent, const char * name = 0 ) - : TQWidget( tqparent, name ), m_flag( flag ) + // Constructor: parent widget, flag (PD_SOMETHING) and name + KoParagLayoutWidget( int flag, TQWidget * parent, const char * name = 0 ) + : TQWidget( parent, name ), m_flag( flag ) { } virtual ~KoParagLayoutWidget() {} @@ -110,7 +110,7 @@ class KOTEXT_EXPORT KoIndentSpacingWidget : public KoParagLayoutWidget Q_OBJECT TQ_OBJECT public: - KoIndentSpacingWidget( KoUnit::Unit unit, double _frameWidth, TQWidget * tqparent,const char * name = 0 ); + KoIndentSpacingWidget( KoUnit::Unit unit, double _frameWidth, TQWidget * parent,const char * name = 0 ); virtual ~KoIndentSpacingWidget() {} virtual void display( const KoParagLayout & lay ); @@ -154,7 +154,7 @@ class KOTEXT_EXPORT KoParagAlignWidget : public KoParagLayoutWidget Q_OBJECT TQ_OBJECT public: - KoParagAlignWidget(bool breakLine, TQWidget * tqparent, const char * name = 0 ); + KoParagAlignWidget(bool breakLine, TQWidget * parent, const char * name = 0 ); virtual ~KoParagAlignWidget() {} virtual void display( const KoParagLayout & lay ); @@ -188,7 +188,7 @@ class KOTEXT_EXPORT KoParagDecorationWidget : public KoParagLayoutWidget Q_OBJECT TQ_OBJECT public: - KoParagDecorationWidget( TQWidget * tqparent, const char * name = 0 ); + KoParagDecorationWidget( TQWidget * parent, const char * name = 0 ); virtual ~KoParagDecorationWidget() {} virtual void display( const KoParagLayout & lay ); @@ -265,7 +265,7 @@ class KOTEXT_EXPORT KoCounterStyleWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - KoCounterStyleWidget( bool displayDepth= true, bool onlyStyleTypeLetter = false, bool disableAll=false, TQWidget* tqparent = 0, const char* name = 0 ); + KoCounterStyleWidget( bool displayDepth= true, bool onlyStyleTypeLetter = false, bool disableAll=false, TQWidget* parent = 0, const char* name = 0 ); class StyleRepresenter { public: @@ -348,7 +348,7 @@ class KOTEXT_EXPORT KoParagCounterWidget : public KoParagLayoutWidget TQ_OBJECT public: - KoParagCounterWidget( bool disableAll=false ,TQWidget * tqparent=0L, const char * name = 0 ); + KoParagCounterWidget( bool disableAll=false ,TQWidget * parent=0L, const char * name = 0 ); virtual ~KoParagCounterWidget() {} virtual void display( const KoParagLayout & lay ); @@ -392,7 +392,7 @@ class KoTabulatorsLineEdit : public KoUnitDoubleSpinBox Q_OBJECT TQ_OBJECT public: - KoTabulatorsLineEdit( TQWidget *tqparent, double lower, double upper, double step, double value = 0.0, + KoTabulatorsLineEdit( TQWidget *parent, double lower, double upper, double step, double value = 0.0, KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 ); protected: @@ -409,7 +409,7 @@ class KOTEXT_EXPORT KoParagTabulatorsWidget : public KoParagLayoutWidget Q_OBJECT TQ_OBJECT public: - KoParagTabulatorsWidget( KoUnit::Unit unit, double _frameWidth, TQWidget * tqparent, const char * name = 0 ); + KoParagTabulatorsWidget( KoUnit::Unit unit, double _frameWidth, TQWidget * parent, const char * name = 0 ); virtual ~KoParagTabulatorsWidget() {} virtual void display( const KoParagLayout & lay ); @@ -471,7 +471,7 @@ class KoStylePreview : public TQGroupBox TQ_OBJECT public: - KoStylePreview( const TQString &title, const TQString &text, TQWidget *tqparent, const char* name = 0 ); + KoStylePreview( const TQString &title, const TQString &text, TQWidget *parent, const char* name = 0 ); virtual ~KoStylePreview(); /** Apply the given @p style to the preview. diff --git a/lib/kotext/KoParagDia_p.h b/lib/kotext/KoParagDia_p.h index 18b75a94..a1ca5737 100644 --- a/lib/kotext/KoParagDia_p.h +++ b/lib/kotext/KoParagDia_p.h @@ -42,8 +42,8 @@ public: enum counterType{ NONE,NUM,ALPHAB_L,ALPHAB_U,ROM_NUM_L,ROM_NUM_U}; KoSpinBox( int minValue, int maxValue, int step = 1, - TQWidget * tqparent = 0, const char * name = 0 ); - KoSpinBox( TQWidget * tqparent = 0, const char * name = 0 ); + TQWidget * parent = 0, const char * name = 0 ); + KoSpinBox( TQWidget * parent = 0, const char * name = 0 ); virtual ~KoSpinBox(); virtual TQString mapValueToText( int value ); virtual int mapTextToValue( bool * ok ); diff --git a/lib/kotext/KoParagStyle.cpp b/lib/kotext/KoParagStyle.cpp index 96209cba..a68c6768 100644 --- a/lib/kotext/KoParagStyle.cpp +++ b/lib/kotext/KoParagStyle.cpp @@ -96,7 +96,7 @@ void KoParagStyle::saveStyle( TQDomElement & parentElem ) parentElem.appendChild( element ); element.setAttribute( "name", followingStyle()->displayName() ); } - // TODO save tqparent style, and inherited flags. + // TODO save parent style, and inherited flags. parentElem.setAttribute( "outline", m_bOutline ? "true" : "false" ); } diff --git a/lib/kotext/KoRichText.cpp b/lib/kotext/KoRichText.cpp index 5df4c93d..7b51bb4f 100644 --- a/lib/kotext/KoRichText.cpp +++ b/lib/kotext/KoRichText.cpp @@ -933,7 +933,7 @@ bool KoTextCursor::removePreviousChar() // shouldn't be needed, just to make sure. fixCursorPosition(); string->format( -1, TRUE ); - //else if ( string->document() && string->document()->tqparent() ) + //else if ( string->document() && string->document()->parent() ) // string->document()->nextDoubleBuffered = TRUE; return FALSE; } else if ( string->prev() ) { @@ -952,7 +952,7 @@ bool KoTextCursor::remove() int next = string->string()->nextCursorPosition( idx ); string->remove( idx, next-idx ); string->format( -1, TRUE ); - //else if ( doc && doc->tqparent() ) + //else if ( doc && doc->parent() ) // doc->nextDoubleBuffered = TRUE; return FALSE; } else if ( string->next() ) { @@ -990,7 +990,7 @@ void KoTextCursor::killLine() return; string->remove( idx, string->length() - idx - 1 ); string->format( -1, TRUE ); - //else if ( doc && doc->tqparent() ) + //else if ( doc && doc->parent() ) //doc->nextDoubleBuffered = TRUE; } @@ -1690,7 +1690,7 @@ int KoTextFormatterBase::formatVertically( KoTextDocument* doc, KoTextParag* par // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ KoTextCustomItem::KoTextCustomItem( KoTextDocument *p ) - : width(-1), height(0), tqparent(p), xpos(0), ypos(-1), parag(0) + : width(-1), height(0), parent(p), xpos(0), ypos(-1), parag(0) { m_deleted = false; // added for kotext } diff --git a/lib/kotext/KoRichText.h b/lib/kotext/KoRichText.h index e161b2fe..44c360d5 100644 --- a/lib/kotext/KoRichText.h +++ b/lib/kotext/KoRichText.h @@ -497,7 +497,7 @@ public: int stretch() const { return stretch_; } KoTextDocument* richText() const { return richtext; } - KoTextTable* table() const { return tqparent; } + KoTextTable* table() const { return parent; } void draw( int x, int y, int cx, int cy, int cw, int ch, const TQColorGroup& cg, bool selected ); @@ -510,7 +510,7 @@ public: private: TQPainter* painter() const; TQRect geom; - KoTextTable* tqparent; + KoTextTable* parent; KoTextDocument* richtext; int row_; int col_; diff --git a/lib/kotext/KoSearchDia.cpp b/lib/kotext/KoSearchDia.cpp index 0acd88cc..a41de932 100644 --- a/lib/kotext/KoSearchDia.cpp +++ b/lib/kotext/KoSearchDia.cpp @@ -62,11 +62,11 @@ KoSearchContext::~KoSearchContext() } -KoSearchContextUI::KoSearchContextUI( KoSearchContext *ctx, TQWidget *tqparent ) - : TQObject(tqparent), m_ctx(ctx), m_parent(tqparent) +KoSearchContextUI::KoSearchContextUI( KoSearchContext *ctx, TQWidget *parent ) + : TQObject(parent), m_ctx(ctx), m_parent(parent) { m_bOptionsShown = false; - m_btnShowOptions = new TQPushButton( i18n("Show Formatting Options"), tqparent ); + m_btnShowOptions = new TQPushButton( i18n("Show Formatting Options"), parent ); connect( m_btnShowOptions, TQT_SIGNAL( clicked() ), TQT_SLOT( slotShowOptions() ) ); m_grid = new TQGridLayout( m_parent, 1, 1, 0, 6 ); @@ -100,8 +100,8 @@ void KoSearchContextUI::setCtxHistory( const TQStringList & history ) m_ctx->m_strings = history; } -KoSearchDia::KoSearchDia( TQWidget * tqparent,const char *name, KoSearchContext *find, bool hasSelection, bool hasCursor ) - : KFindDialog( tqparent, name, find->m_options, find->m_strings ) +KoSearchDia::KoSearchDia( TQWidget * parent,const char *name, KoSearchContext *find, bool hasSelection, bool hasCursor ) + : KFindDialog( parent, name, find->m_options, find->m_strings ) { // The dialog extension. m_findUI = new KoSearchContextUI( find, findExtension() ); @@ -119,8 +119,8 @@ void KoSearchDia::slotOk() m_findUI->setCtxHistory( findHistory() ); } -KoReplaceDia::KoReplaceDia( TQWidget *tqparent, const char *name, KoSearchContext *find, KoSearchContext *replace, bool hasSelection, bool hasCursor ) - : KReplaceDialog( tqparent, name, find->m_options, find->m_strings, replace->m_strings ) +KoReplaceDia::KoReplaceDia( TQWidget *parent, const char *name, KoSearchContext *find, KoSearchContext *replace, bool hasSelection, bool hasCursor ) + : KReplaceDialog( parent, name, find->m_options, find->m_strings, replace->m_strings ) { // The dialog extension. m_findUI = new KoSearchContextUI( find, findExtension() ); @@ -146,8 +146,8 @@ void KoReplaceDia::slotOk() -KoFindReplace::KoFindReplace( TQWidget * tqparent, KoSearchDia * dialog, const TQValueList<KoTextObject *> & lstObject, KoTextView* textView ) - : m_find( new KoTextFind( dialog->pattern(), dialog->options(), this, tqparent ) ), +KoFindReplace::KoFindReplace( TQWidget * parent, KoSearchDia * dialog, const TQValueList<KoTextObject *> & lstObject, KoTextView* textView ) + : m_find( new KoTextFind( dialog->pattern(), dialog->options(), this, parent ) ), m_replace( 0L ), m_searchContext( *dialog->searchContext() ), m_replaceContext(), @@ -161,9 +161,9 @@ KoFindReplace::KoFindReplace( TQWidget * tqparent, KoSearchDia * dialog, const T connectFind( m_find ); } -KoFindReplace::KoFindReplace( TQWidget * tqparent, KoReplaceDia * dialog, const TQValueList<KoTextObject *> & lstObject, KoTextView* textView ) +KoFindReplace::KoFindReplace( TQWidget * parent, KoReplaceDia * dialog, const TQValueList<KoTextObject *> & lstObject, KoTextView* textView ) : m_find( 0L ), - m_replace( new KoTextReplace( dialog->pattern(), dialog->replacement(), dialog->options(), this, tqparent ) ), + m_replace( new KoTextReplace( dialog->pattern(), dialog->replacement(), dialog->options(), this, parent ) ), m_searchContext( *dialog->searchContext() ), m_replaceContext( *dialog->replaceContext() ), m_searchContextEnabled( dialog->optionFindSelected() ), @@ -510,8 +510,8 @@ int KoFindReplace::numReplacements() const //// -KoTextFind::KoTextFind( const TQString &pattern, long options, KoFindReplace *_findReplace, TQWidget *tqparent ) - : KFind( pattern, options, tqparent), +KoTextFind::KoTextFind( const TQString &pattern, long options, KoFindReplace *_findReplace, TQWidget *parent ) + : KFind( pattern, options, parent), m_findReplace( _findReplace) { } @@ -525,8 +525,8 @@ bool KoTextFind::validateMatch( const TQString &text, int index, int matchedleng return m_findReplace->validateMatch( text, index, matchedlength ); } -KoTextReplace::KoTextReplace(const TQString &pattern, const TQString &replacement, long options, KoFindReplace *_findReplace, TQWidget *tqparent ) - : KReplace( pattern, replacement, options, tqparent), +KoTextReplace::KoTextReplace(const TQString &pattern, const TQString &replacement, long options, KoFindReplace *_findReplace, TQWidget *parent ) + : KReplace( pattern, replacement, options, parent), m_findReplace( _findReplace) { } @@ -540,8 +540,8 @@ bool KoTextReplace::validateMatch( const TQString &text, int index, int matchedl return m_findReplace->validateMatch( text, index, matchedlength ); } -KoFormatDia::KoFormatDia( TQWidget* tqparent, const TQString & _caption, KoSearchContext *_ctx , const char* name) - : KDialogBase( tqparent, name, true, _caption, Ok|Cancel|User1 |User2 ), +KoFormatDia::KoFormatDia( TQWidget* parent, const TQString & _caption, KoSearchContext *_ctx , const char* name) + : KDialogBase( parent, name, true, _caption, Ok|Cancel|User1 |User2 ), m_ctx(_ctx) { TQWidget *page = new TQWidget( this ); diff --git a/lib/kotext/KoSearchDia.h b/lib/kotext/KoSearchDia.h index 49eb75d1..e833cbc9 100644 --- a/lib/kotext/KoSearchDia.h +++ b/lib/kotext/KoSearchDia.h @@ -102,7 +102,7 @@ class KoSearchContextUI : public TQObject Q_OBJECT TQ_OBJECT public: - KoSearchContextUI( KoSearchContext *ctx, TQWidget *tqparent ); + KoSearchContextUI( KoSearchContext *ctx, TQWidget *parent ); void setCtxOptions( long options ); void setCtxHistory( const TQStringList & history ); KoSearchContext *context() const { return m_ctx;} @@ -128,7 +128,7 @@ class KOTEXT_EXPORT KoSearchDia: TQ_OBJECT public: - KoSearchDia( TQWidget *tqparent, const char *name, KoSearchContext *find, bool hasSelection, bool hasCursor ); + KoSearchDia( TQWidget *parent, const char *name, KoSearchContext *find, bool hasSelection, bool hasCursor ); KoSearchContext * searchContext() { return m_findUI->context(); } @@ -152,7 +152,7 @@ class KOTEXT_EXPORT KoReplaceDia: public: - KoReplaceDia( TQWidget *tqparent, const char *name, KoSearchContext *find, KoSearchContext *replace, bool hasSelection, bool hasCursor ); + KoReplaceDia( TQWidget *parent, const char *name, KoSearchContext *find, KoSearchContext *replace, bool hasSelection, bool hasCursor ); KoSearchContext * searchContext() { return m_findUI->context(); } @@ -178,7 +178,7 @@ class KoTextFind : public KFind Q_OBJECT TQ_OBJECT public: - KoTextFind(const TQString &pattern, long options, KoFindReplace *_findReplace, TQWidget *tqparent = 0); + KoTextFind(const TQString &pattern, long options, KoFindReplace *_findReplace, TQWidget *parent = 0); ~KoTextFind(); virtual bool validateMatch( const TQString &text, int index, int matchedlength ); private: @@ -193,7 +193,7 @@ class KoTextReplace : public KReplace Q_OBJECT TQ_OBJECT public: - KoTextReplace(const TQString &pattern, const TQString &replacement, long options, KoFindReplace *_findReplace, TQWidget *tqparent = 0); + KoTextReplace(const TQString &pattern, const TQString &replacement, long options, KoFindReplace *_findReplace, TQWidget *parent = 0); ~KoTextReplace(); virtual bool validateMatch( const TQString &text, int index, int matchedlength ); private: @@ -209,8 +209,8 @@ class KOTEXT_EXPORT KoFindReplace : public TQObject Q_OBJECT TQ_OBJECT public: - KoFindReplace( TQWidget * tqparent, KoSearchDia * dialog, const TQValueList<KoTextObject *> & lstObject, KoTextView* textView ); - KoFindReplace( TQWidget * tqparent, KoReplaceDia * dialog, const TQValueList<KoTextObject *> & lstObject, KoTextView* textView ); + KoFindReplace( TQWidget * parent, KoSearchDia * dialog, const TQValueList<KoTextObject *> & lstObject, KoTextView* textView ); + KoFindReplace( TQWidget * parent, KoReplaceDia * dialog, const TQValueList<KoTextObject *> & lstObject, KoTextView* textView ); ~KoFindReplace(); KoTextParag *currentParag() { @@ -299,7 +299,7 @@ class KoFormatDia: public KDialogBase Q_OBJECT TQ_OBJECT public: - KoFormatDia( TQWidget* tqparent, const TQString & _caption, KoSearchContext *_ctx, const char* name=0L); + KoFormatDia( TQWidget* parent, const TQString & _caption, KoSearchContext *_ctx, const char* name=0L); //apply to parameter to context ! void ctxOptions( ); diff --git a/lib/kotext/KoSpell.cpp b/lib/kotext/KoSpell.cpp index 87ef1803..d0361b4c 100644 --- a/lib/kotext/KoSpell.cpp +++ b/lib/kotext/KoSpell.cpp @@ -49,9 +49,9 @@ public: KoTextDocument *lastTxtDocument; }; -KoSpell::KoSpell( const Broker::Ptr& broker, TQObject *tqparent, +KoSpell::KoSpell( const Broker::Ptr& broker, TQObject *parent, const char *name ) - : BackgroundChecker( broker, tqparent, name ) + : BackgroundChecker( broker, parent, name ) { d = new Private; d->parag = 0; diff --git a/lib/kotext/KoSpell.h b/lib/kotext/KoSpell.h index 4c1ee72c..55c3971c 100644 --- a/lib/kotext/KoSpell.h +++ b/lib/kotext/KoSpell.h @@ -48,7 +48,7 @@ class KOTEXT_EXPORT KoSpell : public KSpell2::BackgroundChecker TQ_OBJECT public: - KoSpell( const KSpell2::Broker::Ptr& broker, TQObject *tqparent =0, + KoSpell( const KSpell2::Broker::Ptr& broker, TQObject *parent =0, const char *name =0 ); /** * The destructor instructs ISpell/ASpell to write out the personal diff --git a/lib/kotext/KoStyleCollection.cpp b/lib/kotext/KoStyleCollection.cpp index 7313e7be..f8c93f01 100644 --- a/lib/kotext/KoStyleCollection.cpp +++ b/lib/kotext/KoStyleCollection.cpp @@ -98,7 +98,7 @@ int KoStyleCollection::loadOasisStyles( KoOasisContext& context ) } } - // TODO the same thing for style inheritance (style:tqparent-style-name) and setParentStyle() + // TODO the same thing for style inheritance (style:parent-style-name) and setParentStyle() Q_ASSERT( defaultStyle() ); return stylesLoaded; @@ -107,7 +107,7 @@ int KoStyleCollection::loadOasisStyles( KoOasisContext& context ) void KoStyleCollection::saveOasis( KoGenStyles& styles, int styleType, KoSavingContext& context ) const { // In order to reduce the bloat, we define that the first style (usually Standard) - // is the "tqparent" (reference) for the others. + // is the "parent" (reference) for the others. // ## This is mostly a hack due to lack of proper style inheritance. // Once that's implemented, default to 'styles derive from Standard', but save normally. TQString refStyleName; diff --git a/lib/kotext/KoStyleManager.cpp b/lib/kotext/KoStyleManager.cpp index e921ff1e..e5a7dbfa 100644 --- a/lib/kotext/KoStyleManager.cpp +++ b/lib/kotext/KoStyleManager.cpp @@ -370,11 +370,11 @@ void KoStyleManager::save() { else { int indexParentStyle=styleIndex( m_inheritCombo->currentItem()-1 ); - KoParagStyle *tqparent=m_origStyles.at(indexParentStyle); - if( tqparent==0L ) //If not found in the orig list (means its a new Style) look in the changeStyles list - tqparent=m_changedStyles.at(indexParentStyle); + KoParagStyle *parent=m_origStyles.at(indexParentStyle); + if( parent==0L ) //If not found in the orig list (means its a new Style) look in the changeStyles list + parent=m_changedStyles.at(indexParentStyle); - m_currentStyle->setParentStyle( tqparent ); + m_currentStyle->setParentStyle( parent ); } if ( d->cbIncludeInTOC ) @@ -447,7 +447,7 @@ void KoStyleManager::updateInheritStyle( KoParagStyle *s ) for ( KoParagStyle* p = m_changedStyles.first(); p != 0L; p = m_changedStyles.next() ) { //when we remove style, we must replace inherite style to 0L - //when tqparent style was removed. + //when parent style was removed. //##########Laurent change inherited style attribute if ( p->parentStyle() == s) p->setParentStyle(0L); @@ -649,8 +649,8 @@ void KoStyleManager::renameStyle(const TQString &theText) { ///////////// -KoStyleParagTab::KoStyleParagTab( TQWidget * tqparent ) - : KoStyleManagerTab( tqparent ) +KoStyleParagTab::KoStyleParagTab( TQWidget * parent ) + : KoStyleManagerTab( parent ) { ( new TQVBoxLayout( this ) )->setAutoAdd( true ); m_widget = 0L; @@ -677,8 +677,8 @@ void KoStyleParagTab::resizeEvent( TQResizeEvent *e ) if ( m_widget ) m_widget->resize( size() ); } -KoStyleFontTab::KoStyleFontTab( TQWidget * tqparent ) - : KoStyleManagerTab( tqparent ) +KoStyleFontTab::KoStyleFontTab( TQWidget * parent ) + : KoStyleManagerTab( parent ) { ( new TQVBoxLayout( this ) )->setAutoAdd( true ); TQTabWidget *fontTabContainer = new TQTabWidget( this ); diff --git a/lib/kotext/KoStyleManager.h b/lib/kotext/KoStyleManager.h index 328668fd..af848e1d 100644 --- a/lib/kotext/KoStyleManager.h +++ b/lib/kotext/KoStyleManager.h @@ -123,7 +123,7 @@ class KOTEXT_EXPORT KoStyleManagerTab : public TQWidget { Q_OBJECT TQ_OBJECT public: - KoStyleManagerTab(TQWidget *tqparent) : TQWidget(tqparent) {}; + KoStyleManagerTab(TQWidget *parent) : TQWidget(parent) {}; /** the new style which is to be displayed */ void setStyle(KoParagStyle *style) { m_style = style; } @@ -144,9 +144,9 @@ class KOTEXT_EXPORT KoStyleParagTab : public KoStyleManagerTab Q_OBJECT TQ_OBJECT public: - KoStyleParagTab( TQWidget * tqparent ); + KoStyleParagTab( TQWidget * parent ); - // not a constructor parameter since 'this' is the tqparent of the widget + // not a constructor parameter since 'this' is the parent of the widget void setWidget( KoParagLayoutWidget * widget ); virtual void update(); @@ -164,7 +164,7 @@ class KOTEXT_EXPORT KoStyleFontTab : public KoStyleManagerTab Q_OBJECT TQ_OBJECT public: - KoStyleFontTab( TQWidget * tqparent ); + KoStyleFontTab( TQWidget * parent ); ~KoStyleFontTab(); virtual void update(); virtual TQString tabName(); diff --git a/lib/kotext/KoTextCustomItem.h b/lib/kotext/KoTextCustomItem.h index ff7e4ffc..d232bedc 100644 --- a/lib/kotext/KoTextCustomItem.h +++ b/lib/kotext/KoTextCustomItem.h @@ -83,12 +83,12 @@ public: virtual void pageBreak( int /*y*/, KoTextFlow* /*flow*/ ) {} - KoTextDocument *tqparent; + KoTextDocument *parent; /** The text document in which this customitem is */ - KoTextDocument * textDocument() const { return tqparent; } + KoTextDocument * textDocument() const { return parent; } /** When the user deletes a custom item, it isn't destroyed but * moved into the undo/redo history - setDeleted( true ) diff --git a/lib/kotext/KoTextDocument.cpp b/lib/kotext/KoTextDocument.cpp index de81299c..f981dd26 100644 --- a/lib/kotext/KoTextDocument.cpp +++ b/lib/kotext/KoTextDocument.cpp @@ -44,7 +44,7 @@ KoTextDocument::KoTextDocument( KoTextZoomHandler *zoomHandler, KoTextFormatColl : m_zoomHandler( zoomHandler ), m_bDestroying( false ), #ifdef TQTEXTTABLE_AVAILABLE - par( 0L /*we don't use tqparent documents */ ), + par( 0L /*we don't use parent documents */ ), tc( 0 ), #endif tArray( 0 ), tStopWidth( 0 ) @@ -1288,7 +1288,7 @@ void KoTextDocument::drawParagWYSIWYG( TQPainter *p, KoTextParag *parag, int cx, brush.color() == TQt::white && is_printer(p)); - bool useDoubleBuffer = !parag->document()->tqparent(); + bool useDoubleBuffer = !parag->document()->parent(); if ( is_printer(p) ) useDoubleBuffer = FALSE; // Can't handle transparency using double-buffering, in case of rotation/scaling (due to bitBlt) diff --git a/lib/kotext/KoTextDocument.h b/lib/kotext/KoTextDocument.h index 1f7739aa..8cdc1b52 100644 --- a/lib/kotext/KoTextDocument.h +++ b/lib/kotext/KoTextDocument.h @@ -65,7 +65,7 @@ public: // see below for constructor virtual ~KoTextDocument(); - //KoTextDocument *tqparent() const { return par; } + //KoTextDocument *parent() const { return par; } void setText( const TQString &text, const TQString &context ); diff --git a/lib/kotext/KoTextFormat.cpp b/lib/kotext/KoTextFormat.cpp index 27556ed6..24214ae4 100644 --- a/lib/kotext/KoTextFormat.cpp +++ b/lib/kotext/KoTextFormat.cpp @@ -82,11 +82,11 @@ KoTextFormat::KoTextFormat() //#endif } -KoTextFormat::KoTextFormat( const TQFont &f, const TQColor &c, const TQString &_language, bool hyphenation, KoTextFormatCollection *tqparent ) +KoTextFormat::KoTextFormat( const TQFont &f, const TQColor &c, const TQString &_language, bool hyphenation, KoTextFormatCollection *parent ) : fn( f ), col( c ) /*fm( TQFontMetrics( f ) ),*/ //linkColor( TRUE ) { #ifdef DEBUG_COLLECTION - kdDebug(32500) << "KoTextFormat with font & color & tqparent (" << tqparent << "), addRef. " << this << endl; + kdDebug(32500) << "KoTextFormat with font & color & parent (" << parent << "), addRef. " << this << endl; #endif int pointSize; if ( f.pointSize() == -1 ) // font was set with a pixelsize, we need a pointsize! @@ -97,7 +97,7 @@ KoTextFormat::KoTextFormat( const TQFont &f, const TQColor &c, const TQString &_ // WYSIWYG works much much better with scalable fonts -> force it to be scalable fn.setStyleStrategy( TQFont::ForceOutline ); ref = 0; - collection = tqparent; + collection = parent; //leftBearing = fm.minLeftBearing(); //rightBearing = fm.minRightBearing(); //hei = fm.height(); @@ -188,8 +188,8 @@ KoTextFormat::~KoTextFormat() // Removing a format that is in the collection is forbidden, in fact. // It should have been removed from the collection before being deleted. #ifndef NDEBUG - if ( tqparent() && tqparent()->defaultFormat() ) // not when destroying the collection - assert( ! ( tqparent()->dict().find( key() ) == this ) ); + if ( parent() && parent()->defaultFormat() ) // not when destroying the collection + assert( ! ( parent()->dict().find( key() ) == this ) ); // (has to be the same pointer, not only the same key) #endif delete d; @@ -1709,7 +1709,7 @@ KoTextFormatCollection::~KoTextFormatCollection() KoTextFormat *KoTextFormatCollection::format( const KoTextFormat *f ) { - if ( f->tqparent() == this || f == defFormat ) { + if ( f->parent() == this || f == defFormat ) { #ifdef DEBUG_COLLECTION kdDebug(32500) << " format(f) need '" << f->key() << "', best case!" << endl; #endif diff --git a/lib/kotext/KoTextFormat.h b/lib/kotext/KoTextFormat.h index 25211f54..0e7c1a13 100644 --- a/lib/kotext/KoTextFormat.h +++ b/lib/kotext/KoTextFormat.h @@ -139,7 +139,7 @@ public: /// A simple text format with some default settings /// Only used for the default format KoTextFormat( const TQFont &f, const TQColor &c, const TQString &_language, - bool hyphenation, KoTextFormatCollection *tqparent = 0 ); + bool hyphenation, KoTextFormatCollection *parent = 0 ); /// A complete text format (used by KoFontDia) KoTextFormat( const TQFont &_font, @@ -197,8 +197,8 @@ public: void setVAlign( VerticalAlignment a ); bool operator==( const KoTextFormat &f ) const; - KoTextFormatCollection *tqparent() const; - void setCollection( KoTextFormatCollection *tqparent ) { collection = tqparent; } + KoTextFormatCollection *parent() const; + void setCollection( KoTextFormatCollection *parent ) { collection = parent; } TQString key() const; static TQString getKey( const TQFont &f, const TQColor &c, bool misspelled, VerticalAlignment vAlign ); @@ -476,7 +476,7 @@ inline bool KoTextFormat::operator==( const KoTextFormat &f ) const return key() == f.key(); } -inline KoTextFormatCollection *KoTextFormat::tqparent() const +inline KoTextFormatCollection *KoTextFormat::parent() const { return collection; } diff --git a/lib/kotext/KoTextObject.cpp b/lib/kotext/KoTextObject.cpp index d9a2f054..30bf6dd3 100644 --- a/lib/kotext/KoTextObject.cpp +++ b/lib/kotext/KoTextObject.cpp @@ -60,8 +60,8 @@ public: KoTextObject::KoTextObject( KoTextZoomHandler *zh, const TQFont& defaultFont, const TQString &defaultLanguage, bool hyphenation, KoParagStyle* defaultStyle, int tabStopWidth, - TQObject* tqparent, const char *name ) - : TQObject( tqparent, name ), m_defaultStyle( defaultStyle ), undoRedoInfo( this ) + TQObject* parent, const char *name ) + : TQObject( parent, name ), m_defaultStyle( defaultStyle ), undoRedoInfo( this ) { textdoc = new KoTextDocument( zh, new KoTextFormatCollection( defaultFont, TQColor(),defaultLanguage, hyphenation ) ); if ( tabStopWidth != -1 ) @@ -70,8 +70,8 @@ KoTextObject::KoTextObject( KoTextZoomHandler *zh, const TQFont& defaultFont, } KoTextObject::KoTextObject( KoTextDocument* _textdoc, KoParagStyle* defaultStyle, - TQObject* tqparent, const char *name ) - : TQObject( tqparent, name ), m_defaultStyle( defaultStyle ), undoRedoInfo( this ) + TQObject* parent, const char *name ) + : TQObject( parent, name ), m_defaultStyle( defaultStyle ), undoRedoInfo( this ) { textdoc = _textdoc; init(); @@ -2677,7 +2677,7 @@ KCommand *KoTextFormatInterface::setTextSuperScriptCommand(bool on) KCommand *KoTextFormatInterface::setDefaultFormatCommand() { - KoTextFormatCollection * coll = currentFormat()->tqparent(); + KoTextFormatCollection * coll = currentFormat()->parent(); Q_ASSERT(coll); if(coll) { diff --git a/lib/kotext/KoTextObject.h b/lib/kotext/KoTextObject.h index a463d0fc..15574075 100644 --- a/lib/kotext/KoTextObject.h +++ b/lib/kotext/KoTextObject.h @@ -192,13 +192,13 @@ public: * @param defaultHyphenation the default setting for hyphenation (see KoTextFormatCollection) * @param defaultStyle the style to use by default (initial pararaph, and when deleting a used style) * @param tabStopWidth the global value for the tabstop width - * @param tqparent tqparent widget for this object + * @param parent parent widget for this object * @param name name for this object * */ KoTextObject( KoTextZoomHandler *zh, const TQFont& defaultFont, const TQString &defaultLanguage, bool defaultHyphenation, KoParagStyle* defaultStyle, int tabStopWidth = -1, - TQObject* tqparent = 0, const char *name = 0 ); + TQObject* parent = 0, const char *name = 0 ); /** Alternative constructor. * This constructor allows to use a derived class from KoTextDocument. @@ -206,11 +206,11 @@ public: * @param textdoc the text document to use in this text object. Ownership is transferred * to the text object. * @param defaultStyle the style to use by default (initial pararaph, and when deleting a used style) - * @param tqparent tqparent widget for this object + * @param parent parent widget for this object * @param name name for this object */ KoTextObject( KoTextDocument *textdoc, KoParagStyle* defaultStyle, - TQObject* tqparent = 0, const char *name = 0 ); + TQObject* parent = 0, const char *name = 0 ); virtual ~KoTextObject(); @@ -562,7 +562,7 @@ public: // made public for KWTextFrameSet... int eid; // id of last parag int index; // index (for insertion/deletion) Type type; // type of command - KoTextObject* textobj; // tqparent + KoTextObject* textobj; // parent CustomItemsMap customItemsMap; // character position -> qtextcustomitem TQValueList<KoParagLayout> oldParagLayouts; KoParagLayout newParagLayout; diff --git a/lib/kotext/KoTextParag.cpp b/lib/kotext/KoTextParag.cpp index 633bdb58..23754c28 100644 --- a/lib/kotext/KoTextParag.cpp +++ b/lib/kotext/KoTextParag.cpp @@ -1229,7 +1229,7 @@ void KoTextParag::drawLabel( TQPainter* p, int xLU, int yLU, int /*wLU*/, int /* else { TQString counterText = m_layout.counter->text( this ); - // There are no bullets...any tqparent bullets have already been suppressed. + // There are no bullets...any parent bullets have already been suppressed. // Just draw the text! Note: one space is always appended. if ( !counterText.isEmpty() ) { @@ -2708,7 +2708,7 @@ static TQString normalizeWhitespace( const TQString& in, bool leadingSpace ) // check for space, tab, line feed, carriage return if ( ch == ' ' || ch == '\t' ||ch == '\r' || ch == '\n') { - // if we were lead by whitespace in some tqparent or previous sibling element, + // if we were lead by whitespace in some parent or previous sibling element, // we completely collapse this space if ( r != 0 || !leadingSpace ) text[w++] = TQChar( ' ' ); @@ -2733,19 +2733,19 @@ static TQString normalizeWhitespace( const TQString& in, bool leadingSpace ) return text; } -void KoTextParag::loadOasisSpan( const TQDomElement& tqparent, KoOasisContext& context, uint& pos, bool stripLeadingSpace ) +void KoTextParag::loadOasisSpan( const TQDomElement& parent, KoOasisContext& context, uint& pos, bool stripLeadingSpace ) { bool dummy; - return loadOasisSpan( tqparent, context, pos, stripLeadingSpace, &dummy ); + return loadOasisSpan( parent, context, pos, stripLeadingSpace, &dummy ); } -void KoTextParag::loadOasisSpan( const TQDomElement& tqparent, KoOasisContext& context, uint& pos, bool stripLeadingSpace, bool *hasTrailingSpace ) +void KoTextParag::loadOasisSpan( const TQDomElement& parent, KoOasisContext& context, uint& pos, bool stripLeadingSpace, bool *hasTrailingSpace ) { - // Parse every child node of the tqparent + // Parse every child node of the parent // Can't use forEachElement here since we also care about text nodes TQDomNode node; - for ( node = tqparent.firstChild(); !node.isNull(); node = node.nextSibling() ) + for ( node = parent.firstChild(); !node.isNull(); node = node.nextSibling() ) { TQDomElement ts = node.toElement(); TQString textData; @@ -2772,7 +2772,7 @@ void KoTextParag::loadOasisSpan( const TQDomElement& tqparent, KoOasisContext& c // should only have one space between each of "Foo", "Bar", and "Baz" // so we need to keep track of whether there was any trailing whitespace // in sub-spans so that we can propogate the whitespace compression state - // back up to the tqparent element + // back up to the parent element loadOasisSpan( ts, context, pos, stripLeadingSpace, hasTrailingSpace ); // recurse stripLeadingSpace = *hasTrailingSpace; context.styleStack().restore(); @@ -2885,7 +2885,7 @@ KoParagLayout KoTextParag::loadParagLayout( KoOasisContext& context, KoStyleColl return tqlayout; } -void KoTextParag::loadOasis( const TQDomElement& tqparent, KoOasisContext& context, KoStyleCollection *styleCollection, uint& pos ) +void KoTextParag::loadOasis( const TQDomElement& parent, KoOasisContext& context, KoStyleCollection *styleCollection, uint& pos ) { // First load tqlayout from style KoParagLayout paragLayout = loadParagLayout( context, styleCollection, true ); @@ -2898,7 +2898,7 @@ void KoTextParag::loadOasis( const TQDomElement& tqparent, KoOasisContext& conte // Load text // OO.o compatibility: ignore leading whitespace in <p> and <h> elements - loadOasisSpan( tqparent, context, pos, true ); + loadOasisSpan( parent, context, pos, true ); // Apply default format to trailing space const int len = str->length(); @@ -2915,7 +2915,7 @@ void KoTextParag::saveOasis( KoXmlWriter& writer, KoSavingContext& context, { KoGenStyles& mainStyles = context.mainStyles(); - // Write paragtqlayout to styles (with tqparent == the parag's style) + // Write paragtqlayout to styles (with parent == the parag's style) TQString parentStyleName; if ( m_layout.style ) parentStyleName = m_layout.style->name(); @@ -3059,7 +3059,7 @@ void KoTextParag::saveOasis( KoXmlWriter& writer, KoSavingContext& context, { lastFormatRaw = newFormat; // Remove isMisspelled from format, to avoid useless derived styles - // (which would be indentical to their tqparent style) + // (which would be indentical to their parent style) KoTextFormat tmpFormat( *newFormat ); tmpFormat.setMisspelled( false ); newFormat = formatCollection()->format( &tmpFormat ); diff --git a/lib/kotext/KoTextParag.h b/lib/kotext/KoTextParag.h index 4ccc2196..e27a9afc 100644 --- a/lib/kotext/KoTextParag.h +++ b/lib/kotext/KoTextParag.h @@ -328,20 +328,20 @@ public: /** * Load a section of text from a oasis based xml tree. - * @param tqparent the xml element that has content as tqchildren. + * @param parent the xml element that has content as tqchildren. * @param context the context * @param stripLeadingSpace whether to remove leading literal whitespace */ - void loadOasisSpan( const TQDomElement& tqparent, KoOasisContext& context, uint& pos, bool stripLeadingSpace = false ); + void loadOasisSpan( const TQDomElement& parent, KoOasisContext& context, uint& pos, bool stripLeadingSpace = false ); /** * Load a section of text from a oasis based xml tree. - * @param tqparent the xml element that has content as tqchildren. + * @param parent the xml element that has content as tqchildren. * @param context the context * @param stripLeadingSpace whether to remove leading literal whitespace * @param hasTrailingSpace whether there was trailing literal whitespace in the span's text */ - void loadOasisSpan( const TQDomElement& tqparent, KoOasisContext& context, uint& pos, bool stripLeadingSpace, bool *hasTrailingSpace ); + void loadOasisSpan( const TQDomElement& parent, KoOasisContext& context, uint& pos, bool stripLeadingSpace, bool *hasTrailingSpace ); void applyListStyle( KoOasisContext& context, int restartNumbering, bool orderedList, bool heading, int level ); diff --git a/lib/kotext/KoTextView.h b/lib/kotext/KoTextView.h index f094053d..6b9937bb 100644 --- a/lib/kotext/KoTextView.h +++ b/lib/kotext/KoTextView.h @@ -228,7 +228,7 @@ protected: /** Draws the cursor (or hides it if b is false). * The default implementation only changes an internal flag, make sure to reimplement - * and to call the tqparent implementation (in all cases) + * and to call the parent implementation (in all cases) */ virtual void drawCursor( bool b ); diff --git a/lib/kotext/TimeFormatWidget.cpp b/lib/kotext/TimeFormatWidget.cpp index 34fd7cb2..06603969 100644 --- a/lib/kotext/TimeFormatWidget.cpp +++ b/lib/kotext/TimeFormatWidget.cpp @@ -15,11 +15,11 @@ #include <KoVariable.h> /* - * Constructs a TimeFormatWidget which is a child of 'tqparent', with the + * Constructs a TimeFormatWidget which is a child of 'parent', with the * name 'name' and widget flags set to 'f' */ -TimeFormatWidget::TimeFormatWidget( TQWidget* tqparent, const char* name, WFlags fl ) - : TimeDateFormatWidgetPrototype( tqparent, name, fl ) +TimeFormatWidget::TimeFormatWidget( TQWidget* parent, const char* name, WFlags fl ) + : TimeDateFormatWidgetPrototype( parent, name, fl ) { setCaption( i18n( "TimeFormat", "This Dialog Allows You to Set the Format of the Time Variable" ) ); diff --git a/lib/kotext/TimeFormatWidget.h b/lib/kotext/TimeFormatWidget.h index 62ee6957..3fd2c8bf 100644 --- a/lib/kotext/TimeFormatWidget.h +++ b/lib/kotext/TimeFormatWidget.h @@ -8,7 +8,7 @@ class TimeFormatWidget : public TimeDateFormatWidgetPrototype TQ_OBJECT public: - TimeFormatWidget( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + TimeFormatWidget( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~TimeFormatWidget(); TQString resultString(); int correctValue(); diff --git a/lib/kotext/kohyphen/hyphdicts/hyph_sv.dic b/lib/kotext/kohyphen/hyphdicts/hyph_sv.dic index 1726d063..6ec0f944 100755 --- a/lib/kotext/kohyphen/hyphdicts/hyph_sv.dic +++ b/lib/kotext/kohyphen/hyphdicts/hyph_sv.dic @@ -2183,7 +2183,7 @@ mani1k 5ma3ri mash5 mas3ko -tqmask3ro +mask3ro ma5sk^^f6 mas3ti mas4v diff --git a/lib/kotext/tests/kobordertest.cpp b/lib/kotext/tests/kobordertest.cpp index 36169272..5d5fbe5e 100644 --- a/lib/kotext/tests/kobordertest.cpp +++ b/lib/kotext/tests/kobordertest.cpp @@ -9,8 +9,8 @@ class MyWidget : public TQWidget { public: - MyWidget( KoZoomHandler* _zh, TQWidget* tqparent ) - : TQWidget( tqparent ), m_zh(_zh) { + MyWidget( KoZoomHandler* _zh, TQWidget* parent ) + : TQWidget( parent ), m_zh(_zh) { tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); } diff --git a/lib/kross/api/eventslot.h b/lib/kross/api/eventslot.h index f9736fd0..aaf1ebba 100644 --- a/lib/kross/api/eventslot.h +++ b/lib/kross/api/eventslot.h @@ -47,7 +47,7 @@ namespace Kross { namespace Api { * * \param name The name of the EventSlot. The EventSlot * will be accessible by that unique name via - * it's tqparent. + * it's parent. * \param receiver The receiver of the event. * \param slot The slot of the receiver which this * EventSlot points to. diff --git a/lib/kross/api/interpreter.h b/lib/kross/api/interpreter.h index 443585e3..ebb1a09b 100644 --- a/lib/kross/api/interpreter.h +++ b/lib/kross/api/interpreter.h @@ -94,7 +94,7 @@ namespace Kross { namespace Api { /** * \return the file-wildcard used to determinate by this interpreter * used scriptingfiles. Those filter will be used e.g. with - * KGlobal::dirs()->findAllResources() as filtertqmask. For example + * KGlobal::dirs()->findAllResources() as filtermask. For example * python just defines it as "*py". */ const TQString getWildcard(); diff --git a/lib/kross/main/scriptguiclient.cpp b/lib/kross/main/scriptguiclient.cpp index ebcf0b00..b3b29bda 100644 --- a/lib/kross/main/scriptguiclient.cpp +++ b/lib/kross/main/scriptguiclient.cpp @@ -44,15 +44,15 @@ namespace Kross { namespace Api { { public: /** - * The \a KXMLGUIClient that is tqparent of the \a ScriptGUIClient + * The \a KXMLGUIClient that is parent of the \a ScriptGUIClient * instance. */ KXMLGUIClient* guiclient; /** - * The optional tqparent TQWidget widget. + * The optional parent TQWidget widget. */ - TQWidget* tqparent; + TQWidget* parent; /** * Map of \a ScriptActionCollection instances the \a ScriptGUIClient @@ -63,15 +63,15 @@ namespace Kross { namespace Api { }} -ScriptGUIClient::ScriptGUIClient(KXMLGUIClient* guiclient, TQWidget* tqparent) - : TQObject( tqparent ) +ScriptGUIClient::ScriptGUIClient(KXMLGUIClient* guiclient, TQWidget* parent) + : TQObject( parent ) , KXMLGUIClient( guiclient ) , d( new ScriptGUIClientPrivate() ) // initialize d-pointer class { krossdebug( TQString("ScriptGUIClient::ScriptGUIClient() Ctor") ); d->guiclient = guiclient; - d->tqparent = tqparent; + d->parent = parent; setInstance( ScriptGUIClient::instance() ); @@ -311,7 +311,7 @@ KURL ScriptGUIClient::openScriptFile(const TQString& caption) KFileDialog* filedialog = new KFileDialog( TQString(), // startdir mimetypes.join(" "), // filter - 0, // tqparent widget + 0, // parent widget "ScriptGUIClientFileDialog", // name true // modal ); @@ -374,7 +374,7 @@ bool ScriptGUIClient::executeScriptAction(ScriptAction::Ptr action) void ScriptGUIClient::showScriptManager() { - KDialogBase* dialog = new KDialogBase(d->tqparent, "", true, i18n("Scripts Manager"), KDialogBase::Close); + KDialogBase* dialog = new KDialogBase(d->parent, "", true, i18n("Scripts Manager"), KDialogBase::Close); WdgScriptsManager* wsm = new WdgScriptsManager(this, dialog); dialog->setMainWidget(wsm); dialog->resize( TQSize(360, 320).expandedTo(dialog->tqminimumSizeHint()) ); diff --git a/lib/kross/main/scriptguiclient.h b/lib/kross/main/scriptguiclient.h index af762720..a835d0a2 100644 --- a/lib/kross/main/scriptguiclient.h +++ b/lib/kross/main/scriptguiclient.h @@ -58,12 +58,12 @@ namespace Kross { namespace Api { * * \param guiclient The KXMLGUIClient this \a ScriptGUIClient * is a child of. - * \param tqparent The tqparent TQWidget. If defined TQt will handle + * \param parent The parent TQWidget. If defined TQt will handle * freeing this \a ScriptGUIClient instance else the * caller has to take care of freeing this instance * if not needed any longer. */ - explicit ScriptGUIClient(KXMLGUIClient* guiclient, TQWidget* tqparent = 0); + explicit ScriptGUIClient(KXMLGUIClient* guiclient, TQWidget* parent = 0); /** * Destructor. diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp index 781f344b..d3ab6277 100644 --- a/lib/kross/main/wdgscriptsmanager.cpp +++ b/lib/kross/main/wdgscriptsmanager.cpp @@ -87,7 +87,7 @@ class ListItem : public TQListViewItem class ToolTip : public TQToolTip { public: - ToolTip(KListView* tqparent) : TQToolTip(tqparent->viewport()), m_parent(tqparent) {} + ToolTip(KListView* parent) : TQToolTip(parent->viewport()), m_parent(parent) {} virtual ~ToolTip () { remove(m_parent->viewport()); } protected: virtual void maybeTip(const TQPoint& p) { @@ -114,8 +114,8 @@ class WdgScriptsManagerPrivate //enum { LoadBtn = 0, UnloadBtn, InstallBtn, UninstallBtn, ExecBtn, NewStuffBtn }; }; -WdgScriptsManager::WdgScriptsManager(ScriptGUIClient* scr, TQWidget* tqparent, const char* name, WFlags fl ) - : WdgScriptsManagerBase(tqparent, name, fl) +WdgScriptsManager::WdgScriptsManager(ScriptGUIClient* scr, TQWidget* parent, const char* name, WFlags fl ) + : WdgScriptsManagerBase(parent, name, fl) , d(new WdgScriptsManagerPrivate) { d->m_scripguiclient = scr; @@ -254,7 +254,7 @@ void WdgScriptsManager::slotInstallScript() KFileDialog* filedialog = new KFileDialog( TQString(), // startdir "*.tar.gz *.tgz *.bz2", // filter - this, // tqparent widget + this, // parent widget "WdgScriptsManagerInstallFileDialog", // name true // modal ); diff --git a/lib/kross/main/wdgscriptsmanager.h b/lib/kross/main/wdgscriptsmanager.h index 34976373..596017ce 100644 --- a/lib/kross/main/wdgscriptsmanager.h +++ b/lib/kross/main/wdgscriptsmanager.h @@ -37,7 +37,7 @@ class WdgScriptsManager : public WdgScriptsManagerBase Q_OBJECT TQ_OBJECT public: - WdgScriptsManager(ScriptGUIClient* scr, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0); + WdgScriptsManager(ScriptGUIClient* scr, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0); ~WdgScriptsManager(); public slots: void slotLoadScript(); diff --git a/lib/kross/python/pythonscript.cpp b/lib/kross/python/pythonscript.cpp index 7d34a6fb..2329a1d1 100644 --- a/lib/kross/python/pythonscript.cpp +++ b/lib/kross/python/pythonscript.cpp @@ -108,7 +108,7 @@ void PythonScript::initialize() // python scripting code. Py::Dict moduledict = d->m_module->getDict(); moduledict["self"] = PythonExtension::toPyObject( m_scriptcontainer ); - //moduledict["tqparent"] = PythonExtension::toPyObject( m_manager ); + //moduledict["parent"] = PythonExtension::toPyObject( m_manager ); /* // Prepare the local context. diff --git a/lib/kross/python/scripts/gui.py b/lib/kross/python/scripts/gui.py index 997e9849..9dc8a799 100755 --- a/lib/kross/python/scripts/gui.py +++ b/lib/kross/python/scripts/gui.py @@ -43,43 +43,43 @@ class TkDialog: self.widget = mainframe.widget class Widget: - def __init__(self, dialog, tqparent): + def __init__(self, dialog, parent): self.dialog = dialog - self.tqparent = tqparent + self.parent = parent #def setVisible(self, visibled): pass #def setEnabled(self, enabled): pass class Frame(Widget): - def __init__(self, dialog, tqparent): - #TkDialog.Widget.__init__(self, dialog, tqparent) + def __init__(self, dialog, parent): + #TkDialog.Widget.__init__(self, dialog, parent) import Tkinter - self.widget = Tkinter.Frame(tqparent) + self.widget = Tkinter.Frame(parent) self.widget.pack() class Label(Widget): - def __init__(self, dialog, tqparent, caption): - #TkDialog.Widget.__init__(self, dialog, tqparent) + def __init__(self, dialog, parent, caption): + #TkDialog.Widget.__init__(self, dialog, parent) import Tkinter - self.widget = Tkinter.Label(tqparent, text=caption) + self.widget = Tkinter.Label(parent, text=caption) self.widget.pack(side=Tkinter.TOP) class CheckBox(Widget): - def __init__(self, dialog, tqparent, caption, checked = True): - #TkDialog.Widget.__init__(self, dialog, tqparent) + def __init__(self, dialog, parent, caption, checked = True): + #TkDialog.Widget.__init__(self, dialog, parent) import Tkinter self.checkstate = Tkinter.IntVar() self.checkstate.set(checked) - self.widget = Tkinter.Checkbutton(tqparent, text=caption, variable=self.checkstate) + self.widget = Tkinter.Checkbutton(parent, text=caption, variable=self.checkstate) self.widget.pack(side=Tkinter.TOP) def isChecked(self): return self.checkstate.get() class List(Widget): - def __init__(self, dialog, tqparent, caption, items): - #TkDialog.Widget.__init__(self, dialog, tqparent) + def __init__(self, dialog, parent, caption, items): + #TkDialog.Widget.__init__(self, dialog, parent) import Tkinter - listframe = Tkinter.Frame(tqparent) + listframe = Tkinter.Frame(parent) listframe.pack() Tkinter.Label(listframe, text=caption).pack(side=Tkinter.LEFT) @@ -94,10 +94,10 @@ class TkDialog: self.variable.set( self.items[index] ) class Button(Widget): - def __init__(self, dialog, tqparent, caption, commandmethod): - #TkDialog.Widget.__init__(self, dialog, tqparent) + def __init__(self, dialog, parent, caption, commandmethod): + #TkDialog.Widget.__init__(self, dialog, parent) import Tkinter - self.widget = Tkinter.Button(tqparent, text=caption, command=self.doCommand) + self.widget = Tkinter.Button(parent, text=caption, command=self.doCommand) self.commandmethod = commandmethod self.widget.pack(side=Tkinter.LEFT) def doCommand(self): @@ -114,10 +114,10 @@ class TkDialog: #self.dialog.root.destroy() class Edit(Widget): - def __init__(self, dialog, tqparent, caption, text): - #TkDialog.Widget.__init__(self, dialog, tqparent) + def __init__(self, dialog, parent, caption, text): + #TkDialog.Widget.__init__(self, dialog, parent) import Tkinter - self.widget = Tkinter.Frame(tqparent) + self.widget = Tkinter.Frame(parent) self.widget.pack() label = Tkinter.Label(self.widget, text=caption) label.pack(side=Tkinter.LEFT) @@ -129,8 +129,8 @@ class TkDialog: return self.entrytext.get() class FileChooser(Edit): - def __init__(self, dialog, tqparent, caption, initialfile = None, filetypes = None): - TkDialog.Edit.__init__(self, dialog, tqparent, caption, initialfile) + def __init__(self, dialog, parent, caption, initialfile = None, filetypes = None): + TkDialog.Edit.__init__(self, dialog, parent, caption, initialfile) import Tkinter self.initialfile = initialfile @@ -187,27 +187,27 @@ class QtDialog: import qt class Dialog(qt.QDialog): - def __init__(self, tqparent = None, name = None, modal = 0, fl = 0): - qt.QDialog.__init__(self, tqparent, name, modal, fl) + def __init__(self, parent = None, name = None, modal = 0, fl = 0): + qt.QDialog.__init__(self, parent, name, modal, fl) qt.QDialog.accept = self.accept self.tqlayout = qt.QVBoxLayout(self) self.tqlayout.setSpacing(6) self.tqlayout.setMargin(11) class Label(qt.QLabel): - def __init__(self, dialog, tqparent, caption): - qt.QLabel.__init__(self, tqparent) + def __init__(self, dialog, parent, caption): + qt.QLabel.__init__(self, parent) self.setText("<qt>%s</qt>" % caption.replace("\n","<br>")) class Frame(qt.QHBox): - def __init__(self, dialog, tqparent): - qt.QHBox.__init__(self, tqparent) + def __init__(self, dialog, parent): + qt.QHBox.__init__(self, parent) self.widget = self self.setSpacing(6) class Edit(qt.QHBox): - def __init__(self, dialog, tqparent, caption, text): - qt.QHBox.__init__(self, tqparent) + def __init__(self, dialog, parent, caption, text): + qt.QHBox.__init__(self, parent) self.setSpacing(6) label = qt.QLabel(caption, self) self.edit = qt.QLineEdit(self) @@ -219,26 +219,26 @@ class QtDialog: class Button(qt.QPushButton): #def __init__(self, *args): - def __init__(self, dialog, tqparent, caption, commandmethod): + def __init__(self, dialog, parent, caption, commandmethod): #apply(qt.QPushButton.__init__, (self,) + args) - qt.QPushButton.__init__(self, tqparent) + qt.QPushButton.__init__(self, parent) self.commandmethod = commandmethod self.setText(caption) qt.QObject.connect(self, qt.SIGNAL("clicked()"), self.commandmethod) class CheckBox(qt.QCheckBox): - def __init__(self, dialog, tqparent, caption, checked = True): - #TkDialog.Widget.__init__(self, dialog, tqparent) - qt.QCheckBox.__init__(self, tqparent) + def __init__(self, dialog, parent, caption, checked = True): + #TkDialog.Widget.__init__(self, dialog, parent) + qt.QCheckBox.__init__(self, parent) self.setText(caption) self.setChecked(checked) #def isChecked(self): # return self.isChecked() class List(qt.QHBox): - def __init__(self, dialog, tqparent, caption, items): - qt.QHBox.__init__(self, tqparent) + def __init__(self, dialog, parent, caption, items): + qt.QHBox.__init__(self, parent) self.setSpacing(6) label = qt.QLabel(caption, self) self.combo = qt.QComboBox(self) @@ -252,9 +252,9 @@ class QtDialog: self.combo.setCurrentItem(index) class FileChooser(qt.QHBox): - def __init__(self, dialog, tqparent, caption, initialfile = None, filetypes = None): + def __init__(self, dialog, parent, caption, initialfile = None, filetypes = None): #apply(qt.QHBox.__init__, (self,) + args) - qt.QHBox.__init__(self, tqparent) + qt.QHBox.__init__(self, parent) self.setMinimumWidth(400) self.initialfile = initialfile @@ -274,29 +274,29 @@ class QtDialog: return self.edit.text() def browseButtonClicked(self): - filtertqmask = "" + filtermask = "" import types if isinstance(self.filetypes, types.TupleType): for ft in self.filetypes: if len(ft) == 1: - filtertqmask += "%s\n" % (ft[0]) + filtermask += "%s\n" % (ft[0]) if len(ft) == 2: - filtertqmask += "%s|%s (%s)\n" % (ft[1],ft[0],ft[1]) - if filtertqmask == "": - filtertqmask = "All files (*.*)" + filtermask += "%s|%s (%s)\n" % (ft[1],ft[0],ft[1]) + if filtermask == "": + filtermask = "All files (*.*)" else: - filtertqmask = filtertqmask[:-1] + filtermask = filtermask[:-1] filename = None try: print "QtDialog.FileChooser.browseButtonClicked() kfile.KFileDialog" # try to use the kfile module included in pykde import kfile - filename = kfile.KFileDialog.getOpenFileName(self.initialfile, filtertqmask, self, "Save to file") + filename = kfile.KFileDialog.getOpenFileName(self.initialfile, filtermask, self, "Save to file") except: print "QtDialog.FileChooser.browseButtonClicked() qt.QFileDialog" # fallback to Qt filedialog - filename = qt.QFileDialog.getOpenFileName(self.initialfile, filtertqmask, self, "Save to file") + filename = qt.QFileDialog.getOpenFileName(self.initialfile, filtermask, self, "Save to file") if filename != None and filename != "": self.edit.setText(filename) diff --git a/lib/kross/test/testgui.py b/lib/kross/test/testgui.py index a7353873..98552044 100644 --- a/lib/kross/test/testgui.py +++ b/lib/kross/test/testgui.py @@ -44,8 +44,8 @@ class QtTest: apply(qt.QPushButton.__init__, (self,) + args) class ComboBox(qt.QHBox): - def __init__(self, tqparent, caption, items = []): - qt.QHBox.__init__(self, tqparent) + def __init__(self, parent, caption, items = []): + qt.QHBox.__init__(self, parent) self.setSpacing(6) label = qt.QLabel(str(caption), self) self.combobox = qt.QComboBox(self) @@ -85,8 +85,8 @@ class QtTest: self.edit.setText(filename) class Dialog(qt.QDialog): - def __init__(self, tqparent = None, name = None, modal = 0, fl = 0): - qt.QDialog.__init__(self, tqparent, name, modal, fl) + def __init__(self, parent = None, name = None, modal = 0, fl = 0): + qt.QDialog.__init__(self, parent, name, modal, fl) qt.QDialog.accept = self.accept self.setCaption("Export to HTML") #self.tqlayout() diff --git a/lib/kross/test/testobject.cpp b/lib/kross/test/testobject.cpp index 1c7e8e39..eb687d02 100644 --- a/lib/kross/test/testobject.cpp +++ b/lib/kross/test/testobject.cpp @@ -26,8 +26,8 @@ TestObject::TestObject() { } -TestObject::TestObject(TQObject* tqparent, Kross::Api::ScriptContainer::Ptr scriptcontainer) - : TQObject(tqparent, "TestObject") +TestObject::TestObject(TQObject* parent, Kross::Api::ScriptContainer::Ptr scriptcontainer) + : TQObject(parent, "TestObject") { connect(this, TQT_SIGNAL(testSignal()), this, TQT_SLOT(testSignalSlot())); connect(this, TQT_SIGNAL(stdoutSignal(const TQString&)), this, TQT_SLOT(stdoutSlot(const TQString&))); diff --git a/lib/kross/test/testobject.h b/lib/kross/test/testobject.h index 5a04d9dc..7bbf6f05 100644 --- a/lib/kross/test/testobject.h +++ b/lib/kross/test/testobject.h @@ -34,7 +34,7 @@ class TestObject : public TQObject public: TestObject(); - TestObject(TQObject* tqparent, Kross::Api::ScriptContainer::Ptr scriptcontainer); + TestObject(TQObject* parent, Kross::Api::ScriptContainer::Ptr scriptcontainer); ~TestObject(); uint func1(uint); diff --git a/lib/store/KoXmlWriter.cpp b/lib/store/KoXmlWriter.cpp index dca95d8a..f3568606 100644 --- a/lib/store/KoXmlWriter.cpp +++ b/lib/store/KoXmlWriter.cpp @@ -72,31 +72,31 @@ void KoXmlWriter::endDocument() Q_ASSERT( m_tags.isEmpty() ); } -// returns the value of indentInside of the tqparent +// returns the value of indentInside of the parent bool KoXmlWriter::prepareForChild() { if ( !m_tags.isEmpty() ) { - Tag& tqparent = m_tags.top(); - if ( !tqparent.hasChildren ) { - closeStartElement( tqparent ); - tqparent.hasChildren = true; - tqparent.lastChildIsText = false; + Tag& parent = m_tags.top(); + if ( !parent.hasChildren ) { + closeStartElement( parent ); + parent.hasChildren = true; + parent.lastChildIsText = false; } - if ( tqparent.indentInside ) { + if ( parent.indentInside ) { writeIndent(); } - return tqparent.indentInside; + return parent.indentInside; } return true; } void KoXmlWriter::prepareForTextNode() { - Tag& tqparent = m_tags.top(); - if ( !tqparent.hasChildren ) { - closeStartElement( tqparent ); - tqparent.hasChildren = true; - tqparent.lastChildIsText = true; + Tag& parent = m_tags.top(); + if ( !parent.hasChildren ) { + closeStartElement( parent ); + parent.hasChildren = true; + parent.lastChildIsText = true; } } @@ -104,7 +104,7 @@ void KoXmlWriter::startElement( const char* tagName, bool indentInside ) { Q_ASSERT( tagName != 0 ); - // Tell tqparent that it has tqchildren + // Tell parent that it has tqchildren bool parentIndent = prepareForChild(); m_tags.push( Tag( tagName, parentIndent && indentInside ) ); diff --git a/lib/store/tests/storedroptest.cpp b/lib/store/tests/storedroptest.cpp index 344cab54..9da8d2d8 100644 --- a/lib/store/tests/storedroptest.cpp +++ b/lib/store/tests/storedroptest.cpp @@ -9,7 +9,7 @@ class StoreDropTest : public TQTextBrowser { public: - StoreDropTest( TQWidget* tqparent ); + StoreDropTest( TQWidget* parent ); protected: virtual void contentsDragEnterEvent( TQDragEnterEvent * e ); virtual void contentsDragMoveEvent( TQDragMoveEvent * e ); @@ -36,8 +36,8 @@ int main( int argc, char** argv ) return app.exec(); } -StoreDropTest::StoreDropTest( TQWidget* tqparent ) - : TQTextBrowser( tqparent ) +StoreDropTest::StoreDropTest( TQWidget* parent ) + : TQTextBrowser( parent ) { setText( "KoStore drop/paste test\nDrop or paste a selection from a KOffice application into this widget to see the ZIP contents" ); setAcceptDrops( true ); |