TDE
/
ktechlab
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/ktechlab
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove the tq in front of these incorrectly TQt4-converted methods/data members:

Browse Source 
tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/ktechlab@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent 87a016680e
commit 6c86748fed
53 changed files with 138 additions and 138 deletions
Show Stats Download Patch File Download Diff File

4
src/circuitdocument.cpp
Unescape View File

@ -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 );
}
}
}

6
src/connector.cpp
Unescape View File

@ -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
{

2
src/connector.h
Unescape View File

@ -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
*/

6
src/electronics/ecnode.cpp
Unescape View File

@ -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<Component*>(tqparentItem) )
if ( Component * component = dynamic_cast<Component*>(parentItem) )
{
connect( component, TQT_SIGNAL(elementDestroyed(Element* )), this, TQT_SLOT(removeElement(Element* )) );
connect( component, TQT_SIGNAL(switchDestroyed( Switch* )), this, TQT_SLOT(removeSwitch( Switch* )) );

2
src/electronics/ecnode.h
Unescape View File

@ -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.

2
src/electronics/pin.h
Unescape View File

@ -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.

2
src/electronics/simulation/circuit.h
Unescape View File

@ -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();
/**

4
src/flowcontainer.cpp
Unescape View File

@ -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<FlowContainer*>((Item*)(p_parentItem));
return !fc->isExpanded() || fc->tqparentIsCollapsed();
return !fc->isExpanded() || fc->parentIsCollapsed();
}

4
src/flowcontainer.h
Unescape View File

@ -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 );

20
src/flowparts/flowpart.cpp
Unescape View File

@ -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);
}
}

6
src/fpnode.cpp
Unescape View File

@ -30,7 +30,7 @@ FPNode::~FPNode()
FlowPart *FPNode::outputFlowPart() const
{
FlowPart *flowPart = dynamic_cast<FlowPart*>(tqparentItem());
FlowPart *flowPart = dynamic_cast<FlowPart*>(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<FlowPart*>(tqparentItem());
FlowPart *flowPart = dynamic_cast<FlowPart*>(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<FlowPart*>(startNode->tqparentItem()) : 0l;
FlowPart *flowPart = startNode ? dynamic_cast<FlowPart*>(startNode->parentItem()) : 0l;
if (flowPart)
list.append(flowPart);
}

2
src/gui/asmformattingwidget.ui
Unescape View File

@ -202,7 +202,7 @@
<tabstop>kcfg_IndentComment</tabstop>
<tabstop>kcfg_AutoFormatMBOutput</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>

2
src/gui/createsubprojectwidget.ui
Unescape View File

@ -90,7 +90,7 @@
</spacer>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>

2
src/gui/generaloptionswidget.ui
Unescape View File

@ -261,7 +261,7 @@
<tabstop>kcfg_RaiseMessagesLog</tabstop>
<tabstop>refreshRateSlider</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
<includehint>knuminput.h</includehint>

2
src/gui/gpasmsettingswidget.ui
Unescape View File

@ -278,7 +278,7 @@
<tabstop>kcfg_IgnoreCase</tabstop>
<tabstop>kcfg_DosFormat</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>kcombobox.h</includehint>

20
src/gui/itemselector.cpp
Unescape View File

@ -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"<<endl;
return;
}
ILVItem *item = new ILVItem( tqparentItem, id );
ILVItem *item = new ILVItem( parentItem, id );
item->setPixmap( 0, icon );
item->setText( 0, caption );
item->setRemovable(removable);

2
src/gui/linkeroptionswidget.ui
Unescape View File

@ -167,7 +167,7 @@
<tabstop>m_pOther</tabstop>
<tabstop>m_pInternalLibraries</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>klineedit.h</includehint>

2
src/gui/logicwidget.ui
Unescape View File

@ -262,7 +262,7 @@ These values will apply to all components, apart from the PIC, whose pins' imped
</spacer>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>

2
src/gui/microsettingswidget.ui
Unescape View File

@ -186,7 +186,7 @@ Drag it to set the type (input/output).</string>
</widget>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>kpushbutton.h</includehint>

2
src/gui/newfilewidget.ui
Unescape View File

@ -187,7 +187,7 @@ Creates a new circuit, with drag and drop editor. Real time simulation of the ci
<tabstop>typeIconView</tabstop>
<tabstop>addToProjectCheck</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kiconview.h</includehint>
<includehint>microselectwidget.h</includehint>

2
src/gui/newpinmappingwidget.ui
Unescape View File

@ -123,7 +123,7 @@
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
</includehints>

2
src/gui/newprojectwidget.ui
Unescape View File

@ -100,7 +100,7 @@
<tabstop>projectNameEdit</tabstop>
<tabstop>projectLocationURL</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>kurlrequester.h</includehint>

2
src/gui/oscilloscopewidget.ui
Unescape View File

@ -281,7 +281,7 @@
<data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154388db5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c6a2573410000000049454e44ae426082</data>
</image>
</images>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>oscilloscopeview.h</includehint>
<includehint>probepositioner.h</includehint>

2
src/gui/outputmethodwidget.ui
Unescape View File

@ -172,7 +172,7 @@
<slot>setEnabled(bool)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>

2
src/gui/picprogrammerconfigwidget.ui
Unescape View File

@ -270,7 +270,7 @@
<tabstop>eraseCommand</tabstop>
<tabstop>kcfg_PicProgrammerPort</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>

2
src/gui/processingoptionswidget.ui
Unescape View File

@ -88,7 +88,7 @@
<data format="PNG" length="1122">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042949444154388db5954d6c545514c77ff7de37eff1a6a550da994e5ba798868f948fc847a2a2911816c436b0a02ed0083161a1981877ee10d90aa94656063491882c5cd4c4b8103f20cd806909a98604da8482341de80cb69de9bcd799799d79efba980f1da3a80b4f727273939bdff99f9b93f3175a6b6a21849080020c4002a29a8f0a5dcd002803bed63a1035f0d0d0504b6f6fef51d7758fa4d3e98d8ee3fc03af128ee3303939399548242eb8aefb09300f78464de9f0f0f0d148cc7caf3d5424de97a7ec17104220242805520a44557bbd4b21f083801d33e63a6d1bc7bf19c6064e0319a35a58b9ae7ba43d54e4d7c54b64dc097c7f09d30ef04b36736983cc7c11b4456b9b492c5e20dc54a6540e00896a8268a7017010f8bcae1830d2e9f4c69ebe3c197782b2ce60d94ddc9b30f9feeb45ae5d7181c5ead35636ef08d3ffe26a76ee3208b4031a56d80aa00768fda362e9380e25bf80ef3b587613d7afc099533380a4b5dda46fcb5aa42998b9eb7173dce5e6788e434763ec7fc942532008ea436003660d2caa7f8d69c3bd8910674e4d033e83877ad8d36fb0aa4d6058658ac5358c5df6383bf480f31fdda5a3632bbbfb6da4ccd5c00a10b2012cc12fd97cfb5516f0187c25cee0619396480ec3ca909d0f3372d1e5f9fe66de3ad605587c712ec55256a2540d5519d19ae24a29057329839f7ecc138944d833102290f3184ae1e6d6f0e98739c61229e6d21eafbed1c9c8c5558c8f3ee4ceed76946a1c43d97091828585223e2eebfbc295f60d45de89707628cb58224577bc85a79e5d4d786581cddb9b0148259711b20145836221400416e0232d1f6595c9ce4538773ac7b54406f0b15784e8e80aa1ac2594190220d021e49f2437960156b70ba095e95f96f18acd8c263cc6122962b1167a7ba34cdd7ec8c977a699bed546722a8fc2a02b6e2185fff78ab586ce78894ddb9ab9f5738ed14b1e030756929d8ff2e4ae5544632b38f96e89a99b298ebd6950cc2d12ed0eb3618b26f520788462ad09877df60db600f0f1fb49c646f21c7ebd836dcf94e9d9b4c0db27d6d3bd36c6426a96bce731703046d7da129a4670836284a054869d4f1b1c7e2dca67676ef3c1898091ef5ad8bc358c3205c93bf7c9a40ad4c660f4728edd7bbb3142ea2fc1da711cfc200011e08b45f6bd1c261adbce9717928c5f9d63fc6a19f0014567773303073790f8214bd6f5282dfbb8b9fa1f6b40d7c1939393533b92e63ad9240990484aec7e41b27d579cbb531e0f67023492d86316ebb768ba1e0f786e6f37e56550c62237aee7011e54abd7c1412291b8a06de378b4d3c0b215da9708e5a3a442192085404a83d4accfecac067c0c43e13a70e3fa12e96409e0325000966bbb354465339d04a6f9dd15fe6dde07ce030780278088d05ad72cc9a6b2f2daaaa74d75a1f0e8d0d5f60b40868a8364ead6248430000b0857a126ffcdf396abf03ce089ffcb4c7f033046c6b4a995e7a00000000049454e44ae426082</data>
</image>
</images>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>microselectwidget.h</includehint>
<includehint>kurlrequester.h</includehint>

2
src/gui/programmerwidget.ui
Unescape View File

@ -115,7 +115,7 @@
<data format="PNG" length="1122">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042949444154388db5954d6c545514c77ff7de37eff1a6a550da994e5ba798868f948fc847a2a2911816c436b0a02ed0083161a1981877ee10d90aa94656063491882c5cd4c4b8103f20cd806909a98604da8482341de80cb69de9bcd799799d79efba980f1da3a80b4f727273939bdff99f9b93f3175a6b6a21849080020c4002a29a8f0a5dcd002803bed63a1035f0d0d0504b6f6fef51d7758fa4d3e98d8ee3fc03af128ee3303939399548242eb8aefb09300f78464de9f0f0f0d148cc7caf3d5424de97a7ec17104220242805520a44557bbd4b21f083801d33e63a6d1bc7bf19c6064e0319a35a58b9ae7ba43d54e4d7c54b64dc097c7f09d30ef04b36736983cc7c11b4456b9b492c5e20dc54a6540e00896a8268a7017010f8bcae1830d2e9f4c69ebe3c197782b2ce60d94ddc9b30f9feeb45ae5d7181c5ead35636ef08d3ffe26a76ee3208b4031a56d80aa00768fda362e9380e25bf80ef3b587613d7afc099533380a4b5dda46fcb5aa42998b9eb7173dce5e6788e434763ec7fc942532008ea436003660d2caa7f8d69c3bd8910674e4d033e83877ad8d36fb0aa4d6058658ac5358c5df6383bf480f31fdda5a3632bbbfb6da4ccd5c00a10b2012cc12fd97cfb5516f0187c25cee0619396480ec3ca909d0f3372d1e5f9fe66de3ad605587c712ec55256a2540d5519d19ae24a29057329839f7ecc138944d833102290f3184ae1e6d6f0e98739c61229e6d21eafbed1c9c8c5558c8f3ee4ceed76946a1c43d97091828585223e2eebfbc295f60d45de89707628cb58224577bc85a79e5d4d786581cddb9b0148259711b20145836221400416e0232d1f6595c9ce4538773ac7b54406f0b15784e8e80aa1ac2594190220d021e49f2437960156b70ba095e95f96f18acd8c263cc6122962b1167a7ba34cdd7ec8c977a699bed546722a8fc2a02b6e2185fff78ab586ce78894ddb9ab9f5738ed14b1e030756929d8ff2e4ae5544632b38f96e89a99b298ebd6950cc2d12ed0eb3618b26f520788462ad09877df60db600f0f1fb49c646f21c7ebd836dcf94e9d9b4c0db27d6d3bd36c6426a96bce731703046d7da129a4670836284a054869d4f1b1c7e2dca67676ef3c1898091ef5ad8bc358c3205c93bf7c9a40ad4c660f4728edd7bbb3142ea2fc1da711cfc200011e08b45f6bd1c261adbce9717928c5f9d63fc6a19f0014567773303073790f8214bd6f5282dfbb8b9fa1f6b40d7c1939393533b92e63ad9240990484aec7e41b27d579cbb531e0f67023492d86316ebb768ba1e0f786e6f37e56550c62237aee7011e54abd7c1412291b8a06de378b4d3c0b215da9708e5a3a442192085404a83d4accfecac067c0c43e13a70e3fa12e96409e0325000966bbb354465339d04a6f9dd15fe6dde07ce030780278088d05ad72cc9a6b2f2daaaa74d75a1f0e8d0d5f60b40868a8364ead6248430000b0857a126ffcdf396abf03ce089ffcb4c7f033046c6b4a995e7a00000000049454e44ae426082</data>
</image>
</images>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>microselectwidget.h</includehint>

2
src/gui/sdccoptionswidget.ui
Unescape View File

@ -579,7 +579,7 @@
</spacer>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
</includehints>

16
src/icndocument.cpp
Unescape View File

@ -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<Connector*>(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 )
{

2
src/icndocument.h
Unescape View File

@ -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();

10
src/item.cpp
Unescape View File

@ -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;

4
src/item.h
Unescape View File

@ -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

14
src/itemdocument.cpp
Unescape View File

@ -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<KAction> tqalignment_actions;
tqalignment_actions.append( m_pAlignmentAction );
p_ktechlab->plugActionList( "tqalignment_actionlist", tqalignment_actions );
TQPtrList<KAction> 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;

4
src/itemdocument.h
Unescape View File

@ -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();

12
src/itemdocumentdata.cpp
Unescape View File

@ -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 );
}

2
src/itemdocumentdata.h
Unescape View File

@ -52,7 +52,7 @@ class ItemData
bool flipped;
BoolMap buttonMap;
IntMap sliderMap;
TQString tqparentId;
TQString parentId;
BoolMap dataBool;
DoubleMap dataNumber;
TQColorMap dataColor;

8
src/itemgroup.cpp
Unescape View File

@ -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() );

2
src/itemgroup.h
Unescape View File

@ -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;

26
src/itemlibrary.cpp
Unescape View File

@ -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 );
}

4
src/katemdi.cpp
Unescape View File

@ -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))
{

2
src/katemdi.h
Unescape View File

@ -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

2
src/ktechlab.cpp
Unescape View File

@ -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()) );

2
src/languages/flowcode.cpp
Unescape View File

@ -444,7 +444,7 @@ void FlowCode::tidyCode()
void FlowCode::addSubroutine( FlowPart *part )
{
if ( !part || m_subroutines.tqcontains(part) || part->tqparentItem() || !dynamic_cast<FlowContainer*>(part) ) return;
if ( !part || m_subroutines.tqcontains(part) || part->parentItem() || !dynamic_cast<FlowContainer*>(part) ) return;
m_subroutines.append(part);
}

8
src/mechanics/mechanicsgroup.cpp
Unescape View File

@ -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<MechanicsItem*>(tqparent->tqparentItem());
tqparent = dynamic_cast<MechanicsItem*>(tqparent->parentItem());
}
}

12
src/mechanics/mechanicsitem.cpp
Unescape View File

@ -102,9 +102,9 @@ void MechanicsItem::dataChanged()
PositionInfo MechanicsItem::absolutePosition() const
{
MechanicsItem *tqparentMechItem = dynamic_cast<MechanicsItem*>((Item*)(p_parentItem));
if (tqparentMechItem)
return tqparentMechItem->absolutePosition() + m_relativePosition;
MechanicsItem *parentMechItem = dynamic_cast<MechanicsItem*>((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() );

2
src/mechanics/mechanicsitem.h
Unescape View File

@ -188,7 +188,7 @@ public slots:
* Rotate the item by the given amount (in radians)
*/
void rotateBy( double dtheta );
void tqparentMoved();
void parentMoved();
signals:
/**

14
src/mechanics/mechanicssimulation.cpp
Unescape View File

@ -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<MechanicsItem*>((*it)->tqparentItem());
MechanicsItem *parentItem = *it;
MechanicsItem *parentCandidate = dynamic_cast<MechanicsItem*>((*it)->parentItem());
while (tqparentCandidate)
while (parentCandidate)
{
tqparentItem = tqparentCandidate;
tqparentCandidate = dynamic_cast<MechanicsItem*>(tqparentItem->tqparentItem());
parentItem = parentCandidate;
parentCandidate = dynamic_cast<MechanicsItem*>(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;

6
src/node.cpp
Unescape View File

@ -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());

6
src/node.h
Unescape View File

@ -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
*/

2
src/resizeoverlay.cpp
Unescape View File

@ -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;

2
src/resizeoverlay.h
Unescape View File

@ -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.

2
src/view.cpp
Unescape View File

@ -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 );
}
};

2
src/viewcontainer.h
Unescape View File

@ -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 );

Write Preview
Loading…
Cancel
Save