--- branches/KDE/3.5/kdepim/kdgantt/KDGanttViewTaskItem.h	2008/02/24 13:29:26	778731
+++ branches/KDE/3.5/kdepim/kdgantt/KDGanttViewTaskItem.h	2008/02/24 13:32:04	778732
@@ -60,8 +60,10 @@
     void setStartTime( const QDateTime& start );
     void setEndTime( const QDateTime& end );
 
-private:
+protected:
     void showItem( bool show = true, int coordY = 0 );
+
+private:
     void initItem();
     void hideMe();
     QBrush myBrush, undefinedBrush;
--- branches/KDE/3.5/kdepim/korganizer/kodaymatrix.cpp	2008/02/24 14:12:56	778743
+++ branches/KDE/3.5/kdepim/korganizer/kodaymatrix.cpp	2008/02/24 14:14:09	778744
@@ -54,6 +54,7 @@
 #include <qcursor.h>
 #include <kpopupmenu.h>
 #include <X11/Xlib.h>
+#undef FocusIn
 #undef KeyPress
 #undef None
 #undef Status
--- branches/KDE/3.5/kdepim/korganizer/timelineitem.cpp	2008/02/23 16:28:17	778447
+++ branches/KDE/3.5/kdepim/korganizer/timelineitem.cpp	2008/02/23 16:32:02	778448
@@ -119,13 +119,13 @@
     y = coordY;
   else
     y = getCoordY();
-  int startX = myGanttView->myTimeHeader->getCoordX(myStartTime);
-  int endX = myGanttView->myTimeHeader->getCoordX(myEndTime);
+  int startX = myGanttView->timeHeaderWidget()->getCoordX(myStartTime);
+  int endX = myGanttView->timeHeaderWidget()->getCoordX(myEndTime);
 
   const int mw = QMAX( 1, QMIN( 4, endX - startX ) );
   if ( !mLeft || mw != mMarkerWidth ) {
     if ( !mLeft ) {
-      mLeft = new KDCanvasPolygon( myGanttView->myTimeTable, this, Type_is_KDGanttViewItem );
+      mLeft = new KDCanvasPolygon( myGanttView->timeTableWidget(), this, Type_is_KDGanttViewItem );
       mLeft->setBrush( Qt::black );
     }
     QPointArray a = QPointArray( 4 );
@@ -137,7 +137,7 @@
   }
   if ( !mRight || mw != mMarkerWidth ) {
     if ( !mRight ) {
-      mRight = new KDCanvasPolygon( myGanttView->myTimeTable, this, Type_is_KDGanttViewItem );
+      mRight = new KDCanvasPolygon( myGanttView->timeTableWidget(), this, Type_is_KDGanttViewItem );
       mRight->setBrush( Qt::black );
     }
     QPointArray a = QPointArray( 4 );