1 files changed, 16 insertions, 16 deletions

diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp
index bd83feb14..57bd2566d 100644
--- a/kdgantt/KDGanttViewSubwidgets.cpp
+++ b/kdgantt/KDGanttViewSubwidgets.cpp
@@ -702,12 +702,12 @@ KDTimeHeaderWidget:: KDTimeHeaderWidget( TQWidget* parent,KDGanttView* gant )
     mySizeHint = 0;
     myGanttView = gant;
     flagDoNotRecomputeAfterChange = true;
-    TQDateTime start = (TQDateTime::tqcurrentDateTime ()).addSecs(-3600);
+    TQDateTime start = (TQDateTime::currentDateTime ()).addSecs(-3600);
     setHorizonStart(start);
     setHorizonEnd( start.addSecs(3600*2));
     flagStartTimeSet = false;
     flagEndTimeSet = false;
-    myCenterDateTime = TQDateTime::tqcurrentDateTime ();
+    myCenterDateTime = TQDateTime::currentDateTime ();
     setScale(KDGanttView::Auto);
     //setScale(KDGanttView::Hour);
     myMaxScale = KDGanttView::Month;
@@ -2086,7 +2086,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale)
     TQPainter p(this);
     int Width, Height;
     TQString testTextMinor,testTextMajor, tempStr;
-    TQRect tqitemRectMinor, tqitemRectMajor;
+    TQRect itemRectMinor, itemRectMajor;
     TQDate tempDate = myRealStart.date();
     myRealEnd = myRealStart;
     // preparing the testtext for the differennt scales
@@ -2109,25 +2109,25 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale)
                 testTextMinor = "12 AM";
             testTextMajor = "Mon Aug 30, x";
             if ( yearFormat() != KDGanttView::NoDate )
-                testTextMajor += getYear(TQDate::tqcurrentDate());
+                testTextMajor += getYear(TQDate::currentDate());
             minorPerMajor = 2400;
             break;
         case KDGanttView::Day:
             minorItems = minorItems/(60*24);
             testTextMinor = "88";
-            testTextMajor = "Aug 30, x"+getYear(TQDate::tqcurrentDate());
+            testTextMajor = "Aug 30, x"+getYear(TQDate::currentDate());
             minorPerMajor = 700;
             break;
         case KDGanttView::Week:
             minorItems = minorItems/(60*24*7);
             testTextMinor = "88";
-            testTextMajor = "Aug x"+getYear(TQDate::tqcurrentDate());
+            testTextMajor = "Aug x"+getYear(TQDate::currentDate());
             minorPerMajor = 435; // 435 = 365days/12months/7days * 100
             break;
         case KDGanttView::Month:
             minorItems = (minorItems*12)/(60*24*365);
             testTextMinor = "M";
-            testTextMajor = "x"+getYear(TQDate::tqcurrentDate());
+            testTextMajor = "x"+getYear(TQDate::currentDate());
             minorPerMajor = 1200;
             break;
         case KDGanttView::Auto:
@@ -2135,12 +2135,12 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale)
             qDebug("             RealScale == Auto : This may not be! ");
             break;
         }
-    tqitemRectMinor = p.boundingRect ( 10, 10, 2, 2, TQt::AlignLeft,testTextMinor);
-    tqitemRectMajor = p.boundingRect ( 10, 10, 2, 2, TQt::AlignLeft,testTextMajor);
+    itemRectMinor = p.boundingRect ( 10, 10, 2, 2, TQt::AlignLeft,testTextMinor);
+    itemRectMajor = p.boundingRect ( 10, 10, 2, 2, TQt::AlignLeft,testTextMajor);
     p.end();
     //qDebug("     tempMinorScaleCount %d ", tempMinorScaleCount);
-    Height = tqitemRectMinor.height()+tqitemRectMajor.height()+11;
-    Width = (tqitemRectMinor.width()+5);
+    Height = itemRectMinor.height()+itemRectMajor.height()+11;
+    Width = (itemRectMinor.width()+5);
     if (Width < minimumColumnWidth()) Width = minimumColumnWidth();
     // if the desired width is greater than the maximum width of this widget
     // increase the minorscalecount
@@ -2197,7 +2197,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale)
     // checking, if enough space for majorscale
     // if not, increasing MajorScaleCount
 
-    while ((minorPerMajor*Width)/100 < tqitemRectMajor.width()) {
+    while ((minorPerMajor*Width)/100 < itemRectMajor.width()) {
         minorPerMajor = minorPerMajor/tempMajorScaleCount;
         ++tempMajorScaleCount;
         minorPerMajor = minorPerMajor*tempMajorScaleCount;
@@ -2213,7 +2213,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale)
             resize( Width, Height );
             emit  sizeChanged( Width );
         }
-    myMajorGridHeight = tqitemRectMajor.height()+5;
+    myMajorGridHeight = itemRectMajor.height()+5;
     TQTime tempTime = myRealStart.time();
     TQDateTime tempDateTime;
     int i;
@@ -2631,7 +2631,7 @@ TQSize KDLegendWidget::legendSize()
 TQSize KDLegendWidget::legendSizeHint()
 {
     TQApplication::sendPostedEvents( 0, TQEvent::LayoutHint );
-    return TQSize( myLegend->tqsizeHint().width(), myLegend->tqsizeHint().height()+scroll->horizontalScrollBar()->height());
+    return TQSize( myLegend->sizeHint().width(), myLegend->sizeHint().height()+scroll->horizontalScrollBar()->height());
 }
 
 
@@ -2949,7 +2949,7 @@ void KDListView::drawAllContents(TQPainter * p, int cx, int cy, int cw, int ch)
                 p->translate( rleft, crtop );
                 //kdDebug()<<k_funcinfo<<"paintBranches: "<<current->i->text(0)<<endl;
 
-                current->i->paintBranches( p, tqcolorGroup(), treeStepSize(),
+                current->i->paintBranches( p, colorGroup(), treeStepSize(),
                                         rtop - crtop, r.height() );
                 p->restore();
             }
@@ -3510,7 +3510,7 @@ KDGanttCanvasView::MovingOperation KDGanttCanvasView::gvItemHitTest( KDGanttView
 void KDGanttCanvasView::contentsMousePressEvent ( TQMouseEvent * e )
 {
     //qDebug("mousepress! %d ", this);
-    //qDebug("focus %d ",tqApp->tqfocusWidget());
+    //qDebug("focus %d ",tqApp->focusWidget());
     setFocus();
     currentLink = 0;
     currentItem = 0;