1 files changed, 2 insertions, 2 deletions

diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp
index de74d46..fe2ab51 100644
--- a/core/pim/datebook/datebookweeklst.cpp
+++ b/core/pim/datebook/datebookweeklst.cpp
@@ -115,146 +115,146 @@ DateBookWeekLstDayHdr::DateBookWeekLstDayHdr(const QDate &d, bool /* onM */,
 
     //dont use dayOfWeek() to save space !
 	label->setText( QString(QObject::tr(QString(QChar(day)))) + " " +QString::number(d.day()) );
 
      add->setText("+");
 
 	if (d == QDate::currentDate()) {
 		QPalette pal=label->palette();
 		pal.setColor(QColorGroup::Foreground, QColor(0,0,255));
 		label->setPalette(pal);
 
 		/*
 		QFont f=label->font();
 		f.setItalic(true);
 		label->setFont(f);
 		label->setPalette(QPalette(QColor(0,0,255),label->backgroundColor()));
 		*/
 	} else if (d.dayOfWeek() == 7) { // FIXME: Match any holiday
 		QPalette pal=label->palette();
 		pal.setColor(QColorGroup::Foreground, QColor(255,0,0));
 		label->setPalette(pal);
 	}
 
 	connect (label, SIGNAL(clicked()), this, SLOT(showDay()));
 	connect (add, SIGNAL(clicked()), this, SLOT(newEvent()));
 }
 
 void DateBookWeekLstDayHdr::showDay() {
 	emit showDate(date.year(), date.month(), date.day());
 }
 
 void DateBookWeekLstDayHdr::newEvent() {
     QDateTime start, stop;
     start=stop=date;
     start.setTime(QTime(10,0));
     stop.setTime(QTime(12,0));
 
     emit addEvent(start,stop,"",0);
 }
 DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &ev,
 						int weeklistviewconfig,
 						QWidget* parent,
 						const char* name,
 						WFlags fl ) : OClickableLabel(parent,name,fl), event(ev)
 {
 	// old values... lastday = "__|__", middle="   |---", Firstday="00:00",
 	QString s,start,middle,end,day;
 
-	Opie::Core::odebug << "weeklistviewconfig=" << weeklistviewconfig << oendl;
+	odebug << "weeklistviewconfig=" << weeklistviewconfig << oendl;
 	if(weeklistviewconfig==NONE) {	// No times displayed.
 //		start.sprintf("%.2d:%.2d-",ev.start().hour(),ev.start().minute());
 //		middle.sprintf("<--->");
 //		end.sprintf("-%.2d:%.2d",ev.end().hour(),ev.end().minute());
 //		day.sprintf("%.2d:%.2d-%.2d:%.2d",ev.start().hour(),ev.start().minute(),ev.end().hour(),ev.end().minute());
 	} else if(weeklistviewconfig==NORMAL) {	// "Normal", only display start time.
 		start.sprintf("%.2d:%.2d",ev.start().hour(),ev.start().minute());
 		middle.sprintf("   |---");
 		end.sprintf("__|__");
 		day.sprintf("%.2d:%.2d",ev.start().hour(),ev.start().minute());
 	} else if(weeklistviewconfig==EXTENDED) { // Extended mode, display start and end times.
 		start.sprintf("%.2d:%.2d-",ev.start().hour(),ev.start().minute());
 		middle.sprintf("<--->");
 		end.sprintf("-%.2d:%.2d",ev.end().hour(),ev.end().minute());
 		day.sprintf("%.2d:%.2d-%.2d:%.2d",ev.start().hour(),ev.start().minute(),ev.end().hour(),ev.end().minute());
 	}
 
 	if(ev.event().type() == Event::Normal) {
 		if(ev.startDate()==ev.date() && ev.endDate()==ev.date()) {	// day event.
 			s=day;
 		} else if(ev.startDate()==ev.date()) {	// start event.
 			s=start;
 		} else if(ev.endDate()==ev.date()) { // end event.
 			s=end;
 		} else {	// middle day.
 			s=middle;
 		}
 	} else {
 		s="";
 	}
 	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());
 }
 
 
 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);
-	Opie::Core::odebug << "weeklistviewconfig: " << weeklistviewconfig << oendl;
+	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&)));
 			}
 			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,