diff options
Diffstat (limited to 'quanta/components/framewizard/visualframeeditor.cpp')
-rw-r--r-- | quanta/components/framewizard/visualframeeditor.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/quanta/components/framewizard/visualframeeditor.cpp b/quanta/components/framewizard/visualframeeditor.cpp index ff32277b..3795a3ce 100644 --- a/quanta/components/framewizard/visualframeeditor.cpp +++ b/quanta/components/framewizard/visualframeeditor.cpp @@ -76,17 +76,17 @@ void VisualFrameEditor::split(const TQString &l, int n, SplitType type) { setGeometries(l); } else { - TQString tqparentLabel=m_internalTree->findNode(l)->tqparentLabel(); - SplitType tqparentSplit=m_internalTree->findNode(tqparentLabel)->splitType(); - if( tqparentSplit != type ) { + TQString parentLabel=m_internalTree->findNode(l)->parentLabel(); + SplitType parentSplit=m_internalTree->findNode(parentLabel)->splitType(); + if( parentSplit != type ) { m_internalTree->findNode(l)->setSplitType(type); for(int i = 1; i<=n; i++) m_internalTree->addChildNode(l); setGeometries(l); } else { for(int i = 1; i<=n; i++) m_internalTree->insertChildNode(l); - m_internalTree->findNode(tqparentLabel)->removeChildNode(l,true); - setGeometries(m_internalTree->findNode(tqparentLabel)->label()); + m_internalTree->findNode(parentLabel)->removeChildNode(l,true); + setGeometries(m_internalTree->findNode(parentLabel)->label()); } } } @@ -246,23 +246,23 @@ void VisualFrameEditor::paintEvent ( TQPaintEvent * ){ void VisualFrameEditor::removeNode(const TQString &l){ if( l == m_internalTree->root()->label() ) m_internalTree->reset();//trying to remove root node is equivalent to reinitialize else { - TQString tqparentLabel=m_internalTree->findNode(l)->tqparentLabel(); - if(m_internalTree->findNode(tqparentLabel)->countChildren()>=3) - m_internalTree->removeChildNode(tqparentLabel,l,true); + TQString parentLabel=m_internalTree->findNode(l)->parentLabel(); + if(m_internalTree->findNode(parentLabel)->countChildren()>=3) + m_internalTree->removeChildNode(parentLabel,l,true); else { - m_internalTree->removeChildNode(tqparentLabel,l,true); - if( !m_internalTree->findNode(tqparentLabel)->firstChild()->hasChildren() ){ //final nodes - TQMap<TQString,TQString> map = m_internalTree->findNode(tqparentLabel)->firstChild()->atts()->attributeMap(); - m_internalTree->findNode(tqparentLabel)->removeChildren(); - m_internalTree->findNode(tqparentLabel)->atts()->setAllAttributes( map ) ; - m_internalTree->findNode(tqparentLabel)->setSplitType(NONE); + m_internalTree->removeChildNode(parentLabel,l,true); + if( !m_internalTree->findNode(parentLabel)->firstChild()->hasChildren() ){ //final nodes + TQMap<TQString,TQString> map = m_internalTree->findNode(parentLabel)->firstChild()->atts()->attributeMap(); + m_internalTree->findNode(parentLabel)->removeChildren(); + m_internalTree->findNode(parentLabel)->atts()->setAllAttributes( map ) ; + m_internalTree->findNode(parentLabel)->setSplitType(NONE); } else { - TQPtrList<treeNode> list = m_internalTree->findNode(tqparentLabel)->firstChild()->tqchildrenList(); - if( tqparentLabel != m_internalTree->root()->label() ) { - TQString grandParentLabel = m_internalTree->findNode(tqparentLabel)->tqparentLabel(); - m_internalTree->removeChildNode( tqparentLabel,m_internalTree->findNode(tqparentLabel)->firstChild()->label(),false ); - m_internalTree->removeChildNode( grandParentLabel ,tqparentLabel, true ); + TQPtrList<treeNode> list = m_internalTree->findNode(parentLabel)->firstChild()->tqchildrenList(); + if( parentLabel != m_internalTree->root()->label() ) { + TQString grandParentLabel = m_internalTree->findNode(parentLabel)->parentLabel(); + m_internalTree->removeChildNode( parentLabel,m_internalTree->findNode(parentLabel)->firstChild()->label(),false ); + m_internalTree->removeChildNode( grandParentLabel ,parentLabel, true ); treeNode *node; for ( node = list.first(); node; node = list.next() ) { node->setParentLabel(grandParentLabel); @@ -270,12 +270,12 @@ void VisualFrameEditor::removeNode(const TQString &l){ } } else { - m_internalTree->findNode(tqparentLabel)->setSplitType( m_internalTree->findNode(tqparentLabel)->firstChild()->splitType() ); - m_internalTree->removeChildNode( tqparentLabel,m_internalTree->findNode(tqparentLabel)->firstChild()->label(),false ); + m_internalTree->findNode(parentLabel)->setSplitType( m_internalTree->findNode(parentLabel)->firstChild()->splitType() ); + m_internalTree->removeChildNode( parentLabel,m_internalTree->findNode(parentLabel)->firstChild()->label(),false ); treeNode *node; for ( node = list.first(); node; node = list.next() ) { - node->setParentLabel(tqparentLabel); - m_internalTree->findNode(tqparentLabel)->addChildNode(node); + node->setParentLabel(parentLabel); + m_internalTree->findNode(parentLabel)->addChildNode(node); } } } |