-rw-r--r-- | korganizer/koagenda.cpp | 169 |
1 files changed, 90 insertions, 79 deletions
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index 1d4d6de..fe59787 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp | |||
@@ -31,8 +31,19 @@ | |||
31 | #endif | 31 | #endif |
32 | #include <qintdict.h> | 32 | #include <q3intdict.h> |
33 | #include <qdatetime.h> | 33 | #include <qdatetime.h> |
34 | #include <qapplication.h> | 34 | #include <qapplication.h> |
35 | #include <qpopupmenu.h> | 35 | #include <q3popupmenu.h> |
36 | #include <qcursor.h> | 36 | #include <qcursor.h> |
37 | #include <qpainter.h> | 37 | #include <qpainter.h> |
38 | #include <QDesktopWidget> | ||
39 | //Added by qt3to4: | ||
40 | #include <QResizeEvent> | ||
41 | #include <QLabel> | ||
42 | #include <QPixmap> | ||
43 | #include <QMouseEvent> | ||
44 | #include <QKeyEvent> | ||
45 | #include <Q3MemArray> | ||
46 | #include <QEvent> | ||
47 | #include <Q3Frame> | ||
48 | #include <Q3PtrList> | ||
38 | 49 | ||
@@ -65,3 +76,3 @@ extern int globalFlagBlockStartup; | |||
65 | MarcusBains::MarcusBains(KOAgenda *_agenda,const char *name) | 76 | MarcusBains::MarcusBains(KOAgenda *_agenda,const char *name) |
66 | : QFrame(_agenda->viewport(),name), agenda(_agenda) | 77 | : Q3Frame(_agenda->viewport(),name), agenda(_agenda) |
67 | { | 78 | { |
@@ -171,4 +182,4 @@ void MarcusBains::updateLocation(bool recalculate) | |||
171 | KOAgenda::KOAgenda(int columns,int rows,int rowSize,QWidget *parent, | 182 | KOAgenda::KOAgenda(int columns,int rows,int rowSize,QWidget *parent, |
172 | const char *name,WFlags f) : | 183 | const char *name,Qt::WFlags f) : |
173 | QScrollView(parent,name,f) | 184 | Q3ScrollView(parent,name,f) |
174 | { | 185 | { |
@@ -192,4 +203,4 @@ KOAgenda::KOAgenda(int columns,int rows,int rowSize,QWidget *parent, | |||
192 | */ | 203 | */ |
193 | KOAgenda::KOAgenda(int columns,QWidget *parent,const char *name,WFlags f) : | 204 | KOAgenda::KOAgenda(int columns,QWidget *parent,const char *name,Qt::WFlags f) : |
194 | QScrollView(parent,name,f) | 205 | Q3ScrollView(parent,name,f) |
195 | { | 206 | { |
@@ -233,3 +244,3 @@ void KOAgenda::init() | |||
233 | 244 | ||
234 | mNewItemPopup = new QPopupMenu( this ); | 245 | mNewItemPopup = new Q3PopupMenu( this ); |
235 | connect ( mNewItemPopup, SIGNAL (activated ( int ) ), this, SLOT ( newItem(int)) ); | 246 | connect ( mNewItemPopup, SIGNAL (activated ( int ) ), this, SLOT ( newItem(int)) ); |
@@ -242,14 +253,14 @@ void KOAgenda::init() | |||
242 | 253 | ||
243 | mNewItemPopup->insertItem ( SmallIcon( pathString +"newevent" ), i18n("New Event..."), 1 ); | 254 | mNewItemPopup->insertItem ( (QIcon)SmallIcon( pathString +"newevent" ), i18n("New Event..."), 1 ); |
244 | mNewItemPopup->insertItem ( SmallIcon( pathString +"newtodo" ), i18n("New Todo..."),2 ); | 255 | mNewItemPopup->insertItem ( (QIcon)SmallIcon( pathString +"newtodo" ), i18n("New Todo..."),2 ); |
245 | mNewItemPopup->insertSeparator ( ); | 256 | mNewItemPopup->insertSeparator ( ); |
246 | mNewItemPopup->insertItem ( SmallIcon( pathString +"day" ), i18n("Day view"),3 ); | 257 | mNewItemPopup->insertItem ( (QIcon)SmallIcon( pathString +"day" ), i18n("Day view"),3 ); |
247 | mNewItemPopup->insertItem ( SmallIcon( pathString +"xdays" ), i18n("Next days"),8 ); | 258 | mNewItemPopup->insertItem ( (QIcon)SmallIcon( pathString +"xdays" ), i18n("Next days"),8 ); |
248 | mNewItemPopup->insertItem ( SmallIcon( pathString +"week" ), i18n("Next week"),4 ); | 259 | mNewItemPopup->insertItem ( (QIcon)SmallIcon( pathString +"week" ), i18n("Next week"),4 ); |
249 | mNewItemPopup->insertItem ( SmallIcon( pathString +"week" ), i18n("Next two weeks"),5 ); | 260 | mNewItemPopup->insertItem ( (QIcon)SmallIcon( pathString +"week" ), i18n("Next two weeks"),5 ); |
250 | mNewItemPopup->insertItem ( SmallIcon( pathString +"month" ), i18n("This month"),6 ); | 261 | mNewItemPopup->insertItem ( (QIcon)SmallIcon( pathString +"month" ), i18n("This month"),6 ); |
251 | mNewItemPopup->insertItem ( SmallIcon( pathString +"journal" ), i18n("Journal view"),7 ); | 262 | mNewItemPopup->insertItem ( (QIcon)SmallIcon( pathString +"journal" ), i18n("Journal view"),7 ); |
252 | #ifndef _WIN32_ | 263 | #ifndef _WIN32_ |
253 | int wflags = viewport()-> getWFlags() |WRepaintNoErase;//WResizeNoErase | 264 | Qt::WindowFlags wflags = viewport()-> windowFlags() |Qt::WRepaintNoErase;//WResizeNoErase |
254 | viewport()->setWFlags ( wflags); | 265 | viewport()->setWindowFlags ( wflags); |
255 | #endif | 266 | #endif |
@@ -265,3 +276,3 @@ void KOAgenda::init() | |||
265 | // effect. Has to be fixed. | 276 | // effect. Has to be fixed. |
266 | setFocusPolicy(WheelFocus); | 277 | setFocusPolicy(Qt::WheelFocus); |
267 | 278 | ||
@@ -397,3 +408,3 @@ bool KOAgenda::eventFilter ( QObject *object, QEvent *event ) | |||
397 | if (!mActionItem) | 408 | if (!mActionItem) |
398 | setCursor(arrowCursor); | 409 | setCursor(Qt::arrowCursor); |
399 | return true; | 410 | return true; |
@@ -401,3 +412,3 @@ bool KOAgenda::eventFilter ( QObject *object, QEvent *event ) | |||
401 | default: | 412 | default: |
402 | return QScrollView::eventFilter(object,event); | 413 | return Q3ScrollView::eventFilter(object,event); |
403 | } | 414 | } |
@@ -507,3 +518,3 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) | |||
507 | #ifdef DESKTOP_VERSION | 518 | #ifdef DESKTOP_VERSION |
508 | leftButt = (me->button() == LeftButton); | 519 | leftButt = (me->button() == Qt::LeftButton); |
509 | #endif | 520 | #endif |
@@ -511,3 +522,3 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) | |||
511 | case QEvent::MouseButtonPress: | 522 | case QEvent::MouseButtonPress: |
512 | if (me->button() == LeftButton) { | 523 | if (me->button() == Qt::LeftButton) { |
513 | mPopupTimer->start( 600 ); | 524 | mPopupTimer->start( 600 ); |
@@ -580,6 +591,6 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) | |||
580 | mPopupKind = 1; | 591 | mPopupKind = 1; |
581 | if (me->button() == RightButton) { | 592 | if (me->button() == Qt::RightButton) { |
582 | mPopupKind = 3; | 593 | mPopupKind = 3; |
583 | popupMenu(); | 594 | popupMenu(); |
584 | } else if (me->button() == LeftButton) { | 595 | } else if (me->button() == Qt::LeftButton) { |
585 | mActionItem = (KOAgendaItem *)object; | 596 | mActionItem = (KOAgendaItem *)object; |
@@ -602,3 +613,3 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) | |||
602 | mActionItem = 0; | 613 | mActionItem = 0; |
603 | if (me->button() == RightButton) { | 614 | if (me->button() == Qt::RightButton) { |
604 | int x,y; | 615 | int x,y; |
@@ -613,4 +624,4 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) | |||
613 | popupMenu(); | 624 | popupMenu(); |
614 | } else if (me->button() == LeftButton) { | 625 | } else if (me->button() == Qt::LeftButton) { |
615 | setCursor(arrowCursor); | 626 | setCursor(Qt::arrowCursor); |
616 | startSelectAction(viewportPos); | 627 | startSelectAction(viewportPos); |
@@ -621,3 +632,3 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) | |||
621 | case QEvent::MouseButtonRelease: | 632 | case QEvent::MouseButtonRelease: |
622 | if (me->button() == LeftButton ) { | 633 | if (me->button() == Qt::LeftButton ) { |
623 | mPopupTimer->stop(); | 634 | mPopupTimer->stop(); |
@@ -625,3 +636,3 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) | |||
625 | if (object != viewport()) { | 636 | if (object != viewport()) { |
626 | if (me->button() == LeftButton && mLeftMouseDown) { | 637 | if (me->button() == Qt::LeftButton && mLeftMouseDown) { |
627 | if (mActionItem) { | 638 | if (mActionItem) { |
@@ -635,3 +646,3 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) | |||
635 | // emit startDragSignal( mActionItem->incidence() ); | 646 | // emit startDragSignal( mActionItem->incidence() ); |
636 | setCursor( arrowCursor ); | 647 | setCursor( Qt::arrowCursor ); |
637 | mActionItem = 0; | 648 | mActionItem = 0; |
@@ -647,3 +658,3 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) | |||
647 | } else { // ---------- viewport() | 658 | } else { // ---------- viewport() |
648 | if (me->button() == LeftButton && mLeftMouseDown ) { //left click | 659 | if (me->button() == Qt::LeftButton && mLeftMouseDown ) { //left click |
649 | endSelectAction( true ); // emit new event signal | 660 | endSelectAction( true ); // emit new event signal |
@@ -651,3 +662,3 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) | |||
651 | } | 662 | } |
652 | if (me->button() == LeftButton) | 663 | if (me->button() == Qt::LeftButton) |
653 | mLeftMouseDown = false; | 664 | mLeftMouseDown = false; |
@@ -852,3 +863,3 @@ void KOAgenda::startItemAction(QPoint viewportPos) | |||
852 | mActionType = RESIZELEFT; | 863 | mActionType = RESIZELEFT; |
853 | setCursor(sizeHorCursor); | 864 | setCursor(Qt::sizeHorCursor); |
854 | } else if ( allowResize && (mGridSpacingX - gridDistanceX) < mResizeBorderWidth && | 865 | } else if ( allowResize && (mGridSpacingX - gridDistanceX) < mResizeBorderWidth && |
@@ -856,3 +867,3 @@ void KOAgenda::startItemAction(QPoint viewportPos) | |||
856 | mActionType = RESIZERIGHT; | 867 | mActionType = RESIZERIGHT; |
857 | setCursor(sizeHorCursor); | 868 | setCursor(Qt::sizeHorCursor); |
858 | } else { | 869 | } else { |
@@ -860,3 +871,3 @@ void KOAgenda::startItemAction(QPoint viewportPos) | |||
860 | mActionItem->startMove(); | 871 | mActionItem->startMove(); |
861 | setCursor(sizeAllCursor); | 872 | setCursor(Qt::sizeAllCursor); |
862 | } | 873 | } |
@@ -868,3 +879,3 @@ void KOAgenda::startItemAction(QPoint viewportPos) | |||
868 | mActionType = RESIZETOP; | 879 | mActionType = RESIZETOP; |
869 | setCursor(sizeVerCursor); | 880 | setCursor(Qt::sizeVerCursor); |
870 | } else if (allowResize &&(mGridSpacingY - gridDistanceY) < mResizeBorderWidth && | 881 | } else if (allowResize &&(mGridSpacingY - gridDistanceY) < mResizeBorderWidth && |
@@ -873,3 +884,3 @@ void KOAgenda::startItemAction(QPoint viewportPos) | |||
873 | mActionType = RESIZEBOTTOM; | 884 | mActionType = RESIZEBOTTOM; |
874 | setCursor(sizeVerCursor); | 885 | setCursor(Qt::sizeVerCursor); |
875 | } else { | 886 | } else { |
@@ -877,3 +888,3 @@ void KOAgenda::startItemAction(QPoint viewportPos) | |||
877 | mActionItem->startMove(); | 888 | mActionItem->startMove(); |
878 | setCursor(sizeAllCursor); | 889 | setCursor(Qt::sizeAllCursor); |
879 | } | 890 | } |
@@ -908,3 +919,3 @@ void KOAgenda::performItemAction(QPoint viewportPos) | |||
908 | // emit startDragSignal( mActionItem->incidence() ); | 919 | // emit startDragSignal( mActionItem->incidence() ); |
909 | setCursor( arrowCursor ); | 920 | setCursor( Qt::arrowCursor ); |
910 | mActionItem = 0; | 921 | mActionItem = 0; |
@@ -917,3 +928,3 @@ void KOAgenda::performItemAction(QPoint viewportPos) | |||
917 | case MOVE: | 928 | case MOVE: |
918 | setCursor( sizeAllCursor ); | 929 | setCursor( Qt::sizeAllCursor ); |
919 | break; | 930 | break; |
@@ -921,3 +932,3 @@ void KOAgenda::performItemAction(QPoint viewportPos) | |||
921 | case RESIZEBOTTOM: | 932 | case RESIZEBOTTOM: |
922 | setCursor( sizeVerCursor ); | 933 | setCursor( Qt::sizeVerCursor ); |
923 | break; | 934 | break; |
@@ -925,6 +936,6 @@ void KOAgenda::performItemAction(QPoint viewportPos) | |||
925 | case RESIZERIGHT: | 936 | case RESIZERIGHT: |
926 | setCursor( sizeHorCursor ); | 937 | setCursor( Qt::sizeHorCursor ); |
927 | break; | 938 | break; |
928 | default: | 939 | default: |
929 | setCursor( arrowCursor ); | 940 | setCursor( Qt::arrowCursor ); |
930 | } | 941 | } |
@@ -973,3 +984,3 @@ void KOAgenda::performItemAction(QPoint viewportPos) | |||
973 | //moveChild(mActionItem,childX(mActionItem),y); | 984 | //moveChild(mActionItem,childX(mActionItem),y); |
974 | QScrollView::moveChild( mActionItem,childX(mActionItem),y ); | 985 | Q3ScrollView::moveChild( mActionItem,childX(mActionItem),y ); |
975 | } | 986 | } |
@@ -1021,3 +1032,3 @@ void KOAgenda::endItemAction() | |||
1021 | //emit itemModified( placeItem, mActionType /*KOGlobals::EVENTEDITED */); | 1032 | //emit itemModified( placeItem, mActionType /*KOGlobals::EVENTEDITED */); |
1022 | QPtrList<KOAgendaItem> oldconflictItems ;//= placeItem->conflictItems(); | 1033 | Q3PtrList<KOAgendaItem> oldconflictItems ;//= placeItem->conflictItems(); |
1023 | KOAgendaItem *item; | 1034 | KOAgendaItem *item; |
@@ -1112,3 +1123,3 @@ void KOAgenda::endItemAction() | |||
1112 | mScrollDownTimer.stop(); | 1123 | mScrollDownTimer.stop(); |
1113 | setCursor( arrowCursor ); | 1124 | setCursor( Qt::arrowCursor ); |
1114 | mActionItem = 0; | 1125 | mActionItem = 0; |
@@ -1138,8 +1149,8 @@ void KOAgenda::setNoActionCursor(KOAgendaItem *moveItem,QPoint viewportPos) | |||
1138 | moveItem->cellX() == gx) { | 1149 | moveItem->cellX() == gx) { |
1139 | setCursor(sizeHorCursor); | 1150 | setCursor(Qt::sizeHorCursor); |
1140 | } else if ((mGridSpacingX - gridDistanceX) < mResizeBorderWidth && | 1151 | } else if ((mGridSpacingX - gridDistanceX) < mResizeBorderWidth && |
1141 | moveItem->cellXWidth() == gx) { | 1152 | moveItem->cellXWidth() == gx) { |
1142 | setCursor(sizeHorCursor); | 1153 | setCursor(Qt::sizeHorCursor); |
1143 | } else { | 1154 | } else { |
1144 | setCursor(arrowCursor); | 1155 | setCursor(Qt::arrowCursor); |
1145 | } | 1156 | } |
@@ -1150,3 +1161,3 @@ void KOAgenda::setNoActionCursor(KOAgendaItem *moveItem,QPoint viewportPos) | |||
1150 | !moveItem->firstMultiItem()) { | 1161 | !moveItem->firstMultiItem()) { |
1151 | setCursor(sizeVerCursor); | 1162 | setCursor(Qt::sizeVerCursor); |
1152 | } else if ((mGridSpacingY - gridDistanceY) < mResizeBorderWidth && | 1163 | } else if ((mGridSpacingY - gridDistanceY) < mResizeBorderWidth && |
@@ -1154,5 +1165,5 @@ void KOAgenda::setNoActionCursor(KOAgendaItem *moveItem,QPoint viewportPos) | |||
1154 | !moveItem->lastMultiItem()) { | 1165 | !moveItem->lastMultiItem()) { |
1155 | setCursor(sizeVerCursor); | 1166 | setCursor(Qt::sizeVerCursor); |
1156 | } else { | 1167 | } else { |
1157 | setCursor(arrowCursor); | 1168 | setCursor(Qt::arrowCursor); |
1158 | } | 1169 | } |
@@ -1175,5 +1186,5 @@ void KOAgenda::placeSubCells(KOAgendaItem *placeItem) | |||
1175 | 1186 | ||
1176 | QPtrList<KOAgendaItem> conflictItems; | 1187 | Q3PtrList<KOAgendaItem> conflictItems; |
1177 | int maxSubCells = 0; | 1188 | int maxSubCells = 0; |
1178 | QIntDict<KOAgendaItem> subCellDict(7); | 1189 | Q3IntDict<KOAgendaItem> subCellDict(7); |
1179 | 1190 | ||
@@ -1242,3 +1253,3 @@ void KOAgenda::placeSubCells(KOAgendaItem *placeItem) | |||
1242 | KOAgendaItem *item2; | 1253 | KOAgendaItem *item2; |
1243 | QPtrList<KOAgendaItem> conflictItems2 = item->conflictItems(); | 1254 | Q3PtrList<KOAgendaItem> conflictItems2 = item->conflictItems(); |
1244 | for ( item2=conflictItems2.first(); item2 != 0; | 1255 | for ( item2=conflictItems2.first(); item2 != 0; |
@@ -1327,5 +1338,5 @@ void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch) | |||
1327 | //qDebug("OFF %d %d %d", off,vySel, vy ); | 1338 | //qDebug("OFF %d %d %d", off,vySel, vy ); |
1328 | bitBlt ( pd, vx, vy+off, &mPaintPixmap, cx, cy+off, cw , ch-off ,CopyROP); | 1339 | bitBlt ( pd, vx, vy+off, &mPaintPixmap, cx, cy+off, cw , ch-off ,QPainter::CompositionMode_Source); |
1329 | } else { | 1340 | } else { |
1330 | bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,CopyROP); | 1341 | bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,QPainter::CompositionMode_Source); |
1331 | } | 1342 | } |
@@ -1344,3 +1355,3 @@ void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch) | |||
1344 | hei -= 5; | 1355 | hei -= 5; |
1345 | bitBlt ( pd, vx+1, vy+offset, &mHighlightPixmap, 0, 0, mGridSpacingX-1, p_hei ,CopyROP); | 1356 | bitBlt ( pd, vx+1, vy+offset, &mHighlightPixmap, 0, 0, mGridSpacingX-1, p_hei ,QPainter::CompositionMode_Source); |
1346 | offset += 5; | 1357 | offset += 5; |
@@ -1367,3 +1378,3 @@ void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch) | |||
1367 | if ( !(selectionX == cx && cy == mSelectionYTop && cw ==mGridSpacingX && ch == mSelectionHeight ) ) | 1378 | if ( !(selectionX == cx && cy == mSelectionYTop && cw ==mGridSpacingX && ch == mSelectionHeight ) ) |
1368 | bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,CopyROP); | 1379 | bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,QPainter::CompositionMode_Source); |
1369 | 1380 | ||
@@ -1381,3 +1392,3 @@ void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch) | |||
1381 | hei -= 5; | 1392 | hei -= 5; |
1382 | bitBlt ( pd, vx+1, vy+offset, &mHighlightPixmap, 0, 0, mGridSpacingX-1, p_hei ,CopyROP); | 1393 | bitBlt ( pd, vx+1, vy+offset, &mHighlightPixmap, 0, 0, mGridSpacingX-1, p_hei ,QPainter::CompositionMode_Source); |
1383 | offset += 5; | 1394 | offset += 5; |
@@ -1578,6 +1589,6 @@ void KOAgenda::drawContentsToPainter( QPainter* paint, bool backgroundOnly )// i | |||
1578 | while (y < cy + ch) { | 1589 | while (y < cy + ch) { |
1579 | p->setPen( SolidLine ); | 1590 | p->setPen( Qt::SolidLine ); |
1580 | p->drawLine(cx,y,cx+cw,y); | 1591 | p->drawLine(cx,y,cx+cw,y); |
1581 | y+=lGridSpacingY; | 1592 | y+=lGridSpacingY; |
1582 | p->setPen( DotLine ); | 1593 | p->setPen( Qt::DotLine ); |
1583 | p->drawLine(cx,y,cx+cw,y); | 1594 | p->drawLine(cx,y,cx+cw,y); |
@@ -1585,3 +1596,3 @@ void KOAgenda::drawContentsToPainter( QPainter* paint, bool backgroundOnly )// i | |||
1585 | } | 1596 | } |
1586 | p->setPen( SolidLine ); | 1597 | p->setPen( Qt::SolidLine ); |
1587 | } | 1598 | } |
@@ -1719,3 +1730,3 @@ void KOAgenda::updateTodo( Todo * todo, int days, bool remove) | |||
1719 | mItems.remove( item ); | 1730 | mItems.remove( item ); |
1720 | QPtrList<KOAgendaItem> oldconflictItems = item->conflictItems(); | 1731 | Q3PtrList<KOAgendaItem> oldconflictItems = item->conflictItems(); |
1721 | KOAgendaItem *itemit; | 1732 | KOAgendaItem *itemit; |
@@ -1749,3 +1760,3 @@ void KOAgenda::updateTodo( Todo * todo, int days, bool remove) | |||
1749 | QDate currentDate = QDate::currentDate(); | 1760 | QDate currentDate = QDate::currentDate(); |
1750 | bool overdue = (!todo->isCompleted()) && (todo->dtDue() < currentDate)&& ( KOPrefs::instance()->mShowTodoInAgenda ); | 1761 | bool overdue = (!todo->isCompleted()) && (todo->dtDue() < (QDateTime)currentDate)&& ( KOPrefs::instance()->mShowTodoInAgenda ); |
1751 | QDateTime dt; | 1762 | QDateTime dt; |
@@ -1781,3 +1792,3 @@ void KOAgenda::updateTodo( Todo * todo, int days, bool remove) | |||
1781 | globalFlagBlockAgendaItemPaint = 0; | 1792 | globalFlagBlockAgendaItemPaint = 0; |
1782 | QPtrList<KOAgendaItem> oldconflictItems = item->conflictItems(); | 1793 | Q3PtrList<KOAgendaItem> oldconflictItems = item->conflictItems(); |
1783 | KOAgendaItem *itemit; | 1794 | KOAgendaItem *itemit; |
@@ -1869,3 +1880,3 @@ void KOAgenda::insertMultiItem (Event *event,QDate qd,int XBegin,int XEnd, | |||
1869 | KOAgendaItem *current = 0; | 1880 | KOAgendaItem *current = 0; |
1870 | QPtrList<KOAgendaItem> multiItems; | 1881 | Q3PtrList<KOAgendaItem> multiItems; |
1871 | for (cellX = XBegin;cellX <= XEnd;++cellX) { | 1882 | for (cellX = XBegin;cellX <= XEnd;++cellX) { |
@@ -1929,3 +1940,3 @@ void KOAgenda::resizeEvent ( QResizeEvent *ev ) | |||
1929 | computeSizes(); | 1940 | computeSizes(); |
1930 | QScrollView::resizeEvent( ev ); | 1941 | Q3ScrollView::resizeEvent( ev ); |
1931 | return; | 1942 | return; |
@@ -2018,3 +2029,3 @@ void KOAgenda::popupAlarm() | |||
2018 | Alarm* alarm; | 2029 | Alarm* alarm; |
2019 | QPtrList<Alarm> list(mClickedItem->incidence()->alarms()); | 2030 | Q3PtrList<Alarm> list(mClickedItem->incidence()->alarms()); |
2020 | for(alarm=list.first();alarm;alarm=list.next()) { | 2031 | for(alarm=list.first();alarm;alarm=list.next()) { |
@@ -2109,12 +2120,12 @@ void KOAgenda::keyPressEvent( QKeyEvent *kev ) | |||
2109 | switch(kev->key()) { | 2120 | switch(kev->key()) { |
2110 | case Key_PageDown: | 2121 | case Qt::Key_PageDown: |
2111 | verticalScrollBar()->addPage(); | 2122 | verticalScrollBar()->addPage(); |
2112 | break; | 2123 | break; |
2113 | case Key_PageUp: | 2124 | case Qt::Key_PageUp: |
2114 | verticalScrollBar()->subtractPage(); | 2125 | verticalScrollBar()->subtractPage(); |
2115 | break; | 2126 | break; |
2116 | case Key_Down: | 2127 | case Qt::Key_Down: |
2117 | verticalScrollBar()->addLine(); | 2128 | verticalScrollBar()->addLine(); |
2118 | break; | 2129 | break; |
2119 | case Key_Up: | 2130 | case Qt::Key_Up: |
2120 | verticalScrollBar()->subtractLine(); | 2131 | verticalScrollBar()->subtractLine(); |
@@ -2148,3 +2159,3 @@ void KOAgenda::setDateList(const DateList &selectedDates) | |||
2148 | 2159 | ||
2149 | void KOAgenda::setHolidayMask(QMemArray<bool> *mask) | 2160 | void KOAgenda::setHolidayMask(Q3MemArray<bool> *mask) |
2150 | { | 2161 | { |
@@ -2164,3 +2175,3 @@ void KOAgenda::contentsMousePressEvent ( QMouseEvent *event ) | |||
2164 | 2175 | ||
2165 | QScrollView::contentsMousePressEvent(event); | 2176 | Q3ScrollView::contentsMousePressEvent(event); |
2166 | } | 2177 | } |
@@ -2198,3 +2209,3 @@ void KOAgenda::moveChild( QWidget *w, int x , int y ) | |||
2198 | ++x; | 2209 | ++x; |
2199 | QScrollView::moveChild( w, x , y ); | 2210 | Q3ScrollView::moveChild( w, x , y ); |
2200 | } | 2211 | } |
@@ -2204,3 +2215,3 @@ void KOAgenda::moveChild( QWidget *w, int x , int y ) | |||
2204 | #include <qpainter.h> | 2215 | #include <qpainter.h> |
2205 | #include <qpaintdevicemetrics.h> | 2216 | #include <q3paintdevicemetrics.h> |
2206 | 2217 | ||
@@ -2233,3 +2244,3 @@ void KOAgenda::printSelection() | |||
2233 | QPainter p( printer ); | 2244 | QPainter p( printer ); |
2234 | QPaintDeviceMetrics m = QPaintDeviceMetrics ( printer ); | 2245 | Q3PaintDeviceMetrics m = Q3PaintDeviceMetrics ( printer ); |
2235 | QString date = i18n("Date range: ")+KGlobal::locale()->formatDate( mSelectedDates.first() )+" - "+KGlobal::locale()->formatDate( mSelectedDates.last() ); | 2246 | QString date = i18n("Date range: ")+KGlobal::locale()->formatDate( mSelectedDates.first() )+" - "+KGlobal::locale()->formatDate( mSelectedDates.last() ); |