summaryrefslogtreecommitdiffstats
path: root/quanta/components
diff options
context:
space:
mode:
Diffstat (limited to 'quanta/components')
-rw-r--r--quanta/components/csseditor/csseditors.ui2
-rw-r--r--quanta/components/csseditor/cssselectors.ui2
-rw-r--r--quanta/components/csseditor/encodingselectors.ui2
-rw-r--r--quanta/components/csseditor/fontfamilychoosers.ui2
-rw-r--r--quanta/components/csseditor/stylesheetparser.cpp4
-rw-r--r--quanta/components/csseditor/stylesheetparser.h4
-rw-r--r--quanta/components/cvsservice/cvscommitdlgs.ui2
-rw-r--r--quanta/components/cvsservice/cvsupdatetodlgs.ui2
-rw-r--r--quanta/components/debugger/conditionalbreakpointdialogs.ui2
-rw-r--r--quanta/components/debugger/dbgp/dbgpsettingss.ui2
-rw-r--r--quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp20
-rw-r--r--quanta/components/debugger/debuggermanager.cpp4
-rw-r--r--quanta/components/debugger/debuggervariablesets.ui2
-rw-r--r--quanta/components/debugger/gubed/gubedsettingss.ui2
-rw-r--r--quanta/components/debugger/gubed/quantadebuggergubed.cpp20
-rw-r--r--quanta/components/debugger/pathmapperdialogs.ui2
-rw-r--r--quanta/components/framewizard/fmfpeditors.ui2
-rw-r--r--quanta/components/framewizard/fmrceditors.ui2
-rw-r--r--quanta/components/framewizard/framewizards.ui2
-rw-r--r--quanta/components/framewizard/treenode.cpp2
-rw-r--r--quanta/components/framewizard/treenode.h2
-rw-r--r--quanta/components/framewizard/visualframeeditor.cpp46
-rw-r--r--quanta/components/tableeditor/tableeditors.ui2
23 files changed, 66 insertions, 66 deletions
diff --git a/quanta/components/csseditor/csseditors.ui b/quanta/components/csseditor/csseditors.ui
index cc7f94f3..d1fe0993 100644
--- a/quanta/components/csseditor/csseditors.ui
+++ b/quanta/components/csseditor/csseditors.ui
@@ -404,7 +404,7 @@
<slot>accept()</slot>
</connection>
</connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kpushbutton.h</includehint>
</includehints>
diff --git a/quanta/components/csseditor/cssselectors.ui b/quanta/components/csseditor/cssselectors.ui
index 09356a70..dd899b1b 100644
--- a/quanta/components/csseditor/cssselectors.ui
+++ b/quanta/components/csseditor/cssselectors.ui
@@ -975,7 +975,7 @@
<slot>reject()</slot>
</connection>
</connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/quanta/components/csseditor/encodingselectors.ui b/quanta/components/csseditor/encodingselectors.ui
index 532cc137..6ac64343 100644
--- a/quanta/components/csseditor/encodingselectors.ui
+++ b/quanta/components/csseditor/encodingselectors.ui
@@ -111,5 +111,5 @@
<slot>reject()</slot>
</connection>
</connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/quanta/components/csseditor/fontfamilychoosers.ui b/quanta/components/csseditor/fontfamilychoosers.ui
index 11d3bfe8..86a109d9 100644
--- a/quanta/components/csseditor/fontfamilychoosers.ui
+++ b/quanta/components/csseditor/fontfamilychoosers.ui
@@ -429,7 +429,7 @@
<slot>accept()</slot>
</connection>
</connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/quanta/components/csseditor/stylesheetparser.cpp b/quanta/components/csseditor/stylesheetparser.cpp
index 7374ce9a..06e7600a 100644
--- a/quanta/components/csseditor/stylesheetparser.cpp
+++ b/quanta/components/csseditor/stylesheetparser.cpp
@@ -20,7 +20,7 @@
#include <kdebug.h>
static const TQString msg1(i18n("has not been closed")),
- msg2(i18n("needs an opening tqparenthesis "));
+ msg2(i18n("needs an opening parenthesis "));
stylesheetParser::stylesheetParser(const TQString& s){
m_styleSheet = s;
@@ -87,7 +87,7 @@ void stylesheetParser::parseComment(){
}
}
-unsigned int stylesheetParser::numberOfParenthesisInAParenthesisBlock(tqparenthesisKind p, const TQString& b){
+unsigned int stylesheetParser::numberOfParenthesisInAParenthesisBlock(parenthesisKind p, const TQString& b){
TQChar searchFor = '{';
if (p == closed)
searchFor = '}';
diff --git a/quanta/components/csseditor/stylesheetparser.h b/quanta/components/csseditor/stylesheetparser.h
index 9fc0716d..9da028fb 100644
--- a/quanta/components/csseditor/stylesheetparser.h
+++ b/quanta/components/csseditor/stylesheetparser.h
@@ -31,7 +31,7 @@ class stylesheetParser : public TQObject{
TQ_OBJECT
private:
- enum tqparenthesisKind { opened, closed };
+ enum parenthesisKind { opened, closed };
TQString m_styleSheet;
bool m_stopProcessing;
unsigned int m_orderNumber;
@@ -41,7 +41,7 @@ class stylesheetParser : public TQObject{
void parseAtRules1();
void parseAtRules2();
int whiteSpaces(int);
- unsigned int numberOfParenthesisInAParenthesisBlock(tqparenthesisKind p, const TQString& b);
+ unsigned int numberOfParenthesisInAParenthesisBlock(parenthesisKind p, const TQString& b);
public:
stylesheetParser(const TQString& s);
diff --git a/quanta/components/cvsservice/cvscommitdlgs.ui b/quanta/components/cvsservice/cvscommitdlgs.ui
index a2ce167e..3eb19d7a 100644
--- a/quanta/components/cvsservice/cvscommitdlgs.ui
+++ b/quanta/components/cvsservice/cvscommitdlgs.ui
@@ -143,7 +143,7 @@
<tabstop>okButton</tabstop>
<tabstop>cancelButton</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistbox.h</includehint>
</includehints>
diff --git a/quanta/components/cvsservice/cvsupdatetodlgs.ui b/quanta/components/cvsservice/cvsupdatetodlgs.ui
index d5e116a4..4b85c5d2 100644
--- a/quanta/components/cvsservice/cvsupdatetodlgs.ui
+++ b/quanta/components/cvsservice/cvsupdatetodlgs.ui
@@ -194,5 +194,5 @@
<slot>accept()</slot>
</connection>
</connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/quanta/components/debugger/conditionalbreakpointdialogs.ui b/quanta/components/debugger/conditionalbreakpointdialogs.ui
index 9c397431..dd94f4ae 100644
--- a/quanta/components/debugger/conditionalbreakpointdialogs.ui
+++ b/quanta/components/debugger/conditionalbreakpointdialogs.ui
@@ -320,7 +320,7 @@
<tabstop>buttonOk</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/quanta/components/debugger/dbgp/dbgpsettingss.ui b/quanta/components/debugger/dbgp/dbgpsettingss.ui
index 98da70f1..b8ab40bd 100644
--- a/quanta/components/debugger/dbgp/dbgpsettingss.ui
+++ b/quanta/components/debugger/dbgp/dbgpsettingss.ui
@@ -721,7 +721,7 @@
<slot>checkLocalProject_toggled(bool)</slot>
<slot>slotLocalProjectToggle(bool)</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>ktextbrowser.h</includehint>
</includehints>
diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
index ba1c7c44..ac3793bd 100644
--- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
+++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
@@ -705,7 +705,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
el = node.namedItem("localproject").toElement();
if (!el.isNull())
- el.tqparentNode().removeChild(el);
+ el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("localproject");
node.appendChild( el );
if(set.checkLocalProject->isChecked())
@@ -725,7 +725,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
el = node.namedItem("localbasedir").toElement();
if (!el.isNull())
- el.tqparentNode().removeChild(el);
+ el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("localbasedir");
node.appendChild( el );
el.appendChild( node.ownerDocument().createTextNode(m_localBasedir) );
@@ -734,7 +734,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
el = node.namedItem("serverbasedir").toElement();
if (!el.isNull())
- el.tqparentNode().removeChild(el);
+ el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("serverbasedir");
node.appendChild( el );
if(debuggerInterface())
@@ -743,7 +743,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
el = node.namedItem("listenport").toElement();
if (!el.isNull())
- el.tqparentNode().removeChild(el);
+ el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("listenport");
node.appendChild( el );
m_listenPort = set.lineServerListenPort->text();
@@ -751,7 +751,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
el = node.namedItem("startsession").toElement();
if (!el.isNull())
- el.tqparentNode().removeChild(el);
+ el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("startsession");
node.appendChild( el );
m_startsession = set.lineStartSession->text();
@@ -759,7 +759,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
el = node.namedItem("defaultexecutionstate").toElement();
if (!el.isNull())
- el.tqparentNode().removeChild(el);
+ el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("defaultexecutionstate");
node.appendChild( el );
if(set.comboDefaultExecutionState->currentItem() == 0)
@@ -776,7 +776,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
el = node.namedItem("errortqmask").toElement();
if (!el.isNull())
- el.tqparentNode().removeChild(el);
+ el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("errortqmask");
node.appendChild( el );
m_errortqmask = (set.checkBreakOnNotice->isChecked() ? QuantaDebuggerDBGp::Notice : 0)
@@ -790,7 +790,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
// Profiler
el = node.namedItem("profilerfilename").toElement();
if (!el.isNull())
- el.tqparentNode().removeChild(el);
+ el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("profilerfilename");
node.appendChild( el );
m_profilerFilename = set.lineProfilerFilename->text();
@@ -798,7 +798,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
el = node.namedItem("profilerfilename_map").toElement();
if (!el.isNull())
- el.tqparentNode().removeChild(el);
+ el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("profilerfilename_map");
node.appendChild( el );
m_profilerMapFilename = (set.checkProfilerMapFilename->isChecked() ? true : false);
@@ -806,7 +806,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
el = node.namedItem("profiler_autoopen").toElement();
if (!el.isNull())
- el.tqparentNode().removeChild(el);
+ el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("profiler_autoopen");
node.appendChild( el );
m_profilerAutoOpen = (set.checkProfilerAutoOpen->isChecked() ? true : false);
diff --git a/quanta/components/debugger/debuggermanager.cpp b/quanta/components/debugger/debuggermanager.cpp
index 0810cd91..1380c26a 100644
--- a/quanta/components/debugger/debuggermanager.cpp
+++ b/quanta/components/debugger/debuggermanager.cpp
@@ -781,7 +781,7 @@ void DebuggerManager::saveProperties( )
// (Re)create breakpoints section
TQDomNode nodeBreakpoints = nodeDbg.namedItem("breakpoints");
if(!nodeBreakpoints.isNull())
- nodeBreakpoints.tqparentNode().removeChild(nodeBreakpoints);
+ nodeBreakpoints.parentNode().removeChild(nodeBreakpoints);
if(m_breakpointList->count() > 0)
{
@@ -818,7 +818,7 @@ void DebuggerManager::saveProperties( )
// (Re)create watches section
TQDomNode nodeWatches = nodeDbg.namedItem("watches");
if(!nodeWatches.isNull())
- nodeWatches.tqparentNode().removeChild(nodeWatches);
+ nodeWatches.parentNode().removeChild(nodeWatches);
if(m_debuggerui->watches()->first())
{
diff --git a/quanta/components/debugger/debuggervariablesets.ui b/quanta/components/debugger/debuggervariablesets.ui
index 76689e57..09a3873c 100644
--- a/quanta/components/debugger/debuggervariablesets.ui
+++ b/quanta/components/debugger/debuggervariablesets.ui
@@ -181,5 +181,5 @@
<tabstop>buttonOk</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/quanta/components/debugger/gubed/gubedsettingss.ui b/quanta/components/debugger/gubed/gubedsettingss.ui
index 7697a337..ccca567c 100644
--- a/quanta/components/debugger/gubed/gubedsettingss.ui
+++ b/quanta/components/debugger/gubed/gubedsettingss.ui
@@ -755,7 +755,7 @@
<Q_SLOTS>
<slot specifier="pure virtual">slotUseProxyToggle( bool )</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>ktextbrowser.h</includehint>
</includehints>
diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.cpp b/quanta/components/debugger/gubed/quantadebuggergubed.cpp
index 58f949a1..e14ca894 100644
--- a/quanta/components/debugger/gubed/quantadebuggergubed.cpp
+++ b/quanta/components/debugger/gubed/quantadebuggergubed.cpp
@@ -878,7 +878,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
el = node.namedItem("serverhost").toElement();
if (!el.isNull())
- el.tqparentNode().removeChild(el);
+ el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("serverhost");
node.appendChild( el );
m_serverHost = set.lineServerHost->text();
@@ -886,7 +886,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
el = node.namedItem("serverport").toElement();
if (!el.isNull())
- el.tqparentNode().removeChild(el);
+ el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("serverport");
node.appendChild( el );
m_serverPort = set.lineServerPort->text();
@@ -894,7 +894,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
el = node.namedItem("localbasedir").toElement();
if (!el.isNull())
- el.tqparentNode().removeChild(el);
+ el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("localbasedir");
node.appendChild( el );
m_localBasedir = set.lineLocalBasedir->text();
@@ -904,7 +904,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
el = node.namedItem("serverbasedir").toElement();
if (!el.isNull())
- el.tqparentNode().removeChild(el);
+ el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("serverbasedir");
node.appendChild( el );
m_serverBasedir = set.lineServerBasedir->text();
@@ -914,7 +914,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
el = node.namedItem("useproxy").toElement();
if (!el.isNull())
- el.tqparentNode().removeChild(el);
+ el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("useproxy");
node.appendChild( el );
m_useproxy = set.checkUseProxy->isChecked();
@@ -922,7 +922,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
el = node.namedItem("listenport").toElement();
if (!el.isNull())
- el.tqparentNode().removeChild(el);
+ el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("listenport");
node.appendChild( el );
m_listenPort = set.lineServerListenPort->text();
@@ -930,7 +930,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
el = node.namedItem("startsession").toElement();
if (!el.isNull())
- el.tqparentNode().removeChild(el);
+ el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("startsession");
node.appendChild( el );
m_startsession = set.lineStartSession->text();
@@ -938,7 +938,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
el = node.namedItem("defaultexecutionstate").toElement();
if (!el.isNull())
- el.tqparentNode().removeChild(el);
+ el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("defaultexecutionstate");
node.appendChild( el );
m_defaultExecutionState = (State)set.comboDefaultExecutionState->currentItem();
@@ -947,7 +947,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
el = node.namedItem("displaydelay").toElement();
if (!el.isNull())
- el.tqparentNode().removeChild(el);
+ el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("displaydelay");
node.appendChild( el );
m_displaydelay = set.sliderDisplayDelay->value();
@@ -955,7 +955,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
el = node.namedItem("errortqmask").toElement();
if (!el.isNull())
- el.tqparentNode().removeChild(el);
+ el.parentNode().removeChild(el);
el = node.ownerDocument().createElement("errortqmask");
node.appendChild( el );
m_errortqmask = (set.checkBreakOnNotice->isChecked() ? QuantaDebuggerGubed::Notice : 0)
diff --git a/quanta/components/debugger/pathmapperdialogs.ui b/quanta/components/debugger/pathmapperdialogs.ui
index 933d003a..c0f27c04 100644
--- a/quanta/components/debugger/pathmapperdialogs.ui
+++ b/quanta/components/debugger/pathmapperdialogs.ui
@@ -338,7 +338,7 @@ The quanta will know that files starting with "/home/user/project/" on the local
<Q_SLOTS>
<slot>slotHistoryclicked()</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kled.h</includehint>
</includehints>
diff --git a/quanta/components/framewizard/fmfpeditors.ui b/quanta/components/framewizard/fmfpeditors.ui
index bcfb43c1..46a5354a 100644
--- a/quanta/components/framewizard/fmfpeditors.ui
+++ b/quanta/components/framewizard/fmfpeditors.ui
@@ -537,5 +537,5 @@
</connection>
</connections>
<pixmapinproject/>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/quanta/components/framewizard/fmrceditors.ui b/quanta/components/framewizard/fmrceditors.ui
index d85bb0da..e0a8926c 100644
--- a/quanta/components/framewizard/fmrceditors.ui
+++ b/quanta/components/framewizard/fmrceditors.ui
@@ -145,5 +145,5 @@
<slot>reject()</slot>
</connection>
</connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/quanta/components/framewizard/framewizards.ui b/quanta/components/framewizard/framewizards.ui
index 6f3d030e..cde1611f 100644
--- a/quanta/components/framewizard/framewizards.ui
+++ b/quanta/components/framewizard/framewizards.ui
@@ -362,7 +362,7 @@
</connection>
</connections>
<pixmapinproject/>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>visualframeeditor.h</includehint>
</includehints>
diff --git a/quanta/components/framewizard/treenode.cpp b/quanta/components/framewizard/treenode.cpp
index 0ff7cf74..ecf42bf8 100644
--- a/quanta/components/framewizard/treenode.cpp
+++ b/quanta/components/framewizard/treenode.cpp
@@ -114,7 +114,7 @@ TQString tree::addChildNode(const TQString &l){
}
bool tree::insertChildNode(const TQString &l){
- TQString tqparent = findNode(l)->tqparentLabel();
+ TQString tqparent = findNode(l)->parentLabel();
int pos=findNode( tqparent )->childPosition( findNode(l) );
++nodeId;
treeNode *newNode = new treeNode(TQString::number(nodeId,10),tqparent);
diff --git a/quanta/components/framewizard/treenode.h b/quanta/components/framewizard/treenode.h
index 6680e443..a1d568a6 100644
--- a/quanta/components/framewizard/treenode.h
+++ b/quanta/components/framewizard/treenode.h
@@ -49,7 +49,7 @@ class treeNode {
int childPosition(treeNode* n){ return m_tqchildrenList.tqfind(n); }
bool insertChild(unsigned int pos, treeNode* n) { return m_tqchildrenList.insert( pos, n); }
TQString label() const { return m_label; }
- TQString tqparentLabel() const { return m_parentLabel; }
+ TQString parentLabel() const { return m_parentLabel; }
SplitType splitType() const { return m_splitType; }
TQPtrList<treeNode> tqchildrenList() { return m_tqchildrenList; }
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);
}
}
}
diff --git a/quanta/components/tableeditor/tableeditors.ui b/quanta/components/tableeditor/tableeditors.ui
index 04af473c..f74a2620 100644
--- a/quanta/components/tableeditor/tableeditors.ui
+++ b/quanta/components/tableeditor/tableeditors.ui
@@ -638,5 +638,5 @@
<tabstop>footerColSpinBox</tabstop>
<tabstop>footerTableData</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>