fix error in thinking about date-diffs I made

1 files changed, 3 insertions, 3 deletions

diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp
index 0555bc7..b0e78f1 100644
--- a/core/pim/datebook/datebookweeklst.cpp
+++ b/core/pim/datebook/datebookweeklst.cpp
@@ -195,243 +195,243 @@ DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &ev,
     }
     setText(QString(s) + " " + ev.description());
 //  connect(this, SIGNAL(clicked()), this, SLOT(editMe()));
     setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) );
 }
 void DateBookWeekLstEvent::editMe() {
     emit editEvent(event.event());
 }
 void DateBookWeekLstEvent::duplicateMe()
 {
        emit duplicateEvent(event.event());
 }
 void DateBookWeekLstEvent::deleteMe()
 {
        emit removeEvent(event.event());
        emit redraw();
 }
 void DateBookWeekLstEvent::beamMe()
 {
     emit beamEvent( event.event() );
 }
 void DateBookWeekLstEvent::mousePressEvent( QMouseEvent *e )
 {
     popmenue = new QPopupMenu;
     popmenue->insertItem( tr( "Edit" ), this, SLOT(editMe()));
     popmenue->insertItem( tr( "Duplicate" ), this, SLOT(duplicateMe()));
     popmenue->insertItem( tr( "Delete" ), this, SLOT(deleteMe()));
     if(Ir::supported())
         popmenue->insertItem( tr( "Beam" ), this, SLOT(beamMe()));
     popmenue->popup( mapToGlobal( e->pos() ));
 }
 
 DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
                      const QDate &d, bool onM,
                      QWidget* parent,
                      const char* name, WFlags fl)
     : QWidget( parent, name, fl )
 {
     Config config("DateBook");
     config.setGroup("Main");
     int weeklistviewconfig=config.readNumEntry("weeklistviewconfig", NORMAL);
     odebug << "weeklistviewconfig: " << weeklistviewconfig << oendl;
 
     bStartOnMonday=onM;
     setPalette(white);
     setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
 
     QVBoxLayout *layout = new QVBoxLayout( this );
 
     qBubbleSort(ev);
     QValueListIterator<EffectiveEvent> it;
     it=ev.begin();
 
     int dayOrder[7];
     if (bStartOnMonday) {
         for (int d=0; d<7; d++) dayOrder[d]=d+1;
     } else {
         for (int d=0; d<7; d++) dayOrder[d]=d;
         dayOrder[0]=7;
     }
 
     // Calculate offset to first day of week.
     int dayoffset=d.dayOfWeek();
     if(bStartOnMonday) dayoffset--;
     else if( dayoffset == 7 ) dayoffset = 0;
 
     for (int i=0; i<7; i++) {
     // Header
         DateBookWeekLstDayHdr *hdr=new DateBookWeekLstDayHdr(d.addDays(i-dayoffset), bStartOnMonday,this);
         connect(hdr, SIGNAL(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int)));
         connect(hdr, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)),
             this, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)));
         layout->addWidget(hdr);
 
         // Events
         while ( (*it).date().dayOfWeek() == dayOrder[i] && it!=ev.end() ) {
             if(!(((*it).end().hour()==0) && ((*it).end().minute()==0) && ((*it).startDate()!=(*it).date()))) {  // Skip events ending at 00:00 starting at another day.
                 DateBookWeekLstEvent *l=new DateBookWeekLstEvent(*it,weeklistviewconfig,this);
                 layout->addWidget(l);
                 connect (l, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&)));
                 connect (l, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &)));
                 connect (l, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &)));
                 connect (l, SIGNAL(beamEvent(const Event &)), this, SIGNAL(beamEvent(const Event &)));
                 connect (l, SIGNAL(redraw()), this, SIGNAL(redraw()));
             }
             it++;
         }
         layout->addItem(new QSpacerItem(1,1, QSizePolicy::Minimum, QSizePolicy::Expanding));
     }
 }
 DateBookWeekLstView::~DateBookWeekLstView(){}
 void DateBookWeekLstView::keyPressEvent(QKeyEvent *e) {e->ignore();}
 
 DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,
                            QValueList<EffectiveEvent> &ev2,
                            QDate &d, bool onM,
                            QWidget* parent,
                            const char* name, WFlags fl)
     : QWidget( parent, name, fl )
 {
     QHBoxLayout *layout = new QHBoxLayout( this );
 
     DateBookWeekLstView *w=new DateBookWeekLstView(ev1,d,onM,this);
     layout->addWidget(w);
     connect (w, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&)));
     connect (w, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &)));
     connect (w, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &)));
     connect (w, SIGNAL(beamEvent(const Event &)), this, SIGNAL(beamEvent(const Event &)));
     connect (w, SIGNAL(redraw()), this, SIGNAL(redraw()));
     connect (w, SIGNAL(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int)));
     connect (w, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)),
         this, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)));
 
 
     w=new DateBookWeekLstView(ev2,d.addDays(7),onM,this);
     layout->addWidget(w);
     connect (w, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&)));
     connect (w, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &)));
     connect (w, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &)));
     connect (w, SIGNAL(beamEvent(const Event &)), this, SIGNAL(beamEvent(const Event &)));
     connect (w, SIGNAL(redraw()), this, SIGNAL(redraw()));
     connect (w, SIGNAL(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int)));
     connect (w, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)),
         this, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)));
 }
 
 DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDBHoliday *newDB,
                   QWidget *parent,
                   const char *name )
     : QWidget( parent, name ),
       db( newDB ),
       startTime( 0 ),
       ampm( ap ),
       bStartOnMonday(onM)
 {
     setFocusPolicy(StrongFocus);
     layout = new QVBoxLayout( this );
     layout->setMargin(0);
 
     header=new DateBookWeekLstHeader(onM, this);
     layout->addWidget( header );
     connect(header, SIGNAL(dateChanged(QDate&)), this, SLOT(dateChanged(QDate&)));
     connect(header, SIGNAL(setDbl(bool)), this, SLOT(setDbl(bool)));
 
     scroll=new QScrollView(this);
     scroll->setResizePolicy(QScrollView::AutoOneFit);
     layout->addWidget(scroll);
 
     view=NULL;
     Config config("DateBook");
     config.setGroup("Main");
     dbl=config.readBoolEntry("weeklst_dbl", false);
     header->dbl->setOn(dbl);
 }
 DateBookWeekLst::~DateBookWeekLst(){
     Config config("DateBook");
     config.setGroup("Main");
     config.writeEntry("weeklst_dbl", dbl);
 }
 
 void DateBookWeekLst::setDate(const QDate &d) {
     bdate=d;
     header->setDate(d);
 }
 
 void DateBookWeekLst::setDbl(bool on) {
     dbl=on;
     redraw();
 }
 void DateBookWeekLst::redraw() {getEvents();}
 
 QDate DateBookWeekLst::date() {
     return bdate;
 }
 
 // return the date at the beginning of the week...
 // copied from DateBookWeek
 QDate DateBookWeekLst::weekDate() const
 {
     QDate d=bdate;
 
     // Calculate offset to first day of week.
     int dayoffset=d.dayOfWeek();
     if(bStartOnMonday) dayoffset--;
     else if( dayoffset == 7 )
         dayoffset = 0;
 
     return d.addDays(-dayoffset);
 }
 
 void DateBookWeekLst::getEvents() {
     QDate start = weekDate(); //date();
-    QDate stop = start.addDays(7);
+    QDate stop = start.addDays(6);
     QValueList<EffectiveEvent> el = db->getEffectiveEvents(start, stop);
 
     if (view) delete view;
     if (dbl) {
-        QDate start2=start.addDays(8);
-        stop=start2.addDays(7);
+        QDate start2=start.addDays(7);
+        stop=start2.addDays(6);
         QValueList<EffectiveEvent> el2 = db->getEffectiveEvents(start2, stop);
         view=new DateBookWeekLstDblView(el,el2,start,bStartOnMonday,scroll);
     } else {
         view=new DateBookWeekLstView(el,start,bStartOnMonday,scroll);
     }
 
     connect (view, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&)));
     connect (view, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &)));
     connect (view, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &)));
     connect (view, SIGNAL(beamEvent(const Event &)), this, SIGNAL(beamEvent(const Event &)));
     connect (view, SIGNAL(redraw()), this, SLOT(redraw()));
     connect (view, SIGNAL(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int)));
     connect (view, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)),
         this, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)));
 
     scroll->addChild(view);
     view->show();
     scroll->updateScrollBars();
 }
 
 void DateBookWeekLst::dateChanged(QDate &newdate) {
     bdate=newdate;
     getEvents();
 }
 
 void DateBookWeekLst::keyPressEvent(QKeyEvent *e)
 {
     switch(e->key()) {
         case Key_Up:
             scroll->scrollBy(0, -20);
             break;
         case Key_Down:
             scroll->scrollBy(0, 20);
             break;
         case Key_Left:
             header->prevWeek();
             break;
         case Key_Right:
             header->nextWeek();
             break;
         default:
             e->ignore();
     }
 }