summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngmar Vanhassel <ingmar@gentoo.org>2008-02-25 09:43:48 +0000
committerIngmar Vanhassel <ingmar@gentoo.org>2008-02-25 09:43:48 +0000
commit18f1496e50cfb4252e7d9b0d3a41431293990c37 (patch)
tree5f9d2ce95a2528da5e92c53b9291e94712276162 /kde-base/korganizer/files
parentBump (diff)
downloadhistorical-18f1496e50cfb4252e7d9b0d3a41431293990c37.tar.gz
historical-18f1496e50cfb4252e7d9b0d3a41431293990c37.tar.bz2
historical-18f1496e50cfb4252e7d9b0d3a41431293990c37.zip
Added a patch to fix compilation with USE=kdeenablefinal, fixes bug 211027.
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'kde-base/korganizer/files')
-rw-r--r--kde-base/korganizer/files/korganizer-3.5.9-kdeenablefinal.patch53
1 files changed, 53 insertions, 0 deletions
diff --git a/kde-base/korganizer/files/korganizer-3.5.9-kdeenablefinal.patch b/kde-base/korganizer/files/korganizer-3.5.9-kdeenablefinal.patch
new file mode 100644
index 000000000000..6e5c372c4372
--- /dev/null
+++ b/kde-base/korganizer/files/korganizer-3.5.9-kdeenablefinal.patch
@@ -0,0 +1,53 @@
+--- 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 );
+