catch up with new define in odebug.h

4 files changed, 5 insertions, 5 deletions

diff --git a/core/pim/osearch/applnkitem.cpp b/core/pim/osearch/applnkitem.cpp
index ca54eef..f9ff565 100644
--- a/core/pim/osearch/applnkitem.cpp
+++ b/core/pim/osearch/applnkitem.cpp
@@ -35,25 +35,25 @@ QString AppLnkItem::toRichText()
 {
     QString text;
     text += "<b><h3>" + _app->name() + "</b></h3><br>";
     text += _app->comment() + "<br>";
     text += "<br>`" + _app->exec() + "`<br>";
     text += "<br>`" + _app->file() + "`<br>";
     text += "<br>`" + _app->linkFile() + "`<br>";
     return text;
 }
 
 void AppLnkItem::action( int act )
 {
-	if (!_app->isValid()) Opie::Core::odebug << "INVALID" << oendl;
+	if (!_app->isValid()) odebug << "INVALID" << oendl;
 	if (act == 0) _app->execute();
 	else if (act == 1){
  		QCopEnvelope e("QPE/Application/advancedfm", "setDocument(QString)");
 		e << _app->linkFile();
 	}
 }
 
 QIntDict<QString> AppLnkItem::actions()
 {
 	QIntDict<QString> result;
 	result.insert( 0, new QString( QObject::tr("execute") ) );
 	result.insert( 1, new QString( QObject::tr("open in filemanager") ) );
diff --git a/core/pim/osearch/datebooksearch.cpp b/core/pim/osearch/datebooksearch.cpp
index af6b194..34cf0ce 100644
--- a/core/pim/osearch/datebooksearch.cpp
+++ b/core/pim/osearch/datebooksearch.cpp
@@ -31,25 +31,25 @@ DatebookSearch::DatebookSearch(QListView* parent, QString name)
 	QIconSet is = Resource::loadIconSet( "datebook/DateBookSmall" );
 	setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
 	actionShowPastEvents = new QAction( QObject::tr("show past events"),QString::null,  0, 0, 0, true );
 	actionSearchInDates = new QAction( QObject::tr("search in dates"),QString::null,  0, 0, 0, true );
 	Config cfg( "osearch", Config::User );
    	cfg.setGroup( "datebook_settings" );
    	actionShowPastEvents->setOn( cfg.readBoolEntry( "show_past_events", false ) );
    	actionSearchInDates->setOn( cfg.readBoolEntry( "search_in_dates", true ) );
 }
 
 DatebookSearch::~DatebookSearch()
 {
-	Opie::Core::odebug << "SAVE DATEBOOK SEARCH CONFIG" << oendl;
+	odebug << "SAVE DATEBOOK SEARCH CONFIG" << oendl;
 	Config cfg( "osearch", Config::User );
    	cfg.setGroup( "datebook_settings" );
    	cfg.writeEntry( "show_past_events", actionShowPastEvents->isOn() );
    	cfg.writeEntry( "search_in_dates", actionSearchInDates->isOn() );
 	delete _dates;
 	delete _popupMenu;
 	delete actionShowPastEvents;
 	delete actionSearchInDates;
 }
 
 
 void DatebookSearch::load()
diff --git a/core/pim/osearch/doclnkitem.cpp b/core/pim/osearch/doclnkitem.cpp
index d908f7c..2e09a63 100644
--- a/core/pim/osearch/doclnkitem.cpp
+++ b/core/pim/osearch/doclnkitem.cpp
@@ -54,26 +54,26 @@ QString DocLnkItem::toRichText()
     text += _doc->exec();
     text += "`";*/
     QStringList list = _doc->mimeTypes();
    int i = 0;
     for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
             text += QString::number( i++) + " - " + *it ;
         }
     return text;
 }
 
 void DocLnkItem::action( int act )
 {
-	Opie::Core::odebug << "action" << act << oendl;
-	if (!_doc->isValid()) Opie::Core::odebug << "INVALID" << oendl;
+	odebug << "action" << act << oendl;
+	if (!_doc->isValid()) odebug << "INVALID" << oendl;
 	if (act == 0) _doc->execute();
 	else if (act == 1){
  		QCopEnvelope e("QPE/Application/advancedfm", "setDocument(QString)");
 		e << _doc->file();
 	}
 }
 
 QIntDict<QString> DocLnkItem::actions()
 {
 	QIntDict<QString> result;
 	result.insert( 0, new QString( QObject::tr("open with ") + _doc->exec() ) );
 	result.insert( 1, new QString( QObject::tr("open in filemanager") ) );
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp
index f329e83..3edc8de 100644
--- a/core/pim/osearch/mainwindow.cpp
+++ b/core/pim/osearch/mainwindow.cpp
@@ -221,25 +221,25 @@ void MainWindow::setCurrent(QListViewItem *item)
 	if (!item) return;
 	_currentItem = (OListViewItem*)item;
 //	_currentItem = dynamic_cast<OListViewItem*>(item);
 	if (_currentItem->rtti() == OListViewItem::Result){
 		ResultItem *res = (ResultItem*)item;
 //		ResultItem *res = dynamic_cast<ResultItem*>(item);
 		richEdit->setText( res->toRichText() );
 		QIntDict<QString> acts = res->actions();
 		QButton *button;
 		for (uint i = 0; i < acts.count(); i++){
 			button = buttonMap[i];
 			if (!button) {
-				Opie::Core::owarn << " no button for " << *acts[i] << oendl;
+				owarn << " no button for " << *acts[i] << oendl;
 			    button = new QPushButton( buttonBox );
 			    buttonMap.insert( i,  button );
                             signalMapper->setMapping(button, i );
                             connect(button, SIGNAL(clicked() ), signalMapper, SLOT(map() ) );
 			}
 			button->setText( *acts[i] );
 			button->show();
 		}
 		for (uint i = acts.count(); i < _buttonCount; i++){
 			button = buttonMap[i];
 			if (button) button->hide();
 		}