From 2b0e1de2ffcca7bb93f1fd8ddd32f74041d0d076 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:51:43 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- quanta/components/framewizard/areaattributedb.h | 6 ++--- quanta/components/framewizard/fmfpeditors.ui | 4 ++-- quanta/components/framewizard/fmrceditors.ui | 6 ++--- quanta/components/framewizard/framewizards.ui | 12 +++++----- quanta/components/framewizard/selectablearea.cpp | 2 +- quanta/components/framewizard/treenode.cpp | 22 ++++++++--------- quanta/components/framewizard/treenode.h | 24 +++++++++---------- .../components/framewizard/visualframeeditor.cpp | 28 +++++++++++----------- quanta/components/framewizard/visualframeeditor.h | 2 +- 9 files changed, 53 insertions(+), 53 deletions(-) (limited to 'quanta/components/framewizard') diff --git a/quanta/components/framewizard/areaattributedb.h b/quanta/components/framewizard/areaattributedb.h index 528da3ea..79e105be 100644 --- a/quanta/components/framewizard/areaattributedb.h +++ b/quanta/components/framewizard/areaattributedb.h @@ -29,7 +29,7 @@ class areaAttribute : public TQObject{ TQ_OBJECT private: - TQRect m_tqgeometry; + TQRect m_geometry; TQMap m_attributeMap; //tag specific attributes public: @@ -38,13 +38,13 @@ class areaAttribute : public TQObject{ void setAttribute(const TQString& name, const TQString& value){ m_attributeMap[name] = value; } void setAllAttributes(TQMap map){ m_attributeMap = map; } void resetAttributes(); - TQRect tqgeometry() const { return m_tqgeometry; } + TQRect geometry() const { return m_geometry; } TQString src() const{ return m_attributeMap["src"]; } TQString attributeValue(TQString l) const { return attributeMap()[l];} TQMap attributeMap() const { return m_attributeMap; } public slots: - void setGeometry(TQRect g) { m_tqgeometry = g; } + void setGeometry(TQRect g) { m_geometry = g; } }; #endif diff --git a/quanta/components/framewizard/fmfpeditors.ui b/quanta/components/framewizard/fmfpeditors.ui index 46a5354a..3e024de5 100644 --- a/quanta/components/framewizard/fmfpeditors.ui +++ b/quanta/components/framewizard/fmfpeditors.ui @@ -43,7 +43,7 @@ Expanding - + 55 0 @@ -510,7 +510,7 @@ Expanding - + 20 40 diff --git a/quanta/components/framewizard/fmrceditors.ui b/quanta/components/framewizard/fmrceditors.ui index e0a8926c..c977d86f 100644 --- a/quanta/components/framewizard/fmrceditors.ui +++ b/quanta/components/framewizard/fmrceditors.ui @@ -20,13 +20,13 @@ 0 - + 300 150 - + 300 150 @@ -104,7 +104,7 @@ Expanding - + 31 0 diff --git a/quanta/components/framewizard/framewizards.ui b/quanta/components/framewizard/framewizards.ui index cde1611f..3a3a1efd 100644 --- a/quanta/components/framewizard/framewizards.ui +++ b/quanta/components/framewizard/framewizards.ui @@ -20,13 +20,13 @@ 0 - + 0 0 - + 32767 32767 @@ -77,7 +77,7 @@ Expanding - + 30 0 @@ -161,7 +161,7 @@ Expanding - + 0 30 @@ -221,7 +221,7 @@ Expanding - + 0 16 @@ -295,7 +295,7 @@ Expanding - + 0 30 diff --git a/quanta/components/framewizard/selectablearea.cpp b/quanta/components/framewizard/selectablearea.cpp index 80c7aa00..c168e323 100644 --- a/quanta/components/framewizard/selectablearea.cpp +++ b/quanta/components/framewizard/selectablearea.cpp @@ -44,7 +44,7 @@ bool SelectableArea::eventFilter(TQObject *o, TQEvent *event){ } break; case TQEvent::Resize : { - emit Resized( view()->tqgeometry() ); + emit Resized( view()->geometry() ); view()->hide(); view()->show(); return true; diff --git a/quanta/components/framewizard/treenode.cpp b/quanta/components/framewizard/treenode.cpp index 2faaf3d6..fd1f187f 100644 --- a/quanta/components/framewizard/treenode.cpp +++ b/quanta/components/framewizard/treenode.cpp @@ -20,7 +20,7 @@ static const int SIZE = 101; treeNode::treeNode(const TQString &l, const TQString &pl) : m_label(l), m_parentLabel(pl), m_splitType(NONE){ - m_tqchildrenList.setAutoDelete(true); + m_childrenList.setAutoDelete(true); m_atts = new areaAttribute; } @@ -29,16 +29,16 @@ treeNode::~treeNode(){ } void treeNode::addChildNode(const TQString &l) { - m_tqchildrenList.append( new treeNode(l,m_label) ); + m_childrenList.append( new treeNode(l,m_label) ); } void treeNode::removeChildNode(const TQString &l,bool autoDelete) { - m_tqchildrenList.setAutoDelete(autoDelete); - m_tqchildrenList.remove(findChild(l)); + m_childrenList.setAutoDelete(autoDelete); + m_childrenList.remove(findChild(l)); } treeNode* treeNode::findChild(const TQString &l){ - TQPtrListIterator it( m_tqchildrenList ); + TQPtrListIterator it( m_childrenList ); treeNode *node; while ( (node = it.current()) != 0 ) { ++it; @@ -68,25 +68,25 @@ void tree::refreshGeometries(treeNode *n){ n->nextChild(); } - TQPtrList list = n->tqchildrenList(); + TQPtrList list = n->childrenList(); TQPtrListIterator it( list ); treeNode *node= it.current(); - TQRect newGeometry = n->atts()->tqgeometry(); + TQRect newGeometry = n->atts()->geometry(); if(n->splitType()==VERTICAL){ - newGeometry.setHeight(node->atts()->tqgeometry().height()); + newGeometry.setHeight(node->atts()->geometry().height()); while ( (node = it.current()) != 0 ) { ++it; - dim += node->atts()->tqgeometry().width(); + dim += node->atts()->geometry().width(); dim += 6; } newGeometry.setWidth(dim); } else if(n->splitType()==HORIZONTAL){ - newGeometry.setWidth(node->atts()->tqgeometry().width()); + newGeometry.setWidth(node->atts()->geometry().width()); while ( (node = it.current()) != 0 ) { ++it; - dim += node->atts()->tqgeometry().height(); + dim += node->atts()->geometry().height(); dim += 6; } newGeometry.setHeight(dim); diff --git a/quanta/components/framewizard/treenode.h b/quanta/components/framewizard/treenode.h index c96d9b17..82d312fb 100644 --- a/quanta/components/framewizard/treenode.h +++ b/quanta/components/framewizard/treenode.h @@ -33,36 +33,36 @@ class treeNode { TQString m_label, m_parentLabel; SplitType m_splitType; - TQPtrList m_tqchildrenList; + TQPtrList m_childrenList; areaAttribute *m_atts; public: treeNode(const TQString &l=TQString(), const TQString &pl=TQString()); ~treeNode(); void addChildNode(const TQString &L); - void addChildNode(treeNode *n){ m_tqchildrenList.append(n); } + void addChildNode(treeNode *n){ m_childrenList.append(n); } void removeChildNode(const TQString &l, bool autoDelete); void setSplitType(SplitType s) { m_splitType = s; } void setLabel(const TQString &l) { m_label = l; } - void removeChildren() { m_tqchildrenList.clear(); } + void removeChildren() { m_childrenList.clear(); } void setParentLabel(const TQString &s){ m_parentLabel = s;} - int childPosition(treeNode* n){ return m_tqchildrenList.find(n); } - bool insertChild(unsigned int pos, treeNode* n) { return m_tqchildrenList.insert( pos, n); } + int childPosition(treeNode* n){ return m_childrenList.find(n); } + bool insertChild(unsigned int pos, treeNode* n) { return m_childrenList.insert( pos, n); } TQString label() const { return m_label; } TQString parentLabel() const { return m_parentLabel; } SplitType splitType() const { return m_splitType; } - TQPtrList tqchildrenList() { return m_tqchildrenList; } + TQPtrList childrenList() { return m_childrenList; } - treeNode* firstChild() { return m_tqchildrenList.first(); } - treeNode* nextChild() { return m_tqchildrenList.next(); } - treeNode* lastChild() { return m_tqchildrenList.last(); } - treeNode* currentChild() { return m_tqchildrenList.current(); } + treeNode* firstChild() { return m_childrenList.first(); } + treeNode* nextChild() { return m_childrenList.next(); } + treeNode* lastChild() { return m_childrenList.last(); } + treeNode* currentChild() { return m_childrenList.current(); } treeNode* findChild(const TQString &L); areaAttribute* atts() { return m_atts; } - int countChildren() const { return m_tqchildrenList.count(); } - bool hasChildren() const { return !m_tqchildrenList.isEmpty(); } + int countChildren() const { return m_childrenList.count(); } + bool hasChildren() const { return !m_childrenList.isEmpty(); } }; class tree{ diff --git a/quanta/components/framewizard/visualframeeditor.cpp b/quanta/components/framewizard/visualframeeditor.cpp index e822d7e0..4b1f62f3 100644 --- a/quanta/components/framewizard/visualframeeditor.cpp +++ b/quanta/components/framewizard/visualframeeditor.cpp @@ -46,12 +46,12 @@ VisualFrameEditor::~VisualFrameEditor(){ void VisualFrameEditor::setGeometries(const TQString &l){ int cP = cancelledPixels(m_internalTree->findNode(l)->countChildren()); - TQRect newGeometry(m_internalTree->findNode(l)->atts()->tqgeometry()); - TQPtrList list=m_internalTree->findNode(l)->tqchildrenList(); + TQRect newGeometry(m_internalTree->findNode(l)->atts()->geometry()); + TQPtrList list=m_internalTree->findNode(l)->childrenList(); TQPtrListIterator it( list ); treeNode *node; if(m_internalTree->findNode(l)->splitType() == VERTICAL){ - int dummyDimension=m_internalTree->findNode(l)->atts()->tqgeometry().width()-cP; + int dummyDimension=m_internalTree->findNode(l)->atts()->geometry().width()-cP; while ( (node = it.current()) != 0 ) { ++it; newGeometry.setWidth( int(dummyDimension/m_internalTree->findNode(l)->countChildren()) ); @@ -60,7 +60,7 @@ void VisualFrameEditor::setGeometries(const TQString &l){ } else if(m_internalTree->findNode(l)->splitType() == HORIZONTAL){ - int dummyDimension=m_internalTree->findNode(l)->atts()->tqgeometry().height()-cP; + int dummyDimension=m_internalTree->findNode(l)->atts()->geometry().height()-cP; while ( (node = it.current()) != 0 ) { ++it; newGeometry.setHeight( int(dummyDimension/m_internalTree->findNode(l)->countChildren()) ); @@ -145,12 +145,12 @@ void VisualFrameEditor::buildInternalTree(const TQString &parent){ TQRegExp pattern("rows\\s*=\"([\\s\\d%,\\*]*)\""); pattern.search(line); - TQRect dummy=m_internalTree->findNode(parent)->atts()->tqgeometry(); + TQRect dummy=m_internalTree->findNode(parent)->atts()->geometry(); TQStringList percentages = convertAsterisks(pattern.cap(1),dummy.height()); int dummyDimension=dummy.height()-cancelledPixels(line.contains(",")+1); - TQPtrList list=m_internalTree->findNode(parent)->tqchildrenList(); + TQPtrList list=m_internalTree->findNode(parent)->childrenList(); TQPtrListIterator it( list ); treeNode *node; while ( (node = it.current()) != 0 ) { @@ -171,12 +171,12 @@ void VisualFrameEditor::buildInternalTree(const TQString &parent){ TQRegExp pattern("cols\\s*=\"([\\s\\d%,\\*]*)\""); pattern.search(line); - TQRect dummy=m_internalTree->findNode(parent)->atts()->tqgeometry(); + TQRect dummy=m_internalTree->findNode(parent)->atts()->geometry(); TQStringList percentages = convertAsterisks(pattern.cap(1),dummy.width()); int dummyDimension=dummy.width()-cancelledPixels(line.contains(",")+1); - TQPtrList list=m_internalTree->findNode(parent)->tqchildrenList(); + TQPtrList list=m_internalTree->findNode(parent)->childrenList(); TQPtrListIterator it( list ); treeNode *node; while ( (node = it.current()) != 0 ) { @@ -258,7 +258,7 @@ void VisualFrameEditor::removeNode(const TQString &l){ m_internalTree->findNode(parentLabel)->setSplitType(NONE); } else { - TQPtrList list = m_internalTree->findNode(parentLabel)->firstChild()->tqchildrenList(); + TQPtrList list = m_internalTree->findNode(parentLabel)->firstChild()->childrenList(); if( parentLabel != m_internalTree->root()->label() ) { TQString grandParentLabel = m_internalTree->findNode(parentLabel)->parentLabel(); m_internalTree->removeChildNode( parentLabel,m_internalTree->findNode(parentLabel)->firstChild()->label(),false ); @@ -304,7 +304,7 @@ void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* parent){ if(parent->isA(TQSPLITTER_OBJECT_NAME_STRING)) dynamic_cast(parent)->setResizeMode(sa->view(),TQSplitter::KeepSize ); else if(!m_firstInsertedSA) m_firstInsertedSA = sa; - sa->view()->setGeometry(n->atts()->tqgeometry()); + sa->view()->setGeometry(n->atts()->geometry()); sa->setIdLabel( n->label() ); sa->setSource( n->atts()->src() ); connect(sa, TQT_SIGNAL(Resized(TQRect)), m_internalTree->findNode(sa->idLabel())->atts(), TQT_SLOT(setGeometry(TQRect))); @@ -371,11 +371,11 @@ TQString VisualFrameEditor::RCvalue(treeNode *n) { int lostPixels = (6*(child_number-1)); // 6 pixels are lost every time a splitter is drawn switch( n->splitType() ) { - case VERTICAL: percentage/=n->atts()->tqgeometry().width(); - for(int i=1;i<=child_number;++i) dimMap[i]=n->tqchildrenList().at(i-1)->atts()->tqgeometry().width(); + case VERTICAL: percentage/=n->atts()->geometry().width(); + for(int i=1;i<=child_number;++i) dimMap[i]=n->childrenList().at(i-1)->atts()->geometry().width(); break; - case HORIZONTAL: percentage/=n->atts()->tqgeometry().height(); - for(int i=1;i<=child_number;++i) dimMap[i]=n->tqchildrenList().at(i-1)->atts()->tqgeometry().height(); + case HORIZONTAL: percentage/=n->atts()->geometry().height(); + for(int i=1;i<=child_number;++i) dimMap[i]=n->childrenList().at(i-1)->atts()->geometry().height(); break; default:break; } diff --git a/quanta/components/framewizard/visualframeeditor.h b/quanta/components/framewizard/visualframeeditor.h index c7338128..39bb4b4c 100644 --- a/quanta/components/framewizard/visualframeeditor.h +++ b/quanta/components/framewizard/visualframeeditor.h @@ -50,7 +50,7 @@ class VisualFrameEditor : public TQHBox { public: VisualFrameEditor( TQWidget * parent = 0, const char * name = 0); ~VisualFrameEditor(); - void draw() { tqrepaint(); } + void draw() { repaint(); } void loadExistingStructure(const TQStringList &list); TQString framesetStructure(); void removeNode(const TQString &l); -- cgit v1.2.1