1 files changed, 17 insertions, 17 deletions

diff --git a/kgantt/kgantt/xQGanttBarViewPort.cpp b/kgantt/kgantt/xQGanttBarViewPort.cpp
index 2ee7ad02..c1dc60d6 100644
--- a/kgantt/kgantt/xQGanttBarViewPort.cpp
+++ b/kgantt/kgantt/xQGanttBarViewPort.cpp
@@ -22,12 +22,12 @@
 
 
 xQGanttBarViewPort::xQGanttBarViewPort(KGanttItem* toplevelitem, 
-				       xQGanttBarView* parent,
+				       xQGanttBarView* tqparent,
 				       const char * name, WFlags f)
-  : TQFrame(parent,name,f)
+  : TQFrame(tqparent,name,f)
 /////////////////////////////////////////////////////////////////////////////
 {
-  _parent = parent;
+  _tqparent = tqparent;
 
   closedIcon =  TQPixmap(open_xpm);
   openedIcon =  TQPixmap(close_xpm);
@@ -35,7 +35,7 @@ xQGanttBarViewPort::xQGanttBarViewPort(KGanttItem* toplevelitem,
   _observedList = NULL;
   _toolbar = NULL;
 
-  _gItemList = TQPtrDict<xQTaskPosition>(449);
+  _gItemList = TQPtrDict<xTQTaskPosition>(449);
   _gItemList.setAutoDelete(true);
 
   _toplevelitem = toplevelitem;
@@ -107,7 +107,7 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw)
 {
   if(_toolbar || mw == 0) return _toolbar;
 
-  _toolbar = new KToolBar(mw,TQMainWindow::DockTop);
+  _toolbar = new KToolBar(mw,TQMainWindow::TQt::DockTop);
 
   mw->addToolBar(_toolbar);
 
@@ -239,7 +239,7 @@ xQGanttBarViewPort::initMenu()
 
   pix = _iconloader->loadIcon("configure.png", KIcon::Toolbar , 16 );
   if(pix.isNull()) printf("configure.png not found !\n");
-  _menu->insertItem(pix, i18n("Configure Gantt..."), _parent, TQT_SLOT(showConfig()));
+  _menu->insertItem(pix, i18n("Configure Gantt..."), _tqparent, TQT_SLOT(showConfig()));
 
 }
 
@@ -420,8 +420,8 @@ xQGanttBarViewPort::recalc(KGanttItem* item, int xPos, int yPos,
   int _textPosY = yPos + (int) (0.7 * (double) tmpHeight * _scaleY);
   int _textPosX = xPos + dd + 18;
 
-  xQTaskPosition* tpos =  
-    new xQTaskPosition(nr, xPos, yPos, _screenW, _screenH, _screenHS,
+  xTQTaskPosition* tpos =  
+    new xTQTaskPosition(nr, xPos, yPos, _screenW, _screenH, _screenHS,
 		       _textPosX, _textPosY, depth);
   
   _gItemList.tqreplace(item, tpos );
@@ -459,7 +459,7 @@ void
 xQGanttBarViewPort::drawItem(KGanttItem* item, TQPainter* p, 
 			     const TQRect& rect )
 {
-  xQTaskPosition* tpos = _gItemList[item];
+  xTQTaskPosition* tpos = _gItemList[item];
 
   if(!tpos) return;
 
@@ -589,8 +589,8 @@ xQGanttBarViewPort::drawRelation(TQPainter* p,
   KGanttItem* from = rel->getFrom();
   KGanttItem* to = rel->getTo();
 
-  xQTaskPosition* tpos_from = _gItemList[from];
-  xQTaskPosition* tpos_to = _gItemList[to];
+  xTQTaskPosition* tpos_from = _gItemList[from];
+  xTQTaskPosition* tpos_to = _gItemList[to];
 
   p->setPen(rel->getPen());
 
@@ -839,7 +839,7 @@ xQGanttBarViewPort::zoom(double sfactor, int sx, int sy)
   recalc();
   adjustSize();
 
-  _parent->center(screenX(wx), screenY(wy) );
+  _tqparent->center(screenX(wx), screenY(wy) );
 
   TQWidget::update();
 
@@ -854,12 +854,12 @@ xQGanttBarViewPort::zoom(double sfactor)
 {
   printf("zoom %f \n", sfactor );
 
-  int x = (int) (_parent->visibleWidth()/2 + 0.5);
-  int y = (int) (_parent->visibleHeight()/2 + 0.5);
+  int x = (int) (_tqparent->visibleWidth()/2 + 0.5);
+  int y = (int) (_tqparent->visibleHeight()/2 + 0.5);
 
   printf("dx/2 = %d, dy/2 = %d \n", x,y);
 
-  zoom(sfactor, x + _parent->contentsX(), y + _parent->contentsY() );
+  zoom(sfactor, x + _tqparent->contentsX(), y + _tqparent->contentsY() );
 
 }
 
@@ -872,7 +872,7 @@ xQGanttBarViewPort::zoomAll()
   printf("zoom all. scaleX = %f\n", _scaleX );
 #endif
 
-  _scaleX = ((double) _parent->visibleWidth()*60)/
+  _scaleX = ((double) _tqparent->visibleWidth()*60)/
     ((double) (_toplevelitem->getStart().secsTo(_toplevelitem->getEnd()) + _marginX*120));
 
   recalc();
@@ -910,7 +910,7 @@ xQGanttBarViewPort::addHoliday(int y, int m, int d)
 xQGanttBarViewPort::Position 
 xQGanttBarViewPort::check(KGanttItem** founditem, int x, int y)
 {
-  TQPtrDictIterator<xQTaskPosition> it(_gItemList); 
+  TQPtrDictIterator<xTQTaskPosition> it(_gItemList); 
 
   static int ty, ty2, tx, tx2, hx, hx2, hy, hy2;
   bool increased;