diff options
Diffstat (limited to 'kplato')
35 files changed, 230 insertions, 230 deletions
diff --git a/kplato/kptaccountspanelbase.ui b/kplato/kptaccountspanelbase.ui index 71e08516..e76a6129 100644 --- a/kplato/kptaccountspanelbase.ui +++ b/kplato/kptaccountspanelbase.ui @@ -123,7 +123,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/kplato/kptaccountsviewconfigurepanelbase.ui b/kplato/kptaccountsviewconfigurepanelbase.ui index 97c097b3..61e55316 100644 --- a/kplato/kptaccountsviewconfigurepanelbase.ui +++ b/kplato/kptaccountsviewconfigurepanelbase.ui @@ -61,7 +61,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kdatewidget.h</includehint> </includehints> diff --git a/kplato/kptcalendar.h b/kplato/kptcalendar.h index b5a7c1cc..6607ea67 100644 --- a/kplato/kptcalendar.h +++ b/kplato/kptcalendar.h @@ -239,17 +239,17 @@ public: const TQPtrList<CalendarDay> &days() const { return m_days; } /** - * Returns the state of definition for tqparents day date in it. - * Also checks the tqparents recursively. + * Returns the state of definition for parents day date in it. + * Also checks the parents recursively. */ - int tqparentDayState(const TQDate &date) const; + int parentDayState(const TQDate &date) const; IntMap weekdaysMap() { return m_weekdays->map(); } void setWeekday(IntMap::iterator it, int state) { m_weekdays->setWeekday(it, state); } CalendarWeekdays *weekdays() { return m_weekdays; } CalendarDay *weekday(int day) const { return m_weekdays->weekday(day); } - TQString tqparentId() const { return m_parentId; } + TQString parentId() const { return m_parentId; } void setParentId(TQString id) { m_parentId = id; } bool hasParent(Calendar *cal); diff --git a/kplato/kptcalendarlistpanel.ui b/kplato/kptcalendarlistpanel.ui index 32ef8452..04f86757 100644 --- a/kplato/kptcalendarlistpanel.ui +++ b/kplato/kptcalendarlistpanel.ui @@ -122,7 +122,7 @@ <tabstop>bDelete</tabstop> <tabstop>baseCalendar</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/kplato/kptcanvasitem.cc b/kplato/kptcanvasitem.cc index 95bf6888..bb3ab2ea 100644 --- a/kplato/kptcanvasitem.cc +++ b/kplato/kptcanvasitem.cc @@ -298,15 +298,15 @@ void PertRelationItem::draw() hgap = m_view->horizontalGap(); // could not use ...rect() here, don't know why - tqparentTop = (int)(m_parentItem->y()); - tqparentBottom = tqparentTop + (int)(m_parentItem->height()); + parentTop = (int)(m_parentItem->y()); + parentBottom = parentTop + (int)(m_parentItem->height()); childTop = (int)(m_childItem->y()); childRow = m_childItem->row(); childCol = m_childItem->column(); - tqparentRow = m_parentItem->row(); - tqparentCol = m_parentItem->column(); - //kdDebug()<<k_funcinfo<<"Parent="<<m_parentItem->node().name()<<" ("<<tqparentRow<<","<<tqparentCol<<") Child="<<m_childItem->node().name()<<" ("<<childRow<<","<<childCol<<")"<<endl; + parentRow = m_parentItem->row(); + parentCol = m_parentItem->column(); + //kdDebug()<<k_funcinfo<<"Parent="<<m_parentItem->node().name()<<" ("<<parentRow<<","<<parentCol<<") Child="<<m_childItem->node().name()<<" ("<<childRow<<","<<childCol<<")"<<endl; switch (type()) { @@ -347,76 +347,76 @@ void PertRelationItem::draw() void PertRelationItem::setFinishStartPoints() { - TQPoint tqparentPoint = m_parentItem->exitPoint(Relation::FinishStart); + TQPoint parentPoint = m_parentItem->exitPoint(Relation::FinishStart); TQPoint childPoint = m_childItem->entryPoint(Relation::FinishStart); TQPointArray a; - a.putPoints(0, 1, tqparentPoint.x(), tqparentPoint.y()); + a.putPoints(0, 1, parentPoint.x(), parentPoint.y()); - if ( tqparentRow == childRow ) + if ( parentRow == childRow ) { - if (tqparentCol == childCol - 1 || rowFree(tqparentRow, tqparentCol+1, childCol-1)) + if (parentCol == childCol - 1 || rowFree(parentRow, parentCol+1, childCol-1)) { a.putPoints(1, 1, childPoint.x(), childPoint.y()); } else // go around below { a.putPoints(1, 9, - tqparentPoint.x()+(wgap/2)-3, tqparentPoint.y(), // stop short - tqparentPoint.x()+(wgap/2), tqparentPoint.y()+3, // right/down - tqparentPoint.x()+(wgap/2), tqparentBottom+(hgap/2)-3, // stop short - tqparentPoint.x()+(wgap/2)+3, tqparentBottom+(hgap/2), // right/down - childPoint.x()-(wgap/2)-3, tqparentBottom+(hgap/2), // stop short - childPoint.x()-(wgap/2), tqparentBottom+(hgap/2)-3, // right/up + parentPoint.x()+(wgap/2)-3, parentPoint.y(), // stop short + parentPoint.x()+(wgap/2), parentPoint.y()+3, // right/down + parentPoint.x()+(wgap/2), parentBottom+(hgap/2)-3, // stop short + parentPoint.x()+(wgap/2)+3, parentBottom+(hgap/2), // right/down + childPoint.x()-(wgap/2)-3, parentBottom+(hgap/2), // stop short + childPoint.x()-(wgap/2), parentBottom+(hgap/2)-3, // right/up childPoint.x()-(wgap/2), childPoint.y()+3, // stop short childPoint.x()-(wgap/2)+3, childPoint.y(), // right/up childPoint.x(), childPoint.y()); } } - else if ( tqparentRow > childRow ) + else if ( parentRow > childRow ) { - if (tqparentCol == childCol - 1) + if (parentCol == childCol - 1) { a.putPoints(1, 5, - tqparentPoint.x()+(wgap/2)-3, tqparentPoint.y(), - tqparentPoint.x()+(wgap/2), tqparentPoint.y()-3, - tqparentPoint.x()+wgap/2, childPoint.y()+3, - tqparentPoint.x()+(wgap/2)+3, childPoint.y(), + parentPoint.x()+(wgap/2)-3, parentPoint.y(), + parentPoint.x()+(wgap/2), parentPoint.y()-3, + parentPoint.x()+wgap/2, childPoint.y()+3, + parentPoint.x()+(wgap/2)+3, childPoint.y(), childPoint.x(), childPoint.y()); } else // go around above { a.putPoints(1, 9, - tqparentPoint.x()+(wgap/2)-3, tqparentPoint.y(), - tqparentPoint.x()+(wgap/2), tqparentPoint.y()-3, - tqparentPoint.x()+wgap/2, tqparentTop-(hgap/2)+3, - tqparentPoint.x()+(wgap/2)+3, tqparentTop-(hgap/2), - childPoint.x()-(wgap/2)-3, tqparentTop-hgap/2, - childPoint.x()-(wgap/2), tqparentTop-(hgap/2)-3, + parentPoint.x()+(wgap/2)-3, parentPoint.y(), + parentPoint.x()+(wgap/2), parentPoint.y()-3, + parentPoint.x()+wgap/2, parentTop-(hgap/2)+3, + parentPoint.x()+(wgap/2)+3, parentTop-(hgap/2), + childPoint.x()-(wgap/2)-3, parentTop-hgap/2, + childPoint.x()-(wgap/2), parentTop-(hgap/2)-3, childPoint.x()-wgap/2, childPoint.y()+3, childPoint.x()-(wgap/2)+3, childPoint.y(), childPoint.x(), childPoint.y()); } } - else if ( tqparentRow < childRow ) + else if ( parentRow < childRow ) { - if (tqparentCol == childCol - 1) + if (parentCol == childCol - 1) { a.putPoints(1, 5, - tqparentPoint.x()+(wgap/2)-3, tqparentPoint.y(), - tqparentPoint.x()+(wgap/2), tqparentPoint.y()+3, - tqparentPoint.x()+wgap/2, childPoint.y()-3, - tqparentPoint.x()+(wgap/2)+3, childPoint.y(), + parentPoint.x()+(wgap/2)-3, parentPoint.y(), + parentPoint.x()+(wgap/2), parentPoint.y()+3, + parentPoint.x()+wgap/2, childPoint.y()-3, + parentPoint.x()+(wgap/2)+3, childPoint.y(), childPoint.x(), childPoint.y()); } else { a.putPoints(1, 9, - tqparentPoint.x()+(wgap/2)-3, tqparentPoint.y(), - tqparentPoint.x()+(wgap/2), tqparentPoint.y()+3, - tqparentPoint.x()+wgap/2, childTop-(hgap/2)-3, - tqparentPoint.x()+(wgap/2)+3, childTop-(hgap/2), + parentPoint.x()+(wgap/2)-3, parentPoint.y(), + parentPoint.x()+(wgap/2), parentPoint.y()+3, + parentPoint.x()+wgap/2, childTop-(hgap/2)-3, + parentPoint.x()+(wgap/2)+3, childTop-(hgap/2), childPoint.x()-(wgap/2)-3, childTop-(hgap/2), childPoint.x()-(wgap/2), childTop-(hgap/2)+3, childPoint.x()-wgap/2, childPoint.y()-3, @@ -430,64 +430,64 @@ void PertRelationItem::setFinishStartPoints() void PertRelationItem::setFinishFinishPoints() { //kdDebug()<<k_funcinfo<<endl; - TQPoint tqparentPoint = m_parentItem->exitPoint(Relation::FinishFinish); + TQPoint parentPoint = m_parentItem->exitPoint(Relation::FinishFinish); TQPoint childPoint = m_childItem->entryPoint(Relation::FinishFinish); TQPointArray a; - a.putPoints(0, 1, tqparentPoint.x(), tqparentPoint.y()); + a.putPoints(0, 1, parentPoint.x(), parentPoint.y()); - if ( tqparentRow >= childRow ) + if ( parentRow >= childRow ) { - if (tqparentCol == childCol) + if (parentCol == childCol) { a.putPoints(1, 5, - childPoint.x()+(wgap/2)-3, tqparentPoint.y(), - childPoint.x()+(wgap/2), tqparentPoint.y()-3, + childPoint.x()+(wgap/2)-3, parentPoint.y(), + childPoint.x()+(wgap/2), parentPoint.y()-3, childPoint.x()+wgap/2, childPoint.y()+3, childPoint.x()+(wgap/2)-3, childPoint.y(), childPoint.x(), childPoint.y()); } - else if (tqparentCol < childCol) + else if (parentCol < childCol) { a.putPoints(1, 9, - tqparentPoint.x()+(wgap/2)-3, tqparentPoint.y(), // stop short - tqparentPoint.x()+(wgap/2), tqparentPoint.y()+3, // right/down - tqparentPoint.x()+(wgap/2), tqparentBottom+(hgap/2)-3, // stop short - tqparentPoint.x()+(wgap/2)+3, tqparentBottom+(hgap/2), // right/down - childPoint.x()+(wgap/2)-3, tqparentBottom+(hgap/2), // stop short - childPoint.x()+(wgap/2), tqparentBottom+(hgap/2)-3, // right/up + parentPoint.x()+(wgap/2)-3, parentPoint.y(), // stop short + parentPoint.x()+(wgap/2), parentPoint.y()+3, // right/down + parentPoint.x()+(wgap/2), parentBottom+(hgap/2)-3, // stop short + parentPoint.x()+(wgap/2)+3, parentBottom+(hgap/2), // right/down + childPoint.x()+(wgap/2)-3, parentBottom+(hgap/2), // stop short + childPoint.x()+(wgap/2), parentBottom+(hgap/2)-3, // right/up childPoint.x()+(wgap/2), childPoint.y()+3, // stop short childPoint.x()+(wgap/2)-3, childPoint.y(), // left/up childPoint.x(), childPoint.y()); } } - else // tqparentRow < choldRow + else // parentRow < choldRow { - if (tqparentCol == childCol) + if (parentCol == childCol) { a.putPoints(1, 5, - tqparentPoint.x()+(wgap/2)-3, tqparentPoint.y(), - tqparentPoint.x()+(wgap/2), tqparentPoint.y()+3, - tqparentPoint.x()+wgap/2, childPoint.y()-3, - tqparentPoint.x()+(wgap/2)-3, childPoint.y(), + parentPoint.x()+(wgap/2)-3, parentPoint.y(), + parentPoint.x()+(wgap/2), parentPoint.y()+3, + parentPoint.x()+wgap/2, childPoint.y()-3, + parentPoint.x()+(wgap/2)-3, childPoint.y(), childPoint.x(), childPoint.y()); } - else if (tqparentCol < childCol) + else if (parentCol < childCol) { - if (rowFree(tqparentRow, tqparentCol+1, childCol)) + if (rowFree(parentRow, parentCol+1, childCol)) a.putPoints(1, 5, - childPoint.x()+(wgap/2)-3, tqparentPoint.y(), - childPoint.x()+(wgap/2), tqparentPoint.y()+3, + childPoint.x()+(wgap/2)-3, parentPoint.y(), + childPoint.x()+(wgap/2), parentPoint.y()+3, childPoint.x()+(wgap/2), childPoint.y()-3, childPoint.x()+(wgap/2)-3, childPoint.y(), childPoint.x(), childPoint.y()); else a.putPoints(1, 9, - tqparentPoint.x()+(wgap/2)-3, tqparentPoint.y(), - tqparentPoint.x()+(wgap/2), tqparentPoint.y()+3, - tqparentPoint.x()+wgap/2, childTop-(hgap/2)-3, - tqparentPoint.x()+(wgap/2)+3, childTop-(hgap/2), + parentPoint.x()+(wgap/2)-3, parentPoint.y(), + parentPoint.x()+(wgap/2), parentPoint.y()+3, + parentPoint.x()+wgap/2, childTop-(hgap/2)-3, + parentPoint.x()+(wgap/2)+3, childTop-(hgap/2), childPoint.x()+(wgap/2)-3, childTop-(hgap/2), childPoint.x()+(wgap/2), childTop-(hgap/2)+3, childPoint.x()+(wgap/2), childPoint.y()-3, @@ -497,10 +497,10 @@ void PertRelationItem::setFinishFinishPoints() else { a.putPoints(1, 9, - tqparentPoint.x()+(wgap/2)-3, tqparentPoint.y(), - tqparentPoint.x()+(wgap/2), tqparentPoint.y()+3, - tqparentPoint.x()+wgap/2, childTop-(hgap/2)-3, - tqparentPoint.x()+(wgap/2)+3, childTop-(hgap/2), + parentPoint.x()+(wgap/2)-3, parentPoint.y(), + parentPoint.x()+(wgap/2), parentPoint.y()+3, + parentPoint.x()+wgap/2, childTop-(hgap/2)-3, + parentPoint.x()+(wgap/2)+3, childTop-(hgap/2), childPoint.x()+(wgap/2)-3, childTop-(hgap/2), childPoint.x()+(wgap/2), childTop-(hgap/2)+3, childPoint.x()+wgap/2, childPoint.y()-3, @@ -514,31 +514,31 @@ void PertRelationItem::setFinishFinishPoints() void PertRelationItem::setStartStartPoints() { //kdDebug()<<k_funcinfo<<endl; - TQPoint tqparentPoint = m_parentItem->exitPoint(Relation::StartStart); + TQPoint parentPoint = m_parentItem->exitPoint(Relation::StartStart); TQPoint childPoint = m_childItem->entryPoint(Relation::StartStart); TQPointArray a; - a.putPoints(0, 1, tqparentPoint.x(), tqparentPoint.y()); + a.putPoints(0, 1, parentPoint.x(), parentPoint.y()); - if ( tqparentRow > childRow ) + if ( parentRow > childRow ) { - if (tqparentCol == childCol) // go up + if (parentCol == childCol) // go up { a.putPoints(1, 4, - tqparentPoint.x()-(wgap/2)+3, tqparentPoint.y(), - tqparentPoint.x()-(wgap/2), tqparentPoint.y()-3, - tqparentPoint.x()-(wgap/2), childPoint.y()+3, - tqparentPoint.x()-(wgap/2)+3, childPoint.y()); + parentPoint.x()-(wgap/2)+3, parentPoint.y(), + parentPoint.x()-(wgap/2), parentPoint.y()-3, + parentPoint.x()-(wgap/2), childPoint.y()+3, + parentPoint.x()-(wgap/2)+3, childPoint.y()); } else // go above myself { a.putPoints(1, 8, - tqparentPoint.x()-(wgap/2)+3, tqparentPoint.y(), - tqparentPoint.x()-(wgap/2), tqparentPoint.y()-3, - tqparentPoint.x()-(wgap/2), tqparentTop-(hgap/2)+3, - tqparentPoint.x()-(wgap/2)+3, tqparentTop-(hgap/2), - childPoint.x()-(wgap/2)-3, tqparentTop-(hgap/2), - childPoint.x()-(wgap/2), tqparentTop-(hgap/2)-3, + parentPoint.x()-(wgap/2)+3, parentPoint.y(), + parentPoint.x()-(wgap/2), parentPoint.y()-3, + parentPoint.x()-(wgap/2), parentTop-(hgap/2)+3, + parentPoint.x()-(wgap/2)+3, parentTop-(hgap/2), + childPoint.x()-(wgap/2)-3, parentTop-(hgap/2), + childPoint.x()-(wgap/2), parentTop-(hgap/2)-3, childPoint.x()-(wgap/2), childPoint.y()+3, childPoint.x()-(wgap/2)+3, childPoint.y()); } @@ -546,32 +546,32 @@ void PertRelationItem::setStartStartPoints() else // go left/down { a.putPoints(1, 2, - tqparentPoint.x()-(wgap/2)+3, tqparentPoint.y(), - tqparentPoint.x()-(wgap/2), tqparentPoint.y()+3); + parentPoint.x()-(wgap/2)+3, parentPoint.y(), + parentPoint.x()-(wgap/2), parentPoint.y()+3); - if (tqparentCol == childCol) + if (parentCol == childCol) { a.putPoints(3, 2, - tqparentPoint.x()-(wgap/2), childPoint.y()-3, - tqparentPoint.x()-(wgap/2)+3, childPoint.y()); + parentPoint.x()-(wgap/2), childPoint.y()-3, + parentPoint.x()-(wgap/2)+3, childPoint.y()); } else // go below myself { - if (tqparentRow == childRow) // go up + if (parentRow == childRow) // go up { a.putPoints(3, 6, - tqparentPoint.x()-(wgap/2), tqparentBottom+hgap/2-3, - tqparentPoint.x()-(wgap/2)+3, tqparentBottom+hgap/2, - childPoint.x()-(wgap/2)-3, tqparentBottom+hgap/2, - childPoint.x()-(wgap/2), tqparentBottom+hgap/2-3, + parentPoint.x()-(wgap/2), parentBottom+hgap/2-3, + parentPoint.x()-(wgap/2)+3, parentBottom+hgap/2, + childPoint.x()-(wgap/2)-3, parentBottom+hgap/2, + childPoint.x()-(wgap/2), parentBottom+hgap/2-3, childPoint.x()-(wgap/2), childPoint.y()+3, childPoint.x()-(wgap/2)+3, childPoint.y()); } else // go down { a.putPoints(3, 6, - tqparentPoint.x()-(wgap/2), childTop-(hgap/2)-3, - tqparentPoint.x()-(wgap/2)+3, childTop-hgap/2, + parentPoint.x()-(wgap/2), childTop-(hgap/2)-3, + parentPoint.x()-(wgap/2)+3, childTop-hgap/2, childPoint.x()-(wgap/2)-3, childTop-hgap/2, childPoint.x()-(wgap/2), childTop-(hgap/2)+3, childPoint.x()-(wgap/2), childPoint.y()-3, diff --git a/kplato/kptcanvasitem.h b/kplato/kptcanvasitem.h index 81d0dc0f..3ce3ec96 100644 --- a/kplato/kptcanvasitem.h +++ b/kplato/kptcanvasitem.h @@ -191,14 +191,14 @@ private: PertNodeItem *m_childItem; int left, top, right, bottom; - int tqparentTop; - int tqparentBottom; + int parentTop; + int parentBottom; int childTop; int childRow; int childCol; - int tqparentRow; - int tqparentCol; + int parentRow; + int parentCol; int wgap; int hgap; diff --git a/kplato/kptconfigbehaviorpanelbase.ui b/kplato/kptconfigbehaviorpanelbase.ui index 007e4c0d..eb329c71 100644 --- a/kplato/kptconfigbehaviorpanelbase.ui +++ b/kplato/kptconfigbehaviorpanelbase.ui @@ -98,5 +98,5 @@ <Q_SLOTS> <slot>slotChanged()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kplato/kptconfigtaskpanelbase.ui b/kplato/kptconfigtaskpanelbase.ui index e972c5c1..31e07542 100644 --- a/kplato/kptconfigtaskpanelbase.ui +++ b/kplato/kptconfigtaskpanelbase.ui @@ -348,7 +348,7 @@ The estimation can be either effort based or duration based. If it is effort bas <tabstop>pessimisticValue</tabstop> <tabstop>descriptionfield</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kcombobox.h</includehint> diff --git a/kplato/kptdurationwidget.ui b/kplato/kptdurationwidget.ui index 19273780..d87befbb 100644 --- a/kplato/kptdurationwidget.ui +++ b/kplato/kptdurationwidget.ui @@ -416,5 +416,5 @@ <function access="private" specifier="non virtual" returnType="double">power( double m, int e )</function> <function access="private" specifier="non virtual" returnType="double">fraction( TQString number, int * exp )</function> </functions> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kplato/kptfactory.cc b/kplato/kptfactory.cc index 4c31ef79..0828ec03 100644 --- a/kplato/kptfactory.cc +++ b/kplato/kptfactory.cc @@ -48,7 +48,7 @@ Factory::~Factory() s_global = 0L; } -KParts::Part *Factory::createPartObject(TQWidget *tqparentWidget, +KParts::Part *Factory::createPartObject(TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, @@ -59,9 +59,9 @@ KParts::Part *Factory::createPartObject(TQWidget *tqparentWidget, // and single view. bool bWantKoDocument = (strcmp(classname, "KoDocument") == 0); - // tqparentWidget and widgetName are used by KoDocument for the + // parentWidget and widgetName are used by KoDocument for the // "readonly+singleView" case. - Part *part = new Part(tqparentWidget, widgetName, tqparent, name, + Part *part = new Part(parentWidget, widgetName, tqparent, name, !bWantKoDocument); if (!bWantKoDocument) diff --git a/kplato/kptfactory.h b/kplato/kptfactory.h index a8126835..8a8022af 100644 --- a/kplato/kptfactory.h +++ b/kplato/kptfactory.h @@ -35,7 +35,7 @@ public: Factory( TQObject* tqparent = 0, const char* name = 0 ); ~Factory(); - virtual KParts::Part *createPartObject( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() ); + virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() ); static KInstance* global(); diff --git a/kplato/kptganttview.cc b/kplato/kptganttview.cc index 1e32a092..37695320 100644 --- a/kplato/kptganttview.cc +++ b/kplato/kptganttview.cc @@ -239,7 +239,7 @@ void GanttView::drawOnPainter(TQPainter* painter, const TQRect rect) // m_taskView->setSizes(sizes); // } // else -// kdWarning() << "Aptqparently the task view splitter contains less than 2 parts!" << endl; +// kdWarning() << "Apparently the task view splitter contains less than 2 parts!" << endl; // bool showlistview = m_gantt->showListView(); // int listviewwidth = m_gantt->listViewWidth(); @@ -401,10 +401,10 @@ KDGanttViewItem *GanttView::correctParent(KDGanttViewItem *item, Node *node) return newItem; } -void GanttView::updateChildren(Node *tqparentNode) +void GanttView::updateChildren(Node *parentNode) { //kdDebug()<<k_funcinfo<<endl; - TQPtrListIterator<Node> nit(tqparentNode->childNodeIterator()); + TQPtrListIterator<Node> nit(parentNode->childNodeIterator()); for (; nit.current(); ++nit ) { updateNode(nit.current()); @@ -728,33 +728,33 @@ void GanttView::modifyMilestone(KDGanttViewItem *item, Task *task) setDrawn(item, true); } -KDGanttViewItem *GanttView::addNode( KDGanttViewItem *tqparentItem, Node *node, KDGanttViewItem *after) +KDGanttViewItem *GanttView::addNode( KDGanttViewItem *parentItem, Node *node, KDGanttViewItem *after) { //kdDebug()<<k_funcinfo<<endl; if (node->type() == Node::Type_Project) { - return addProject(tqparentItem, node, after); + return addProject(parentItem, node, after); } if (node->type() == Node::Type_Subproject) { - return addSubProject(tqparentItem, node, after); + return addSubProject(parentItem, node, after); } if (node->type() == Node::Type_Summarytask) { - return addSummaryTask(tqparentItem, static_cast<Task *>(node), after); + return addSummaryTask(parentItem, static_cast<Task *>(node), after); } if (node->type() == Node::Type_Task) { - return addTask(tqparentItem, static_cast<Task *>(node), after); + return addTask(parentItem, static_cast<Task *>(node), after); } if (node->type() == Node::Type_Milestone) { - return addMilestone(tqparentItem, static_cast<Task *>(node), after); + return addMilestone(parentItem, static_cast<Task *>(node), after); } return 0; } -KDGanttViewItem *GanttView::addProject(KDGanttViewItem *tqparentItem, Node *node, KDGanttViewItem *after) +KDGanttViewItem *GanttView::addProject(KDGanttViewItem *parentItem, Node *node, KDGanttViewItem *after) { //kdDebug()<<k_funcinfo<<endl; GanttViewSummaryItem *item; - if ( tqparentItem) { - item = new GanttViewSummaryItem(tqparentItem, node); + if ( parentItem) { + item = new GanttViewSummaryItem(parentItem, node); } else { // we are on the top level item = new GanttViewSummaryItem(m_gantt, node); @@ -765,19 +765,19 @@ KDGanttViewItem *GanttView::addProject(KDGanttViewItem *tqparentItem, Node *node return item; } -KDGanttViewItem *GanttView::addSubProject(KDGanttViewItem *tqparentItem, Node *node, KDGanttViewItem *after) +KDGanttViewItem *GanttView::addSubProject(KDGanttViewItem *parentItem, Node *node, KDGanttViewItem *after) { //kdDebug()<<k_funcinfo<<endl; - return addProject(tqparentItem, node, after); + return addProject(parentItem, node, after); } -KDGanttViewItem *GanttView::addSummaryTask(KDGanttViewItem *tqparentItem, Task *task, KDGanttViewItem *after) +KDGanttViewItem *GanttView::addSummaryTask(KDGanttViewItem *parentItem, Task *task, KDGanttViewItem *after) { //kdDebug()<<k_funcinfo<<endl; // display summary item GanttViewSummaryItem *item; - if ( tqparentItem) { - item = new GanttViewSummaryItem(tqparentItem, task); + if ( parentItem) { + item = new GanttViewSummaryItem(parentItem, task); } else { // we are on the top level item = new GanttViewSummaryItem(m_gantt, task); @@ -788,13 +788,13 @@ KDGanttViewItem *GanttView::addSummaryTask(KDGanttViewItem *tqparentItem, Task * return item; } -KDGanttViewItem *GanttView::addTask(KDGanttViewItem *tqparentItem, Task *task, KDGanttViewItem *after) +KDGanttViewItem *GanttView::addTask(KDGanttViewItem *parentItem, Task *task, KDGanttViewItem *after) { //kdDebug()<<k_funcinfo<<endl; // display task item GanttViewTaskItem *item; - if ( tqparentItem ) { - item = new GanttViewTaskItem(tqparentItem, task); + if ( parentItem ) { + item = new GanttViewTaskItem(parentItem, task); } else { // we are on the top level @@ -806,12 +806,12 @@ KDGanttViewItem *GanttView::addTask(KDGanttViewItem *tqparentItem, Task *task, K return item; } -KDGanttViewItem *GanttView::addMilestone(KDGanttViewItem *tqparentItem, Task *task, KDGanttViewItem *after) +KDGanttViewItem *GanttView::addMilestone(KDGanttViewItem *parentItem, Task *task, KDGanttViewItem *after) { //kdDebug()<<k_funcinfo<<endl; GanttViewEventItem *item; - if ( tqparentItem ) { - item = new GanttViewEventItem(tqparentItem, task); + if ( parentItem ) { + item = new GanttViewEventItem(parentItem, task); } else { // we are on the top level item = new GanttViewEventItem(m_gantt, task); @@ -822,26 +822,26 @@ KDGanttViewItem *GanttView::addMilestone(KDGanttViewItem *tqparentItem, Task *ta return item; } -void GanttView::drawChildren(KDGanttViewItem *tqparentItem, Node &tqparentNode) +void GanttView::drawChildren(KDGanttViewItem *parentItem, Node &parentNode) { //kdDebug()<<k_funcinfo<<endl; - TQPtrListIterator<Node> nit(tqparentNode.childNodeIterator()); + TQPtrListIterator<Node> nit(parentNode.childNodeIterator()); for ( nit.toLast(); nit.current(); --nit ) { Node *n = nit.current(); if (n->type() == Node::Type_Project) - drawProject(tqparentItem, n); + drawProject(parentItem, n); else if (n->type() == Node::Type_Subproject) - drawSubProject(tqparentItem, n); + drawSubProject(parentItem, n); else if (n->type() == Node::Type_Summarytask) { Task *t = dynamic_cast<Task *>(n); - drawSummaryTask(tqparentItem, t); + drawSummaryTask(parentItem, t); } else if (n->type() == Node::Type_Task) { Task *t = dynamic_cast<Task *>(n); - drawTask(tqparentItem, t); + drawTask(parentItem, t); } else if (n->type() == Node::Type_Milestone) { Task *t = dynamic_cast<Task *>(n); - drawMilestone(tqparentItem, t); + drawMilestone(parentItem, t); } else kdDebug()<<k_funcinfo<<"Node type "<<n->type()<<" not implemented yet"<<endl; @@ -850,37 +850,37 @@ void GanttView::drawChildren(KDGanttViewItem *tqparentItem, Node &tqparentNode) } -void GanttView::drawProject(KDGanttViewItem *tqparentItem, Node *node) +void GanttView::drawProject(KDGanttViewItem *parentItem, Node *node) { //kdDebug()<<k_funcinfo<<endl; - GanttViewSummaryItem *item = dynamic_cast<GanttViewSummaryItem*>(addProject(tqparentItem, node)); + GanttViewSummaryItem *item = dynamic_cast<GanttViewSummaryItem*>(addProject(parentItem, node)); drawChildren(item, *node); } -void GanttView::drawSubProject(KDGanttViewItem *tqparentItem, Node *node) +void GanttView::drawSubProject(KDGanttViewItem *parentItem, Node *node) { //kdDebug()<<k_funcinfo<<endl; - GanttViewSummaryItem *item = dynamic_cast<GanttViewSummaryItem*>(addSubProject(tqparentItem, node)); + GanttViewSummaryItem *item = dynamic_cast<GanttViewSummaryItem*>(addSubProject(parentItem, node)); drawChildren(item, *node); } -void GanttView::drawSummaryTask(KDGanttViewItem *tqparentItem, Task *task) +void GanttView::drawSummaryTask(KDGanttViewItem *parentItem, Task *task) { //kdDebug()<<k_funcinfo<<endl; - GanttViewSummaryItem *item = dynamic_cast<GanttViewSummaryItem*>(addSummaryTask(tqparentItem, task)); + GanttViewSummaryItem *item = dynamic_cast<GanttViewSummaryItem*>(addSummaryTask(parentItem, task)); drawChildren(item, *task); } -void GanttView::drawTask(KDGanttViewItem *tqparentItem, Task *task) +void GanttView::drawTask(KDGanttViewItem *parentItem, Task *task) { //kdDebug()<<k_funcinfo<<endl; - addTask(tqparentItem, task); + addTask(parentItem, task); } -void GanttView::drawMilestone(KDGanttViewItem *tqparentItem, Task *task) +void GanttView::drawMilestone(KDGanttViewItem *parentItem, Task *task) { //kdDebug()<<k_funcinfo<<endl; - addMilestone(tqparentItem, task); + addMilestone(parentItem, task); } void GanttView::addTaskLink(KDGanttViewTaskLink *link) { diff --git a/kplato/kptganttview.h b/kplato/kptganttview.h index b6d0b8a4..42f1ac1d 100644 --- a/kplato/kptganttview.h +++ b/kplato/kptganttview.h @@ -163,20 +163,20 @@ private: void modifyTask(KDGanttViewItem *item, Task *task); void modifyMilestone(KDGanttViewItem *item, Task *task); - KDGanttViewItem *addNode(KDGanttViewItem *tqparentItem, Node *node,KDGanttViewItem *after=0); + KDGanttViewItem *addNode(KDGanttViewItem *parentItem, Node *node,KDGanttViewItem *after=0); - KDGanttViewItem *addProject(KDGanttViewItem *tqparentItem, Node *node, KDGanttViewItem *after=0); - KDGanttViewItem *addSubProject(KDGanttViewItem *tqparentItem, Node *node, KDGanttViewItem *after=0); - KDGanttViewItem *addSummaryTask(KDGanttViewItem *tqparentItem, Task *task, KDGanttViewItem *after=0); - KDGanttViewItem *addTask(KDGanttViewItem *tqparentItem, Task *task, KDGanttViewItem *after=0); - KDGanttViewItem *addMilestone(KDGanttViewItem *tqparentItem, Task *task, KDGanttViewItem *after=0); + KDGanttViewItem *addProject(KDGanttViewItem *parentItem, Node *node, KDGanttViewItem *after=0); + KDGanttViewItem *addSubProject(KDGanttViewItem *parentItem, Node *node, KDGanttViewItem *after=0); + KDGanttViewItem *addSummaryTask(KDGanttViewItem *parentItem, Task *task, KDGanttViewItem *after=0); + KDGanttViewItem *addTask(KDGanttViewItem *parentItem, Task *task, KDGanttViewItem *after=0); + KDGanttViewItem *addMilestone(KDGanttViewItem *parentItem, Task *task, KDGanttViewItem *after=0); void drawChildren(KDGanttViewItem *item, Node &node); - void drawProject(KDGanttViewItem *tqparentItem, Node *node); - void drawSubProject(KDGanttViewItem *tqparentItem, Node *node); - void drawSummaryTask(KDGanttViewItem *tqparentItem, Task *task); - void drawTask(KDGanttViewItem *tqparentItem, Task *task); - void drawMilestone(KDGanttViewItem *tqparentItem, Task *task); + void drawProject(KDGanttViewItem *parentItem, Node *node); + void drawSubProject(KDGanttViewItem *parentItem, Node *node); + void drawSummaryTask(KDGanttViewItem *parentItem, Task *task); + void drawTask(KDGanttViewItem *parentItem, Task *task); + void drawMilestone(KDGanttViewItem *parentItem, Task *task); void drawRelations(); void drawRelations(KDGanttViewItem *item); diff --git a/kplato/kptintervaleditbase.ui b/kplato/kptintervaleditbase.ui index 78580d56..76b00dc4 100644 --- a/kplato/kptintervaleditbase.ui +++ b/kplato/kptintervaleditbase.ui @@ -120,5 +120,5 @@ <tabstop>bAddInterval</tabstop> <tabstop>intervalList</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kplato/kptmainprojectpanelbase.ui b/kplato/kptmainprojectpanelbase.ui index 712f691d..f6622781 100644 --- a/kplato/kptmainprojectpanelbase.ui +++ b/kplato/kptmainprojectpanelbase.ui @@ -275,7 +275,7 @@ Here you can enter any additional text you want to be stored with the project. T <tabstop>descriptionfield</tabstop> <tabstop>idfield</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kplato/kptmilestoneprogresspanelbase.ui b/kplato/kptmilestoneprogresspanelbase.ui index 27e295d0..97a06f4d 100644 --- a/kplato/kptmilestoneprogresspanelbase.ui +++ b/kplato/kptmilestoneprogresspanelbase.ui @@ -54,7 +54,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kdatetimewidget.h</includehint> <includehint>kdatewidget.h</includehint> diff --git a/kplato/kptnode.cc b/kplato/kptnode.cc index 48135a71..e8c25312 100644 --- a/kplato/kptnode.cc +++ b/kplato/kptnode.cc @@ -964,7 +964,7 @@ void Node::printDebug(bool tqchildren, TQCString indent) { kdDebug()<<indent<<" Level: "<<level()<<endl; kdDebug()<<indent<<" No of predecessors: "<<m_dependParentNodes.count()<<endl; TQPtrListIterator<Relation> pit(m_dependParentNodes); - //kdDebug()<<indent<<" Dependant tqparents="<<pit.count()<<endl; + //kdDebug()<<indent<<" Dependant parents="<<pit.count()<<endl; if (pit.count() > 0) { for ( ; pit.current(); ++pit ) { pit.current()->printDebug(indent); diff --git a/kplato/kptpart.cc b/kplato/kptpart.cc index 459f0854..f3075f37 100644 --- a/kplato/kptpart.cc +++ b/kplato/kptpart.cc @@ -48,11 +48,11 @@ namespace KPlato { -Part::Part(TQWidget *tqparentWidget, const char *widgetName, +Part::Part(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, bool singleViewMode) - : KoDocument(tqparentWidget, widgetName, tqparent, name, singleViewMode), - m_project(0), m_projectDialog(0), m_parentWidget(tqparentWidget), m_view(0), - m_embeddedGanttView(new GanttView(tqparentWidget)), + : KoDocument(parentWidget, widgetName, tqparent, name, singleViewMode), + m_project(0), m_projectDialog(0), m_parentWidget(parentWidget), m_view(0), + m_embeddedGanttView(new GanttView(parentWidget)), m_embeddedContext(new Context()), m_embeddedContextInitialized(false), m_context(0), m_xmlLoader() { @@ -90,7 +90,7 @@ Part::~Part() { } -bool Part::initDoc(InitDocFlags flags, TQWidget* tqparentWidget) { +bool Part::initDoc(InitDocFlags flags, TQWidget* parentWidget) { bool result = true; if (flags==KoDocument::InitDocEmpty) @@ -113,7 +113,7 @@ bool Part::initDoc(InitDocFlags flags, TQWidget* tqparentWidget) { ret = KoTemplateChooseDia::choose(Factory::global(), templateDoc, dlgtype, "kplato_template", - tqparentWidget); + parentWidget); if (ret == KoTemplateChooseDia::Template) { resetURL(); result = loadNativeFormat(templateDoc); diff --git a/kplato/kptpart.h b/kplato/kptpart.h index 6aafea3e..25ba542e 100644 --- a/kplato/kptpart.h +++ b/kplato/kptpart.h @@ -49,7 +49,7 @@ class Part : public KoDocument, public KoTextZoomHandler { TQ_OBJECT public: - Part(TQWidget *tqparentWidget = 0, const char *widgetName = 0, + Part(TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false); ~Part(); @@ -58,7 +58,7 @@ public: bool transparent = FALSE, double zoomX = 1.0, double zoomY = 1.0); - virtual bool initDoc(InitDocFlags flags, TQWidget* tqparentWidget=0); + virtual bool initDoc(InitDocFlags flags, TQWidget* parentWidget=0); /** * Edit the settings of the project diff --git a/kplato/kptpertcanvas.cc b/kplato/kptpertcanvas.cc index 910ec600..198d4593 100644 --- a/kplato/kptpertcanvas.cc +++ b/kplato/kptpertcanvas.cc @@ -125,23 +125,23 @@ PertNodeItem *PertCanvas::createNodeItem(Node *node) return item; } -void PertCanvas::createChildItems(PertNodeItem *tqparentItem) +void PertCanvas::createChildItems(PertNodeItem *parentItem) { - //kdDebug()<<k_funcinfo<<"tqparentItem="<<(tqparentItem ? tqparentItem->node().name() : "nil")<<endl; - if (!tqparentItem) + //kdDebug()<<k_funcinfo<<"parentItem="<<(parentItem ? parentItem->node().name() : "nil")<<endl; + if (!parentItem) return; - TQPtrListIterator<Relation> it(tqparentItem->node().dependChildNodes()); + TQPtrListIterator<Relation> it(parentItem->node().dependChildNodes()); for (; it.current(); ++it) { PertNodeItem *childItem = createNodeItem(it.current()->child()); if (childItem) - tqparentItem->addChildRelation(it.current(), childItem); + parentItem->addChildRelation(it.current(), childItem); m_relations.append(it.current()); } // Now my tqchildren - TQPtrListIterator<Node> nit(tqparentItem->node().childNodeIterator()); + TQPtrListIterator<Node> nit(parentItem->node().childNodeIterator()); for ( ; nit.current(); ++nit ) { createChildItems(createNodeItem(nit.current())); } @@ -153,11 +153,11 @@ void PertCanvas::drawRelations() TQPtrListIterator<Relation> it(m_relations); for (; it.current(); ++it) { - PertNodeItem *tqparentItem = m_nodes.tqfind(it.current()->tqparent()); + PertNodeItem *parentItem = m_nodes.tqfind(it.current()->tqparent()); PertNodeItem *childItem = m_nodes.tqfind(it.current()->child()); - if (tqparentItem && childItem) + if (parentItem && childItem) { - PertRelationItem *item = new PertRelationItem(this, tqparentItem, childItem, it.current()); + PertRelationItem *item = new PertRelationItem(this, parentItem, childItem, it.current()); item->show(); } } @@ -174,20 +174,20 @@ void PertCanvas::mapNode(PertNodeItem *item) m_rows.at(item->row())->at(item->column()) = true; } -void PertCanvas::mapChildNode(PertNodeItem *tqparentItem, PertNodeItem *childItem, Relation::Type type) +void PertCanvas::mapChildNode(PertNodeItem *parentItem, PertNodeItem *childItem, Relation::Type type) { - //kdDebug()<<k_funcinfo<<"Parent: "<<tqparentItem->node().name()<<" to child: "<<(childItem ? childItem->node().name() : "None")<<endl; + //kdDebug()<<k_funcinfo<<"Parent: "<<parentItem->node().name()<<" to child: "<<(childItem ? childItem->node().name() : "None")<<endl; if (!childItem) { // shouldn't happen... kdError()<<k_funcinfo<<"No childItem"<<endl; return; } - int row = tqparentItem->row(); - int col = tqparentItem->column(); + int row = parentItem->row(); + int col = parentItem->column(); int chRow = childItem->row(); int chCol = childItem->column(); bool chMapped = (chRow > -1 && chCol > -1); - //kdDebug()<<k_funcinfo<<"Parent: "<<tqparentItem->node().name()<<" at ("<<row<<","<<col<<"): Moving "<<childItem->node().name()<<" from: "<<chRow<<","<<chCol<<endl; + //kdDebug()<<k_funcinfo<<"Parent: "<<parentItem->node().name()<<" at ("<<row<<","<<col<<"): Moving "<<childItem->node().name()<<" from: "<<chRow<<","<<chCol<<endl; if (type == Relation::StartStart || type == Relation::FinishFinish) diff --git a/kplato/kptpertcanvas.h b/kplato/kptpertcanvas.h index 19f0408a..437bb6fa 100644 --- a/kplato/kptpertcanvas.h +++ b/kplato/kptpertcanvas.h @@ -59,7 +59,7 @@ public: void setColumn(int row, int col) { m_rows.at(row)[col] = true; } void mapNode(PertNodeItem *item); - void mapChildNode(PertNodeItem *tqparentItem, PertNodeItem *childItem, Relation::Type type); + void mapChildNode(PertNodeItem *parentItem, PertNodeItem *childItem, Relation::Type type); Node *selectedNode(); 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)) { diff --git a/kplato/kptprojectdialogbase.ui b/kplato/kptprojectdialogbase.ui index 4bffc0e2..2dab71fe 100644 --- a/kplato/kptprojectdialogbase.ui +++ b/kplato/kptprojectdialogbase.ui @@ -252,7 +252,7 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kdatepicker.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kplato/kptsummarytaskgeneralpanelbase.ui b/kplato/kptsummarytaskgeneralpanelbase.ui index 715770c6..57dd2654 100644 --- a/kplato/kptsummarytaskgeneralpanelbase.ui +++ b/kplato/kptsummarytaskgeneralpanelbase.ui @@ -240,7 +240,7 @@ This is not limited to persons available in a resource group but can be anyone. <tabstop>idfield</tabstop> <tabstop>wbsfield</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>ktextedit.h</includehint> diff --git a/kplato/kpttask.cc b/kplato/kpttask.cc index f4b29f79..7b00740b 100644 --- a/kplato/kpttask.cc +++ b/kplato/kpttask.cc @@ -893,7 +893,7 @@ DateTime Task::scheduleForward(const DateTime &earliest, int use) { cs->startTime = time; //kdDebug()<<k_funcinfo<<m_name<<" new startime="<<cs->startTime<<endl; } - // Then my tqparents + // Then my parents time = schedulePredeccessors(m_parentProxyRelations, use); if (time.isValid() && time > cs->startTime) { cs->startTime = time; @@ -1087,7 +1087,7 @@ DateTime Task::scheduleBackward(const DateTime &latest, int use) { if (time.isValid() && time < cs->endTime) { cs->endTime = time; } - // Then my tqparents + // Then my parents time = scheduleSuccessors(m_childProxyRelations, use); if (time.isValid() && time < cs->endTime) { cs->endTime = time; diff --git a/kplato/kpttaskcostpanelbase.ui b/kplato/kpttaskcostpanelbase.ui index cc5c6e08..38250f2b 100644 --- a/kplato/kpttaskcostpanelbase.ui +++ b/kplato/kpttaskcostpanelbase.ui @@ -223,7 +223,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kplato/kpttaskgeneralpanelbase.ui b/kplato/kpttaskgeneralpanelbase.ui index 2d047b50..1d153a02 100644 --- a/kplato/kpttaskgeneralpanelbase.ui +++ b/kplato/kpttaskgeneralpanelbase.ui @@ -537,7 +537,7 @@ The estimation can be either effort based or duration based. If it is effort bas <tabstop>idfield</tabstop> <tabstop>wbsfield</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kcombobox.h</includehint> diff --git a/kplato/kpttasknotespanelbase.ui b/kplato/kpttasknotespanelbase.ui index ea543d1e..90f413ff 100644 --- a/kplato/kpttasknotespanelbase.ui +++ b/kplato/kpttasknotespanelbase.ui @@ -47,5 +47,5 @@ <Q_SLOTS> <slot>scheduling_clicked( int schedulingType )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kplato/kpttaskprogresspanelbase.ui b/kplato/kpttaskprogresspanelbase.ui index 1acf3556..00d23dda 100644 --- a/kplato/kpttaskprogresspanelbase.ui +++ b/kplato/kpttaskprogresspanelbase.ui @@ -411,7 +411,7 @@ <tabstop>finishTime</tabstop> <tabstop>startTime</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kdatetimewidget.h</includehint> <includehint>kdatewidget.h</includehint> diff --git a/kplato/kpttaskresourcespanelbase.ui b/kplato/kpttaskresourcespanelbase.ui index 5183181c..dfa3b818 100644 --- a/kplato/kpttaskresourcespanelbase.ui +++ b/kplato/kpttaskresourcespanelbase.ui @@ -107,5 +107,5 @@ <includes> <include location="local" impldecl="in implementation">kpttaskresourcespanelbase.ui.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kplato/kptwbsdefinitionpanelbase.ui b/kplato/kptwbsdefinitionpanelbase.ui index 5180c73b..4656ce4e 100644 --- a/kplato/kptwbsdefinitionpanelbase.ui +++ b/kplato/kptwbsdefinitionpanelbase.ui @@ -181,5 +181,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kplato/relationpanel.ui b/kplato/relationpanel.ui index 73d3c491..409a52f9 100644 --- a/kplato/relationpanel.ui +++ b/kplato/relationpanel.ui @@ -277,7 +277,7 @@ <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154789cad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a19017a725d8c60000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kptdurationwidget.h</includehint> </includehints> diff --git a/kplato/resourcedialogbase.ui b/kplato/resourcedialogbase.ui index ecf68c35..8107e9ac 100644 --- a/kplato/resourcedialogbase.ui +++ b/kplato/resourcedialogbase.ui @@ -385,7 +385,7 @@ <tabstop>rateEdit</tabstop> <tabstop>overtimeEdit</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kdatetimewidget.h</includehint> <includehint>kdatewidget.h</includehint> diff --git a/kplato/resourcespanelbase.ui b/kplato/resourcespanelbase.ui index e169b156..8428e29c 100644 --- a/kplato/resourcespanelbase.ui +++ b/kplato/resourcespanelbase.ui @@ -188,7 +188,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/kplato/standardworktimedialogbase.ui b/kplato/standardworktimedialogbase.ui index 4119f46f..61f4fddb 100644 --- a/kplato/standardworktimedialogbase.ui +++ b/kplato/standardworktimedialogbase.ui @@ -281,7 +281,7 @@ when there is no calendar defined for a resource.</string> <tabstop>month</tabstop> <tabstop>week</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>klistview.h</includehint> |