summaryrefslogtreecommitdiffstats
path: root/quanta/components/framewizard
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 10:00:36 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 10:00:36 -0600
commit1fffbdafa12271a1a635caf46777fb8acfb6f31b (patch)
tree707785bd058e254fd865ca30ed35f37f206aebbc /quanta/components/framewizard
parent2b0e1de2ffcca7bb93f1fd8ddd32f74041d0d076 (diff)
downloadtdewebdev-1fffbdafa12271a1a635caf46777fb8acfb6f31b.tar.gz
tdewebdev-1fffbdafa12271a1a635caf46777fb8acfb6f31b.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 2b0e1de2ffcca7bb93f1fd8ddd32f74041d0d076.
Diffstat (limited to 'quanta/components/framewizard')
-rw-r--r--quanta/components/framewizard/areaattributedb.h6
-rw-r--r--quanta/components/framewizard/fmfpeditors.ui4
-rw-r--r--quanta/components/framewizard/fmrceditors.ui6
-rw-r--r--quanta/components/framewizard/framewizards.ui12
-rw-r--r--quanta/components/framewizard/selectablearea.cpp2
-rw-r--r--quanta/components/framewizard/treenode.cpp22
-rw-r--r--quanta/components/framewizard/treenode.h24
-rw-r--r--quanta/components/framewizard/visualframeeditor.cpp28
-rw-r--r--quanta/components/framewizard/visualframeeditor.h2
9 files changed, 53 insertions, 53 deletions
diff --git a/quanta/components/framewizard/areaattributedb.h b/quanta/components/framewizard/areaattributedb.h
index 79e105be..528da3ea 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_geometry;
+ TQRect m_tqgeometry;
TQMap<TQString,TQString> 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<TQString,TQString> map){ m_attributeMap = map; }
void resetAttributes();
- TQRect geometry() const { return m_geometry; }
+ TQRect tqgeometry() const { return m_tqgeometry; }
TQString src() const{ return m_attributeMap["src"]; }
TQString attributeValue(TQString l) const { return attributeMap()[l];}
TQMap<TQString,TQString> attributeMap() const { return m_attributeMap; }
public slots:
- void setGeometry(TQRect g) { m_geometry = g; }
+ void setGeometry(TQRect g) { m_tqgeometry = g; }
};
#endif
diff --git a/quanta/components/framewizard/fmfpeditors.ui b/quanta/components/framewizard/fmfpeditors.ui
index 3e024de5..46a5354a 100644
--- a/quanta/components/framewizard/fmfpeditors.ui
+++ b/quanta/components/framewizard/fmfpeditors.ui
@@ -43,7 +43,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>55</width>
<height>0</height>
@@ -510,7 +510,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/quanta/components/framewizard/fmrceditors.ui b/quanta/components/framewizard/fmrceditors.ui
index c977d86f..e0a8926c 100644
--- a/quanta/components/framewizard/fmrceditors.ui
+++ b/quanta/components/framewizard/fmrceditors.ui
@@ -20,13 +20,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>300</width>
<height>150</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>300</width>
<height>150</height>
@@ -104,7 +104,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>31</width>
<height>0</height>
diff --git a/quanta/components/framewizard/framewizards.ui b/quanta/components/framewizard/framewizards.ui
index 3a3a1efd..cde1611f 100644
--- a/quanta/components/framewizard/framewizards.ui
+++ b/quanta/components/framewizard/framewizards.ui
@@ -20,13 +20,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -77,7 +77,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -161,7 +161,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>0</width>
<height>30</height>
@@ -221,7 +221,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>0</width>
<height>16</height>
@@ -295,7 +295,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>0</width>
<height>30</height>
diff --git a/quanta/components/framewizard/selectablearea.cpp b/quanta/components/framewizard/selectablearea.cpp
index c168e323..80c7aa00 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()->geometry() );
+ emit Resized( view()->tqgeometry() );
view()->hide();
view()->show();
return true;
diff --git a/quanta/components/framewizard/treenode.cpp b/quanta/components/framewizard/treenode.cpp
index fd1f187f..2faaf3d6 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_childrenList.setAutoDelete(true);
+ m_tqchildrenList.setAutoDelete(true);
m_atts = new areaAttribute;
}
@@ -29,16 +29,16 @@ treeNode::~treeNode(){
}
void treeNode::addChildNode(const TQString &l) {
- m_childrenList.append( new treeNode(l,m_label) );
+ m_tqchildrenList.append( new treeNode(l,m_label) );
}
void treeNode::removeChildNode(const TQString &l,bool autoDelete) {
- m_childrenList.setAutoDelete(autoDelete);
- m_childrenList.remove(findChild(l));
+ m_tqchildrenList.setAutoDelete(autoDelete);
+ m_tqchildrenList.remove(findChild(l));
}
treeNode* treeNode::findChild(const TQString &l){
- TQPtrListIterator<treeNode> it( m_childrenList );
+ TQPtrListIterator<treeNode> it( m_tqchildrenList );
treeNode *node;
while ( (node = it.current()) != 0 ) {
++it;
@@ -68,25 +68,25 @@ void tree::refreshGeometries(treeNode *n){
n->nextChild();
}
- TQPtrList<treeNode> list = n->childrenList();
+ TQPtrList<treeNode> list = n->tqchildrenList();
TQPtrListIterator<treeNode> it( list );
treeNode *node= it.current();
- TQRect newGeometry = n->atts()->geometry();
+ TQRect newGeometry = n->atts()->tqgeometry();
if(n->splitType()==VERTICAL){
- newGeometry.setHeight(node->atts()->geometry().height());
+ newGeometry.setHeight(node->atts()->tqgeometry().height());
while ( (node = it.current()) != 0 ) {
++it;
- dim += node->atts()->geometry().width();
+ dim += node->atts()->tqgeometry().width();
dim += 6;
}
newGeometry.setWidth(dim);
}
else
if(n->splitType()==HORIZONTAL){
- newGeometry.setWidth(node->atts()->geometry().width());
+ newGeometry.setWidth(node->atts()->tqgeometry().width());
while ( (node = it.current()) != 0 ) {
++it;
- dim += node->atts()->geometry().height();
+ dim += node->atts()->tqgeometry().height();
dim += 6;
}
newGeometry.setHeight(dim);
diff --git a/quanta/components/framewizard/treenode.h b/quanta/components/framewizard/treenode.h
index 82d312fb..c96d9b17 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<treeNode> m_childrenList;
+ TQPtrList<treeNode> m_tqchildrenList;
areaAttribute *m_atts;
public:
treeNode(const TQString &l=TQString(), const TQString &pl=TQString());
~treeNode();
void addChildNode(const TQString &L);
- void addChildNode(treeNode *n){ m_childrenList.append(n); }
+ void addChildNode(treeNode *n){ m_tqchildrenList.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_childrenList.clear(); }
+ void removeChildren() { m_tqchildrenList.clear(); }
void setParentLabel(const TQString &s){ m_parentLabel = s;}
- int childPosition(treeNode* n){ return m_childrenList.find(n); }
- bool insertChild(unsigned int pos, treeNode* n) { return m_childrenList.insert( pos, n); }
+ int childPosition(treeNode* n){ return m_tqchildrenList.find(n); }
+ bool insertChild(unsigned int pos, treeNode* n) { return m_tqchildrenList.insert( pos, n); }
TQString label() const { return m_label; }
TQString parentLabel() const { return m_parentLabel; }
SplitType splitType() const { return m_splitType; }
- TQPtrList<treeNode> childrenList() { return m_childrenList; }
+ TQPtrList<treeNode> tqchildrenList() { return m_tqchildrenList; }
- 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* firstChild() { return m_tqchildrenList.first(); }
+ treeNode* nextChild() { return m_tqchildrenList.next(); }
+ treeNode* lastChild() { return m_tqchildrenList.last(); }
+ treeNode* currentChild() { return m_tqchildrenList.current(); }
treeNode* findChild(const TQString &L);
areaAttribute* atts() { return m_atts; }
- int countChildren() const { return m_childrenList.count(); }
- bool hasChildren() const { return !m_childrenList.isEmpty(); }
+ int countChildren() const { return m_tqchildrenList.count(); }
+ bool hasChildren() const { return !m_tqchildrenList.isEmpty(); }
};
class tree{
diff --git a/quanta/components/framewizard/visualframeeditor.cpp b/quanta/components/framewizard/visualframeeditor.cpp
index 4b1f62f3..e822d7e0 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()->geometry());
- TQPtrList<treeNode> list=m_internalTree->findNode(l)->childrenList();
+ TQRect newGeometry(m_internalTree->findNode(l)->atts()->tqgeometry());
+ TQPtrList<treeNode> list=m_internalTree->findNode(l)->tqchildrenList();
TQPtrListIterator<treeNode> it( list );
treeNode *node;
if(m_internalTree->findNode(l)->splitType() == VERTICAL){
- int dummyDimension=m_internalTree->findNode(l)->atts()->geometry().width()-cP;
+ int dummyDimension=m_internalTree->findNode(l)->atts()->tqgeometry().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()->geometry().height()-cP;
+ int dummyDimension=m_internalTree->findNode(l)->atts()->tqgeometry().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()->geometry();
+ TQRect dummy=m_internalTree->findNode(parent)->atts()->tqgeometry();
TQStringList percentages = convertAsterisks(pattern.cap(1),dummy.height());
int dummyDimension=dummy.height()-cancelledPixels(line.contains(",")+1);
- TQPtrList<treeNode> list=m_internalTree->findNode(parent)->childrenList();
+ TQPtrList<treeNode> list=m_internalTree->findNode(parent)->tqchildrenList();
TQPtrListIterator<treeNode> 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()->geometry();
+ TQRect dummy=m_internalTree->findNode(parent)->atts()->tqgeometry();
TQStringList percentages = convertAsterisks(pattern.cap(1),dummy.width());
int dummyDimension=dummy.width()-cancelledPixels(line.contains(",")+1);
- TQPtrList<treeNode> list=m_internalTree->findNode(parent)->childrenList();
+ TQPtrList<treeNode> list=m_internalTree->findNode(parent)->tqchildrenList();
TQPtrListIterator<treeNode> 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<treeNode> list = m_internalTree->findNode(parentLabel)->firstChild()->childrenList();
+ 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 );
@@ -304,7 +304,7 @@ void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* parent){
if(parent->isA(TQSPLITTER_OBJECT_NAME_STRING)) dynamic_cast<TQSplitter *>(parent)->setResizeMode(sa->view(),TQSplitter::KeepSize );
else
if(!m_firstInsertedSA) m_firstInsertedSA = sa;
- sa->view()->setGeometry(n->atts()->geometry());
+ sa->view()->setGeometry(n->atts()->tqgeometry());
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()->geometry().width();
- for(int i=1;i<=child_number;++i) dimMap[i]=n->childrenList().at(i-1)->atts()->geometry().width();
+ 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();
break;
- 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();
+ 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();
break;
default:break;
}
diff --git a/quanta/components/framewizard/visualframeeditor.h b/quanta/components/framewizard/visualframeeditor.h
index 39bb4b4c..c7338128 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() { repaint(); }
+ void draw() { tqrepaint(); }
void loadExistingStructure(const TQStringList &list);
TQString framesetStructure();
void removeNode(const TQString &l);