| -rw-r--r-- | core/pim/datebook/datebookday.cpp | 10 | ||||
| -rw-r--r-- | core/pim/datebook/datebookday.h | 2 | ||||
| -rw-r--r-- | core/pim/datebook/datebookdayallday.cpp | 11 | ||||
| -rw-r--r-- | core/pim/datebook/datebookweek.cpp | 4 |
4 files changed, 13 insertions, 14 deletions
diff --git a/core/pim/datebook/datebookday.cpp b/core/pim/datebook/datebookday.cpp index 4d64099..751a1da 100644 --- a/core/pim/datebook/datebookday.cpp +++ b/core/pim/datebook/datebookday.cpp @@ -796,4 +796,6 @@ void DateBookDayWidget::mousePressEvent( QMouseEvent *e ) dateBook->repaint(); + Event eve = ev.event(); + QPopupMenu m; m.insertItem( tr( "Edit" ), 1 ); @@ -804,11 +806,11 @@ void DateBookDayWidget::mousePressEvent( QMouseEvent *e ) int r = m.exec( e->globalPos() ); if ( r == 1 ) { - emit editMe( ev.event() ); + emit editMe( eve ); } else if ( r == 2 ) { - emit deleteMe( ev.event() ); + emit deleteMe( eve ); } else if ( r == 3 ) { - emit beamMe( ev.event() ); + emit beamMe( eve ); } else if ( r == 4 ) { - emit duplicateMe( ev.event() ); + emit duplicateMe( eve ); } else if ( r == 5 ) { // create an Event and beam it... diff --git a/core/pim/datebook/datebookday.h b/core/pim/datebook/datebookday.h index 3898cbc..c8cb26b 100644 --- a/core/pim/datebook/datebookday.h +++ b/core/pim/datebook/datebookday.h @@ -125,5 +125,5 @@ private: */ void setEventText( QString& text ); - const EffectiveEvent ev; + EffectiveEvent ev; DateBookDay *dateBook; QString text; diff --git a/core/pim/datebook/datebookdayallday.cpp b/core/pim/datebook/datebookdayallday.cpp index 2294f3c..1244fd3 100644 --- a/core/pim/datebook/datebookdayallday.cpp +++ b/core/pim/datebook/datebookdayallday.cpp @@ -157,4 +157,5 @@ void DatebookAlldayDisp::beam_single_event() void DatebookAlldayDisp::mousePressEvent(QMouseEvent*e) { + Event ev = m_Ev.event(); QColor b = backgroundColor(); setBackgroundColor(green); @@ -172,14 +173,14 @@ void DatebookAlldayDisp::mousePressEvent(QMouseEvent*e) switch (r) { case 1: - emit editMe( m_Ev.event() ); + emit editMe( ev ); break; case 2: - emit deleteMe( m_Ev.event() ); + emit deleteMe( ev ); break; case 3: - emit beamMe( m_Ev.event() ); + emit beamMe( ev ); break; case 4: - emit duplicateMe( m_Ev.event() ); + emit duplicateMe( ev ); break; case 5: @@ -187,5 +188,5 @@ void DatebookAlldayDisp::mousePressEvent(QMouseEvent*e) break; case 6: - emit displayMe( m_Ev.event() ); + emit displayMe( ev ); break; default: diff --git a/core/pim/datebook/datebookweek.cpp b/core/pim/datebook/datebookweek.cpp index 8435132..933e191 100644 --- a/core/pim/datebook/datebookweek.cpp +++ b/core/pim/datebook/datebookweek.cpp @@ -83,7 +83,4 @@ DateBookWeekView::DateBookWeekView( bool ap, bool startOnMonday, void DateBookWeekView::initNames() { -#warning Please review this ! (eilers) - - // Ok, I am Mr. Pedantic, but shouldn't we count until 6 instead of 7, if bOnMonday is false ? (eilers) static bool bFirst = true; @@ -315,5 +312,4 @@ void DateBookWeekView::resizeEvent( QResizeEvent *e ) QScrollView::resizeEvent( e ); -#warning check the geometry i have choosen BRANCH_1_0 (waspe) //HEAD |