fix debugging stuff (see addressbook)

4 files changed, 12 insertions, 12 deletions

diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index 3d1bc0c..0a47bb8 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -63,25 +63,25 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
       presetTime( -1 ),
       startTime( 8 ), // an acceptable default
       rowStyle( 0 ),
       bJumpToCurTime(FALSE),
       syncing(FALSE),
       inSearch(FALSE),
       alarmCounter(0)
 {
 	bool needEvilHack= false; // if we need an Evil Hack
 	QTime t;
 	t.start();
 	db = new DateBookDBHack;
-	Opie::Core::odebug << "loading db t=" << t.elapsed() << oendl;
+	odebug << "loading db t=" << t.elapsed() << oendl;
 	loadSettings();
 	setCaption( tr("Calendar") );
 	setIcon( Resource::loadPixmap( "datebook_icon" ) );
 
 	setToolBarsMovable( FALSE );
 
 	views = new QWidgetStack( this );
 	setCentralWidget( views );
 
 	dayView = 0;
 	weekView = 0;
 	weekLstView = 0;
@@ -167,25 +167,25 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
 #endif
 
     // listen on QPE/System
 #if defined(Q_WS_QWS)
 #if !defined(QT_NO_COP)
 	QCopChannel *channel = new QCopChannel( "QPE/System", this );
 	connect( channel, SIGNAL(received(const QCString&,const QByteArray&)), this, SLOT(receive(const QCString&,const QByteArray&)) );
 	channel = new QCopChannel( "QPE/Datebook", this );
 	connect( channel, SIGNAL(received(const QCString&,const QByteArray&)), this, SLOT(receive(const QCString&,const QByteArray&)) );
 #endif
 #endif
 
-	Opie::Core::odebug << "done t=" << t.elapsed() << oendl;
+	odebug << "done t=" << t.elapsed() << oendl;
 
         connect( qApp, SIGNAL( flush() ), this, SLOT( flush() ) );
         connect( qApp, SIGNAL( reload()), this, SLOT( reload() ) );
     /*
      *  Here is a problem description:
      *  When Weekview is the default view
      *  a DateBookWeekView get's created
      *  redraw() get's called. So what?
      *  Remember that we're still in the c'tor
      *  and no final layout has happened? Ok
      *  now all Events get arranged. Their x
      *  position get's determined by a QHeader
@@ -893,25 +893,25 @@ void DateBook::setDocument( const QString &filename )
     if ( filename.find(".vcs") != int(filename.length()) - 4 ) return;
 
     QValueList<Event> tl = Event::readVCalendar( filename );
     for( QValueList<Event>::Iterator it = tl.begin(); it != tl.end(); ++it ) {
 	db->addEvent( *it );
     }
 }
 
 static const char * beamfile = "/tmp/obex/event.vcs";
 
 void DateBook::beamEvent( const Event &e )
 {
-	Opie::Core::odebug << "trying to beam" << oendl;
+	odebug << "trying to beam" << oendl;
     unlink( beamfile ); // delete if exists
     mkdir("/tmp/obex/", 0755);
     Event::writeVCalendar( beamfile, e );
     Ir *ir = new Ir( this );
     connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) );
     QString description = e.description();
     ir->send( beamfile, description, "text/x-vCalendar" );
 }
 
 void DateBook::beamDone( Ir *ir )
 {
     delete ir;
diff --git a/core/pim/datebook/datebookweekheaderimpl.cpp b/core/pim/datebook/datebookweekheaderimpl.cpp
index 123a478..7462de7 100644
--- a/core/pim/datebook/datebookweekheaderimpl.cpp
+++ b/core/pim/datebook/datebookweekheaderimpl.cpp
@@ -60,40 +60,40 @@ void DateBookWeekHeader::pickDate()
 		picker = new DateBookMonth( m1, 0, TRUE );
 		m1->insertItem( picker );
 		connect( picker, SIGNAL( dateClicked(int,int,int) ), this, SLOT( setDate(int,int,int) ) );
 //		connect( m1, SIGNAL( aboutToHide() ), this, SLOT( gotHide() ) );
 	}
 	picker->setDate( date.year(), date.month(), date.day() );
 	m1->popup(mapToGlobal(labelDate->pos()+QPoint(0,labelDate->height())));
 	picker->setFocus();
 }
 
 void DateBookWeekHeader::nextMonth()
 {
-	Opie::Core::owarn << "nextMonth()" << oendl;
+	owarn << "nextMonth()" << oendl;
 	setDate(date.addDays(28));
 }
 void DateBookWeekHeader::prevMonth()
 {
-	Opie::Core::owarn << "prevMonth()" << oendl;
+	owarn << "prevMonth()" << oendl;
 	setDate(date.addDays(-28));
 }
 void DateBookWeekHeader::nextWeek()
 {
-	Opie::Core::owarn << "nextWeek()" << oendl;
+	owarn << "nextWeek()" << oendl;
 	setDate(date.addDays(7));
 }
 void DateBookWeekHeader::prevWeek()
 {
-	Opie::Core::owarn << "prevWeek()" << oendl;
+	owarn << "prevWeek()" << oendl;
 	setDate(date.addDays(-7));
 }
 
 void DateBookWeekHeader::setDate( int y, int m, int d )
 {
 	setDate(QDate(y,m,d));
 }
 
 void DateBookWeekHeader::setDate(const QDate &d) {
 	int year,week,dayofweek;
 	date=d;
 	dayofweek=d.dayOfWeek();
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
@@ -151,25 +151,25 @@ void DateBookWeekLstDayHdr::newEvent() {
 
     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());
@@ -200,25 +200,25 @@ void DateBookWeekLstEvent::editMe() {
 }
 
 
 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];
diff --git a/core/pim/datebook/dateentryimpl.cpp b/core/pim/datebook/dateentryimpl.cpp
index 42bdbe2..297da94 100644
--- a/core/pim/datebook/dateentryimpl.cpp
+++ b/core/pim/datebook/dateentryimpl.cpp
@@ -422,43 +422,43 @@ Event DateEntry::event()
     }
     // don't set the time if theres no need too
     if ( ev.type() == Event::AllDay ) {
         startTime.setHMS( 0, 0, 0 );
         endTime.setHMS( 23, 59, 59 );
     }
 
     // adjust start and end times based on timezone
     QDateTime start( startDate, startTime );
     QDateTime end( endDate, endTime );
     time_t start_utc, end_utc;
 
-//	Opie::Core::odebug << "tz: " << timezone->currentZone() << oendl;
+//	odebug << "tz: " << timezone->currentZone() << oendl;
 
     // get real timezone
     QString realTZ;
     realTZ = QString::fromLocal8Bit( getenv("TZ") );
 
     // set timezone
     if ( setenv( "TZ", timezone->currentZone(), true ) != 0 )
-	Opie::Core::owarn << "There was a problem setting the timezone." << oendl;
+	owarn << "There was a problem setting the timezone." << oendl;
 
     // convert to UTC based on selected TZ (calling tzset internally)
     start_utc = TimeConversion::toUTC( start );
     end_utc = TimeConversion::toUTC( end );
 
     // done playing around... put it all back
     unsetenv( "TZ" );
     if ( !realTZ.isNull() )
         if ( setenv( "TZ", realTZ, true ) != 0 )
-			Opie::Core::owarn << "There was a problem setting the timezone." << oendl;
+			owarn << "There was a problem setting the timezone." << oendl;
 
     // convert UTC to local time (calling tzset internally)
     ev.setStart( TimeConversion::fromUTC( start_utc ) );
     ev.setEnd( TimeConversion::fromUTC( end_utc ) );
 
     // we only have one type of sound at the moment... LOUD!!!
     if ( comboSound->currentItem() != 0 )
 	st = Event::Loud;
     else
 	st = Event::Silent;
     ev.setAlarm( checkAlarm->isChecked(), spinAlarm->value(), st );
     if ( rp.type != Event::NoRepeat )