diff options
Diffstat (limited to 'kplato/kptproject.cc')
-rw-r--r-- | kplato/kptproject.cc | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/kplato/kptproject.cc b/kplato/kptproject.cc index 85992dcf..3a15ce2f 100644 --- a/kplato/kptproject.cc +++ b/kplato/kptproject.cc @@ -440,11 +440,11 @@ bool Project::load(TQDomElement &element) { // calendars references calendars in arbritary saved order TQPtrListIterator<Calendar> calit(m_calendars); for (; calit.current(); ++calit) { - if (calit.current()->id() == calit.current()->tqparentId()) { + if (calit.current()->id() == calit.current()->parentId()) { kdError()<<k_funcinfo<<"Calendar want itself as tqparent"<<endl; continue; } - calit.current()->setParent(calendar(calit.current()->tqparentId())); + calit.current()->setParent(calendar(calit.current()->parentId())); } //kdDebug()<<k_funcinfo<<"Project schedules--->"<<endl; TQIntDictIterator<Schedule> it = m_schedules; @@ -569,18 +569,18 @@ bool Project::addTask( Node* task, Node* position ) } // find the position // we have to tell the tqparent that we want to delete one of its tqchildren - Node* tqparentNode = position->getParent(); - if ( !tqparentNode ) { + Node* parentNode = position->getParent(); + if ( !parentNode ) { kdDebug()<<k_funcinfo<<"tqparent node not found???"<<endl; return false; } - int index = tqparentNode->findChildNode( position ); + int index = parentNode->findChildNode( position ); if ( -1 == index ) { // ok, it does not exist kdDebug()<<k_funcinfo<<"Task not found???"<<endl; return false; } - return addSubTask(task, index+1, tqparentNode); + return addSubTask(task, index+1, parentNode); } bool Project::addSubTask( Node* task, Node* position ) @@ -637,11 +637,11 @@ bool Project::canIndentTask(Node* node) return false; } // we have to find the tqparent of task to manipulate its list of tqchildren - Node* tqparentNode = node->getParent(); - if ( !tqparentNode ) { + Node* parentNode = node->getParent(); + if ( !parentNode ) { return false; } - if (tqparentNode->findChildNode(node) == -1) { + if (parentNode->findChildNode(node) == -1) { kdError()<<k_funcinfo<<"Tasknot found???"<<endl; return false; } @@ -681,16 +681,16 @@ bool Project::canUnindentTask( Node* node ) } // we have to find the tqparent of task to manipulate its list of tqchildren // and we need the tqparent's tqparent too - Node* tqparentNode = node->getParent(); - if ( !tqparentNode ) { + Node* parentNode = node->getParent(); + if ( !parentNode ) { return false; } - Node* grandParentNode = tqparentNode->getParent(); + Node* grandParentNode = parentNode->getParent(); if ( !grandParentNode ) { //kdDebug()<<k_funcinfo<<"This node already is at the top level"<<endl; return false; } - int index = tqparentNode->findChildNode( node ); + int index = parentNode->findChildNode( node ); if ( -1 == index ) { kdError()<<k_funcinfo<<"Tasknot found???"<<endl; return false; @@ -701,10 +701,10 @@ bool Project::canUnindentTask( Node* node ) bool Project::unindentTask( Node* node ) { if (canUnindentTask(node)) { - Node *tqparentNode = node->getParent(); - Node *grandParentNode = tqparentNode->getParent(); - tqparentNode->delChildNode(node, false/*do not delete objekt*/); - grandParentNode->addChildNode(node,tqparentNode); + Node *parentNode = node->getParent(); + Node *grandParentNode = parentNode->getParent(); + parentNode->delChildNode(node, false/*do not delete objekt*/); + grandParentNode->addChildNode(node,parentNode); return true; } return false; @@ -715,12 +715,12 @@ bool Project::canMoveTaskUp( Node* node ) if (node == 0) return false; // safety // we have to find the tqparent of task to manipulate its list of tqchildren - Node* tqparentNode = node->getParent(); - if (!tqparentNode) { + Node* parentNode = node->getParent(); + if (!parentNode) { //kdDebug()<<k_funcinfo<<"No tqparent found"<<endl; return false; } - if (tqparentNode->findChildNode(node) == -1) { + if (parentNode->findChildNode(node) == -1) { kdError()<<k_funcinfo<<"Tasknot found???"<<endl; return false; } @@ -743,11 +743,11 @@ bool Project::canMoveTaskDown( Node* node ) if (node == 0) return false; // safety // we have to find the tqparent of task to manipulate its list of tqchildren - Node* tqparentNode = node->getParent(); - if (!tqparentNode) { + Node* parentNode = node->getParent(); + if (!parentNode) { return false; } - if (tqparentNode->findChildNode(node) == -1) { + if (parentNode->findChildNode(node) == -1) { kdError()<<k_funcinfo<<"Tasknot found???"<<endl; return false; } @@ -987,7 +987,7 @@ void Project::setStandardWorktime(StandardWorktime * worktime) { } bool Project::legalToLink(Node *par, Node *child) { - //kdDebug()<<k_funcinfo<<par.name()<<" ("<<par.numDependParentNodes()<<" tqparents) "<<child.name()<<" ("<<child.numDependChildNodes()<<" tqchildren)"<<endl; + //kdDebug()<<k_funcinfo<<par.name()<<" ("<<par.numDependParentNodes()<<" parents) "<<child.name()<<" ("<<child.numDependChildNodes()<<" tqchildren)"<<endl; if (!child || par->isDependChildOf(child)) { return false; @@ -1007,7 +1007,7 @@ bool Project::legalToLink(Node *par, Node *child) { bool Project::legalParents(Node *par, Node *child) { bool legal = true; - //kdDebug()<<k_funcinfo<<par->name()<<" ("<<par->numDependParentNodes()<<" tqparents) "<<child->name()<<" ("<<child->numDependChildNodes()<<" tqchildren)"<<endl; + //kdDebug()<<k_funcinfo<<par->name()<<" ("<<par->numDependParentNodes()<<" parents) "<<child->name()<<" ("<<child->numDependChildNodes()<<" tqchildren)"<<endl; for (int i=0; i < par->numDependParentNodes() && legal; ++i) { Node *pNode = par->getDependParentNode(i)->tqparent(); if (child->isParentOf(pNode) || pNode->isParentOf(child)) { @@ -1024,7 +1024,7 @@ bool Project::legalParents(Node *par, Node *child) { bool Project::legalChildren(Node *par, Node *child) { bool legal = true; - //kdDebug()<<k_funcinfo<<par->name()<<" ("<<par->numDependParentNodes()<<" tqparents) "<<child->name()<<" ("<<child->numDependChildNodes()<<" tqchildren)"<<endl; + //kdDebug()<<k_funcinfo<<par->name()<<" ("<<par->numDependParentNodes()<<" parents) "<<child->name()<<" ("<<child->numDependChildNodes()<<" tqchildren)"<<endl; for (int j=0; j < child->numDependChildNodes() && legal; ++j) { Node *cNode = child->getDependChildNode(j)->child(); if (par->isParentOf(cNode) || cNode->isParentOf(par)) { |