diff options
116 files changed, 399 insertions, 399 deletions
diff --git a/microbe/btreebase.cpp b/microbe/btreebase.cpp index 7117b26..b45f983 100644 --- a/microbe/btreebase.cpp +++ b/microbe/btreebase.cpp @@ -41,14 +41,14 @@ BTreeBase::~BTreeBase() } -void BTreeBase::addNode(BTreeNode *tqparent, BTreeNode *node, bool left) +void BTreeBase::addNode(BTreeNode *parent, BTreeNode *node, bool left) { // Debugging lines, remove when expression parsing has been completed. - //if(!tqparent) cerr<<"Null tqparent pointer!\n"; + //if(!parent) cerr<<"Null parent pointer!\n"; //if(!node) cerr<<"Null node pointer!\n"); - if(left) tqparent->setLeft(node); - else tqparent->setRight(node); + if(left) parent->setLeft(node); + else parent->setRight(node); } void BTreeBase::pruneTree(BTreeNode *root, bool /*conditionalRoot*/) @@ -60,7 +60,7 @@ void BTreeBase::pruneTree(BTreeNode *root, bool /*conditionalRoot*/) while(!done) { //t.descendLeftwardToTerminal(); - if( t.current()->tqparent() ) + if( t.current()->parent() ) { if( t.oppositeNode()->hasChildren() ) pruneTree(t.oppositeNode()); } @@ -69,7 +69,7 @@ void BTreeBase::pruneTree(BTreeNode *root, bool /*conditionalRoot*/) if( !t.current()->hasChildren() ) { //if(t.current() == t.root()) done = true; - if(!t.current()->tqparent()) done = true; + if(!t.current()->parent()) done = true; continue; } @@ -226,7 +226,7 @@ void BTreeBase::pruneTree(BTreeNode *root, bool /*conditionalRoot*/) } } - if(!t.current()->tqparent() || t.current() == root) done = true; + if(!t.current()->parent() || t.current() == root) done = true; else { @@ -237,12 +237,12 @@ void BTreeBase::pruneTree(BTreeNode *root, bool /*conditionalRoot*/) void BTreeBase::replaceNode(BTreeNode *node, BTreeNode *replacement) { // (This works under the assumption that a node is not linked to two places at once). - if( !node->tqparent() ) + if( !node->parent() ) { setRoot(replacement); replacement->setParent(0L); return; } - if( node->tqparent()->left() == node ) node->tqparent()->setLeft(replacement); - if( node->tqparent()->right() == node ) node->tqparent()->setRight(replacement); + if( node->parent()->left() == node ) node->parent()->setLeft(replacement); + if( node->parent()->right() == node ) node->parent()->setRight(replacement); } diff --git a/microbe/btreebase.h b/microbe/btreebase.h index 8b9d6f0..d8d1040 100644 --- a/microbe/btreebase.h +++ b/microbe/btreebase.h @@ -38,10 +38,10 @@ public: void setRoot(BTreeNode *root){m_root = root; } /** Link the node into the tree. a.t.m all this really - does it sets the tqparent/child relationship pointers, + does it sets the parent/child relationship pointers, but is used in case something needs to be changed in the future Added to the left if left == true or the right if left == false */ - void addNode(BTreeNode *tqparent, BTreeNode *node, bool left); + void addNode(BTreeNode *parent, BTreeNode *node, bool left); /** Deletes all nodes in tree and zeros pointer to root node */ void deleteTree(); @@ -49,7 +49,7 @@ public: /** Tidies the tree up; merging constants and removing redundant branches */ void pruneTree(BTreeNode *root, bool conditionalRoot = true); - /** Put a node in place of another, linking it correctly into the tqparent. */ + /** Put a node in place of another, linking it correctly into the parent. */ void replaceNode(BTreeNode *node, BTreeNode *replacement); protected: diff --git a/microbe/btreenode.h b/microbe/btreenode.h index 2594d0c..ceed185 100644 --- a/microbe/btreenode.h +++ b/microbe/btreenode.h @@ -50,9 +50,9 @@ class BTreeNode */ void deleteChildren(); /** - * @return the tqparent node. + * @return the parent node. */ - BTreeNode *tqparent() const { return m_parent; } + BTreeNode *parent() const { return m_parent; } /** * @return the left child node. */ @@ -61,7 +61,7 @@ class BTreeNode * @return the right child node. */ BTreeNode *right() const { return m_right; } - void setParent(BTreeNode *tqparent) { m_parent = tqparent; } + void setParent(BTreeNode *parent) { m_parent = parent; } /** * Set the child node on the left to the one give, and reparents it to * this node. diff --git a/microbe/instruction.cpp b/microbe/instruction.cpp index 5e41fc8..80a63cc 100644 --- a/microbe/instruction.cpp +++ b/microbe/instruction.cpp @@ -806,7 +806,7 @@ void Code::merge( Code * code, InstructionPosition middleInsertionPosition ) if ( !code ) return; - // Retqparent instructions + // Reparent instructions for ( unsigned i = 0; i < PositionCount; ++i ) { InstructionList * list = code->instructionList( (InstructionPosition)i ); diff --git a/microbe/optimizer.cpp b/microbe/optimizer.cpp index 03e3110..1c8ce13 100644 --- a/microbe/optimizer.cpp +++ b/microbe/optimizer.cpp @@ -386,8 +386,8 @@ bool Optimizer::optimizeInstructions() { // If we are testing STATUS, then we assume that the bits changed // are only those that are marked as independent. - uchar bittqmask = ( i == 1 ) ? behaviour.reg( Register::STATUS ).indep : 0xff; - if ( !canRemove( *it, (i == 0) ? regSet : Register::STATUS, bittqmask ) ) + uchar bitmask = ( i == 1 ) ? behaviour.reg( Register::STATUS ).indep : 0xff; + if ( !canRemove( *it, (i == 0) ? regSet : Register::STATUS, bitmask ) ) { ok = false; break; @@ -479,7 +479,7 @@ bool Optimizer::canRemove( Instruction * ins, const Register & reg, uchar bitMas // The bits that are depended upon in the future for this register uchar depends = generateRegisterDepends( ins, reg ); - // Only interested in those bits allowed by the bit tqmask + // Only interested in those bits allowed by the bit mask depends &= bitMask; RegisterState inputState = ins->inputState().reg( reg ); diff --git a/microbe/traverser.cpp b/microbe/traverser.cpp index 3436d0c..eb6a924 100644 --- a/microbe/traverser.cpp +++ b/microbe/traverser.cpp @@ -54,7 +54,7 @@ BTreeNode * Traverser::start() else n = n->left(); } } - //if(n->tqparent()) m_current = n->tqparent(); + //if(n->parent()) m_current = n->parent(); //else m_current = n; m_current = n; return m_current; @@ -62,22 +62,22 @@ BTreeNode * Traverser::start() BTreeNode * Traverser::next() { - // a.t.m we will just take the next thing to be the tqparent. - if( m_current != m_root ) m_current = m_current->tqparent(); + // a.t.m we will just take the next thing to be the parent. + if( m_current != m_root ) m_current = m_current->parent(); return m_current; } bool Traverser::onLeftBranch() { - return current()->tqparent()->left() == current(); + return current()->parent()->left() == current(); } BTreeNode * Traverser::oppositeNode() { if ( onLeftBranch() ) - return current()->tqparent()->right(); + return current()->parent()->right(); else - return current()->tqparent()->left(); + return current()->parent()->left(); } void Traverser::descendLeftwardToTerminal() @@ -95,6 +95,6 @@ void Traverser::descendLeftwardToTerminal() void Traverser::moveToParent() { - if(current()->tqparent()) m_current = current()->tqparent(); + if(current()->parent()) m_current = current()->parent(); } diff --git a/microbe/traverser.h b/microbe/traverser.h index a0fcd77..7593ba7 100644 --- a/microbe/traverser.h +++ b/microbe/traverser.h @@ -45,7 +45,7 @@ public: /** Returns true if we are on the left branch, false otherwise. */ bool onLeftBranch(); - /** Returns the node on the opposite branch of the tqparent. */ + /** Returns the node on the opposite branch of the parent. */ BTreeNode * oppositeNode(); BTreeNode * current() const { return m_current; } @@ -57,8 +57,8 @@ public: */ void descendLeftwardToTerminal(); - /** It might occur in the future that next() does not just move to the tqparent, - so use this for moving to tqparent + /** It might occur in the future that next() does not just move to the parent, + so use this for moving to parent */ void moveToParent(); diff --git a/src/canvasitemparts.cpp b/src/canvasitemparts.cpp index dc98647..6d20edc 100644 --- a/src/canvasitemparts.cpp +++ b/src/canvasitemparts.cpp @@ -17,16 +17,16 @@ //BEGIN Class GuiPart -GuiPart::GuiPart( CNItem *tqparent, const TQRect & r, TQCanvas * canvas ) - : TQObject(tqparent), +GuiPart::GuiPart( CNItem *parent, const TQRect & r, TQCanvas * canvas ) + : TQObject(parent), TQCanvasRectangle( r, canvas ), m_angleDegrees(0), - p_parent(tqparent), + p_parent(parent), b_pointsAdded(false), m_originalRect(r) { - connect( tqparent, TQT_SIGNAL(movedBy(double, double )), this, TQT_SLOT(slotMoveBy(double, double )) ); - setZ( tqparent->z() + 0.5 ); + connect( parent, TQT_SIGNAL(movedBy(double, double )), this, TQT_SLOT(slotMoveBy(double, double )) ); + setZ( parent->z() + 0.5 ); } @@ -139,8 +139,8 @@ TQRect GuiPart::drawRect() //BEGIN Class Text -Text::Text( const TQString &text, CNItem *tqparent, const TQRect & r, TQCanvas * canvas, int flags ) - : GuiPart( tqparent, r, canvas ) +Text::Text( const TQString &text, CNItem *parent, const TQRect & r, TQCanvas * canvas, int flags ) + : GuiPart( parent, r, canvas ) { m_flags = flags; setText(text); @@ -189,8 +189,8 @@ TQRect Text::recommendedRect() const //BEGIN Class Widget -Widget::Widget( const TQString & id, CNItem * tqparent, const TQRect & r, TQCanvas * canvas ) - : GuiPart( tqparent, r, canvas ) +Widget::Widget( const TQString & id, CNItem * parent, const TQRect & r, TQCanvas * canvas ) + : GuiPart( parent, r, canvas ) { m_id = id; show(); @@ -235,8 +235,8 @@ void Widget::drawShape( TQPainter &p ) //BEGIN Class ToolButton -ToolButton::ToolButton( TQWidget *tqparent ) - : TQToolButton(tqparent) +ToolButton::ToolButton( TQWidget *parent ) + : TQToolButton(parent) { m_angleDegrees = 0; if ( TQFontInfo(m_font).pixelSize() > 11 ) // It has to be > 11, not > 12, as (I think) pixelSize() rounds off the actual size @@ -276,8 +276,8 @@ void ToolButton::drawButtonLabel( TQPainter * p ) //BEGIN Class Button -Button::Button( const TQString & id, CNItem * tqparent, bool isToggle, const TQRect & r, TQCanvas * canvas ) - : Widget( id, tqparent, r, canvas ) +Button::Button( const TQString & id, CNItem * parent, bool isToggle, const TQRect & r, TQCanvas * canvas ) + : Widget( id, parent, r, canvas ) { b_isToggle = isToggle; m_button = new ToolButton(0l); @@ -319,7 +319,7 @@ void Button::posChanged() void Button::slotStateChanged() { - tqparent()->buttonStateChanged( id(), m_button->isDown() || m_button->isOn() ); + parent()->buttonStateChanged( id(), m_button->isDown() || m_button->isOn() ); } TQWidget* Button::widget() const { @@ -425,8 +425,8 @@ void Button::leaveEvent() //BEGIN Class SliderWidget -SliderWidget::SliderWidget( TQWidget *tqparent ) - : TQSlider(tqparent) +SliderWidget::SliderWidget( TQWidget *parent ) + : TQSlider(parent) { setWFlags(WNoAutoErase|WRepaintNoErase); } @@ -434,8 +434,8 @@ SliderWidget::SliderWidget( TQWidget *tqparent ) //BEGIN Class Slider -Slider::Slider( const TQString & id, CNItem * tqparent, const TQRect & r, TQCanvas * canvas ) - : Widget( id, tqparent, r, canvas ) +Slider::Slider( const TQString & id, CNItem * parent, const TQRect & r, TQCanvas * canvas ) + : Widget( id, parent, r, canvas ) { m_orientation = Qt::Vertical; m_slider = new SliderWidget(0l); @@ -527,8 +527,8 @@ void Slider::leaveEvent() void Slider::slotValueChanged( int value ) { - tqparent()->itemDocument()->setModified(true); - tqparent()->sliderValueChanged(id(),value); + parent()->itemDocument()->setModified(true); + parent()->sliderValueChanged(id(),value); } void Slider::setOrientation( Qt::Orientation o ) diff --git a/src/canvasitemparts.h b/src/canvasitemparts.h index f2fee2b..513b508 100644 --- a/src/canvasitemparts.h +++ b/src/canvasitemparts.h @@ -33,7 +33,7 @@ class GuiPart : public TQObject, public TQCanvasRectangle * of calling TQCanvasRectangle::setSize. This allows GuiPart to know * when its size has been changed */ - GuiPart( CNItem *tqparent, const TQRect & r, TQCanvas * canvas ); + GuiPart( CNItem *parent, const TQRect & r, TQCanvas * canvas ); virtual ~GuiPart(); virtual TQRect recommendedRect() const { return m_originalRect; } @@ -61,7 +61,7 @@ class GuiPart : public TQObject, public TQCanvasRectangle TQRect drawRect(); int angleDegrees() const { return m_angleDegrees; } - CNItem *tqparent() const { return p_parent; } + CNItem *parent() const { return p_parent; } protected: /** @@ -97,7 +97,7 @@ class Text : public GuiPart Q_OBJECT TQ_OBJECT public: - Text( const TQString &text, CNItem *tqparent, const TQRect & r, TQCanvas * canvas, int flags = TQt::AlignHCenter | TQt::AlignVCenter ); + Text( const TQString &text, CNItem *parent, const TQRect & r, TQCanvas * canvas, int flags = TQt::AlignHCenter | TQt::AlignVCenter ); ~Text(); /** @@ -131,7 +131,7 @@ typedef TQMap<TQString, TQGuardedPtr<Text> > TextMap; class Widget : public GuiPart { public: - Widget( const TQString & id, CNItem *tqparent, const TQRect & r, TQCanvas * canvas ); + Widget( const TQString & id, CNItem *parent, const TQRect & r, TQCanvas * canvas ); ~Widget(); virtual int rtti() const; @@ -179,7 +179,7 @@ class Widget : public GuiPart class ToolButton : public TQToolButton { public: - ToolButton( TQWidget* tqparent ); + ToolButton( TQWidget* parent ); virtual void mousePressEvent( TQMouseEvent *e ) { TQToolButton::mousePressEvent(e); } virtual void mouseReleaseEvent( TQMouseEvent *e ) { TQToolButton::mouseReleaseEvent(e); } @@ -208,7 +208,7 @@ class Button : public Widget Q_OBJECT TQ_OBJECT public: - Button( const TQString & id, CNItem *tqparent, bool isToggle, const TQRect & r, TQCanvas * canvas ); + Button( const TQString & id, CNItem *parent, bool isToggle, const TQRect & r, TQCanvas * canvas ); ~Button(); virtual void mousePressEvent( TQMouseEvent *e ); @@ -243,7 +243,7 @@ class Button : public Widget class SliderWidget : public TQSlider { public: - SliderWidget( TQWidget* tqparent ); + SliderWidget( TQWidget* parent ); virtual void mousePressEvent( TQMouseEvent *e ) { TQSlider::mousePressEvent(e); } virtual void mouseReleaseEvent( TQMouseEvent *e ) { TQSlider::mouseReleaseEvent(e); } @@ -264,7 +264,7 @@ class Slider : public Widget Q_OBJECT TQ_OBJECT public: - Slider( const TQString & id, CNItem *tqparent, const TQRect & r, TQCanvas * canvas ); + Slider( const TQString & id, CNItem *parent, const TQRect & r, TQCanvas * canvas ); ~Slider(); virtual void mousePressEvent( TQMouseEvent *e ); diff --git a/src/canvasmanipulator.cpp b/src/canvasmanipulator.cpp index cdf3fce..8fef847 100644 --- a/src/canvasmanipulator.cpp +++ b/src/canvasmanipulator.cpp @@ -134,7 +134,7 @@ void CMManager::mousePressEvent( EventInfo eventInfo ) { Widget *widget = dynamic_cast<Widget*>(eventInfo.qcanvasItemClickedOn); if (widget) - eventInfo.qcanvasItemClickedOn = widget->tqparent(); + eventInfo.qcanvasItemClickedOn = widget->parent(); } case ItemDocument::RTTI::CNItem: { @@ -197,7 +197,7 @@ void CMManager::mouseDoubleClickEvent( const EventInfo &eventInfo ) Widget *widget = dynamic_cast<Widget*>(eventInfo.qcanvasItemClickedOn); if (widget) { - widget->tqparent()->mouseDoubleClickEvent(eventInfo); + widget->parent()->mouseDoubleClickEvent(eventInfo); return; } } @@ -226,7 +226,7 @@ void CMManager::mouseMoveEvent( const EventInfo &eventInfo ) Item *item; Widget *widget = dynamic_cast<Widget*>(qcnItem); if (widget) - item = widget->tqparent(); + item = widget->parent(); else item = dynamic_cast<Item*>(qcnItem); @@ -299,7 +299,7 @@ void CMManager::wheelEvent( const EventInfo &eventInfo ) Item *item; Widget *widget = dynamic_cast<Widget*>(qcnItem); if (widget) - item = widget->tqparent(); + item = widget->parent(); else item = dynamic_cast<Item*>(qcnItem); diff --git a/src/cnitemgroup.cpp b/src/cnitemgroup.cpp index 7252c91..7a8c746 100644 --- a/src/cnitemgroup.cpp +++ b/src/cnitemgroup.cpp @@ -98,7 +98,7 @@ bool CNItemGroup::addTQCanvasItem( TQCanvasItem *qcanvasItem ) { ConnectorLine *connectorLine = dynamic_cast<ConnectorLine*>(qcanvasItem); if (connectorLine) - connector = connectorLine->tqparent(); + connector = connectorLine->parent(); } if (connector) return addConnector(connector); @@ -135,7 +135,7 @@ void CNItemGroup::setItems( TQCanvasItemList list ) } case ItemDocument::RTTI::ConnectorLine: { - connectorRemoveList.remove( (dynamic_cast<ConnectorLine*>(*it))->tqparent() ); + connectorRemoveList.remove( (dynamic_cast<ConnectorLine*>(*it))->parent() ); break; } default: @@ -234,7 +234,7 @@ void CNItemGroup::removeTQCanvasItem( TQCanvasItem *qcanvasItem ) { ConnectorLine *connectorLine = dynamic_cast<ConnectorLine*>(qcanvasItem); if (connectorLine) - connector = connectorLine->tqparent(); + connector = connectorLine->parent(); } if (connector) return removeConnector(connector); diff --git a/src/connector.h b/src/connector.h index 740b5b7..002301d 100644 --- a/src/connector.h +++ b/src/connector.h @@ -104,11 +104,11 @@ public: */ void setSemiHidden( bool semiHidden ); /** - * Sets the container tqparent (i.e. the container of the tqparent item) + * Sets the container parent (i.e. the container of the parent item) */ void setParentContainer( const TQString &cnItemId ); /** - * Returns a pointer to the tqparent item container + * Returns a pointer to the parent item container */ CNItem *parentContainer() const { return p_parentContainer; } /** @@ -190,7 +190,7 @@ class ConnectorLine : public TQObject, public TQCanvasLine { public: ConnectorLine( Connector *connector ); - Connector *tqparent() const { return p_connector; } + Connector *parent() const { return p_connector; } virtual int rtti() const; protected: diff --git a/src/electronics/gpsimprocessor.cpp b/src/electronics/gpsimprocessor.cpp index 704aacf..8ad853c 100644 --- a/src/electronics/gpsimprocessor.cpp +++ b/src/electronics/gpsimprocessor.cpp @@ -71,8 +71,8 @@ TQString sanitizeGpsimFile( TQString file ) } -GpsimProcessor::GpsimProcessor( TQString symbolFile, TQObject *tqparent ) - : TQObject(tqparent), +GpsimProcessor::GpsimProcessor( TQString symbolFile, TQObject *parent ) + : TQObject(parent), m_symbolFile(symbolFile) { if (!bDoneGpsimInit) diff --git a/src/electronics/gpsimprocessor.h b/src/electronics/gpsimprocessor.h index 0259889..9939be4 100644 --- a/src/electronics/gpsimprocessor.h +++ b/src/electronics/gpsimprocessor.h @@ -255,7 +255,7 @@ class GpsimProcessor : public TQObject * should always call codLoadtqStatus() to ensure that the cod file was * loaded successfully. */ - GpsimProcessor( TQString symbolFile, TQObject *tqparent = 0 ); + GpsimProcessor( TQString symbolFile, TQObject *parent = 0 ); ~GpsimProcessor(); void setDebugMode( GpsimDebugger::Type mode ) { m_debugMode = mode; } diff --git a/src/electronics/pin.cpp b/src/electronics/pin.cpp index f3cdc0c..56848fc 100644 --- a/src/electronics/pin.cpp +++ b/src/electronics/pin.cpp @@ -13,10 +13,10 @@ #include <assert.h> #include <kdebug.h> -Pin::Pin( ECNode * tqparent ) +Pin::Pin( ECNode * parent ) { - assert(tqparent); - m_pECNode = tqparent; + assert(parent); + m_pECNode = parent; m_voltage = 0.; m_current = 0.; m_eqId = -2; diff --git a/src/electronics/pin.h b/src/electronics/pin.h index 77a9e80..502d986 100644 --- a/src/electronics/pin.h +++ b/src/electronics/pin.h @@ -53,7 +53,7 @@ class Pin : public TQObject gt_low = 15, // current sources gt_never = 20 // everything else }; - Pin( ECNode * tqparent ); + Pin( ECNode * parent ); ~Pin(); ECNode * parentECNode() const { return m_pECNode; } diff --git a/src/electronics/port.cpp b/src/electronics/port.cpp index cb7f4fb..ec74bfc 100644 --- a/src/electronics/port.cpp +++ b/src/electronics/port.cpp @@ -99,24 +99,24 @@ bool SerialPort::pinState( Pin pin ) if ( m_file == -1 ) return false; - int tqmask = 0; + int mask = 0; switch ( pin ) { case CD: - tqmask = TIOCM_CD; + mask = TIOCM_CD; break; case RD: - tqmask = TIOCM_SR; + mask = TIOCM_SR; break; case CTS: - tqmask = TIOCM_CTS; + mask = TIOCM_CTS; break; case RI: - tqmask = TIOCM_RI; + mask = TIOCM_RI; break; case TD: @@ -127,7 +127,7 @@ bool SerialPort::pinState( Pin pin ) break; } - if ( tqmask == 0 ) + if ( mask == 0 ) { kdError() << k_funcinfo << "Bad pin " << pin << endl; return false; @@ -140,7 +140,7 @@ bool SerialPort::pinState( Pin pin ) return false; } - return bits & tqmask; + return bits & mask; } diff --git a/src/electronics/switch.cpp b/src/electronics/switch.cpp index f91095a..581b5b1 100644 --- a/src/electronics/switch.cpp +++ b/src/electronics/switch.cpp @@ -23,7 +23,7 @@ #include <stdlib.h> // for rand #include <time.h> -Switch::Switch( Component * tqparent, Pin * p1, Pin * p2, State state ) +Switch::Switch( Component * parent, Pin * p1, Pin * p2, State state ) { m_bouncePeriod_ms = 5; m_bBounce = false; @@ -31,7 +31,7 @@ Switch::Switch( Component * tqparent, Pin * p1, Pin * p2, State state ) m_pBounceResistance = 0l; m_pP1 = p1; m_pP2 = p2; - m_pComponent = tqparent; + m_pComponent = parent; m_pStopBouncingTimer = new TQTimer( this ); connect( m_pStopBouncingTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(stopBouncing()) ); diff --git a/src/electronics/switch.h b/src/electronics/switch.h index 17fd493..cd1cf4c 100644 --- a/src/electronics/switch.h +++ b/src/electronics/switch.h @@ -35,7 +35,7 @@ class Switch : public TQObject Closed, }; - Switch( Component * tqparent, Pin * p1, Pin * p2, State state ); + Switch( Component * parent, Pin * p1, Pin * p2, State state ); ~Switch(); /** * If bouncing has been set to true, then the state will not switch diff --git a/src/flowcodeview.cpp b/src/flowcodeview.cpp index 0fa5b4d..d6e994f 100644 --- a/src/flowcodeview.cpp +++ b/src/flowcodeview.cpp @@ -53,7 +53,7 @@ FlowCodeView::FlowCodeView( FlowCodeDocument * flowCodeDocument, ViewContainer * TQWhatsThis::add( this, i18n( "Construct a FlowCode document by dragging FlowParts from the list on the left. All FlowCharts require an initial \"Start\" part, of which there can only be one.<br><br>" - "Some FlowParts, such as Subroutines, act as a container element for other FlowParts. Drag the items in or out of a container as appropritate. The container that will become the tqparent of the part being dragged is indicated by being selected.<br><br>" + "Some FlowParts, such as Subroutines, act as a container element for other FlowParts. Drag the items in or out of a container as appropritate. The container that will become the parent of the part being dragged is indicated by being selected.<br><br>" "Note that connections cannot be made between FlowParts in different containers, or at different levels." ) ); diff --git a/src/flowparts/flowpart.cpp b/src/flowparts/flowpart.cpp index 5adb3b5..1ec4a6e 100644 --- a/src/flowparts/flowpart.cpp +++ b/src/flowparts/flowpart.cpp @@ -830,9 +830,9 @@ void FlowPart::orientationPixmap( uint orientation, TQPixmap & pm ) const return; } - TQBitmap tqmask( 50, 50 ); - TQPainter maskPainter(&tqmask); - tqmask.fill( TQt::color0 ); + TQBitmap mask( 50, 50 ); + TQPainter maskPainter(&mask); + mask.fill( TQt::color0 ); maskPainter.setBrush(TQt::color1); maskPainter.setPen(TQt::color1); @@ -968,7 +968,7 @@ void FlowPart::orientationPixmap( uint orientation, TQPixmap & pm ) const } } - pm.setMask(tqmask); + pm.setMask(mask); } diff --git a/src/flowparts/pinmapping.cpp b/src/flowparts/pinmapping.cpp index ee1c8b8..289cbc4 100644 --- a/src/flowparts/pinmapping.cpp +++ b/src/flowparts/pinmapping.cpp @@ -50,8 +50,8 @@ PinMapping::~PinMapping() //BEGIN class PinMapEditor -PinMapEditor::PinMapEditor( PinMapping * pinMapping, MicroInfo * picInfo, TQWidget * tqparent, const char * name ) - : KDialogBase( tqparent, name, true, i18n("Pin Map Editor"), Ok|Apply|Cancel, KDialogBase::Ok, true ) +PinMapEditor::PinMapEditor( PinMapping * pinMapping, MicroInfo * picInfo, TQWidget * parent, const char * name ) + : KDialogBase( parent, name, true, i18n("Pin Map Editor"), Ok|Apply|Cancel, KDialogBase::Ok, true ) { m_pPinMapping = pinMapping; diff --git a/src/flowparts/pinmapping.h b/src/flowparts/pinmapping.h index 8cb0747..2c53d31 100644 --- a/src/flowparts/pinmapping.h +++ b/src/flowparts/pinmapping.h @@ -73,7 +73,7 @@ class PinMapEditor : public KDialogBase Q_OBJECT TQ_OBJECT public: - PinMapEditor( PinMapping * PinMapping, MicroInfo * Info, TQWidget * tqparent, const char * name ); + PinMapEditor( PinMapping * PinMapping, MicroInfo * Info, TQWidget * parent, const char * name ); protected: virtual void slotApply(); diff --git a/src/gui/colorcombo.cpp b/src/gui/colorcombo.cpp index 786ef98..55b8958 100644 --- a/src/gui/colorcombo.cpp +++ b/src/gui/colorcombo.cpp @@ -18,8 +18,8 @@ bool ColorCombo::createdPalettes = false; TQColor * ColorCombo::palette[ NumberOfSchemes ]; int ColorCombo::paletteSize[ NumberOfSchemes ]; -ColorCombo::ColorCombo( ColorScheme colorScheme, TQWidget *tqparent, const char *name ) - : TQComboBox( tqparent, name ) +ColorCombo::ColorCombo( ColorScheme colorScheme, TQWidget *parent, const char *name ) + : TQComboBox( parent, name ) { m_colorScheme = colorScheme; diff --git a/src/gui/colorcombo.h b/src/gui/colorcombo.h index 0fb6071..65af079 100644 --- a/src/gui/colorcombo.h +++ b/src/gui/colorcombo.h @@ -37,7 +37,7 @@ class ColorCombo : public TQComboBox /** * Constructs a color combo box. */ - ColorCombo( ColorScheme colorScheme, TQWidget *tqparent, const char *name = 0L ); + ColorCombo( ColorScheme colorScheme, TQWidget *parent, const char *name = 0L ); ~ColorCombo(); /** diff --git a/src/gui/contexthelp.cpp b/src/gui/contexthelp.cpp index e10c30d..f7a2432 100644 --- a/src/gui/contexthelp.cpp +++ b/src/gui/contexthelp.cpp @@ -26,19 +26,19 @@ ContextHelp * ContextHelp::m_pSelf = 0l; -ContextHelp * ContextHelp::self( KateMDI::ToolView * tqparent ) +ContextHelp * ContextHelp::self( KateMDI::ToolView * parent ) { if (!m_pSelf) { - assert(tqparent); - m_pSelf = new ContextHelp(tqparent); + assert(parent); + m_pSelf = new ContextHelp(parent); } return m_pSelf; } -ContextHelp::ContextHelp( KateMDI::ToolView * tqparent ) - : TQWidget( tqparent, "Context Help" ) +ContextHelp::ContextHelp( KateMDI::ToolView * parent ) + : TQWidget( parent, "Context Help" ) { TQWhatsThis::add( this, i18n("Provides context-sensitive help relevant to the current editing being performed.") ); diff --git a/src/gui/contexthelp.h b/src/gui/contexthelp.h index c363e39..428ac1b 100644 --- a/src/gui/contexthelp.h +++ b/src/gui/contexthelp.h @@ -32,7 +32,7 @@ class ContextHelp : public TQWidget Q_OBJECT TQ_OBJECT public: - static ContextHelp * self( KateMDI::ToolView * tqparent = 0l ); + static ContextHelp * self( KateMDI::ToolView * parent = 0l ); static TQString toolViewIdentifier() { return "ContextHelp"; } ~ContextHelp(); @@ -48,7 +48,7 @@ class ContextHelp : public TQWidget void setContextHelp(const TQString& name, const TQString &help); private: - ContextHelp( KateMDI::ToolView * tqparent ); + ContextHelp( KateMDI::ToolView * parent ); TQLabel *m_nameLbl; TQTextBrowser *m_info; diff --git a/src/gui/doublespinbox.cpp b/src/gui/doublespinbox.cpp index 6a384ed..b994c23 100644 --- a/src/gui/doublespinbox.cpp +++ b/src/gui/doublespinbox.cpp @@ -30,8 +30,8 @@ inline int roundDouble( double val ) } -DoubleSpinBox::DoubleSpinBox( double lower, double upper, double minAbs, double value, const TQString &unit, TQWidget * tqparent ) - : TQSpinBox( tqparent ) +DoubleSpinBox::DoubleSpinBox( double lower, double upper, double minAbs, double value, const TQString &unit, TQWidget * parent ) + : TQSpinBox( parent ) { m_lastEmittedValue = value; m_unit = unit; diff --git a/src/gui/doublespinbox.h b/src/gui/doublespinbox.h index 6df8f76..9a412fb 100644 --- a/src/gui/doublespinbox.h +++ b/src/gui/doublespinbox.h @@ -25,7 +25,7 @@ class DoubleSpinBox : public TQSpinBox Q_OBJECT TQ_OBJECT public: - DoubleSpinBox( double lower, double upper, double minAbs, double value, const TQString & unit, TQWidget * tqparent = 0 ); + DoubleSpinBox( double lower, double upper, double minAbs, double value, const TQString & unit, TQWidget * parent = 0 ); virtual ~DoubleSpinBox(); /** diff --git a/src/gui/itemeditor.cpp b/src/gui/itemeditor.cpp index 3e8a30e..58b0661 100644 --- a/src/gui/itemeditor.cpp +++ b/src/gui/itemeditor.cpp @@ -26,19 +26,19 @@ ItemEditor * ItemEditor::m_pSelf = 0l; -ItemEditor * ItemEditor::self( KateMDI::ToolView * tqparent ) +ItemEditor * ItemEditor::self( KateMDI::ToolView * parent ) { if (!m_pSelf) { - assert(tqparent); - m_pSelf = new ItemEditor(tqparent); + assert(parent); + m_pSelf = new ItemEditor(parent); } return m_pSelf; } -ItemEditor::ItemEditor( KateMDI::ToolView * tqparent ) - : TQWidget( (TQWidget*)tqparent, "Item Editor" ) +ItemEditor::ItemEditor( KateMDI::ToolView * parent ) + : TQWidget( (TQWidget*)parent, "Item Editor" ) { TQWhatsThis::add( this, i18n("This allows editing of advanced properties of the selected item(s). Right click on the picture of the item to set the orientation.") ); diff --git a/src/gui/itemeditor.h b/src/gui/itemeditor.h index 38ed260..506e7c0 100644 --- a/src/gui/itemeditor.h +++ b/src/gui/itemeditor.h @@ -38,7 +38,7 @@ class ItemEditor : public TQWidget Q_OBJECT TQ_OBJECT public: - static ItemEditor * self( KateMDI::ToolView * tqparent = 0l ); + static ItemEditor * self( KateMDI::ToolView * parent = 0l ); ~ItemEditor(); static TQString toolViewIdentifier() { return "ItemEditor"; } @@ -71,7 +71,7 @@ class ItemEditor : public TQWidget void mergeProperties(); private: - ItemEditor( KateMDI::ToolView * tqparent ); + ItemEditor( KateMDI::ToolView * parent ); TQLabel *m_nameLbl; TQPushButton *m_defaultsBtn; diff --git a/src/gui/itemselector.cpp b/src/gui/itemselector.cpp index 38db8f3..539bc40 100644 --- a/src/gui/itemselector.cpp +++ b/src/gui/itemselector.cpp @@ -30,16 +30,16 @@ #include <assert.h> -ILVItem::ILVItem( TQListView* tqparent, const TQString &id ) - : KListViewItem( tqparent, 0 ) +ILVItem::ILVItem( TQListView* parent, const TQString &id ) + : KListViewItem( parent, 0 ) { m_id = id; b_isRemovable = false; m_pProjectItem = 0l; } -ILVItem::ILVItem( TQListViewItem* tqparent, const TQString &id ) - : KListViewItem( tqparent, 0 ) +ILVItem::ILVItem( TQListViewItem* parent, const TQString &id ) + : KListViewItem( parent, 0 ) { m_id = id; b_isRemovable = false; @@ -47,8 +47,8 @@ ILVItem::ILVItem( TQListViewItem* tqparent, const TQString &id ) } -ItemSelector::ItemSelector( TQWidget *tqparent, const char *name ) - : KListView( tqparent, name ) +ItemSelector::ItemSelector( TQWidget *parent, const char *name ) + : KListView( parent, name ) { addColumn( i18n( "Component" ) ); setFullWidth(true); @@ -120,7 +120,7 @@ void ItemSelector::addItem( const TQString & caption, const TQString & id, const if ( !parentItem ) { - kdError() << "Unexpected error in finding tqparent item for category list"<<endl; + kdError() << "Unexpected error in finding parent item for category list"<<endl; return; } @@ -175,13 +175,13 @@ void ItemSelector::slotRemoveSelectedItem() return; emit itemRemoved( item->key( 0, 0 ) ); - ILVItem *tqparent = dynamic_cast<ILVItem*>(item->TQListViewItem::tqparent()); + ILVItem *parent = dynamic_cast<ILVItem*>(item->TQListViewItem::parent()); delete item; // Get rid of the category as well if it has no tqchildren - if ( tqparent && !tqparent->firstChild() ) + if ( parent && !parent->firstChild() ) { - m_categories.remove(tqparent->text(0)); - delete tqparent; + m_categories.remove(parent->text(0)); + delete parent; } } @@ -267,19 +267,19 @@ TQDragObject* ItemSelector::dragObject() ComponentSelector * ComponentSelector::m_pSelf = 0l; -ComponentSelector * ComponentSelector::self( KateMDI::ToolView * tqparent ) +ComponentSelector * ComponentSelector::self( KateMDI::ToolView * parent ) { if (!m_pSelf) { - assert(tqparent); - m_pSelf = new ComponentSelector(tqparent); + assert(parent); + m_pSelf = new ComponentSelector(parent); } return m_pSelf; } -ComponentSelector::ComponentSelector( KateMDI::ToolView * tqparent ) - : ItemSelector( (TQWidget*)tqparent, "Component Selector" ) +ComponentSelector::ComponentSelector( KateMDI::ToolView * parent ) + : ItemSelector( (TQWidget*)parent, "Component Selector" ) { TQWhatsThis::add( this, i18n( "Add components to the circuit diagram by dragging them into the circuit.<br><br>" @@ -307,19 +307,19 @@ ComponentSelector::ComponentSelector( KateMDI::ToolView * tqparent ) FlowPartSelector * FlowPartSelector::m_pSelf = 0l; -FlowPartSelector * FlowPartSelector::self( KateMDI::ToolView * tqparent ) +FlowPartSelector * FlowPartSelector::self( KateMDI::ToolView * parent ) { if (!m_pSelf) { - assert(tqparent); - m_pSelf = new FlowPartSelector(tqparent); + assert(parent); + m_pSelf = new FlowPartSelector(parent); } return m_pSelf; } -FlowPartSelector::FlowPartSelector( KateMDI::ToolView * tqparent ) - : ItemSelector( (TQWidget*)tqparent, "Part Selector" ) +FlowPartSelector::FlowPartSelector( KateMDI::ToolView * parent ) + : ItemSelector( (TQWidget*)parent, "Part Selector" ) { TQWhatsThis::add( this, i18n("Add FlowPart to the FlowCode document by dragging them there.<br><br>To add more than one FlowPart of the same type, doubleclick on a FlowPart, and click repeatedly in the FlowChart to place the component. Right click to stop placement.") ); @@ -340,19 +340,19 @@ FlowPartSelector::FlowPartSelector( KateMDI::ToolView * tqparent ) MechanicsSelector * MechanicsSelector::m_pSelf = 0l; -MechanicsSelector * MechanicsSelector::self( KateMDI::ToolView * tqparent ) +MechanicsSelector * MechanicsSelector::self( KateMDI::ToolView * parent ) { if (!m_pSelf) { - assert(tqparent); - m_pSelf = new MechanicsSelector( (TQWidget*)tqparent ); + assert(parent); + m_pSelf = new MechanicsSelector( (TQWidget*)parent ); } return m_pSelf; } -MechanicsSelector::MechanicsSelector( TQWidget *tqparent ) - : ItemSelector( (TQWidget*)tqparent, "Mechanics Selector" ) +MechanicsSelector::MechanicsSelector( TQWidget *parent ) + : ItemSelector( (TQWidget*)parent, "Mechanics Selector" ) { TQWhatsThis::add( this, i18n("Add mechanical parts to the mechanics work area by dragging them there.") ); diff --git a/src/gui/itemselector.h b/src/gui/itemselector.h index 28f31b2..d0fd691 100644 --- a/src/gui/itemselector.h +++ b/src/gui/itemselector.h @@ -27,8 +27,8 @@ namespace KateMDI { class ToolView; } class ILVItem : public TQObject, public KListViewItem { public: - ILVItem( TQListView *tqparent, const TQString &id ); - ILVItem( TQListViewItem *tqparent, const TQString &id ); + ILVItem( TQListView *parent, const TQString &id ); + ILVItem( TQListViewItem *parent, const TQString &id ); void setProjectItem( ProjectItem * projectItem ) { m_pProjectItem = projectItem; } ProjectItem * projectItem() const { return m_pProjectItem; } @@ -60,7 +60,7 @@ class ItemSelector : public KListView Q_OBJECT TQ_OBJECT public: - ItemSelector( TQWidget *tqparent, const char *name ); + ItemSelector( TQWidget *parent, const char *name ); ~ItemSelector(); /** * Adds a listview item to the ListView @@ -91,7 +91,7 @@ class ItemSelector : public KListView */ void setListCaption( const TQString &caption ); /** - * Writes the open status (folded or unfolded) of "tqparent" items in the view + * Writes the open status (folded or unfolded) of "parent" items in the view * to the config file. */ void writeOpenStates(); @@ -124,11 +124,11 @@ class ComponentSelector : public ItemSelector Q_OBJECT TQ_OBJECT public: - static ComponentSelector * self( KateMDI::ToolView * tqparent = 0l ); + static ComponentSelector * self( KateMDI::ToolView * parent = 0l ); static TQString toolViewIdentifier() { return "ComponentSelector"; } private: - ComponentSelector( KateMDI::ToolView * tqparent ); + ComponentSelector( KateMDI::ToolView * parent ); static ComponentSelector * m_pSelf; }; @@ -142,11 +142,11 @@ class FlowPartSelector : public ItemSelector Q_OBJECT TQ_OBJECT public: - static FlowPartSelector * self( KateMDI::ToolView * tqparent = 0l ); + static FlowPartSelector * self( KateMDI::ToolView * parent = 0l ); static TQString toolViewIdentifier() { return "FlowPartSelector"; } private: - FlowPartSelector( KateMDI::ToolView * tqparent ); + FlowPartSelector( KateMDI::ToolView * parent ); static FlowPartSelector * m_pSelf; }; @@ -159,11 +159,11 @@ class MechanicsSelector : public ItemSelector Q_OBJECT TQ_OBJECT public: - static MechanicsSelector * self( KateMDI::ToolView * tqparent = 0l ); + static MechanicsSelector * self( KateMDI::ToolView * parent = 0l ); static TQString toolViewIdentifier() { return "MechanicsSelector"; } private: - MechanicsSelector( TQWidget *tqparent = 0L ); + MechanicsSelector( TQWidget *parent = 0L ); static MechanicsSelector * m_pSelf; }; diff --git a/src/gui/logview.cpp b/src/gui/logview.cpp index a158049..574d967 100644 --- a/src/gui/logview.cpp +++ b/src/gui/logview.cpp @@ -18,8 +18,8 @@ //BEGIN class LogView -LogView::LogView( KateMDI::ToolView * tqparent, const char *name ) - : KTextEdit( tqparent, name ) +LogView::LogView( KateMDI::ToolView * parent, const char *name ) + : KTextEdit( parent, name ) { setReadOnly(true); setPaper( TQt::white ); diff --git a/src/gui/logview.h b/src/gui/logview.h index a2b9487..74663d4 100644 --- a/src/gui/logview.h +++ b/src/gui/logview.h @@ -44,7 +44,7 @@ class LogView : public KTextEdit Q_OBJECT TQ_OBJECT public: - LogView( KateMDI::ToolView * tqparent, const char *name = 0 ); + LogView( KateMDI::ToolView * parent, const char *name = 0 ); ~LogView(); enum OutputType diff --git a/src/gui/microselectwidget.cpp b/src/gui/microselectwidget.cpp index a1af719..59dfa33 100644 --- a/src/gui/microselectwidget.cpp +++ b/src/gui/microselectwidget.cpp @@ -22,8 +22,8 @@ #include <tqvariant.h> #include <tqwhatsthis.h> -MicroSelectWidget::MicroSelectWidget( TQWidget* tqparent, const char* name, WFlags ) - : TQGroupBox( 4, Qt::Horizontal, i18n("Microprocessor"), tqparent, name ) +MicroSelectWidget::MicroSelectWidget( TQWidget* parent, const char* name, WFlags ) + : TQGroupBox( 4, Qt::Horizontal, i18n("Microprocessor"), parent, name ) { m_allowedAsmSet = AsmInfo::AsmSetAll; m_allowedGpsimSupport = m_allowedFlowCodeSupport = m_allowedMicrobeSupport = MicroInfo::AllSupport; diff --git a/src/gui/microselectwidget.h b/src/gui/microselectwidget.h index 6555a1e..81de13e 100644 --- a/src/gui/microselectwidget.h +++ b/src/gui/microselectwidget.h @@ -30,7 +30,7 @@ class MicroSelectWidget : public TQGroupBox TQ_OBJECT public: - MicroSelectWidget( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + MicroSelectWidget( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~MicroSelectWidget(); void setMicro( const TQString & id ); diff --git a/src/gui/microsettingsdlg.cpp b/src/gui/microsettingsdlg.cpp index 0b61cc5..d8d3a05 100644 --- a/src/gui/microsettingsdlg.cpp +++ b/src/gui/microsettingsdlg.cpp @@ -31,8 +31,8 @@ #include <tqtable.h> #include <tqwhatsthis.h> -MicroSettingsDlg::MicroSettingsDlg( MicroSettings * microSettings, TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name, true, i18n("PIC Settings"), KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel, KDialogBase::Ok, true ) +MicroSettingsDlg::MicroSettingsDlg( MicroSettings * microSettings, TQWidget *parent, const char *name ) + : KDialogBase( parent, name, true, i18n("PIC Settings"), KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel, KDialogBase::Ok, true ) { m_pMicroSettings = microSettings; m_pNewPinMappingWidget = 0l; diff --git a/src/gui/microsettingsdlg.h b/src/gui/microsettingsdlg.h index 3e47bfb..e89b0f0 100644 --- a/src/gui/microsettingsdlg.h +++ b/src/gui/microsettingsdlg.h @@ -33,7 +33,7 @@ class MicroSettingsDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - MicroSettingsDlg( MicroSettings *_microSettings, TQWidget *tqparent = 0L, const char *name = 0L ); + MicroSettingsDlg( MicroSettings *_microSettings, TQWidget *parent = 0L, const char *name = 0L ); ~MicroSettingsDlg(); void reject(); diff --git a/src/gui/newfiledlg.cpp b/src/gui/newfiledlg.cpp index 79c35dd..9da23e2 100644 --- a/src/gui/newfiledlg.cpp +++ b/src/gui/newfiledlg.cpp @@ -33,10 +33,10 @@ #include <tqpaintdevicemetrics.h> -NewFileDlg::NewFileDlg( TQWidget *tqparent ) - : KDialogBase( tqparent, "newfiledlg", true, "New File", KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) +NewFileDlg::NewFileDlg( TQWidget *parent ) + : KDialogBase( parent, "newfiledlg", true, "New File", KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) { - m_pMainParent = tqparent; + m_pMainParent = parent; m_bAccepted = false; m_pNewFileWidget = new NewFileWidget(this); diff --git a/src/gui/newfiledlg.h b/src/gui/newfiledlg.h index 28d3959..19a1b85 100644 --- a/src/gui/newfiledlg.h +++ b/src/gui/newfiledlg.h @@ -27,7 +27,7 @@ class NewFileDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - NewFileDlg( TQWidget *tqparent ); + NewFileDlg( TQWidget *parent ); void reject(); void accept(); diff --git a/src/gui/orientationwidget.cpp b/src/gui/orientationwidget.cpp index 134a958..19f88c3 100644 --- a/src/gui/orientationwidget.cpp +++ b/src/gui/orientationwidget.cpp @@ -27,8 +27,8 @@ const int _size = 44; -OrientationWidget::OrientationWidget(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +OrientationWidget::OrientationWidget(TQWidget *parent, const char *name) + : TQWidget(parent, name) { TQGridLayout *tqlayout = new TQGridLayout( this, 2, 4, 0, 4 ); p_activeFlowPart = 0l; diff --git a/src/gui/orientationwidget.h b/src/gui/orientationwidget.h index 84d2071..a48bf37 100644 --- a/src/gui/orientationwidget.h +++ b/src/gui/orientationwidget.h @@ -27,7 +27,7 @@ class OrientationWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - OrientationWidget( TQWidget *tqparent = 0l, const char *name = 0l ); + OrientationWidget( TQWidget *parent = 0l, const char *name = 0l ); ~OrientationWidget(); public slots: diff --git a/src/gui/oscilloscope.cpp b/src/gui/oscilloscope.cpp index 24495ab..6206134 100644 --- a/src/gui/oscilloscope.cpp +++ b/src/gui/oscilloscope.cpp @@ -47,19 +47,19 @@ TQColor probeColors[9] = { Oscilloscope * Oscilloscope::m_pSelf = 0l; -Oscilloscope * Oscilloscope::self( KateMDI::ToolView * tqparent ) +Oscilloscope * Oscilloscope::self( KateMDI::ToolView * parent ) { if ( !m_pSelf ) { - assert(tqparent); - m_pSelf = new Oscilloscope(tqparent); + assert(parent); + m_pSelf = new Oscilloscope(parent); } return m_pSelf; } -Oscilloscope::Oscilloscope( KateMDI::ToolView * tqparent ) - : OscilloscopeWidget(tqparent) +Oscilloscope::Oscilloscope( KateMDI::ToolView * parent ) + : OscilloscopeWidget(parent) { m_nextColor = 0; m_nextId = 1; diff --git a/src/gui/oscilloscope.h b/src/gui/oscilloscope.h index 1d1503e..0ded495 100644 --- a/src/gui/oscilloscope.h +++ b/src/gui/oscilloscope.h @@ -78,7 +78,7 @@ class Oscilloscope : public OscilloscopeWidget Q_OBJECT TQ_OBJECT public: - static Oscilloscope * self( KateMDI::ToolView * tqparent = 0l ); + static Oscilloscope * self( KateMDI::ToolView * parent = 0l ); static TQString toolViewIdentifier() { return "Oscilloscope"; } virtual ~Oscilloscope(); @@ -177,7 +177,7 @@ class Oscilloscope : public OscilloscopeWidget void updateScrollbars(); private: - Oscilloscope( KateMDI::ToolView * tqparent ); + Oscilloscope( KateMDI::ToolView * parent ); static Oscilloscope * m_pSelf; double m_zoomLevel; diff --git a/src/gui/oscilloscopeview.cpp b/src/gui/oscilloscopeview.cpp index aa05311..f74a822 100644 --- a/src/gui/oscilloscopeview.cpp +++ b/src/gui/oscilloscopeview.cpp @@ -37,8 +37,8 @@ inline ullong min( ullong a, ullong b ) } -OscilloscopeView::OscilloscopeView( TQWidget *tqparent, const char *name ) - : TQFrame( tqparent, name, WNoAutoErase ), +OscilloscopeView::OscilloscopeView( TQWidget *parent, const char *name ) + : TQFrame( parent, name, WNoAutoErase ), b_needRedraw(true), m_pixmap(0l), m_fps(10), diff --git a/src/gui/oscilloscopeview.h b/src/gui/oscilloscopeview.h index d9daaa0..b4e6a10 100644 --- a/src/gui/oscilloscopeview.h +++ b/src/gui/oscilloscopeview.h @@ -28,7 +28,7 @@ class OscilloscopeView : public TQFrame Q_OBJECT TQ_OBJECT public: - OscilloscopeView( TQWidget *tqparent, const char *name = 0 ); + OscilloscopeView( TQWidget *parent, const char *name = 0 ); virtual ~OscilloscopeView(); public slots: diff --git a/src/gui/outputmethoddlg.cpp b/src/gui/outputmethoddlg.cpp index 32349e6..9260fdc 100644 --- a/src/gui/outputmethoddlg.cpp +++ b/src/gui/outputmethoddlg.cpp @@ -66,8 +66,8 @@ void OutputMethodInfo::initialize( OutputMethodDlg * dlg ) //BEGIN class OutputMethodDlg -OutputMethodDlg::OutputMethodDlg( const TQString &caption, const KURL & inputURL, bool showPICSelect, TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name, true, caption, Ok|Cancel ) +OutputMethodDlg::OutputMethodDlg( const TQString &caption, const KURL & inputURL, bool showPICSelect, TQWidget *parent, const char *name ) + : KDialogBase( parent, name, true, caption, Ok|Cancel ) { m_inputURL = inputURL; m_bAccepted = false; diff --git a/src/gui/outputmethoddlg.h b/src/gui/outputmethoddlg.h index 1bf4879..b18f8d7 100644 --- a/src/gui/outputmethoddlg.h +++ b/src/gui/outputmethoddlg.h @@ -69,7 +69,7 @@ class OutputMethodDlg : public KDialogBase * @param inputURL Used for saving/restoring previous options the user has selected for this file; set this to null if temporary file * @param showPICSelect Whether to show the combo boxes for selecting a PIC */ - OutputMethodDlg( const TQString & caption, const KURL & inputURL, bool showPICSelect = false, TQWidget *tqparent = 0, const char *name = 0); + OutputMethodDlg( const TQString & caption, const KURL & inputURL, bool showPICSelect = false, TQWidget *parent = 0, const char *name = 0); ~OutputMethodDlg(); void setOutputExtension( const TQString & outputExtension ); diff --git a/src/gui/pieditor.cpp b/src/gui/pieditor.cpp index 7ca2663..5adce57 100644 --- a/src/gui/pieditor.cpp +++ b/src/gui/pieditor.cpp @@ -21,8 +21,8 @@ #include <tqlayout.h> //BEGIN class PIEditor -PIEditor::PIEditor(TQString id, Variant *data, TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +PIEditor::PIEditor(TQString id, Variant *data, TQWidget *parent, const char *name) + : TQWidget(parent, name) { m_id = id; m_data = data; @@ -43,8 +43,8 @@ void PIEditor::valueChanged( TQVariant /*variant*/ ) //BEGIN class PIBool -PIBool::PIBool(TQString id, Variant *data, TQWidget *tqparent, const char *name ) - : PIEditor( id, data, tqparent, name ) +PIBool::PIBool(TQString id, Variant *data, TQWidget *parent, const char *name ) + : PIEditor( id, data, parent, name ) { TQHBoxLayout *tqlayout = new TQHBoxLayout(this); tqlayout->setAutoAdd(true); @@ -79,8 +79,8 @@ void PIBool::valueChanged( TQVariant /*variant*/ ) //BEGIN class PIColor -PIColor::PIColor(TQString id, Variant *data, TQWidget *tqparent, const char *name ) - : PIEditor(id,data,tqparent, name) +PIColor::PIColor(TQString id, Variant *data, TQWidget *parent, const char *name ) + : PIEditor(id,data,parent, name) { TQHBoxLayout *tqlayout = new TQHBoxLayout(this); tqlayout->setAutoAdd(true); @@ -114,8 +114,8 @@ void PIColor::valueChanged( TQVariant /*variant*/ ) //BEGIN class PIDouble -PIDouble::PIDouble(TQString id, Variant *data, TQWidget *tqparent, const char *name ) - : PIEditor(id,data,tqparent, name) +PIDouble::PIDouble(TQString id, Variant *data, TQWidget *parent, const char *name ) + : PIEditor(id,data,parent, name) { TQHBoxLayout *tqlayout = new TQHBoxLayout(this); tqlayout->setAutoAdd(true); @@ -142,8 +142,8 @@ void PIDouble::valueChanged( TQVariant /*variant*/ ) //BEGIN class PIFileName -PIFilename::PIFilename(TQString id, Variant *data, TQWidget *tqparent, const char *name ) - : PIEditor(id,data,tqparent, name) +PIFilename::PIFilename(TQString id, Variant *data, TQWidget *parent, const char *name ) + : PIEditor(id,data,parent, name) { TQHBoxLayout *tqlayout = new TQHBoxLayout(this); tqlayout->setAutoAdd(true); @@ -193,8 +193,8 @@ void PIFilename::valueChanged( TQVariant /*variant*/ ) //BEGIN class PIInt -PIInt::PIInt( const TQString &id, Variant *data, TQWidget *tqparent, const char *name ) - : PIEditor( id, data, tqparent, name ) +PIInt::PIInt( const TQString &id, Variant *data, TQWidget *parent, const char *name ) + : PIEditor( id, data, parent, name ) { TQHBoxLayout *tqlayout = new TQHBoxLayout(this); tqlayout->setAutoAdd(true); @@ -221,8 +221,8 @@ void PIInt::valueChanged( TQVariant /*variant*/ ) //BEGIN class PILineEdit -PILineEdit::PILineEdit(TQString id, Variant *data, TQWidget *tqparent, const char *name) - : PIEditor( id, data, tqparent, name) +PILineEdit::PILineEdit(TQString id, Variant *data, TQWidget *parent, const char *name) + : PIEditor( id, data, parent, name) { TQHBoxLayout *tqlayout = new TQHBoxLayout(this); tqlayout->setAutoAdd(true); @@ -248,8 +248,8 @@ void PILineEdit::valueChanged( TQVariant /*variant*/ ) //BEGIN class PIStringCombo -PIStringCombo::PIStringCombo(TQString id, Variant *data, TQWidget *tqparent, const char *name) - : PIEditor( id, data, tqparent, name) +PIStringCombo::PIStringCombo(TQString id, Variant *data, TQWidget *parent, const char *name) + : PIEditor( id, data, parent, name) { TQHBoxLayout *tqlayout = new TQHBoxLayout(this); tqlayout->setAutoAdd(true); diff --git a/src/gui/pieditor.h b/src/gui/pieditor.h index bc3c7fb..712959a 100644 --- a/src/gui/pieditor.h +++ b/src/gui/pieditor.h @@ -32,7 +32,7 @@ class PIEditor : public TQWidget Q_OBJECT TQ_OBJECT public: - PIEditor(TQString id, Variant *data, TQWidget *tqparent = 0, const char *name = 0); + PIEditor(TQString id, Variant *data, TQWidget *parent = 0, const char *name = 0); ~PIEditor(); public slots: @@ -55,7 +55,7 @@ class PIBool : public PIEditor Q_OBJECT TQ_OBJECT public: - PIBool( TQString id, Variant *data, TQWidget *tqparent = 0, const char *name = 0 ); + PIBool( TQString id, Variant *data, TQWidget *parent = 0, const char *name = 0 ); ~PIBool(); void popup(); @@ -76,7 +76,7 @@ class PIColor : public PIEditor Q_OBJECT TQ_OBJECT public: - PIColor(TQString id, Variant *data, TQWidget *tqparent = 0, const char *name = 0); + PIColor(TQString id, Variant *data, TQWidget *parent = 0, const char *name = 0); ~PIColor(); void popup(); @@ -98,7 +98,7 @@ class PIDouble : public PIEditor Q_OBJECT TQ_OBJECT public: - PIDouble(TQString id, Variant *data, TQWidget *tqparent = 0, const char *name = 0); + PIDouble(TQString id, Variant *data, TQWidget *parent = 0, const char *name = 0); ~PIDouble(); protected slots: @@ -118,7 +118,7 @@ class PIFilename : public PIEditor Q_OBJECT TQ_OBJECT public: - PIFilename(TQString id, Variant *data, TQWidget *tqparent = 0, const char *name = 0); + PIFilename(TQString id, Variant *data, TQWidget *parent = 0, const char *name = 0); ~PIFilename(); protected slots: @@ -140,7 +140,7 @@ class PIInt : public PIEditor Q_OBJECT TQ_OBJECT public: - PIInt( const TQString &id, Variant *data, TQWidget *tqparent = 0, const char *name = 0); + PIInt( const TQString &id, Variant *data, TQWidget *parent = 0, const char *name = 0); ~PIInt(); protected slots: @@ -160,7 +160,7 @@ class PILineEdit : public PIEditor Q_OBJECT TQ_OBJECT public: - PILineEdit(TQString id, Variant *data, TQWidget *tqparent = 0, const char *name = 0); + PILineEdit(TQString id, Variant *data, TQWidget *parent = 0, const char *name = 0); ~PILineEdit(); protected slots: @@ -180,7 +180,7 @@ class PIStringCombo : public PIEditor Q_OBJECT TQ_OBJECT public: - PIStringCombo(TQString id, Variant *data, TQWidget *tqparent, const char *name = 0); + PIStringCombo(TQString id, Variant *data, TQWidget *parent, const char *name = 0); ~PIStringCombo(); void popup(); diff --git a/src/gui/probepositioner.cpp b/src/gui/probepositioner.cpp index 5cf8ee2..481612c 100644 --- a/src/gui/probepositioner.cpp +++ b/src/gui/probepositioner.cpp @@ -20,8 +20,8 @@ #include <algorithm> #include <cmath> -ProbePositioner::ProbePositioner(TQWidget *tqparent, const char *name) - : TQWidget( tqparent, name, WNoAutoErase ) +ProbePositioner::ProbePositioner(TQWidget *parent, const char *name) + : TQWidget( parent, name, WNoAutoErase ) { m_probePosOffset = 0; p_draggedProbe = 0l; diff --git a/src/gui/probepositioner.h b/src/gui/probepositioner.h index c99c0ab..a28c6c6 100644 --- a/src/gui/probepositioner.h +++ b/src/gui/probepositioner.h @@ -28,7 +28,7 @@ class ProbePositioner : public TQWidget Q_OBJECT TQ_OBJECT public: - ProbePositioner(TQWidget *tqparent = 0, const char *name = 0); + ProbePositioner(TQWidget *parent = 0, const char *name = 0); ~ProbePositioner(); /** * Returns the amount of space (height in pixels) that a probe output diff --git a/src/gui/programmerdlg.cpp b/src/gui/programmerdlg.cpp index 9473720..c8a8066 100644 --- a/src/gui/programmerdlg.cpp +++ b/src/gui/programmerdlg.cpp @@ -21,8 +21,8 @@ #include <klocale.h> #include <kstdguiitem.h> -ProgrammerDlg::ProgrammerDlg( const TQString & picID, TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name, true, i18n("PIC Programmer"), Ok|Cancel ) +ProgrammerDlg::ProgrammerDlg( const TQString & picID, TQWidget *parent, const char *name ) + : KDialogBase( parent, name, true, i18n("PIC Programmer"), Ok|Cancel ) { // Change the "Ok" button to a "Burn" button KGuiItem burnItem = KStdGuiItem::ok(); diff --git a/src/gui/programmerdlg.h b/src/gui/programmerdlg.h index 1c3fa63..20431cd 100644 --- a/src/gui/programmerdlg.h +++ b/src/gui/programmerdlg.h @@ -32,7 +32,7 @@ class ProgrammerDlg : public KDialogBase * options (such as the program to use) will be read in from the * settings. */ - ProgrammerDlg( const TQString & picID, TQWidget * tqparent = 0, const char * name = 0 ); + ProgrammerDlg( const TQString & picID, TQWidget * parent = 0, const char * name = 0 ); ~ProgrammerDlg(); virtual void reject(); diff --git a/src/gui/projectdlgs.cpp b/src/gui/projectdlgs.cpp index 287b8c5..a2ff54e 100644 --- a/src/gui/projectdlgs.cpp +++ b/src/gui/projectdlgs.cpp @@ -30,8 +30,8 @@ #include <tqlayout.h> //BEGIN class NewProjectDlg -NewProjectDlg::NewProjectDlg( TQWidget * tqparent ) - : KDialogBase( tqparent, "newprojectdlg", true, "New Project", KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) +NewProjectDlg::NewProjectDlg( TQWidget * parent ) + : KDialogBase( parent, "newprojectdlg", true, "New Project", KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) { m_pWidget = new NewProjectWidget(this); connect( m_pWidget->projectNameEdit, TQT_SIGNAL(textChanged(const TQString & )), this, TQT_SLOT(locationChanged(const TQString& )) ); @@ -88,8 +88,8 @@ void NewProjectDlg::locationChanged( const TQString & ) //BEGIN class CreateSubprojectDlg -CreateSubprojectDlg::CreateSubprojectDlg( TQWidget * tqparent ) - : KDialogBase( tqparent, "Create Subproject Dialog", true, "Create Subproject", KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) +CreateSubprojectDlg::CreateSubprojectDlg( TQWidget * parent ) + : KDialogBase( parent, "Create Subproject Dialog", true, "Create Subproject", KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) { m_pWidget = new CreateSubprojectWidget(this); @@ -128,8 +128,8 @@ void CreateSubprojectDlg::reject() //BEGIN class LinkerOptionsDlg -LinkerOptionsDlg::LinkerOptionsDlg( LinkerOptions * linkingOptions, TQWidget *tqparent ) - : KDialogBase( tqparent, "Linker Options Dialog", true, "Linker Options", KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) +LinkerOptionsDlg::LinkerOptionsDlg( LinkerOptions * linkingOptions, TQWidget *parent ) + : KDialogBase( parent, "Linker Options Dialog", true, "Linker Options", KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) { m_pLinkerOptions = linkingOptions; m_pWidget = new LinkerOptionsWidget(this); @@ -218,8 +218,8 @@ void LinkerOptionsDlg::reject() //BEGIN class ProcessingOptionsDlg -ProcessingOptionsDlg::ProcessingOptionsDlg( ProjectItem * projectItem, TQWidget *tqparent ) - : KDialogBase( tqparent, "Processing Options Dialog", true, "Processing Options", KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) +ProcessingOptionsDlg::ProcessingOptionsDlg( ProjectItem * projectItem, TQWidget *parent ) + : KDialogBase( parent, "Processing Options Dialog", true, "Processing Options", KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) { m_pProjectItem = projectItem; m_pWidget = new ProcessingOptionsWidget(this); diff --git a/src/gui/projectdlgs.h b/src/gui/projectdlgs.h index 5219072..78ca741 100644 --- a/src/gui/projectdlgs.h +++ b/src/gui/projectdlgs.h @@ -32,7 +32,7 @@ class NewProjectDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - NewProjectDlg( TQWidget * tqparent ); + NewProjectDlg( TQWidget * parent ); /** * Called when the 'Cancel' button is pressed. @@ -75,7 +75,7 @@ class CreateSubprojectDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - CreateSubprojectDlg( TQWidget *tqparent = 0 ); + CreateSubprojectDlg( TQWidget *parent = 0 ); ~CreateSubprojectDlg(); // The following values should agree with the positions in the combo box @@ -115,7 +115,7 @@ class LinkerOptionsDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - LinkerOptionsDlg( LinkerOptions * linkingOptions, TQWidget *tqparent = 0 ); + LinkerOptionsDlg( LinkerOptions * linkingOptions, TQWidget *parent = 0 ); virtual ~LinkerOptionsDlg(); /** @@ -141,7 +141,7 @@ class LinkerOptionsDlg : public KDialogBase class ProcessingOptionsDlg : public KDialogBase { public: - ProcessingOptionsDlg( ProjectItem * projectItem, TQWidget *tqparent = 0 ); + ProcessingOptionsDlg( ProjectItem * projectItem, TQWidget *parent = 0 ); virtual ~ProcessingOptionsDlg(); /** diff --git a/src/gui/propertieslistview.cpp b/src/gui/propertieslistview.cpp index 7e55ed0..75d21ba 100644 --- a/src/gui/propertieslistview.cpp +++ b/src/gui/propertieslistview.cpp @@ -25,8 +25,8 @@ #include <tqpushbutton.h> #include <tqvariant.h> -PropertiesListView::PropertiesListView(TQWidget *tqparent, const char *name) - : KListView(tqparent, name) +PropertiesListView::PropertiesListView(TQWidget *parent, const char *name) + : KListView(parent, name) { addColumn(i18n("Property")); addColumn(i18n("Data")); diff --git a/src/gui/propertieslistview.h b/src/gui/propertieslistview.h index a879ae7..31a5df4 100644 --- a/src/gui/propertieslistview.h +++ b/src/gui/propertieslistview.h @@ -31,7 +31,7 @@ class PropertiesListView : public KListView Q_OBJECT TQ_OBJECT public: - PropertiesListView( TQWidget *tqparent = 0l, const char *name = 0l ); + PropertiesListView( TQWidget *parent = 0l, const char *name = 0l ); ~PropertiesListView(); public slots: diff --git a/src/gui/settingsdlg.cpp b/src/gui/settingsdlg.cpp index 5d9511e..72a7a07 100644 --- a/src/gui/settingsdlg.cpp +++ b/src/gui/settingsdlg.cpp @@ -40,8 +40,8 @@ // Make sure that this value is the same as that in ktechlab.kcfg const int defaultRefreshRate = 50; -SettingsDlg::SettingsDlg( TQWidget *tqparent, const char *name, KConfigSkeleton *config ) - : KConfigDialog( tqparent, name, config ) +SettingsDlg::SettingsDlg( TQWidget *parent, const char *name, KConfigSkeleton *config ) + : KConfigDialog( parent, name, config ) { m_generalOptionsWidget = new GeneralOptionsWidget( this, "generalOptionsWidget" ); m_gpasmSettingsWidget = new GpasmSettingsWidget( this, "gpasmSettingsWidget" ); diff --git a/src/gui/settingsdlg.h b/src/gui/settingsdlg.h index 41f5b55..9f2af44 100644 --- a/src/gui/settingsdlg.h +++ b/src/gui/settingsdlg.h @@ -31,7 +31,7 @@ class SettingsDlg : public KConfigDialog Q_OBJECT TQ_OBJECT public: - SettingsDlg( TQWidget *tqparent, const char *name, KConfigSkeleton *config ); + SettingsDlg( TQWidget *parent, const char *name, KConfigSkeleton *config ); ~SettingsDlg(); static int refreshRateToSliderValue( int refreshRate ); diff --git a/src/gui/symbolviewer.cpp b/src/gui/symbolviewer.cpp index da4d6bd..170880b 100644 --- a/src/gui/symbolviewer.cpp +++ b/src/gui/symbolviewer.cpp @@ -61,18 +61,18 @@ void SymbolViewerItem::radixChanged() //BEGIN class SymbolView SymbolViewer * SymbolViewer::m_pSelf = 0l; -SymbolViewer * SymbolViewer::self( KateMDI::ToolView * tqparent ) +SymbolViewer * SymbolViewer::self( KateMDI::ToolView * parent ) { if (!m_pSelf) { - assert (tqparent); - m_pSelf = new SymbolViewer(tqparent); + assert (parent); + m_pSelf = new SymbolViewer(parent); } return m_pSelf; } -SymbolViewer::SymbolViewer( KateMDI::ToolView * tqparent ) - : TQWidget( (TQWidget*)tqparent ) +SymbolViewer::SymbolViewer( KateMDI::ToolView * parent ) + : TQWidget( (TQWidget*)parent ) { TQGridLayout * grid = new TQGridLayout( this, 1, 1, 0, 6 ); diff --git a/src/gui/symbolviewer.h b/src/gui/symbolviewer.h index ed2fcee..ac085eb 100644 --- a/src/gui/symbolviewer.h +++ b/src/gui/symbolviewer.h @@ -32,7 +32,7 @@ class SymbolViewer : public TQWidget Q_OBJECT TQ_OBJECT public: - static SymbolViewer * self( KateMDI::ToolView * tqparent = 0l ); + static SymbolViewer * self( KateMDI::ToolView * parent = 0l ); static TQString toolViewIdentifier() { return "SymbolViewer"; } ~SymbolViewer(); @@ -78,7 +78,7 @@ class SymbolViewer : public TQWidget Radix m_valueRadix; private: - SymbolViewer( KateMDI::ToolView * tqparent ); + SymbolViewer( KateMDI::ToolView * parent ); static SymbolViewer * m_pSelf; KComboBox * m_pRadixCombo; }; diff --git a/src/icndocument.cpp b/src/icndocument.cpp index 2fd4986..e78e631 100644 --- a/src/icndocument.cpp +++ b/src/icndocument.cpp @@ -803,7 +803,7 @@ void ICNDocument::appendDeleteList( TQCanvasItem *qcanvasItem ) { Connector *connector = dynamic_cast<Connector*>(qcanvasItem); if (!connector) - connector = (dynamic_cast<ConnectorLine*>(qcanvasItem))->tqparent(); + connector = (dynamic_cast<ConnectorLine*>(qcanvasItem))->parent(); connector->removeConnector(); } else @@ -872,7 +872,7 @@ void ICNDocument::flushDeleteList() bool ICNDocument::joinConnectors( Node *node ) { - // We don't want to destroy the node if it has a tqparent + // We don't want to destroy the node if it has a parent if ( node->parentItem() ) return false; @@ -1374,9 +1374,9 @@ void DirCursor::initCursors() { // TQCursor c(TQt::ArrowCursor); // TQBitmap bitmap = *c.bitmap(); -// TQBitmap tqmask = *c.tqmask(); +// TQBitmap mask = *c.mask(); // TQPixmap pm( bitmap->width(), bitmap->height() ); -// pm.setMask(tqmask); +// pm.setMask(mask); // pm = c.pi // @todo finish } diff --git a/src/item.cpp b/src/item.cpp index 2e7d578..884ee17 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -407,7 +407,7 @@ void Item::addChild( Item *child ) if ( child->contains(this) ) { -// kdError() << k_funcinfo << "Attempting to add a child to this item that is already a tqparent of this item. Incest results in stack overflow." << endl; +// kdError() << k_funcinfo << "Attempting to add a child to this item that is already a parent of this item. Incest results in stack overflow." << endl; return; } @@ -106,17 +106,17 @@ public: void setChanged(); /** * Sets this item as a child of the given item. Calls reparented with the - * old and the new tqparent. + * old and the new parent. */ void setParentItem( Item *parentItem ); /** - * The tqparent item for this item, or NULL if none + * The parent item for this item, or NULL if none */ Item *parentItem() const { return p_parentItem; } ItemDocument *itemDocument() const { return p_itemDocument; } /** * Returns the number of items away from the top item this is - * (tqparent-wise). Returns 0 if has no tqparent. + * (parent-wise). Returns 0 if has no parent. */ int level() const; /** @@ -260,7 +260,7 @@ protected slots: protected: /** * Reinherit this function if you want to do anything with tqchildren. Called - * after the tqparent is changed, with the old tqparent and the new tqparent. + * after the parent is changed, with the old parent and the new parent. */ virtual void reparented( Item */*oldParent*/, Item */*newParent*/ ) {}; /** @@ -289,7 +289,7 @@ protected: TQString m_id; TQString m_name, m_desc; // Name and description TQString m_type; - GuardedItem p_parentItem; // If attached to a tqparent item + GuardedItem p_parentItem; // If attached to a parent item ItemList m_tqchildren; TQGuardedPtr<ItemDocument> p_itemDocument; TQPointArray m_itemPoints; // The unorientated and unsized item points diff --git a/src/itemdocument.cpp b/src/itemdocument.cpp index 1742094..283eb5f 100644 --- a/src/itemdocument.cpp +++ b/src/itemdocument.cpp @@ -494,7 +494,7 @@ TQCanvasItem* ItemDocument::itemAtTop( const TQPoint &pos ) const else { if ( item->rtti() == ItemDocument::RTTI::ConnectorLine ) - return (static_cast<ConnectorLine*>(item))->tqparent(); + return (static_cast<ConnectorLine*>(item))->parent(); return item; } @@ -790,7 +790,7 @@ void ItemDocument::exportToImage() // widget for the kfiledialog // It is the bit that says "Crop circuit?" // Okay need to think of something way better to say here. - // gotme here, KFileDialog makes itself tqparent so tries to destroy cropCheck when it is deleted. + // gotme here, KFileDialog makes itself parent so tries to destroy cropCheck when it is deleted. // therefore we use a pointer. TQString cropMessage; if ( type() == Document::dt_flowcode ) diff --git a/src/itemdocumentdata.cpp b/src/itemdocumentdata.cpp index a28f93e..f9085b8 100644 --- a/src/itemdocumentdata.cpp +++ b/src/itemdocumentdata.cpp @@ -424,7 +424,7 @@ TQDomElement ItemDocumentData::itemDataToElement( TQDomDocument &doc, const Item } if ( !itemData.parentId.isEmpty() ) - node.setAttribute( "tqparent", itemData.parentId ); + node.setAttribute( "parent", itemData.parentId ); const TQStringMap::const_iterator stringEnd = itemData.dataString.end(); for ( TQStringMap::const_iterator it = itemData.dataString.begin(); it != stringEnd; ++it ) @@ -528,7 +528,7 @@ void ItemDocumentData::elementToItemData( TQDomElement element ) itemData.angleDegrees = element.attribute( "angle", "0" ).toInt(); itemData.flipped = element.attribute( "flip", "0" ).toInt(); itemData.orientation = element.attribute( "orientation", "-1" ).toInt(); - itemData.parentId = element.attribute( "tqparent", TQString() ); + itemData.parentId = element.attribute( "parent", TQString() ); m_itemDataMap[id] = itemData; @@ -544,7 +544,7 @@ void ItemDocumentData::elementToItemData( TQDomElement element ) { // We're reading in a file saved in the older format, with // child items nestled, so we must specify that the new item - // has the currently parsed item as its tqparent. + // has the currently parsed item as its parent. elementToItemData(childElement); TQString childId = childElement.attribute( "id", TQString() ); if ( !childId.isNull() ) @@ -645,7 +645,7 @@ TQDomElement ItemDocumentData::connectorDataToElement( TQDomDocument &doc, const { node.setAttribute( "start-node-is-child", 1 ); node.setAttribute( "start-node-cid", connectorData.startNodeCId ); - node.setAttribute( "start-node-tqparent", connectorData.startNodeParent ); + node.setAttribute( "start-node-parent", connectorData.startNodeParent ); } else { @@ -658,7 +658,7 @@ TQDomElement ItemDocumentData::connectorDataToElement( TQDomDocument &doc, const { node.setAttribute( "end-node-is-child", 1 ); node.setAttribute( "end-node-cid", connectorData.endNodeCId ); - node.setAttribute( "end-node-tqparent", connectorData.endNodeParent ); + node.setAttribute( "end-node-parent", connectorData.endNodeParent ); } else { @@ -701,7 +701,7 @@ void ItemDocumentData::elementToConnectorData( TQDomElement element ) if ( connectorData.startNodeIsChild ) { connectorData.startNodeCId = element.attribute( "start-node-cid", TQString() ); - connectorData.startNodeParent = element.attribute( "start-node-tqparent", TQString() ); + connectorData.startNodeParent = element.attribute( "start-node-parent", TQString() ); } else connectorData.startNodeId = element.attribute( "start-node-id", TQString() ); @@ -711,7 +711,7 @@ void ItemDocumentData::elementToConnectorData( TQDomElement element ) if ( connectorData.endNodeIsChild ) { connectorData.endNodeCId = element.attribute( "end-node-cid", TQString() ); - connectorData.endNodeParent = element.attribute( "end-node-tqparent", TQString() ); + connectorData.endNodeParent = element.attribute( "end-node-parent", TQString() ); } else connectorData.endNodeId = element.attribute( "end-node-id", TQString() ); @@ -1037,7 +1037,7 @@ void ItemDocumentData::mergeWithDocument( ItemDocument *itemDocument, bool selec { CNItem *item = icnd->cnItemWithID( it.data().startNodeParent ); if (!item) - kdError() << k_funcinfo << "Unable to find node tqparent with id: "<<it.data().startNodeParent<<endl; + kdError() << k_funcinfo << "Unable to find node parent with id: "<<it.data().startNodeParent<<endl; else startNode = item->childNode( it.data().startNodeCId ); } @@ -1048,7 +1048,7 @@ void ItemDocumentData::mergeWithDocument( ItemDocument *itemDocument, bool selec { CNItem *item = icnd->cnItemWithID( it.data().endNodeParent ); if (!item) - kdError() << k_funcinfo << "Unable to find node tqparent with id: "<<it.data().endNodeParent<<endl; + kdError() << k_funcinfo << "Unable to find node parent with id: "<<it.data().endNodeParent<<endl; else endNode = item->childNode( it.data().endNodeCId ); } diff --git a/src/iteminterface.cpp b/src/iteminterface.cpp index 78bc7b0..6a60ec6 100644 --- a/src/iteminterface.cpp +++ b/src/iteminterface.cpp @@ -233,10 +233,10 @@ TQWidget * ItemInterface::configWidget() VariantDataMap *variantMap = p_itemGroup->activeItem()->variantMap(); - TQWidget * tqparent = m_pActiveItemEditorToolBar; + TQWidget * parent = m_pActiveItemEditorToolBar; - // Create new widget with the toolbar or dialog as the tqparent - TQWidget * configWidget = new TQWidget( tqparent, "tbConfigWidget" ); + // Create new widget with the toolbar or dialog as the parent + TQWidget * configWidget = new TQWidget( parent, "tbConfigWidget" ); configWidget->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding, 1, 1 ) ); TQHBoxLayout * configLayout = new TQHBoxLayout( configWidget ); @@ -385,8 +385,8 @@ TQWidget * ItemInterface::configWidget() continue; // In the case of the toolbar, we don't want it too high - if ( editWidget->height() > tqparent->height()-2 ) - editWidget->setMaximumHeight( tqparent->height()-2 ); + if ( editWidget->height() > parent->height()-2 ) + editWidget->setMaximumHeight( parent->height()-2 ); switch ( type ) { diff --git a/src/itemlibrary.cpp b/src/itemlibrary.cpp index 67a1a86..4d955d2 100644 --- a/src/itemlibrary.cpp +++ b/src/itemlibrary.cpp @@ -367,10 +367,10 @@ TQImage ItemLibrary::itemImage( Item *item, const uint maxSize ) TQPixmap pm( bound.size() ); - TQBitmap tqmask( bound.size() ); - tqmask.fill( TQt::color0 ); + TQBitmap mask( bound.size() ); + mask.fill( TQt::color0 ); - TQPainter maskPainter(&tqmask); + TQPainter maskPainter(&mask); maskPainter.translate( -bound.x(), -bound.y() ); maskPainter.setPen( TQt::color1 ); maskPainter.setBrush( TQt::color1 ); @@ -449,7 +449,7 @@ TQImage ItemLibrary::itemImage( Item *item, const uint maxSize ) transMatrix = Component::transMatrix( component->angleDegrees(), component->flipped(), bound.width()/2, bound.height()/2, true ); } - pm.setMask(tqmask); + pm.setMask(mask); // Now, rotate the image so that it's the right way up, and scale it to size TQImage im = pm.convertToImage(); diff --git a/src/katemdi.cpp b/src/katemdi.cpp index 01abfd3..5378396 100644 --- a/src/katemdi.cpp +++ b/src/katemdi.cpp @@ -35,8 +35,8 @@ namespace KateMDI { //BEGIN SPLITTER -Splitter::Splitter(Qt::Orientation o, TQWidget* tqparent, const char* name) - : TQSplitter(o, tqparent, name) +Splitter::Splitter(Qt::Orientation o, TQWidget* parent, const char* name) + : TQSplitter(o, parent, name) { } @@ -60,8 +60,8 @@ int Splitter::idAfter ( TQWidget * w ) const //BEGIN TOGGLETOOLVIEWACTION ToggleToolViewAction::ToggleToolViewAction ( const TQString& text, const KShortcut& cut, ToolView *tv, - TQObject* tqparent, const char* name ) - : KToggleAction(text,cut,tqparent,name) + TQObject* parent, const char* name ) + : KToggleAction(text,cut,parent,name) , m_tv(tv) { connect(this,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotToggled(bool))); @@ -150,8 +150,8 @@ void GUIClient::updateActions() //BEGIN TOOLVIEW -ToolView::ToolView (MainWindow *mainwin, Sidebar *sidebar, TQWidget *tqparent) - : TQVBox (tqparent) +ToolView::ToolView (MainWindow *mainwin, Sidebar *sidebar, TQWidget *parent) + : TQVBox (parent) , m_mainWin (mainwin) , m_sidebar (sidebar) , m_visible (false) @@ -192,8 +192,8 @@ void ToolView::childEvent ( TQChildEvent *ev ) //BEGIN SIDEBAR -Sidebar::Sidebar (KMultiTabBar::KMultiTabBarPosition pos, MainWindow *mainwin, TQWidget *tqparent) - : KMultiTabBar ((pos == KMultiTabBar::Top || pos == KMultiTabBar::Bottom) ? KMultiTabBar::Horizontal : KMultiTabBar::Vertical, tqparent) +Sidebar::Sidebar (KMultiTabBar::KMultiTabBarPosition pos, MainWindow *mainwin, TQWidget *parent) + : KMultiTabBar ((pos == KMultiTabBar::Top || pos == KMultiTabBar::Bottom) ? KMultiTabBar::Horizontal : KMultiTabBar::Vertical, parent) , m_mainWin (mainwin) , m_splitter (0) , m_ownSplit (0) diff --git a/src/katemdi.h b/src/katemdi.h index 58f569a..e886acd 100644 --- a/src/katemdi.h +++ b/src/katemdi.h @@ -39,7 +39,7 @@ class Splitter : public TQSplitter TQ_OBJECT public: - Splitter(Qt::Orientation o, TQWidget* tqparent=0, const char* name=0); + Splitter(Qt::Orientation o, TQWidget* parent=0, const char* name=0); ~Splitter(); /** Since there is supposed to be only 2 childs of a katesplitter, @@ -60,7 +60,7 @@ class ToggleToolViewAction : public KToggleAction public: ToggleToolViewAction ( const TQString& text, const KShortcut& cut, - class ToolView *tv, TQObject* tqparent = 0, const char* name = 0 ); + class ToolView *tv, TQObject* parent = 0, const char* name = 0 ); virtual ~ToggleToolViewAction(); @@ -109,9 +109,9 @@ class ToolView : public TQVBox * be automatically set to be the focus proxy of the toolview * @param mainwin main window for this toolview * @param sidebar sidebar of this toolview - * @param tqparent tqparent widget, e.g. the splitter of one of the sidebars + * @param parent parent widget, e.g. the splitter of one of the sidebars */ - ToolView (class MainWindow *mainwin, class Sidebar *sidebar, TQWidget *tqparent); + ToolView (class MainWindow *mainwin, class Sidebar *sidebar, TQWidget *parent); public: /** @@ -172,7 +172,7 @@ class Sidebar : public KMultiTabBar TQ_OBJECT public: - Sidebar (KMultiTabBar::KMultiTabBarPosition pos, class MainWindow *mainwin, TQWidget *tqparent); + Sidebar (KMultiTabBar::KMultiTabBarPosition pos, class MainWindow *mainwin, TQWidget *parent); virtual ~Sidebar (); void setSplitter (Splitter *sp); @@ -269,7 +269,7 @@ class MainWindow : public KParts::MainWindow public: /** * central widget ;) - * use this as tqparent for your content + * use this as parent for your content * this widget will get focus if a toolview is hidden * @return central widget */ diff --git a/src/ktechlab.cpp b/src/ktechlab.cpp index 3da09c1..b6bfe79 100644 --- a/src/ktechlab.cpp +++ b/src/ktechlab.cpp @@ -286,7 +286,7 @@ void KTechlab::overlayToolBarScreenshot() if ( !toolsWidget && !debugWidget ) return; - TQWidget * tqparent = TQT_TQWIDGET(toolsWidget ? toolsWidget->tqparent() : debugWidget->tqparent()); + TQWidget * parent = TQT_TQWIDGET(toolsWidget ? toolsWidget->parent() : debugWidget->parent()); TQRect grabRect; @@ -300,9 +300,9 @@ void KTechlab::overlayToolBarScreenshot() if ( !grabRect.isValid() ) return; - TQPixmap shot = TQPixmap::grabWidget( tqparent, grabRect.x(), grabRect.y(), grabRect.width(), grabRect.height() ); + TQPixmap shot = TQPixmap::grabWidget( parent, grabRect.x(), grabRect.y(), grabRect.width(), grabRect.height() ); - m_pToolBarOverlayLabel->move( tqparent->mapToGlobal( grabRect.topLeft() ) ); + m_pToolBarOverlayLabel->move( parent->mapToGlobal( grabRect.topLeft() ) ); m_pToolBarOverlayLabel->setFixedSize( grabRect.size() ); m_pToolBarOverlayLabel->setPixmap( shot ); m_pToolBarOverlayLabel->show(); diff --git a/src/languages/externallanguage.cpp b/src/languages/externallanguage.cpp index 784bf0f..82e35aa 100644 --- a/src/languages/externallanguage.cpp +++ b/src/languages/externallanguage.cpp @@ -17,8 +17,8 @@ #include <tqregexp.h> #include <tqtimer.h> -ExternalLanguage::ExternalLanguage( ProcessChain *processChain, KTechlab *tqparent, const TQString &name ) - : Language( processChain, tqparent, name ) +ExternalLanguage::ExternalLanguage( ProcessChain *processChain, KTechlab *parent, const TQString &name ) + : Language( processChain, parent, name ) { m_languageProcess = 0l; } diff --git a/src/languages/externallanguage.h b/src/languages/externallanguage.h index 51a34f6..4bf06ce 100644 --- a/src/languages/externallanguage.h +++ b/src/languages/externallanguage.h @@ -27,7 +27,7 @@ class ExternalLanguage : public Language Q_OBJECT TQ_OBJECT public: - ExternalLanguage( ProcessChain *processChain, KTechlab *tqparent, const TQString &name ); + ExternalLanguage( ProcessChain *processChain, KTechlab *parent, const TQString &name ); ~ExternalLanguage(); protected slots: diff --git a/src/languages/flowcode.cpp b/src/languages/flowcode.cpp index a1c664d..5356eab 100644 --- a/src/languages/flowcode.cpp +++ b/src/languages/flowcode.cpp @@ -22,8 +22,8 @@ // #include <kmessagebox.h> #include <tqfile.h> -FlowCode::FlowCode( ProcessChain *processChain, KTechlab *tqparent ) - : Language( processChain, tqparent, i18n("FlowCode") ) +FlowCode::FlowCode( ProcessChain *processChain, KTechlab *parent ) + : Language( processChain, parent, i18n("FlowCode") ) { m_successfulMessage = i18n("*** Microbe generation successful ***"); m_failedMessage = i18n("*** Microbe generation failed ***"); diff --git a/src/languages/flowcode.h b/src/languages/flowcode.h index 77fa5c1..ab6813e 100644 --- a/src/languages/flowcode.h +++ b/src/languages/flowcode.h @@ -39,7 +39,7 @@ basic from the code that they create. The 3 simple steps for usage of this funct class FlowCode : public Language { public: - FlowCode( ProcessChain *processChain, KTechlab *tqparent ); + FlowCode( ProcessChain *processChain, KTechlab *parent ); virtual void processInput( ProcessOptions options ); virtual ProcessOptions::ProcessPath::Path outputPath( ProcessOptions::ProcessPath::Path inputPath ) const; diff --git a/src/languages/gpasm.cpp b/src/languages/gpasm.cpp index 4020b60..1da7355 100644 --- a/src/languages/gpasm.cpp +++ b/src/languages/gpasm.cpp @@ -20,8 +20,8 @@ #include <kprocess.h> #include <tqregexp.h> -Gpasm::Gpasm( ProcessChain *processChain, KTechlab * tqparent ) - : ExternalLanguage( processChain, tqparent, "Gpasm" ) +Gpasm::Gpasm( ProcessChain *processChain, KTechlab * parent ) + : ExternalLanguage( processChain, parent, "Gpasm" ) { m_successfulMessage = i18n("*** Assembly successful ***"); m_failedMessage = i18n("*** Assembly failed ***"); diff --git a/src/languages/gpasm.h b/src/languages/gpasm.h index f071b8d..bdebaa4 100644 --- a/src/languages/gpasm.h +++ b/src/languages/gpasm.h @@ -20,7 +20,7 @@ class Gpasm : public ExternalLanguage { public: - Gpasm( ProcessChain *processChain, KTechlab *tqparent ); + Gpasm( ProcessChain *processChain, KTechlab *parent ); ~Gpasm(); virtual void processInput( ProcessOptions options ); diff --git a/src/languages/gpdasm.cpp b/src/languages/gpdasm.cpp index e0a7b9e..0827ba8 100644 --- a/src/languages/gpdasm.cpp +++ b/src/languages/gpdasm.cpp @@ -19,8 +19,8 @@ #include <tqfile.h> #include <tqregexp.h> -Gpdasm::Gpdasm( ProcessChain *processChain, KTechlab *tqparent ) - : ExternalLanguage( processChain, tqparent, "Gpdasm" ) +Gpdasm::Gpdasm( ProcessChain *processChain, KTechlab *parent ) + : ExternalLanguage( processChain, parent, "Gpdasm" ) { m_successfulMessage = i18n("*** Disassembly successful ***"); m_failedMessage = i18n("*** Disassembly failed ***"); diff --git a/src/languages/gpdasm.h b/src/languages/gpdasm.h index 8fd977c..4b7df32 100644 --- a/src/languages/gpdasm.h +++ b/src/languages/gpdasm.h @@ -20,7 +20,7 @@ Interface to the GNU Pic Disassembler class Gpdasm : public ExternalLanguage { public: - Gpdasm( ProcessChain *processChain, KTechlab *tqparent ); + Gpdasm( ProcessChain *processChain, KTechlab *parent ); ~Gpdasm(); virtual void processInput( ProcessOptions options ); diff --git a/src/languages/gplib.cpp b/src/languages/gplib.cpp index 919efee..b7d3156 100644 --- a/src/languages/gplib.cpp +++ b/src/languages/gplib.cpp @@ -16,8 +16,8 @@ #include <kmessagebox.h> #include <kprocess.h> -Gplib::Gplib( ProcessChain *processChain, KTechlab * tqparent ) - : ExternalLanguage( processChain, tqparent, "Gpasm" ) +Gplib::Gplib( ProcessChain *processChain, KTechlab * parent ) + : ExternalLanguage( processChain, parent, "Gpasm" ) { m_successfulMessage = i18n("*** Archiving successful ***"); m_failedMessage = i18n("*** Archiving failed ***"); diff --git a/src/languages/gplib.h b/src/languages/gplib.h index 1d3df03..019dfe1 100644 --- a/src/languages/gplib.h +++ b/src/languages/gplib.h @@ -19,7 +19,7 @@ class Gplib : public ExternalLanguage { public: - Gplib( ProcessChain *processChain, KTechlab *tqparent ); + Gplib( ProcessChain *processChain, KTechlab *parent ); ~Gplib(); virtual void processInput( ProcessOptions options ); diff --git a/src/languages/gplink.cpp b/src/languages/gplink.cpp index 7055fa2..3562a09 100644 --- a/src/languages/gplink.cpp +++ b/src/languages/gplink.cpp @@ -16,8 +16,8 @@ #include <kmessagebox.h> #include <kprocess.h> -Gplink::Gplink( ProcessChain *processChain, KTechlab * tqparent ) - : ExternalLanguage( processChain, tqparent, "Gpasm" ) +Gplink::Gplink( ProcessChain *processChain, KTechlab * parent ) + : ExternalLanguage( processChain, parent, "Gpasm" ) { m_successfulMessage = i18n("*** Linking successful ***"); m_failedMessage = i18n("*** Linking failed ***"); diff --git a/src/languages/gplink.h b/src/languages/gplink.h index 47cb1c9..7015e58 100644 --- a/src/languages/gplink.h +++ b/src/languages/gplink.h @@ -20,7 +20,7 @@ class Gplink : public ExternalLanguage { public: - Gplink( ProcessChain *processChain, KTechlab *tqparent ); + Gplink( ProcessChain *processChain, KTechlab *parent ); ~Gplink(); virtual void processInput( ProcessOptions options ); diff --git a/src/languages/language.cpp b/src/languages/language.cpp index e2c4c7a..71854a4 100644 --- a/src/languages/language.cpp +++ b/src/languages/language.cpp @@ -26,10 +26,10 @@ #include <tqtimer.h> //BEGIN class Language -Language::Language( ProcessChain *processChain, KTechlab *tqparent, const TQString &name ) - : TQObject(tqparent,name) +Language::Language( ProcessChain *processChain, KTechlab *parent, const TQString &name ) + : TQObject(parent,name) { - p_ktechlab = tqparent; + p_ktechlab = parent; p_processChain = processChain; } diff --git a/src/languages/language.h b/src/languages/language.h index 54fc408..8980cac 100644 --- a/src/languages/language.h +++ b/src/languages/language.h @@ -206,7 +206,7 @@ class Language : public TQObject Q_OBJECT TQ_OBJECT public: - Language( ProcessChain *processChain, KTechlab *tqparent, const TQString &name ); + Language( ProcessChain *processChain, KTechlab *parent, const TQString &name ); ~Language(); /** diff --git a/src/languages/languagemanager.cpp b/src/languages/languagemanager.cpp index 0a641a9..5d9b4cc 100644 --- a/src/languages/languagemanager.cpp +++ b/src/languages/languagemanager.cpp @@ -33,23 +33,23 @@ LanguageManager * LanguageManager::m_pSelf = 0l; -LanguageManager * LanguageManager::self( KateMDI::ToolView * tqparent, KTechlab * ktl ) +LanguageManager * LanguageManager::self( KateMDI::ToolView * parent, KTechlab * ktl ) { if (!m_pSelf) { - assert(tqparent); + assert(parent); assert(ktl); - m_pSelf = new LanguageManager( tqparent, ktl ); + m_pSelf = new LanguageManager( parent, ktl ); } return m_pSelf; } -LanguageManager::LanguageManager( KateMDI::ToolView * tqparent, KTechlab * ktl ) +LanguageManager::LanguageManager( KateMDI::ToolView * parent, KTechlab * ktl ) : TQObject((TQObject*)ktl) { p_ktechlab = ktl; - m_logView = new LogView( tqparent, "LanguageManager LogView"); + m_logView = new LogView( parent, "LanguageManager LogView"); TQWhatsThis::add( m_logView, i18n("These messages show the output of language-related functionality such as compiling and assembling.<br><br>For error messages, clicking on the line will automatically open up the file at the position of the error.") ); connect( m_logView, TQT_SIGNAL(paraClicked(const TQString&, MessageInfo )), this, TQT_SLOT(slotParaClicked(const TQString&, MessageInfo )) ); diff --git a/src/languages/languagemanager.h b/src/languages/languagemanager.h index 2a64e90..9bfe41b 100644 --- a/src/languages/languagemanager.h +++ b/src/languages/languagemanager.h @@ -38,7 +38,7 @@ class LanguageManager : public TQObject Q_OBJECT TQ_OBJECT public: - static LanguageManager * self( KateMDI::ToolView * tqparent = 0l, KTechlab * ktl = 0l ); + static LanguageManager * self( KateMDI::ToolView * parent = 0l, KTechlab * ktl = 0l ); static TQString toolViewIdentifier() { return "LanguageManager"; } ~LanguageManager(); @@ -81,7 +81,7 @@ class LanguageManager : public TQObject void slotMessage( const TQString &message, MessageInfo messageInfo ); protected: - LanguageManager( KateMDI::ToolView * tqparent, KTechlab * ktl ); + LanguageManager( KateMDI::ToolView * parent, KTechlab * ktl ); private: LogView * m_logView; diff --git a/src/languages/microbe.cpp b/src/languages/microbe.cpp index 00cf1ed..110d200 100644 --- a/src/languages/microbe.cpp +++ b/src/languages/microbe.cpp @@ -22,8 +22,8 @@ #include <tqfile.h> #include <kprocess.h> -Microbe::Microbe( ProcessChain *processChain, KTechlab *tqparent ) - : ExternalLanguage( processChain, tqparent, "Microbe" ) +Microbe::Microbe( ProcessChain *processChain, KTechlab *parent ) + : ExternalLanguage( processChain, parent, "Microbe" ) { m_failedMessage = i18n("*** Compilation failed ***"); m_successfulMessage = i18n("*** Compilation successful ***"); diff --git a/src/languages/microbe.h b/src/languages/microbe.h index 91b4544..617085b 100644 --- a/src/languages/microbe.h +++ b/src/languages/microbe.h @@ -24,7 +24,7 @@ typedef TQMap< int, TQString > ErrorMap; class Microbe : public ExternalLanguage { public: - Microbe( ProcessChain *processChain, KTechlab *tqparent ); + Microbe( ProcessChain *processChain, KTechlab *parent ); ~Microbe(); virtual void processInput( ProcessOptions options ); diff --git a/src/languages/picprogrammer.cpp b/src/languages/picprogrammer.cpp index 3c4e38d..5ef37dd 100644 --- a/src/languages/picprogrammer.cpp +++ b/src/languages/picprogrammer.cpp @@ -353,8 +353,8 @@ bool PicProgrammerSettings::isPredefined( const TQString & name ) const //BEGIN class PicProgrammer -PicProgrammer::PicProgrammer( ProcessChain *processChain, KTechlab * tqparent ) - : ExternalLanguage( processChain, tqparent, "PicProgrammer" ) +PicProgrammer::PicProgrammer( ProcessChain *processChain, KTechlab * parent ) + : ExternalLanguage( processChain, parent, "PicProgrammer" ) { m_successfulMessage = i18n("*** Programming successful ***"); m_failedMessage = i18n("*** Programming failed ***"); diff --git a/src/languages/picprogrammer.h b/src/languages/picprogrammer.h index 1c5f406..9e1b606 100644 --- a/src/languages/picprogrammer.h +++ b/src/languages/picprogrammer.h @@ -113,7 +113,7 @@ class PicProgrammerSettings class PicProgrammer : public ExternalLanguage { public: - PicProgrammer( ProcessChain *processChain, KTechlab *tqparent ); + PicProgrammer( ProcessChain *processChain, KTechlab *parent ); ~PicProgrammer(); virtual void processInput( ProcessOptions options ); diff --git a/src/languages/processchain.cpp b/src/languages/processchain.cpp index 129c74e..6f5c95a 100644 --- a/src/languages/processchain.cpp +++ b/src/languages/processchain.cpp @@ -286,11 +286,11 @@ LanguageFunction( SDCC, sdcc, m_pSDCC ) //BEGIN class ProcessListChain -ProcessListChain::ProcessListChain( ProcessOptionsList pol, KTechlab * tqparent, const char * name ) - : TQObject( (TQObject*)tqparent, name ) +ProcessListChain::ProcessListChain( ProcessOptionsList pol, KTechlab * parent, const char * name ) + : TQObject( (TQObject*)parent, name ) { m_processOptionsList = pol; - m_pKTechlab = tqparent; + m_pKTechlab = parent; // Start us off... slotProcessChainSuccessful(); diff --git a/src/languages/processchain.h b/src/languages/processchain.h index e4a51b4..a15bb43 100644 --- a/src/languages/processchain.h +++ b/src/languages/processchain.h @@ -37,7 +37,7 @@ class ProcessChain : public TQObject Q_OBJECT TQ_OBJECT public: - ProcessChain( ProcessOptions options, KTechlab *tqparent, const char *name = 0l ); + ProcessChain( ProcessOptions options, KTechlab *parent, const char *name = 0l ); ~ProcessChain(); void setProcessOptions( ProcessOptions options ) { m_processOptions = options; } @@ -105,7 +105,7 @@ class ProcessListChain : public TQObject TQ_OBJECT public: - ProcessListChain( ProcessOptionsList pol, KTechlab *tqparent, const char *name = 0l ); + ProcessListChain( ProcessOptionsList pol, KTechlab *parent, const char *name = 0l ); signals: /** diff --git a/src/languages/sdcc.cpp b/src/languages/sdcc.cpp index 881db33..ea1845d 100644 --- a/src/languages/sdcc.cpp +++ b/src/languages/sdcc.cpp @@ -20,8 +20,8 @@ #include <kmessagebox.h> #include <kprocess.h> -SDCC::SDCC( ProcessChain * processChain, KTechlab * tqparent ) - : ExternalLanguage( processChain, tqparent, "SDCC" ) +SDCC::SDCC( ProcessChain * processChain, KTechlab * parent ) + : ExternalLanguage( processChain, parent, "SDCC" ) { m_successfulMessage = i18n("*** Compilation successful ***"); m_failedMessage = i18n("*** Compilation failed ***"); diff --git a/src/languages/sdcc.h b/src/languages/sdcc.h index b37a5de..9b6af3b 100644 --- a/src/languages/sdcc.h +++ b/src/languages/sdcc.h @@ -19,7 +19,7 @@ class SDCC : public ExternalLanguage { public: - SDCC( ProcessChain * processChain, KTechlab * tqparent ); + SDCC( ProcessChain * processChain, KTechlab * parent ); ~SDCC(); virtual void processInput( ProcessOptions options ); diff --git a/src/mechanics/mechanicsgroup.cpp b/src/mechanics/mechanicsgroup.cpp index 40b0c8a..900eb92 100644 --- a/src/mechanics/mechanicsgroup.cpp +++ b/src/mechanics/mechanicsgroup.cpp @@ -30,13 +30,13 @@ bool MechanicsGroup::addItem( Item *item ) return false; } - // Check that the item's tqparent isn't already selected - Item *tqparent = item->parentItem(); - while (tqparent) + // Check that the item's parent isn't already selected + Item *parent = item->parentItem(); + while (parent) { - if ( m_itemList.contains(tqparent) ) + if ( m_itemList.contains(parent) ) return false; - tqparent = tqparent->parentItem(); + parent = parent->parentItem(); } removeChildren(item); @@ -131,13 +131,13 @@ MechanicsItemList MechanicsGroup::toplevelMechItemList() const const MechanicsItemList::const_iterator end = mechItemList.end(); for ( MechanicsItemList::const_iterator it = mechItemList.begin(); it != end; ++it ) { - MechanicsItem* tqparent = *it; - while (tqparent) + MechanicsItem* parent = *it; + while (parent) { - if ( !tqparent->parentItem() && !toplevel.contains(tqparent) ) - toplevel.append(tqparent); + if ( !parent->parentItem() && !toplevel.contains(parent) ) + toplevel.append(parent); - tqparent = dynamic_cast<MechanicsItem*>(tqparent->parentItem()); + parent = dynamic_cast<MechanicsItem*>(parent->parentItem()); } } diff --git a/src/mechanics/mechanicsitem.h b/src/mechanics/mechanicsitem.h index 054e04a..3c8f7a1 100644 --- a/src/mechanics/mechanicsitem.h +++ b/src/mechanics/mechanicsitem.h @@ -152,8 +152,8 @@ public: */ PositionInfo absolutePosition() const; /** - * Returns the position relative to the tqparent item (or the absolute - * position if there is no tqparent item) + * Returns the position relative to the parent item (or the absolute + * position if there is no parent item) */ PositionInfo relativePosition() const { return m_relativePosition; } /** @@ -227,7 +227,7 @@ protected: void updateCanvasPoints(); MechanicsDocument *p_mechanicsDocument; - PositionInfo m_relativePosition; // Absolution position if not attached to a tqparent item, or otherwise relative to tqparent item + PositionInfo m_relativePosition; // Absolution position if not attached to a parent item, or otherwise relative to parent item MechanicsInfo m_mechanicsInfo; CombinedMechanicsInfo m_mechanicsInfoCombined; diff --git a/src/mechanics/mechanicssimulation.h b/src/mechanics/mechanicssimulation.h index 9a82d91..f91a159 100644 --- a/src/mechanics/mechanicssimulation.h +++ b/src/mechanics/mechanicssimulation.h @@ -76,8 +76,8 @@ protected: /** Rigid body with mass, inertia, etc. Collection of mechanics items with -functionality for moving them about, rotating, etc. Only one mother-tqparent -(has no tqparent itself, all other items are descendents) allowed. +functionality for moving them about, rotating, etc. Only one mother-parent +(has no parent itself, all other items are descendents) allowed. @short Rigid body, handles MechanicsItems @author David Saxton */ @@ -107,7 +107,7 @@ public: protected: /** - * Attempt to find the overall tqparent. + * Attempt to find the overall parent. * @returns false iff unsucessful (including if there are no MechanicsItems present) */ bool findOverallParent(); diff --git a/src/node.cpp b/src/node.cpp index 8e38b02..be2e04b 100644 --- a/src/node.cpp +++ b/src/node.cpp @@ -290,7 +290,7 @@ void Node::setParentItem( CNItem *parentItem ) { if (!parentItem) { - kdError() << k_funcinfo << "no tqparent item" << endl; + kdError() << k_funcinfo << "no parent item" << endl; return; } @@ -77,7 +77,7 @@ public: const TQString childId() const { return m_childId; } /** * Use this function to set the child-id, that is unique to the node - * amongst the other nodes associated with its tqparent CNItem + * amongst the other nodes associated with its parent CNItem */ void setChildId( const TQString &id ) { m_childId = id; } /** @@ -151,9 +151,9 @@ public: void addOutputConnector( Connector * const connector ); /** * Returns the total number of connections to the node. This is the number - * of input connectors, the number of output connectors, and the tqparent + * of input connectors, the number of output connectors, and the parent * item connector if it exists and is requested. - * @param includeParentItem Count the tqparent item as a connector if it exists + * @param includeParentItem Count the parent item as a connector if it exists * @param includeHiddenConnectors hidden connectors are those as e.g. part of a subcircuit */ int numCon( bool includeParentItem, bool includeHiddenConnectors ) const; diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp index 884a8e9..3a6565c 100644 --- a/src/projectmanager.cpp +++ b/src/projectmanager.cpp @@ -179,10 +179,10 @@ void ProcessingOptions::domElementToProcessingOptions( const TQDomElement & elem //BEGIN class ProjectItem -ProjectItem::ProjectItem( ProjectItem * tqparent, Type type, ProjectManager * projectManager, KTechlab * ktechlab ) +ProjectItem::ProjectItem( ProjectItem * parent, Type type, ProjectManager * projectManager, KTechlab * ktechlab ) : TQObject() { - m_pParent = tqparent; + m_pParent = parent; m_pILVItem = 0l; m_pProjectManager = projectManager; p_ktechlab = ktechlab; @@ -389,7 +389,7 @@ ProjectItem::OutputType ProjectItem::outputType() const case ProjectItem::FileType: { - kdWarning() << k_funcinfo << "Don't know how to handle tqparent item being a file" << endl; + kdWarning() << k_funcinfo << "Don't know how to handle parent item being a file" << endl; return UnknownOutput; } @@ -889,20 +889,20 @@ bool ProjectInfo::saveAndClose() //BEGIN class ProjectManager ProjectManager * ProjectManager::m_pSelf = 0l; -ProjectManager * ProjectManager::self( KTechlab * ktl, KateMDI::ToolView * tqparent ) +ProjectManager * ProjectManager::self( KTechlab * ktl, KateMDI::ToolView * parent ) { if ( !m_pSelf ) { assert(ktl); - assert(tqparent); - m_pSelf = new ProjectManager( ktl, tqparent ); + assert(parent); + m_pSelf = new ProjectManager( ktl, parent ); } return m_pSelf; } -ProjectManager::ProjectManager( KTechlab * ktl, KateMDI::ToolView * tqparent ) - : ItemSelector( tqparent, "Project Manager" ), +ProjectManager::ProjectManager( KTechlab * ktl, KateMDI::ToolView * parent ) + : ItemSelector( parent, "Project Manager" ), m_pCurrentProject(0l), p_ktechlab(ktl) { diff --git a/src/projectmanager.h b/src/projectmanager.h index dce400e..33d239b 100644 --- a/src/projectmanager.h +++ b/src/projectmanager.h @@ -150,7 +150,7 @@ class ProjectItem : public TQObject, public LinkerOptions, public ProcessingOpti }; enum { AllOutputs = ProgramOutput | ObjectOutput | LibraryOutput | UnknownOutput }; - ProjectItem( ProjectItem * tqparent, Type type, ProjectManager * projectManager, KTechlab * ktechlab ); + ProjectItem( ProjectItem * parent, Type type, ProjectManager * projectManager, KTechlab * ktechlab ); virtual ~ProjectItem(); Type type() const { return m_type; } @@ -270,7 +270,7 @@ class ProjectManager : public ItemSelector TQ_OBJECT public: ~ProjectManager(); - static ProjectManager * self( KTechlab * ktl = 0l, KateMDI::ToolView * tqparent = 0l ); + static ProjectManager * self( KTechlab * ktl = 0l, KateMDI::ToolView * parent = 0l ); static TQString toolViewIdentifier() { return "ProjectManager"; } @@ -340,7 +340,7 @@ class ProjectManager : public ItemSelector KTechlab * const p_ktechlab; private: - ProjectManager( KTechlab * ktl, KateMDI::ToolView * tqparent ); + ProjectManager( KTechlab * ktl, KateMDI::ToolView * parent ); static ProjectManager * m_pSelf; }; diff --git a/src/recentfilesaction.cpp b/src/recentfilesaction.cpp index 64ba467..deba448 100644 --- a/src/recentfilesaction.cpp +++ b/src/recentfilesaction.cpp @@ -15,8 +15,8 @@ #include <kstandarddirs.h> #include <kurl.h> -RecentFilesAction::RecentFilesAction( const TQString & configGroupName, const TQString& text, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name ) - : KSelectAction( text, 0/*pix*/, tqparent, name ) +RecentFilesAction::RecentFilesAction( const TQString & configGroupName, const TQString& text, const TQObject* receiver, const char* slot, TQObject* parent, const char* name ) + : KSelectAction( text, 0/*pix*/, parent, name ) { m_configGroupName = configGroupName; m_maxItems = 10; diff --git a/src/recentfilesaction.h b/src/recentfilesaction.h index 1e6bbaf..0f5b98f 100644 --- a/src/recentfilesaction.h +++ b/src/recentfilesaction.h @@ -22,7 +22,7 @@ class RecentFilesAction : public KSelectAction Q_OBJECT TQ_OBJECT public: - RecentFilesAction( const TQString & configGroupName, const TQString & text, const TQObject * receiver, const char* slot, TQObject* tqparent, const char * name ); + RecentFilesAction( const TQString & configGroupName, const TQString & text, const TQObject * receiver, const char* slot, TQObject* parent, const char * name ); ~RecentFilesAction(); diff --git a/src/resizeoverlay.cpp b/src/resizeoverlay.cpp index a34aeb8..4b17794 100644 --- a/src/resizeoverlay.cpp +++ b/src/resizeoverlay.cpp @@ -17,12 +17,12 @@ //BEGIN class ResizeOverlay -ResizeOverlay::ResizeOverlay( Item *tqparent ) - : TQObject(tqparent) +ResizeOverlay::ResizeOverlay( Item *parent ) + : TQObject(parent) { b_showResizeHandles = false; b_visible = true; - p_item = tqparent; + p_item = parent; } @@ -137,12 +137,12 @@ void ResizeOverlay::syncY( ResizeHandle *rh1, ResizeHandle *rh2 ) //BEGIN class MechanicsItemOverlay -MechanicsItemOverlay::MechanicsItemOverlay( MechanicsItem *tqparent ) - : ResizeOverlay(tqparent) +MechanicsItemOverlay::MechanicsItemOverlay( MechanicsItem *parent ) + : ResizeOverlay(parent) { - p_mechanicsItem = tqparent; - connect( tqparent, TQT_SIGNAL(moved()), this, TQT_SLOT(slotUpdateResizeHandles()) ); - connect( tqparent, TQT_SIGNAL(resized()), this, TQT_SLOT(slotUpdateResizeHandles()) ); + p_mechanicsItem = parent; + connect( parent, TQT_SIGNAL(moved()), this, TQT_SLOT(slotUpdateResizeHandles()) ); + connect( parent, TQT_SIGNAL(resized()), this, TQT_SLOT(slotUpdateResizeHandles()) ); m_tl = createResizeHandle( ResizeHandle::rhp_topLeft, ResizeHandle::dt_resize_backwardsDiagonal ); m_tm = createResizeHandle( ResizeHandle::rhp_topMiddle, ResizeHandle::dt_resize_vertical ); @@ -229,11 +229,11 @@ void MechanicsItemOverlay::slotResizeHandleMoved( int id, double dx, double dy ) //BEGIN class RectangularOverlay -RectangularOverlay::RectangularOverlay( Item *tqparent, int xsnap, int ysnap ) - : ResizeOverlay(tqparent) +RectangularOverlay::RectangularOverlay( Item *parent, int xsnap, int ysnap ) + : ResizeOverlay(parent) { - connect( tqparent, TQT_SIGNAL(resized()), this, TQT_SLOT(slotUpdateResizeHandles()) ); - connect( tqparent, TQT_SIGNAL(movedBy(double, double )), this, TQT_SLOT(slotMoveAllResizeHandles(double, double )) ); + connect( parent, TQT_SIGNAL(resized()), this, TQT_SLOT(slotUpdateResizeHandles()) ); + connect( parent, TQT_SIGNAL(movedBy(double, double )), this, TQT_SLOT(slotMoveAllResizeHandles(double, double )) ); m_tl = createResizeHandle( ResizeHandle::rhp_topLeft, ResizeHandle::dt_resize_backwardsDiagonal, xsnap, ysnap ); m_tm = createResizeHandle( ResizeHandle::rhp_topMiddle, ResizeHandle::dt_resize_vertical, xsnap, ysnap ); @@ -356,11 +356,11 @@ TQRect RectangularOverlay::getSizeRect( bool *ok, bool *widthOk, bool *heightOk //BEGIN class LineOverlay -LineOverlay::LineOverlay( Item * tqparent ) - : ResizeOverlay(tqparent) +LineOverlay::LineOverlay( Item * parent ) + : ResizeOverlay(parent) { - connect( tqparent, TQT_SIGNAL(resized()), this, TQT_SLOT(slotUpdateResizeHandles()) ); - connect( tqparent, TQT_SIGNAL(movedBy(double, double )), this, TQT_SLOT(slotMoveAllResizeHandles(double, double )) ); + connect( parent, TQT_SIGNAL(resized()), this, TQT_SLOT(slotUpdateResizeHandles()) ); + connect( parent, TQT_SIGNAL(movedBy(double, double )), this, TQT_SLOT(slotMoveAllResizeHandles(double, double )) ); m_pStart = createResizeHandle( ResizeHandle::rhp_start, ResizeHandle::dt_point_rect ); m_pEnd = createResizeHandle( ResizeHandle::rhp_end, ResizeHandle::dt_point_rect ); diff --git a/src/resizeoverlay.h b/src/resizeoverlay.h index aa7a46e..6fbb17f 100644 --- a/src/resizeoverlay.h +++ b/src/resizeoverlay.h @@ -119,7 +119,7 @@ class ResizeOverlay : public TQObject Q_OBJECT TQ_OBJECT public: - ResizeOverlay( Item *tqparent ); + ResizeOverlay( Item *parent ); ~ResizeOverlay(); Item *parentItem() const { return p_item; } @@ -193,7 +193,7 @@ class MechanicsItemOverlay : public ResizeOverlay Q_OBJECT TQ_OBJECT public: - MechanicsItemOverlay( MechanicsItem *tqparent ); + MechanicsItemOverlay( MechanicsItem *parent ); ~MechanicsItemOverlay(); public slots: @@ -229,7 +229,7 @@ public: void removeBotMiddle(); /** * Get the size rectangle from the position of the handles. If the size - * is invalid (e.g. the tqparent Item does not consider it a valid size, + * is invalid (e.g. the parent Item does not consider it a valid size, * then *ok is set to false; otherwise to true. * @returns the sizerect, regardless of whether or not it is valid */ @@ -263,7 +263,7 @@ class LineOverlay : public ResizeOverlay Q_OBJECT TQ_OBJECT public: - LineOverlay( Item * tqparent ); + LineOverlay( Item * parent ); TQPoint startPoint() const; TQPoint endPoint() const; diff --git a/src/textdocument.cpp b/src/textdocument.cpp index 628cfb6..77cfb30 100644 --- a/src/textdocument.cpp +++ b/src/textdocument.cpp @@ -34,9 +34,9 @@ #include <ktempfile.h> -TextDocument *TextDocument::constructTextDocument( const TQString& caption, KTechlab *tqparent, const char *name ) +TextDocument *TextDocument::constructTextDocument( const TQString& caption, KTechlab *parent, const char *name ) { - TextDocument *textDocument = new TextDocument( caption, tqparent, name); + TextDocument *textDocument = new TextDocument( caption, parent, name); if( textDocument->m_constructorSuccessful ) return textDocument; delete textDocument; @@ -143,9 +143,9 @@ View * TextDocument::createView( ViewContainer *viewContainer, uint viewAreaId, } -Kate::View* TextDocument::createKateView( TQWidget *tqparent, const char *name ) +Kate::View* TextDocument::createKateView( TQWidget *parent, const char *name ) { - return static_cast<Kate::View*>((m_doc->createView( tqparent, name ))->qt_cast("Kate::View")); + return static_cast<Kate::View*>((m_doc->createView( parent, name ))->qt_cast("Kate::View")); } diff --git a/src/textdocument.h b/src/textdocument.h index 18e4e81..edd8850 100644 --- a/src/textdocument.h +++ b/src/textdocument.h @@ -59,7 +59,7 @@ public: * it if successful, or 0 if it failed. * @returns pointer to constructed object, or 0 if there was a problem */ - static TextDocument *constructTextDocument( const TQString& caption, KTechlab *tqparent, const char *name = 0L ); + static TextDocument *constructTextDocument( const TQString& caption, KTechlab *parent, const char *name = 0L ); /** * @returns the guessed code type that this file is */ @@ -133,7 +133,7 @@ public: virtual void print(); virtual void setModified( bool modified ); - Kate::View* createKateView( TQWidget *tqparent, const char *name = 0l ); + Kate::View* createKateView( TQWidget *parent, const char *name = 0l ); virtual void undo(); virtual void redo(); @@ -229,7 +229,7 @@ private slots: void slotSelectionmChanged(); private: - TextDocument( const TQString& caption, KTechlab *tqparent, const char *name = 0L ); + TextDocument( const TQString& caption, KTechlab *parent, const char *name = 0L ); bool m_constructorSuccessful; CodeType m_guessedCodeType; TQPtrList<KAction> m_bookmarkActions; diff --git a/src/variablelabel.cpp b/src/variablelabel.cpp index f4b64b8..4601804 100644 --- a/src/variablelabel.cpp +++ b/src/variablelabel.cpp @@ -18,8 +18,8 @@ //BEGIN class VariableLabel -VariableLabel::VariableLabel( TextView * tqparent ) - : TQLabel( tqparent, "toolTipTip", WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM ) +VariableLabel::VariableLabel( TextView * parent ) + : TQLabel( parent, "toolTipTip", WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM ) { m_value = -1; diff --git a/src/variablelabel.h b/src/variablelabel.h index ea5fea5..1462d33 100644 --- a/src/variablelabel.h +++ b/src/variablelabel.h @@ -31,7 +31,7 @@ class VariableLabel : public TQLabel Q_OBJECT TQ_OBJECT public: - VariableLabel( TextView * tqparent ); + VariableLabel( TextView * parent ); /** * Sets the register that this label is displaying the value of. */ diff --git a/src/view.cpp b/src/view.cpp index bfa9e3f..09907eb 100644 --- a/src/view.cpp +++ b/src/view.cpp @@ -41,7 +41,7 @@ */ class KVSSBSep : public TQWidget { public: - KVSSBSep( View * tqparent=0) : TQWidget(tqparent) + KVSSBSep( View * parent=0) : TQWidget(parent) { setFixedHeight( 2 ); } @@ -69,7 +69,7 @@ public: KAction * action( const TQString & name ) const; bool isFocused() const { return b_isFocused; } /** - * Pointer to the tqparent document + * Pointer to the parent document */ Document *document() const { return m_pDocument; } /** @@ -78,7 +78,7 @@ public: DCOPObject * dcopObject() const; /** * Returns the dcop suffix for this view - a unique ID for the current the - * view within all views associated with the tqparent document. DCOP name + * view within all views associated with the parent document. DCOP name * will become "View#docID#viewID". */ unsigned dcopID() const { return m_dcopID; } diff --git a/src/viewcontainer.cpp b/src/viewcontainer.cpp index a06c95a..35635d2 100644 --- a/src/viewcontainer.cpp +++ b/src/viewcontainer.cpp @@ -21,8 +21,8 @@ #include <ktabwidget.h> #include <tqobjectlist.h> -ViewContainer::ViewContainer( const TQString & caption, KTechlab * ktechlab, TQWidget * tqparent ) - : TQWidget( ktechlab ? ktechlab->tabWidget() : tqparent ) +ViewContainer::ViewContainer( const TQString & caption, KTechlab * ktechlab, TQWidget * parent ) + : TQWidget( ktechlab ? ktechlab->tabWidget() : parent ) { b_deleted = false; p_ktechlab = ktechlab; @@ -375,8 +375,8 @@ void ViewContainer::setKTechlabDeleted() -ViewArea::ViewArea( TQWidget *tqparent, ViewContainer *viewContainer, int id, const char *name ) - : TQSplitter( tqparent, name ) +ViewArea::ViewArea( TQWidget *parent, ViewContainer *viewContainer, int id, const char *name ) + : TQSplitter( parent, name ) { p_viewContainer = viewContainer; m_id = id; diff --git a/src/viewcontainer.h b/src/viewcontainer.h index e31aac2..50458b6 100644 --- a/src/viewcontainer.h +++ b/src/viewcontainer.h @@ -58,7 +58,7 @@ public: Bottom }; - ViewArea( TQWidget *tqparent, ViewContainer *viewContainer, int id, const char *name = 0 ); + ViewArea( TQWidget *parent, ViewContainer *viewContainer, int id, const char *name = 0 ); ~ViewArea(); ViewContainer *viewContainer() const { return p_viewContainer; } @@ -117,10 +117,10 @@ Q_OBJECT public: /** * Constructs a new ViewContainer, along with a default ViewArea ready for - * parenting a View, with an id of 0. tqparent is only used if ktechlab is - * null; otherwise the tqparent widget is ktechlab's tabWidget() + * parenting a View, with an id of 0. parent is only used if ktechlab is + * null; otherwise the parent widget is ktechlab's tabWidget() */ - ViewContainer( const TQString & caption, KTechlab * ktechlab, TQWidget * tqparent = 0 ); + ViewContainer( const TQString & caption, KTechlab * ktechlab, TQWidget * parent = 0 ); ~ViewContainer(); /** @@ -149,7 +149,7 @@ public: */ bool closeViewArea( uint id ); /** - * Creates a view area (tqparent TQWidget, splitter et al) ready for inclusion + * Creates a view area (parent TQWidget, splitter et al) ready for inclusion * of a view. * @param relativeViewArea the viewarea to position the new viewarea next to, if -1 then is taken to be the active view area * @param position Top, Right, Bottom or Left of given relativeViewArea |