rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 19 insertions, 19 deletions

diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
index 44071116..0680a0c0 100644
--- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
+++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
@@ -49,11 +49,11 @@ K_EXPORT_COMPONENT_FACTORY( quantadebuggerdbgp,
 
 const char QuantaDebuggerDBGp::protocolversion[] = "1.0";
 
-QuantaDebuggerDBGp::QuantaDebuggerDBGp (TQObject *tqparent, const char*, const TQStringList&)
-    : DebuggerClient (tqparent, "DBGp")
+QuantaDebuggerDBGp::QuantaDebuggerDBGp (TQObject *parent, const char*, const TQStringList&)
+    : DebuggerClient (parent, "DBGp")
 {
   // Create a socket object and set up its signals
-  m_errortqmask = 1794;
+  m_errormask = 1794;
   m_supportsasync = false;
   m_defaultExecutionState = Starting;
   setExecutionState(m_defaultExecutionState);
@@ -649,9 +649,9 @@ void QuantaDebuggerDBGp::readConfig(TQDomNode node)
   valuenode = node.namedItem("useproxy");
   m_useproxy = valuenode.firstChild().nodeValue() == "1";
 
-  valuenode = node.namedItem("errortqmask");
-  m_errortqmask = valuenode.firstChild().nodeValue().toLong();
-  kdDebug(24002) << k_funcinfo << ", m_errortqmask = " << m_errortqmask << endl;
+  valuenode = node.namedItem("errormask");
+  m_errormask = valuenode.firstChild().nodeValue().toLong();
+  kdDebug(24002) << k_funcinfo << ", m_errormask = " << m_errormask << endl;
   
   // Profiler
   valuenode = node.namedItem("profilerfilename");
@@ -687,11 +687,11 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
   else
     set.comboDefaultExecutionState->setCurrentItem(1);
 
-  set.checkBreakOnNotice->setChecked(QuantaDebuggerDBGp::Notice & m_errortqmask);
-  set.checkBreakOnWarning->setChecked(QuantaDebuggerDBGp::Warning & m_errortqmask);
-  set.checkBreakOnUserNotice->setChecked(QuantaDebuggerDBGp::User_Notice & m_errortqmask);
-  set.checkBreakOnUserWarning->setChecked(QuantaDebuggerDBGp::User_Warning & m_errortqmask);
-  set.checkBreakOnUserError->setChecked(QuantaDebuggerDBGp::User_Error & m_errortqmask);
+  set.checkBreakOnNotice->setChecked(QuantaDebuggerDBGp::Notice & m_errormask);
+  set.checkBreakOnWarning->setChecked(QuantaDebuggerDBGp::Warning & m_errormask);
+  set.checkBreakOnUserNotice->setChecked(QuantaDebuggerDBGp::User_Notice & m_errormask);
+  set.checkBreakOnUserWarning->setChecked(QuantaDebuggerDBGp::User_Warning & m_errormask);
+  set.checkBreakOnUserError->setChecked(QuantaDebuggerDBGp::User_Error & m_errormask);
 
   set.lineProfilerFilename->setText(m_profilerFilename);
   if(m_profilerAutoOpen)
@@ -774,18 +774,18 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
 
     }
 
-    el = node.namedItem("errortqmask").toElement();
+    el = node.namedItem("errormask").toElement();
     if (!el.isNull())
       el.parentNode().removeChild(el);
-    el = node.ownerDocument().createElement("errortqmask");
+    el = node.ownerDocument().createElement("errormask");
     node.appendChild( el );
-    m_errortqmask = (set.checkBreakOnNotice->isChecked() ? QuantaDebuggerDBGp::Notice : 0)
+    m_errormask = (set.checkBreakOnNotice->isChecked() ? QuantaDebuggerDBGp::Notice : 0)
                   + (set.checkBreakOnWarning->isChecked() ? QuantaDebuggerDBGp::Warning : 0)
                   + (set.checkBreakOnUserNotice->isChecked() ? QuantaDebuggerDBGp::User_Notice : 0)
                   + (set.checkBreakOnUserWarning->isChecked() ? QuantaDebuggerDBGp::User_Warning : 0)
                   + (set.checkBreakOnUserError->isChecked() ? QuantaDebuggerDBGp::User_Error : 0);
-    kdDebug(24002) << k_funcinfo << ", m_errortqmask = " << m_errortqmask << endl;
-    el.appendChild( node.ownerDocument().createTextNode(TQString::number(m_errortqmask)));
+    kdDebug(24002) << k_funcinfo << ", m_errormask = " << m_errormask << endl;
+    el.appendChild( node.ownerDocument().createTextNode(TQString::number(m_errormask)));
 
     // Profiler
     el = node.namedItem("profilerfilename").toElement();
@@ -1015,7 +1015,7 @@ void QuantaDebuggerDBGp::handleError(const TQDomNode & statusnode )
         {
           // Managable error
           long error = attribute(errornode, "code").toLong();
-          if(!(error & m_errortqmask))
+          if(!(error & m_errormask))
           {
             setExecutionState(Running);
           }
diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.h b/quanta/components/debugger/dbgp/quantadebuggerdbgp.h
index 52ec17bc..8e5b667f 100644
--- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.h
+++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.h
@@ -35,7 +35,7 @@ class QuantaDebuggerDBGp : public DebuggerClient
   TQ_OBJECT
 
   public:
-    QuantaDebuggerDBGp(TQObject *tqparent, const char* name, const TQStringList&);
+    QuantaDebuggerDBGp(TQObject *parent, const char* name, const TQStringList&);
     ~QuantaDebuggerDBGp();
 
     // Execution states
@@ -122,7 +122,7 @@ class QuantaDebuggerDBGp : public DebuggerClient
     bool    m_profilerAutoOpen;
     bool    m_profilerMapFilename;
     State   m_executionState, m_defaultExecutionState;
-    long    m_errortqmask;
+    long    m_errormask;
     long    m_displaydelay;
     bool    m_supportsasync;