diff --git a/src/circuitdocument.cpp b/src/circuitdocument.cpp index 8948b8d..c8e2d9c 100644 --- a/src/circuitdocument.cpp +++ b/src/circuitdocument.cpp @@ -330,7 +330,7 @@ void CircuitDocument::calculateConnectorCurrents() n->resetCurrent(); n->setSwitchCurrentsUnknown(); - if ( !n->tqparentECNode()->isChildNode() ) + if ( !n->parentECNode()->isChildNode() ) { n->setCurrentKnown( true ); // (and it has a current of 0 amps) @@ -343,7 +343,7 @@ void CircuitDocument::calculateConnectorCurrents() else { // Child node that is non ground - n->setCurrentKnown( n->tqparentECNode()->numPins() < 2 ); + n->setCurrentKnown( n->parentECNode()->numPins() < 2 ); } } } diff --git a/src/connector.cpp b/src/connector.cpp index febb20c..6d64377 100644 --- a/src/connector.cpp +++ b/src/connector.cpp @@ -165,7 +165,7 @@ void Connector::syncWiresWithNodes() void Connector::setParentContainer( const TQString &cnItemId ) { -// // We only allow the node to be tqparented once +// // We only allow the node to be parented once // if ( p_parentContainer || !ICNDocument->itemWithID(cnItemId) ) return; p_parentContainer = p_icnDocument->cnItemWithID(cnItemId); } @@ -556,7 +556,7 @@ ConnectorData Connector::connectorData() const { connectorData.startNodeIsChild = true; connectorData.startNodeCId = m_startNode->childId(); - connectorData.startNodeParent = m_startNode->tqparentItem()->id(); + connectorData.startNodeParent = m_startNode->parentItem()->id(); } else { @@ -568,7 +568,7 @@ ConnectorData Connector::connectorData() const { connectorData.endNodeIsChild = true; connectorData.endNodeCId = m_endNode->childId(); - connectorData.endNodeParent = m_endNode->tqparentItem()->id(); + connectorData.endNodeParent = m_endNode->parentItem()->id(); } else { diff --git a/src/connector.h b/src/connector.h index 57fc378..740b5b7 100644 --- a/src/connector.h +++ b/src/connector.h @@ -110,7 +110,7 @@ public: /** * Returns a pointer to the tqparent item container */ - CNItem *tqparentContainer() const { return p_parentContainer; } + CNItem *parentContainer() const { return p_parentContainer; } /** * @returns whether the points have been set by the user manually defining them */ diff --git a/src/electronics/ecnode.cpp b/src/electronics/ecnode.cpp index b4079e8..385b98e 100644 --- a/src/electronics/ecnode.cpp +++ b/src/electronics/ecnode.cpp @@ -132,11 +132,11 @@ void ECNode::setNodeChanged() } -void ECNode::setParentItem( CNItem * tqparentItem ) +void ECNode::setParentItem( CNItem * parentItem ) { - Node::setParentItem(tqparentItem); + Node::setParentItem(parentItem); - if ( Component * component = dynamic_cast(tqparentItem) ) + if ( Component * component = dynamic_cast(parentItem) ) { connect( component, TQT_SIGNAL(elementDestroyed(Element* )), this, TQT_SLOT(removeElement(Element* )) ); connect( component, TQT_SIGNAL(switchDestroyed( Switch* )), this, TQT_SLOT(removeSwitch( Switch* )) ); diff --git a/src/electronics/ecnode.h b/src/electronics/ecnode.h index 24d34e4..b75e945 100644 --- a/src/electronics/ecnode.h +++ b/src/electronics/ecnode.h @@ -37,7 +37,7 @@ class ECNode : public Node ECNode( ICNDocument *icnDocument, Node::node_type type, node_dir dir, const TQPoint &pos, TQString *id = 0L ); ~ECNode(); - virtual void setParentItem( CNItem *tqparentItem ); + virtual void setParentItem( CNItem *parentItem ); virtual void drawShape( TQPainter &p ); /** * Set the number of pins "contained" in this node. diff --git a/src/electronics/pin.h b/src/electronics/pin.h index 95aad7c..77a9e80 100644 --- a/src/electronics/pin.h +++ b/src/electronics/pin.h @@ -56,7 +56,7 @@ class Pin : public TQObject Pin( ECNode * tqparent ); ~Pin(); - ECNode * tqparentECNode() const { return m_pECNode; } + ECNode * parentECNode() const { return m_pECNode; } /** * This function returns the pins that are directly connected to this pins: * either at the ends of connected wires, or via switches. diff --git a/src/electronics/simulation/circuit.h b/src/electronics/simulation/circuit.h index c8c53cd..82c1f34 100644 --- a/src/electronics/simulation/circuit.h +++ b/src/electronics/simulation/circuit.h @@ -70,7 +70,7 @@ class Circuit */ void initCache(); /** - * Marks all cached results as tqinvalidated and removes them. + * Marks all cached results as invalidated and removes them. */ void setCacheInvalidated(); /** diff --git a/src/flowcontainer.cpp b/src/flowcontainer.cpp index 817627a..4d86d5b 100644 --- a/src/flowcontainer.cpp +++ b/src/flowcontainer.cpp @@ -270,13 +270,13 @@ void FlowContainer::buttonStateChanged(const TQString &/*id*/, bool state) } -bool FlowContainer::tqparentIsCollapsed() const +bool FlowContainer::parentIsCollapsed() const { if ( !p_parentItem ) return false; FlowContainer *fc = dynamic_cast((Item*)(p_parentItem)); - return !fc->isExpanded() || fc->tqparentIsCollapsed(); + return !fc->isExpanded() || fc->parentIsCollapsed(); } diff --git a/src/flowcontainer.h b/src/flowcontainer.h index a3dbecb..8d94ac3 100644 --- a/src/flowcontainer.h +++ b/src/flowcontainer.h @@ -39,9 +39,9 @@ public: */ bool isExpanded() const { return b_expanded; } /** - * Returns true if one of this tqparents is collapsed. + * Returns true if one of this parents is collapsed. */ - bool tqparentIsCollapsed() const; + bool parentIsCollapsed() const; void setExpanded( bool expanded ); virtual void setSelected( bool yes ); diff --git a/src/flowparts/flowpart.cpp b/src/flowparts/flowpart.cpp index abf8880..69d42a4 100644 --- a/src/flowparts/flowpart.cpp +++ b/src/flowparts/flowpart.cpp @@ -831,10 +831,10 @@ void FlowPart::orientationPixmap( uint orientation, TQPixmap & pm ) const } TQBitmap tqmask( 50, 50 ); - TQPainter tqmaskPainter(&tqmask); + TQPainter maskPainter(&tqmask); tqmask.fill( TQt::color0 ); - tqmaskPainter.setBrush(TQt::color1); - tqmaskPainter.setPen(TQt::color1); + maskPainter.setBrush(TQt::color1); + maskPainter.setPen(TQt::color1); TQPainter p(&pm); p.setBrush(m_brushCol); @@ -862,14 +862,14 @@ void FlowPart::orientationPixmap( uint orientation, TQPixmap & pm ) const diamond[i] = c[i]; p.drawPolygon(diamond); - tqmaskPainter.drawPolygon(diamond); + maskPainter.drawPolygon(diamond); //END Draw diamond outline //BEGIN Draw input int pos0 = nodeDirToPos( diamondNodePositioning[orientation][0] ); p.drawLine( c[pos0], d[pos0] ); - tqmaskPainter.drawLine( c[pos0], d[pos0] ); + maskPainter.drawLine( c[pos0], d[pos0] ); //END Draw input @@ -883,7 +883,7 @@ void FlowPart::orientationPixmap( uint orientation, TQPixmap & pm ) const int pos1 = nodeDirToPos( diamondNodePositioning[orientation][1] ); tick.translate( d[pos1].x(), d[pos1].y() ); p.drawLineSegments(tick); - tqmaskPainter.drawLineSegments(tick); + maskPainter.drawLineSegments(tick); //END Draw "true" output as a tick @@ -897,14 +897,14 @@ void FlowPart::orientationPixmap( uint orientation, TQPixmap & pm ) const int pos2 = nodeDirToPos( diamondNodePositioning[orientation][2] ); cross.translate( d[pos2].x(), d[pos2].y() ); p.drawLineSegments(cross); - tqmaskPainter.drawLineSegments(cross); + maskPainter.drawLineSegments(cross); //END Draw "false" output as a cross } else if ( m_stdInput || m_stdOutput ) { p.drawRoundRect( int(0.3*size.width()), int(0.4*size.height()), int(0.4*size.width()), int(0.2*size.height()) ); - tqmaskPainter.drawRoundRect( int(0.3*size.width()), int(0.4*size.height()), int(0.4*size.width()), int(0.2*size.height()) ); + maskPainter.drawRoundRect( int(0.3*size.width()), int(0.4*size.height()), int(0.4*size.width()), int(0.2*size.height()) ); int hal = 5; // half arrow length int haw = 3; // half arrow width @@ -952,7 +952,7 @@ void FlowPart::orientationPixmap( uint orientation, TQPixmap & pm ) const } inArrow.translate( d[inPos].x(), d[inPos].y() ); p.drawPolygon(inArrow); - tqmaskPainter.drawPolygon(inArrow); + maskPainter.drawPolygon(inArrow); } if ( outPos != -1 ) @@ -964,7 +964,7 @@ void FlowPart::orientationPixmap( uint orientation, TQPixmap & pm ) const } outArrow.translate( d[outPos].x(), d[outPos].y() ); p.drawPolygon(outArrow); - tqmaskPainter.drawPolygon(outArrow); + maskPainter.drawPolygon(outArrow); } } diff --git a/src/fpnode.cpp b/src/fpnode.cpp index 5663bfb..b62f0ae 100644 --- a/src/fpnode.cpp +++ b/src/fpnode.cpp @@ -30,7 +30,7 @@ FPNode::~FPNode() FlowPart *FPNode::outputFlowPart() const { - FlowPart *flowPart = dynamic_cast(tqparentItem()); + FlowPart *flowPart = dynamic_cast(parentItem()); if ( type() == fp_in ) return flowPart; @@ -52,7 +52,7 @@ FlowPart *FPNode::outputFlowPart() const FlowPartList FPNode::inputFlowParts() const { FlowPartList list; - FlowPart *flowPart = dynamic_cast(tqparentItem()); + FlowPart *flowPart = dynamic_cast(parentItem()); if ( type() != fp_in && flowPart ) { list.append(flowPart); @@ -64,7 +64,7 @@ FlowPartList FPNode::inputFlowParts() const if (*it) { Node *startNode = (*it)->startNode(); - FlowPart *flowPart = startNode ? dynamic_cast(startNode->tqparentItem()) : 0l; + FlowPart *flowPart = startNode ? dynamic_cast(startNode->parentItem()) : 0l; if (flowPart) list.append(flowPart); } diff --git a/src/gui/asmformattingwidget.ui b/src/gui/asmformattingwidget.ui index a246581..1245538 100644 --- a/src/gui/asmformattingwidget.ui +++ b/src/gui/asmformattingwidget.ui @@ -202,7 +202,7 @@ kcfg_IndentComment kcfg_AutoFormatMBOutput - + knuminput.h knuminput.h diff --git a/src/gui/createsubprojectwidget.ui b/src/gui/createsubprojectwidget.ui index bf3efde..2d18c06 100644 --- a/src/gui/createsubprojectwidget.ui +++ b/src/gui/createsubprojectwidget.ui @@ -90,7 +90,7 @@ - + kurlrequester.h klineedit.h diff --git a/src/gui/generaloptionswidget.ui b/src/gui/generaloptionswidget.ui index d98b794..6c9cd19 100644 --- a/src/gui/generaloptionswidget.ui +++ b/src/gui/generaloptionswidget.ui @@ -261,7 +261,7 @@ kcfg_RaiseMessagesLog refreshRateSlider - + kcolorbutton.h knuminput.h diff --git a/src/gui/gpasmsettingswidget.ui b/src/gui/gpasmsettingswidget.ui index 9cf9be0..2e94ebc 100644 --- a/src/gui/gpasmsettingswidget.ui +++ b/src/gui/gpasmsettingswidget.ui @@ -278,7 +278,7 @@ kcfg_IgnoreCase kcfg_DosFormat - + kcombobox.h kcombobox.h diff --git a/src/gui/itemselector.cpp b/src/gui/itemselector.cpp index c02fffd..32ff6da 100644 --- a/src/gui/itemselector.cpp +++ b/src/gui/itemselector.cpp @@ -77,7 +77,7 @@ void ItemSelector::clear() void ItemSelector::addItem( const TQString & caption, const TQString & id, const TQString & _category, const TQPixmap & icon, bool removable ) { - ILVItem *tqparentItem = 0L; + ILVItem *parentItem = 0L; TQString category = _category; if ( !category.startsWith("/") ) { @@ -99,32 +99,32 @@ void ItemSelector::addItem( const TQString & caption, const TQString & id, const { m_categories.append(cat); - if (tqparentItem) { - tqparentItem = new ILVItem( tqparentItem, "" ); + if (parentItem) { + parentItem = new ILVItem( parentItem, "" ); } else { - tqparentItem = new ILVItem( this, "" ); + parentItem = new ILVItem( this, "" ); } - tqparentItem->setOpen( readOpenState(cat) ); + parentItem->setOpen( readOpenState(cat) ); - tqparentItem->setExpandable(true); - tqparentItem->setText( 0, cat ); + parentItem->setExpandable(true); + parentItem->setText( 0, cat ); } else { - tqparentItem = (ILVItem*)tqfindItem( cat, 0 ); + parentItem = (ILVItem*)tqfindItem( cat, 0 ); } category.remove( 0, pos ); } while ( category.tqcontains('/') ); - if ( !tqparentItem ) + if ( !parentItem ) { kdError() << "Unexpected error in finding tqparent item for category list"<setPixmap( 0, icon ); item->setText( 0, caption ); item->setRemovable(removable); diff --git a/src/gui/linkeroptionswidget.ui b/src/gui/linkeroptionswidget.ui index 4674641..ef4dcb8 100644 --- a/src/gui/linkeroptionswidget.ui +++ b/src/gui/linkeroptionswidget.ui @@ -167,7 +167,7 @@ m_pOther m_pInternalLibraries - + kcombobox.h klineedit.h diff --git a/src/gui/logicwidget.ui b/src/gui/logicwidget.ui index a931dc5..2280eb4 100644 --- a/src/gui/logicwidget.ui +++ b/src/gui/logicwidget.ui @@ -262,7 +262,7 @@ These values will apply to all components, apart from the PIC, whose pins' imped - + knuminput.h knuminput.h diff --git a/src/gui/microsettingswidget.ui b/src/gui/microsettingswidget.ui index 417275d..3d5ff66 100644 --- a/src/gui/microsettingswidget.ui +++ b/src/gui/microsettingswidget.ui @@ -186,7 +186,7 @@ Drag it to set the type (input/output). - + kcombobox.h kpushbutton.h diff --git a/src/gui/newfilewidget.ui b/src/gui/newfilewidget.ui index 4925106..cf33850 100644 --- a/src/gui/newfilewidget.ui +++ b/src/gui/newfilewidget.ui @@ -187,7 +187,7 @@ Creates a new circuit, with drag and drop editor. Real time simulation of the ci typeIconView addToProjectCheck - + kiconview.h microselectwidget.h diff --git a/src/gui/newpinmappingwidget.ui b/src/gui/newpinmappingwidget.ui index 3ea01e7..4972642 100644 --- a/src/gui/newpinmappingwidget.ui +++ b/src/gui/newpinmappingwidget.ui @@ -123,7 +123,7 @@ - + klineedit.h diff --git a/src/gui/newprojectwidget.ui b/src/gui/newprojectwidget.ui index efcebad..dc36007 100644 --- a/src/gui/newprojectwidget.ui +++ b/src/gui/newprojectwidget.ui @@ -100,7 +100,7 @@ projectNameEdit projectLocationURL - + klineedit.h kurlrequester.h diff --git a/src/gui/oscilloscopewidget.ui b/src/gui/oscilloscopewidget.ui index 1d128ba..0a6acb9 100644 --- a/src/gui/oscilloscopewidget.ui +++ b/src/gui/oscilloscopewidget.ui @@ -281,7 +281,7 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154388db5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c6a2573410000000049454e44ae426082 - + oscilloscopeview.h probepositioner.h diff --git a/src/gui/outputmethodwidget.ui b/src/gui/outputmethodwidget.ui index 26b76f4..0814591 100644 --- a/src/gui/outputmethodwidget.ui +++ b/src/gui/outputmethodwidget.ui @@ -172,7 +172,7 @@ setEnabled(bool) - + kurlrequester.h klineedit.h diff --git a/src/gui/picprogrammerconfigwidget.ui b/src/gui/picprogrammerconfigwidget.ui index 520e9d4..43929f9 100644 --- a/src/gui/picprogrammerconfigwidget.ui +++ b/src/gui/picprogrammerconfigwidget.ui @@ -270,7 +270,7 @@ eraseCommand kcfg_PicProgrammerPort - + kpushbutton.h kpushbutton.h diff --git a/src/gui/processingoptionswidget.ui b/src/gui/processingoptionswidget.ui index be18723..501fd3b 100644 --- a/src/gui/processingoptionswidget.ui +++ b/src/gui/processingoptionswidget.ui @@ -88,7 +88,7 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042949444154388db5954d6c545514c77ff7de37eff1a6a550da994e5ba798868f948fc847a2a2911816c436b0a02ed0083161a1981877ee10d90aa94656063491882c5cd4c4b8103f20cd806909a98604da8482341de80cb69de9bcd799799d79efba980f1da3a80b4f727273939bdff99f9b93f3175a6b6a21849080020c4002a29a8f0a5dcd002803bed63a1035f0d0d0504b6f6fef51d7758fa4d3e98d8ee3fc03af128ee3303939399548242eb8aefb09300f78464de9f0f0f0d148cc7caf3d5424de97a7ec17104220242805520a44557bbd4b21f083801d33e63a6d1bc7bf19c6064e0319a35a58b9ae7ba43d54e4d7c54b64dc097c7f09d30ef04b36736983cc7c11b4456b9b492c5e20dc54a6540e00896a8268a7017010f8bcae1830d2e9f4c69ebe3c197782b2ce60d94ddc9b30f9feeb45ae5d7181c5ead35636ef08d3ffe26a76ee3208b4031a56d80aa00768fda362e9380e25bf80ef3b587613d7afc099533380a4b5dda46fcb5aa42998b9eb7173dce5e6788e434763ec7fc942532008ea436003660d2caa7f8d69c3bd8910674e4d033e83877ad8d36fb0aa4d6058658ac5358c5df6383bf480f31fdda5a3632bbbfb6da4ccd5c00a10b2012cc12fd97cfb5516f0187c25cee0619396480ec3ca909d0f3372d1e5f9fe66de3ad605587c712ec55256a2540d5519d19ae24a29057329839f7ecc138944d833102290f3184ae1e6d6f0e98739c61229e6d21eafbed1c9c8c5558c8f3ee4ceed76946a1c43d97091828585223e2eebfbc295f60d45de89707628cb58224577bc85a79e5d4d786581cddb9b0148259711b20145836221400416e0232d1f6595c9ce4538773ac7b54406f0b15784e8e80aa1ac2594190220d021e49f2437960156b70ba095e95f96f18acd8c263cc6122962b1167a7ba34cdd7ec8c977a699bed546722a8fc2a02b6e2185fff78ab586ce78894ddb9ab9f5738ed14b1e030756929d8ff2e4ae5544632b38f96e89a99b298ebd6950cc2d12ed0eb3618b26f520788462ad09877df60db600f0f1fb49c646f21c7ebd836dcf94e9d9b4c0db27d6d3bd36c6426a96bce731703046d7da129a4670836284a054869d4f1b1c7e2dca67676ef3c1898091ef5ad8bc358c3205c93bf7c9a40ad4c660f4728edd7bbb3142ea2fc1da711cfc200011e08b45f6bd1c261adbce9717928c5f9d63fc6a19f0014567773303073790f8214bd6f5282dfbb8b9fa1f6b40d7c1939393533b92e63ad9240990484aec7e41b27d579cbb531e0f67023492d86316ebb768ba1e0f786e6f37e56550c62237aee7011e54abd7c1412291b8a06de378b4d3c0b215da9708e5a3a442192085404a83d4accfecac067c0c43e13a70e3fa12e96409e0325000966bbb354465339d04a6f9dd15fe6dde07ce030780278088d05ad72cc9a6b2f2daaaa74d75a1f0e8d0d5f60b40868a8364ead6248430000b0857a126ffcdf396abf03ce089ffcb4c7f033046c6b4a995e7a00000000049454e44ae426082 - + microselectwidget.h kurlrequester.h diff --git a/src/gui/programmerwidget.ui b/src/gui/programmerwidget.ui index 73c651a..b41a05a 100644 --- a/src/gui/programmerwidget.ui +++ b/src/gui/programmerwidget.ui @@ -115,7 +115,7 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042949444154388db5954d6c545514c77ff7de37eff1a6a550da994e5ba798868f948fc847a2a2911816c436b0a02ed0083161a1981877ee10d90aa94656063491882c5cd4c4b8103f20cd806909a98604da8482341de80cb69de9bcd799799d79efba980f1da3a80b4f727273939bdff99f9b93f3175a6b6a21849080020c4002a29a8f0a5dcd002803bed63a1035f0d0d0504b6f6fef51d7758fa4d3e98d8ee3fc03af128ee3303939399548242eb8aefb09300f78464de9f0f0f0d148cc7caf3d5424de97a7ec17104220242805520a44557bbd4b21f083801d33e63a6d1bc7bf19c6064e0319a35a58b9ae7ba43d54e4d7c54b64dc097c7f09d30ef04b36736983cc7c11b4456b9b492c5e20dc54a6540e00896a8268a7017010f8bcae1830d2e9f4c69ebe3c197782b2ce60d94ddc9b30f9feeb45ae5d7181c5ead35636ef08d3ffe26a76ee3208b4031a56d80aa00768fda362e9380e25bf80ef3b587613d7afc099533380a4b5dda46fcb5aa42998b9eb7173dce5e6788e434763ec7fc942532008ea436003660d2caa7f8d69c3bd8910674e4d033e83877ad8d36fb0aa4d6058658ac5358c5df6383bf480f31fdda5a3632bbbfb6da4ccd5c00a10b2012cc12fd97cfb5516f0187c25cee0619396480ec3ca909d0f3372d1e5f9fe66de3ad605587c712ec55256a2540d5519d19ae24a29057329839f7ecc138944d833102290f3184ae1e6d6f0e98739c61229e6d21eafbed1c9c8c5558c8f3ee4ceed76946a1c43d97091828585223e2eebfbc295f60d45de89707628cb58224577bc85a79e5d4d786581cddb9b0148259711b20145836221400416e0232d1f6595c9ce4538773ac7b54406f0b15784e8e80aa1ac2594190220d021e49f2437960156b70ba095e95f96f18acd8c263cc6122962b1167a7ba34cdd7ec8c977a699bed546722a8fc2a02b6e2185fff78ab586ce78894ddb9ab9f5738ed14b1e030756929d8ff2e4ae5544632b38f96e89a99b298ebd6950cc2d12ed0eb3618b26f520788462ad09877df60db600f0f1fb49c646f21c7ebd836dcf94e9d9b4c0db27d6d3bd36c6426a96bce731703046d7da129a4670836284a054869d4f1b1c7e2dca67676ef3c1898091ef5ad8bc358c3205c93bf7c9a40ad4c660f4728edd7bbb3142ea2fc1da711cfc200011e08b45f6bd1c261adbce9717928c5f9d63fc6a19f0014567773303073790f8214bd6f5282dfbb8b9fa1f6b40d7c1939393533b92e63ad9240990484aec7e41b27d579cbb531e0f67023492d86316ebb768ba1e0f786e6f37e56550c62237aee7011e54abd7c1412291b8a06de378b4d3c0b215da9708e5a3a442192085404a83d4accfecac067c0c43e13a70e3fa12e96409e0325000966bbb354465339d04a6f9dd15fe6dde07ce030780278088d05ad72cc9a6b2f2daaaa74d75a1f0e8d0d5f60b40868a8364ead6248430000b0857a126ffcdf396abf03ce089ffcb4c7f033046c6b4a995e7a00000000049454e44ae426082 - + kcombobox.h microselectwidget.h diff --git a/src/gui/sdccoptionswidget.ui b/src/gui/sdccoptionswidget.ui index 3f73699..a8412b8 100644 --- a/src/gui/sdccoptionswidget.ui +++ b/src/gui/sdccoptionswidget.ui @@ -579,7 +579,7 @@ - + klineedit.h diff --git a/src/icndocument.cpp b/src/icndocument.cpp index 1273802..b98d5c2 100644 --- a/src/icndocument.cpp +++ b/src/icndocument.cpp @@ -279,11 +279,11 @@ bool ICNDocument::canConnect( TQCanvasItem *qcanvasItem1, TQCanvasItem *qcanvasI //BEGIN Advanced level check CNItem * startParentItem[3]; for ( unsigned i = 0; i < 3; i++ ) - startParentItem[i] = start[i] ? start[i]->tqparentItem() : 0l; + startParentItem[i] = start[i] ? start[i]->parentItem() : 0l; CNItem * endParentItem[3]; for ( unsigned i = 0; i < 3; i++ ) - endParentItem[i] = end[i] ? end[i]->tqparentItem() : 0l; + endParentItem[i] = end[i] ? end[i]->parentItem() : 0l; Item * container[6] = {0l}; @@ -293,7 +293,7 @@ bool ICNDocument::canConnect( TQCanvasItem *qcanvasItem1, TQCanvasItem *qcanvasI { int dl = start[i]->level() - startParentItem[i]->level(); if ( dl == 0 ) - container[i] = startParentItem[i]->tqparentItem(); + container[i] = startParentItem[i]->parentItem(); else if ( dl == 1 ) container[i] = startParentItem[i]; else @@ -303,7 +303,7 @@ bool ICNDocument::canConnect( TQCanvasItem *qcanvasItem1, TQCanvasItem *qcanvasI { int dl = end[i]->level() - endParentItem[i]->level(); if ( dl == 0 ) - container[i+3] = endParentItem[i]->tqparentItem(); + container[i+3] = endParentItem[i]->parentItem(); else if ( dl == 1 ) container[i+3] = endParentItem[i]; else @@ -715,7 +715,7 @@ void ICNDocument::getTranslatable( const ItemList & itemList, ConnectorList * fi Node *startNode = it.key()->endNode(); Node *endNode = it.key()->startNode(); if ( (it.data() > 1) || - (startNode && endNode && startNode->tqparentItem() == endNode->tqparentItem()) ) + (startNode && endNode && startNode->parentItem() == endNode->parentItem()) ) { translatableConnectors->append( const_cast(it.key()) ); } @@ -855,7 +855,7 @@ void ICNDocument::flushDeleteList() { (*it)->removeNullConnectors(); int conCount = (*it)->inputConnectorList().count() + (*it)->outputConnectorList().count(); - if ( conCount == 2 && !(*it)->tqparentItem() ) + if ( conCount == 2 && !(*it)->parentItem() ) { if ( joinConnectors(*it) ) doneJoin = true; @@ -873,7 +873,7 @@ void ICNDocument::flushDeleteList() bool ICNDocument::joinConnectors( Node *node ) { // We don't want to destroy the node if it has a tqparent - if ( node->tqparentItem() ) + if ( node->parentItem() ) return false; node->removeNullConnectors(); @@ -1208,7 +1208,7 @@ void ICNDocument::rerouteInvalidatedConnectors() } } - // To allow proper rerouting, we want to start with clean routes for all of the tqinvalidated connectors + // To allow proper rerouting, we want to start with clean routes for all of the invalidated connectors const NodeGroupList::iterator nodeGroupRerouteEnd = nodeGroupRerouteList.end(); for ( NodeGroupList::iterator it = nodeGroupRerouteList.begin(); it != nodeGroupRerouteEnd; ++it ) { diff --git a/src/icndocument.h b/src/icndocument.h index c463bb1..96fcfb5 100644 --- a/src/icndocument.h +++ b/src/icndocument.h @@ -161,7 +161,7 @@ public: void getTranslatable( const ItemList & itemList, ConnectorList * fixedConnectors = 0l, ConnectorList * translatableConnectors = 0l, NodeGroupList * translatableNodeGroups = 0l ); /** - * Reroutes tqinvalidated directors. You shouldn't call this function + * Reroutes invalidated directors. You shouldn't call this function * directly - instead use ItemDocument::requestEvent. */ void rerouteInvalidatedConnectors(); diff --git a/src/item.cpp b/src/item.cpp index e5f7466..e2cd3b0 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -138,14 +138,14 @@ ItemData Item::itemData() const itemData.x = x(); itemData.y = y(); - if ( !tqparentItem() ) + if ( !parentItem() ) itemData.z = m_baseZ; itemData.size = m_sizeRect; itemData.setSize = canResize(); if (p_parentItem) - itemData.tqparentId = p_parentItem->id(); + itemData.parentId = p_parentItem->id(); const VariantDataMap::const_iterator end = m_variantData.end(); for ( VariantDataMap::const_iterator it = m_variantData.begin(); it != end; ++it ) @@ -212,9 +212,9 @@ void Item::restoreFromItemData( const ItemData &itemData ) if ( canResize() ) setSize( itemData.size ); - Item *tqparentItem = p_itemDocument->itemWithID( itemData.tqparentId ); - if (tqparentItem) - setParentItem(tqparentItem); + Item *parentItem = p_itemDocument->itemWithID( itemData.parentId ); + if (parentItem) + setParentItem(parentItem); else m_baseZ = itemData.z; diff --git a/src/item.h b/src/item.h index 7f65c7a..3807e6d 100644 --- a/src/item.h +++ b/src/item.h @@ -108,11 +108,11 @@ public: * Sets this item as a child of the given item. Calls reparented with the * old and the new tqparent. */ - void setParentItem( Item *tqparentItem ); + void setParentItem( Item *parentItem ); /** * The tqparent item for this item, or NULL if none */ - Item *tqparentItem() const { return p_parentItem; } + Item *parentItem() const { return p_parentItem; } ItemDocument *itemDocument() const { return p_itemDocument; } /** * Returns the number of items away from the top item this is diff --git a/src/itemdocument.cpp b/src/itemdocument.cpp index 0556552..215b88a 100644 --- a/src/itemdocument.cpp +++ b/src/itemdocument.cpp @@ -232,7 +232,7 @@ bool ItemDocument::openURL( const KURL &url ) ItemList::iterator end = m_itemList.end(); for ( ItemList::iterator it = m_itemList.begin(); it != end; ++it ) { - if ( !*it || (*it)->tqparentItem() ) + if ( !*it || (*it)->parentItem() ) continue; m_zOrder[(*it)->baseZ()] = *it; @@ -572,7 +572,7 @@ void ItemDocument::canvasRightClick( const TQPoint &pos, TQCanvasItem* item ) } } - p_ktechlab->unplugActionList("tqalignment_actionlist"); + p_ktechlab->unplugActionList("alignment_actionlist"); p_ktechlab->unplugActionList("orientation_actionlist"); p_ktechlab->unplugActionList("component_actionlist"); fillContextMenu(pos); @@ -611,9 +611,9 @@ void ItemDocument::fillContextMenu( const TQPoint & pos ) m_pAlignmentAction->remove( align_actions[i] ); m_pAlignmentAction->insert( align_actions[i] ); } - TQPtrList tqalignment_actions; - tqalignment_actions.append( m_pAlignmentAction ); - p_ktechlab->plugActionList( "tqalignment_actionlist", tqalignment_actions ); + TQPtrList alignment_actions; + alignment_actions.append( m_pAlignmentAction ); + p_ktechlab->plugActionList( "alignment_actionlist", alignment_actions ); } @@ -1039,7 +1039,7 @@ void ItemDocument::slotUpdateZOrdering() toAdd.remove(item); - if ( !item->tqparentItem() && item->isMovable() ) + if ( !item->parentItem() && item->isMovable() ) newZOrder[atLevel++] = item; } @@ -1047,7 +1047,7 @@ void ItemDocument::slotUpdateZOrdering() for ( ItemList::iterator it = toAdd.begin(); it != addEnd; ++it ) { Item * item = *it; - if ( item->tqparentItem() || !item->isMovable() ) + if ( item->parentItem() || !item->isMovable() ) continue; newZOrder[atLevel++] = item; diff --git a/src/itemdocument.h b/src/itemdocument.h index c40bc31..03d8d35 100644 --- a/src/itemdocument.h +++ b/src/itemdocument.h @@ -85,7 +85,7 @@ class ItemDocument : public Document /** * Some things (such as the canvas getting resized, connectors being - * tqinvalidated, need to be done after editing operations have finished, + * invalidated, need to be done after editing operations have finished, * etc, and they also need to be done in the order given in the * enumeration below. */ @@ -292,7 +292,7 @@ class ItemDocument : public Document void distributeVertically(); /** * Adds an items not in the Z ordering to the ordering, and removes any - * items from the Z ordering if they have tqparents. Then, calls all items + * items from the Z ordering if they have parents. Then, calls all items * found in the ordering to tell them their Z position. */ void slotUpdateZOrdering(); diff --git a/src/itemdocumentdata.cpp b/src/itemdocumentdata.cpp index a352b04..8981980 100644 --- a/src/itemdocumentdata.cpp +++ b/src/itemdocumentdata.cpp @@ -423,8 +423,8 @@ TQDomElement ItemDocumentData::itemDataToElement( TQDomDocument &doc, const Item node.setAttribute( "flip", itemData.flipped ); } - if ( !itemData.tqparentId.isEmpty() ) - node.setAttribute( "tqparent", itemData.tqparentId ); + if ( !itemData.parentId.isEmpty() ) + node.setAttribute( "tqparent", 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.tqparentId = element.attribute( "tqparent", TQString() ); + itemData.parentId = element.attribute( "tqparent", TQString() ); m_itemDataMap[id] = itemData; @@ -548,7 +548,7 @@ void ItemDocumentData::elementToItemData( TQDomElement element ) elementToItemData(childElement); TQString childId = childElement.attribute( "id", TQString() ); if ( !childId.isNull() ) - m_itemDataMap[childId].tqparentId = id; + m_itemDataMap[childId].parentId = id; } else if ( tagName == "data" ) @@ -826,7 +826,7 @@ void ItemDocumentData::generateUniqueIDs( ItemDocument *itemDocument ) const ItemDataMap::iterator end = newItemDataMap.end(); for ( ItemDataMap::iterator it = newItemDataMap.begin(); it != end; ++it ) { - it.data().tqparentId = replaced[it.data().tqparentId]; + it.data().parentId = replaced[it.data().parentId]; } } { @@ -1000,7 +1000,7 @@ void ItemDocumentData::mergeWithDocument( ItemDocument *itemDocument, bool selec } if (item) { - //HACK We move the item now before restoreFromItemData is called later, in case it is to be tqparented + //HACK We move the item now before restoreFromItemData is called later, in case it is to be parented //(as we don't want to move tqchildren)... item->move( it.data().x, it.data().y ); } diff --git a/src/itemdocumentdata.h b/src/itemdocumentdata.h index b5e349a..905de9c 100644 --- a/src/itemdocumentdata.h +++ b/src/itemdocumentdata.h @@ -52,7 +52,7 @@ class ItemData bool flipped; BoolMap buttonMap; IntMap sliderMap; - TQString tqparentId; + TQString parentId; BoolMap dataBool; DoubleMap dataNumber; TQColorMap dataColor; diff --git a/src/itemgroup.cpp b/src/itemgroup.cpp index 9abdfe0..d6d6fb2 100644 --- a/src/itemgroup.cpp +++ b/src/itemgroup.cpp @@ -46,7 +46,7 @@ ItemList ItemGroup::items( bool excludeParentedItems ) const return m_itemList; ItemList items = m_itemList; - ItemList tqparents = m_itemList; + ItemList parents = m_itemList; uint oldSize = items.size(); do @@ -54,8 +54,8 @@ ItemList ItemGroup::items( bool excludeParentedItems ) const oldSize = items.size(); ItemList tqchildren; - ItemList::iterator end = tqparents.end(); - for ( ItemList::iterator it = tqparents.begin(); it != end; ++it ) + ItemList::iterator end = parents.end(); + for ( ItemList::iterator it = parents.begin(); it != end; ++it ) tqchildren += (*it)->tqchildren(); end = tqchildren.end(); @@ -67,7 +67,7 @@ ItemList ItemGroup::items( bool excludeParentedItems ) const tqchildren.remove((Item*)0l); items += tqchildren; - tqparents = tqchildren; + parents = tqchildren; } while ( oldSize != items.size() ); diff --git a/src/itemgroup.h b/src/itemgroup.h index bf31cc1..bc6654f 100644 --- a/src/itemgroup.h +++ b/src/itemgroup.h @@ -57,7 +57,7 @@ public: virtual void deleteAllItems() = 0; /** * Returns a list of all the Items in the group. - * @param excludeParented whether to return items whose (grand-) tqparents are + * @param excludeParented whether to return items whose (grand-) parents are * already in the list. */ ItemList items( bool excludeParented = true ) const; diff --git a/src/itemlibrary.cpp b/src/itemlibrary.cpp index 9905372..6451e6b 100644 --- a/src/itemlibrary.cpp +++ b/src/itemlibrary.cpp @@ -370,10 +370,10 @@ TQImage ItemLibrary::itemImage( Item *item, const uint maxSize ) TQBitmap tqmask( bound.size() ); tqmask.fill( TQt::color0 ); - TQPainter tqmaskPainter(&tqmask); - tqmaskPainter.translate( -bound.x(), -bound.y() ); - tqmaskPainter.setPen( TQt::color1 ); - tqmaskPainter.setBrush( TQt::color1 ); + TQPainter maskPainter(&tqmask); + maskPainter.translate( -bound.x(), -bound.y() ); + maskPainter.setPen( TQt::color1 ); + maskPainter.setBrush( TQt::color1 ); TQPainter p(&pm); @@ -391,7 +391,7 @@ TQImage ItemLibrary::itemImage( Item *item, const uint maxSize ) item->blockSignals(false); } item->drawShape(p); - item->drawShape(tqmaskPainter); + item->drawShape(maskPainter); if (sel) { item->blockSignals(true); @@ -399,8 +399,8 @@ TQImage ItemLibrary::itemImage( Item *item, const uint maxSize ) item->blockSignals(false); } - tqmaskPainter.setPen( TQt::color1 ); - tqmaskPainter.setBrush( TQt::color1 ); + maskPainter.setPen( TQt::color1 ); + maskPainter.setBrush( TQt::color1 ); TQWMatrix transMatrix; // Matrix to apply to the image @@ -420,13 +420,13 @@ TQImage ItemLibrary::itemImage( Item *item, const uint maxSize ) const bool showVB = ecnode->showVoltageBars(); ecnode->setShowVoltageBars(false); ecnode->drawShape(p); - ecnode->drawShape(tqmaskPainter); + ecnode->drawShape(maskPainter); ecnode->setShowVoltageBars(showVB); } else { node->drawShape(p); - node->drawShape(tqmaskPainter); + node->drawShape(maskPainter); } if (sel) node->setSelected(sel); @@ -438,13 +438,13 @@ TQImage ItemLibrary::itemImage( Item *item, const uint maxSize ) for ( TextMap::iterator it = text.begin(); it != textEnd; ++it ) { it.data()->drawShape(p); - it.data()->drawShape(tqmaskPainter); + it.data()->drawShape(maskPainter); } -// tqmaskPainter.setPen( TQt::color1 ); -// tqmaskPainter.setBrush( TQt::color1 ); +// maskPainter.setPen( TQt::color1 ); +// maskPainter.setBrush( TQt::color1 ); cnItem->drawWidgets(p); -// cnItem->drawWidgets(tqmaskPainter); +// cnItem->drawWidgets(maskPainter); transMatrix = Component::transMatrix( component->angleDegrees(), component->flipped(), bound.width()/2, bound.height()/2, true ); } diff --git a/src/katemdi.cpp b/src/katemdi.cpp index e518136..e641744 100644 --- a/src/katemdi.cpp +++ b/src/katemdi.cpp @@ -588,8 +588,8 @@ void Sidebar::saveSession (KConfig *config) //BEGIN MAIN WINDOW -MainWindow::MainWindow (TQWidget* tqparentWidget, const char* name) - : KParts::MainWindow( tqparentWidget, name) +MainWindow::MainWindow (TQWidget* parentWidget, const char* name) + : KParts::MainWindow( parentWidget, name) , m_restoreConfig (0) , m_guiClient (new GUIClient (this)) { diff --git a/src/katemdi.h b/src/katemdi.h index 177d3b2..58f569a 100644 --- a/src/katemdi.h +++ b/src/katemdi.h @@ -256,7 +256,7 @@ class MainWindow : public KParts::MainWindow /** * Constructor */ - MainWindow (TQWidget* tqparentWidget = 0, const char* name = 0); + MainWindow (TQWidget* parentWidget = 0, const char* name = 0); /** * Destructor diff --git a/src/ktechlab.cpp b/src/ktechlab.cpp index 1e10245..c3ec9f7 100644 --- a/src/ktechlab.cpp +++ b/src/ktechlab.cpp @@ -645,7 +645,7 @@ void KTechlab::saveProperties( KConfig *conf ) saveSession( conf, "KateMDI" ); // Piss off KMainWindow conf->setGroup("KateMDI"); - int scnum = TQApplication::desktop()->screenNumber(tqparentWidget()); + int scnum = TQApplication::desktop()->screenNumber(parentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); conf->deleteEntry( TQString::tqfromLatin1("Width %1").tqarg(desk.width()) ); conf->deleteEntry( TQString::tqfromLatin1("Height %1").tqarg(desk.height()) ); diff --git a/src/languages/flowcode.cpp b/src/languages/flowcode.cpp index 9fad28d..b557c59 100644 --- a/src/languages/flowcode.cpp +++ b/src/languages/flowcode.cpp @@ -444,7 +444,7 @@ void FlowCode::tidyCode() void FlowCode::addSubroutine( FlowPart *part ) { - if ( !part || m_subroutines.tqcontains(part) || part->tqparentItem() || !dynamic_cast(part) ) return; + if ( !part || m_subroutines.tqcontains(part) || part->parentItem() || !dynamic_cast(part) ) return; m_subroutines.append(part); } diff --git a/src/mechanics/mechanicsgroup.cpp b/src/mechanics/mechanicsgroup.cpp index 8d27579..32f1748 100644 --- a/src/mechanics/mechanicsgroup.cpp +++ b/src/mechanics/mechanicsgroup.cpp @@ -31,12 +31,12 @@ bool MechanicsGroup::addItem( Item *item ) } // Check that the item's tqparent isn't already selected - Item *tqparent = item->tqparentItem(); + Item *tqparent = item->parentItem(); while (tqparent) { if ( m_itemList.tqcontains(tqparent) ) return false; - tqparent = tqparent->tqparentItem(); + tqparent = tqparent->parentItem(); } removeChildren(item); @@ -134,10 +134,10 @@ MechanicsItemList MechanicsGroup::toplevelMechItemList() const MechanicsItem* tqparent = *it; while (tqparent) { - if ( !tqparent->tqparentItem() && !toplevel.tqcontains(tqparent) ) + if ( !tqparent->parentItem() && !toplevel.tqcontains(tqparent) ) toplevel.append(tqparent); - tqparent = dynamic_cast(tqparent->tqparentItem()); + tqparent = dynamic_cast(tqparent->parentItem()); } } diff --git a/src/mechanics/mechanicsitem.cpp b/src/mechanics/mechanicsitem.cpp index 379face..96c4adf 100644 --- a/src/mechanics/mechanicsitem.cpp +++ b/src/mechanics/mechanicsitem.cpp @@ -102,9 +102,9 @@ void MechanicsItem::dataChanged() PositionInfo MechanicsItem::absolutePosition() const { - MechanicsItem *tqparentMechItem = dynamic_cast((Item*)(p_parentItem)); - if (tqparentMechItem) - return tqparentMechItem->absolutePosition() + m_relativePosition; + MechanicsItem *parentMechItem = dynamic_cast((Item*)(p_parentItem)); + if (parentMechItem) + return parentMechItem->absolutePosition() + m_relativePosition; return m_relativePosition; } @@ -118,13 +118,13 @@ void MechanicsItem::reparented( Item *oldItem, Item *newItem ) if (oldMechItem) { m_relativePosition = oldMechItem->absolutePosition() + m_relativePosition; - disconnect( oldMechItem, TQT_SIGNAL(moved()), this, TQT_SLOT(tqparentMoved()) ); + disconnect( oldMechItem, TQT_SIGNAL(moved()), this, TQT_SLOT(parentMoved()) ); } if (newMechItem) { m_relativePosition = m_relativePosition - newMechItem->absolutePosition(); - connect( newMechItem, TQT_SIGNAL(moved()), this, TQT_SLOT(tqparentMoved()) ); + connect( newMechItem, TQT_SIGNAL(moved()), this, TQT_SLOT(parentMoved()) ); } updateCanvasPoints(); @@ -153,7 +153,7 @@ void MechanicsItem::childRemoved( Item *child ) } -void MechanicsItem::tqparentMoved() +void MechanicsItem::parentMoved() { PositionInfo absPos = absolutePosition(); Item::moveBy( absPos.x() - x(), absPos.y() - y() ); diff --git a/src/mechanics/mechanicsitem.h b/src/mechanics/mechanicsitem.h index 8c73d9d..054e04a 100644 --- a/src/mechanics/mechanicsitem.h +++ b/src/mechanics/mechanicsitem.h @@ -188,7 +188,7 @@ public slots: * Rotate the item by the given amount (in radians) */ void rotateBy( double dtheta ); - void tqparentMoved(); + void parentMoved(); signals: /** diff --git a/src/mechanics/mechanicssimulation.cpp b/src/mechanics/mechanicssimulation.cpp index c641074..15900d3 100644 --- a/src/mechanics/mechanicssimulation.cpp +++ b/src/mechanics/mechanicssimulation.cpp @@ -85,20 +85,20 @@ bool RigidBody::findOverallParent() const MechanicsItemList::iterator end = m_mechanicsItemList.end(); for ( MechanicsItemList::iterator it = m_mechanicsItemList.begin(); it != end; ++it ) { - MechanicsItem *tqparentItem = *it; - MechanicsItem *tqparentCandidate = dynamic_cast((*it)->tqparentItem()); + MechanicsItem *parentItem = *it; + MechanicsItem *parentCandidate = dynamic_cast((*it)->parentItem()); - while (tqparentCandidate) + while (parentCandidate) { - tqparentItem = tqparentCandidate; - tqparentCandidate = dynamic_cast(tqparentItem->tqparentItem()); + parentItem = parentCandidate; + parentCandidate = dynamic_cast(parentItem->parentItem()); } if ( !p_overallParent ) // Must be the first item to test - p_overallParent = tqparentItem; + p_overallParent = parentItem; - if ( p_overallParent != tqparentItem ) + if ( p_overallParent != parentItem ) { p_overallParent = 0l; return false; diff --git a/src/node.cpp b/src/node.cpp index 68002a2..4aa3ebe 100644 --- a/src/node.cpp +++ b/src/node.cpp @@ -286,15 +286,15 @@ TQPoint Node::findConnectorDivergePoint( bool * found ) } -void Node::setParentItem( CNItem *tqparentItem ) +void Node::setParentItem( CNItem *parentItem ) { - if (!tqparentItem) + if (!parentItem) { kdError() << k_funcinfo << "no tqparent item" << endl; return; } - p_parentItem = tqparentItem; + p_parentItem = parentItem; setLevel(p_parentItem->level()); diff --git a/src/node.h b/src/node.h index f3bdfef..1a2005b 100644 --- a/src/node.h +++ b/src/node.h @@ -72,7 +72,7 @@ public: const TQString id() const { return m_id; } /** * Returns the id that is internal to the CNItem to which the - * node belongs to. Returns a null TQString if no tqparentitem + * node belongs to. Returns a null TQString if no parentitem */ const TQString childId() const { return m_childId; } /** @@ -118,7 +118,7 @@ public: * Associates a CNItem with the node - ie the node belongs to the CNItem, * and hence gets deleted when the CNItem gets deleted.s */ - virtual void setParentItem( CNItem *tqparentItem ); + virtual void setParentItem( CNItem *parentItem ); /** * Returns true if the node is part of a CNItem * (i.e. not between multiple connectors) @@ -128,7 +128,7 @@ public: * Returns a pointer to the CNItem to which the node belongs, * or Null if it doesn't. */ - CNItem *tqparentItem() const { return p_parentItem; } + CNItem *parentItem() const { return p_parentItem; } /** * Remove a specific connector */ diff --git a/src/resizeoverlay.cpp b/src/resizeoverlay.cpp index 6c45f93..c3ad8ef 100644 --- a/src/resizeoverlay.cpp +++ b/src/resizeoverlay.cpp @@ -404,7 +404,7 @@ void LineOverlay::slotResizeHandleMoved( int id, double dx, double dy ) //BEGIN class ResizeHandle ResizeHandle::ResizeHandle( ResizeOverlay *resizeOverlay, int id, DrawType drawType, int xsnap, int ysnap ) - : TQObject(), TQCanvasRectangle( 0, 0, 13, 13, resizeOverlay->tqparentItem()->canvas() ) + : TQObject(), TQCanvasRectangle( 0, 0, 13, 13, resizeOverlay->parentItem()->canvas() ) { p_resizeOverlay = resizeOverlay; m_drawType = drawType; diff --git a/src/resizeoverlay.h b/src/resizeoverlay.h index 2684ede..aa7a46e 100644 --- a/src/resizeoverlay.h +++ b/src/resizeoverlay.h @@ -122,7 +122,7 @@ public: ResizeOverlay( Item *tqparent ); ~ResizeOverlay(); - Item *tqparentItem() const { return p_item; } + Item *parentItem() const { return p_item; } /** * Shows / hides the resize handles. They are hidden by default. diff --git a/src/view.cpp b/src/view.cpp index 8785321..bfa9e3f 100644 --- a/src/view.cpp +++ b/src/view.cpp @@ -51,7 +51,7 @@ class KVSSBSep : public TQWidget { TQPainter p( this ); p.setPen( tqcolorGroup().shadow() ); p.drawLine( e->rect().left(), 0, e->rect().right(), 0 ); - p.setPen( ((View*)tqparentWidget())->isFocused() ? tqcolorGroup().light() : tqcolorGroup().midlight() ); + p.setPen( ((View*)parentWidget())->isFocused() ? tqcolorGroup().light() : tqcolorGroup().midlight() ); p.drawLine( e->rect().left(), 1, e->rect().right(), 1 ); } }; diff --git a/src/viewcontainer.h b/src/viewcontainer.h index 25f0f33..e31aac2 100644 --- a/src/viewcontainer.h +++ b/src/viewcontainer.h @@ -117,7 +117,7 @@ Q_OBJECT public: /** * Constructs a new ViewContainer, along with a default ViewArea ready for - * tqparenting a View, with an id of 0. tqparent is only used if ktechlab is + * parenting a View, with an id of 0. tqparent is only used if ktechlab is * null; otherwise the tqparent widget is ktechlab's tabWidget() */ ViewContainer( const TQString & caption, KTechlab * ktechlab, TQWidget * tqparent = 0 );