Magellan Linux

Contents of /trunk/kdepim/patches/kdepim-3.5.9-kdeenablefinal.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 561 - (show annotations) (download)
Sat Apr 5 16:56:24 2008 UTC (16 years, 1 month ago) by niro
File size: 2046 byte(s)
-compilation fixes

1 --- branches/KDE/3.5/kdepim/kdgantt/KDGanttViewTaskItem.h 2008/02/24 13:29:26 778731
2 +++ branches/KDE/3.5/kdepim/kdgantt/KDGanttViewTaskItem.h 2008/02/24 13:32:04 778732
3 @@ -60,8 +60,10 @@
4 void setStartTime( const QDateTime& start );
5 void setEndTime( const QDateTime& end );
6
7 -private:
8 +protected:
9 void showItem( bool show = true, int coordY = 0 );
10 +
11 +private:
12 void initItem();
13 void hideMe();
14 QBrush myBrush, undefinedBrush;
15 --- branches/KDE/3.5/kdepim/korganizer/kodaymatrix.cpp 2008/02/24 14:12:56 778743
16 +++ branches/KDE/3.5/kdepim/korganizer/kodaymatrix.cpp 2008/02/24 14:14:09 778744
17 @@ -54,6 +54,7 @@
18 #include <qcursor.h>
19 #include <kpopupmenu.h>
20 #include <X11/Xlib.h>
21 +#undef FocusIn
22 #undef KeyPress
23 #undef None
24 #undef Status
25 --- branches/KDE/3.5/kdepim/korganizer/timelineitem.cpp 2008/02/23 16:28:17 778447
26 +++ branches/KDE/3.5/kdepim/korganizer/timelineitem.cpp 2008/02/23 16:32:02 778448
27 @@ -119,13 +119,13 @@
28 y = coordY;
29 else
30 y = getCoordY();
31 - int startX = myGanttView->myTimeHeader->getCoordX(myStartTime);
32 - int endX = myGanttView->myTimeHeader->getCoordX(myEndTime);
33 + int startX = myGanttView->timeHeaderWidget()->getCoordX(myStartTime);
34 + int endX = myGanttView->timeHeaderWidget()->getCoordX(myEndTime);
35
36 const int mw = QMAX( 1, QMIN( 4, endX - startX ) );
37 if ( !mLeft || mw != mMarkerWidth ) {
38 if ( !mLeft ) {
39 - mLeft = new KDCanvasPolygon( myGanttView->myTimeTable, this, Type_is_KDGanttViewItem );
40 + mLeft = new KDCanvasPolygon( myGanttView->timeTableWidget(), this, Type_is_KDGanttViewItem );
41 mLeft->setBrush( Qt::black );
42 }
43 QPointArray a = QPointArray( 4 );
44 @@ -137,7 +137,7 @@
45 }
46 if ( !mRight || mw != mMarkerWidth ) {
47 if ( !mRight ) {
48 - mRight = new KDCanvasPolygon( myGanttView->myTimeTable, this, Type_is_KDGanttViewItem );
49 + mRight = new KDCanvasPolygon( myGanttView->timeTableWidget(), this, Type_is_KDGanttViewItem );
50 mRight->setBrush( Qt::black );
51 }
52 QPointArray a = QPointArray( 4 );
53