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
@@ -72,7 +72,7 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
 	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" ) );
@@ -176,7 +176,7 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
 #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() ) );
@@ -902,7 +902,7 @@ 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 );
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
@@ -69,22 +69,22 @@ void DateBookWeekHeader::pickDate()
 
 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));
 }
 
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
@@ -160,7 +160,7 @@ DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &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("<--->");
@@ -209,7 +209,7 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
 	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);
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
@@ -431,7 +431,7 @@ Event DateEntry::event()
     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;
@@ -439,7 +439,7 @@ Event DateEntry::event()
 
     // 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 );
@@ -449,7 +449,7 @@ Event DateEntry::event()
     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 ) );