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
@@ -15,47 +15,47 @@
 #include <opie2/odebug.h>
 
 #include <qpe/applnk.h>
 #include <qpe/qcopenvelope_qws.h>
 
 AppLnkItem::AppLnkItem(OListViewItem* parent, AppLnk *app)
 	: ResultItem(parent)
 {
 	_app = app;
 	setText(0, _app->name() );
 	setPixmap(0, _app->pixmap() );
 }
 
 
 AppLnkItem::~AppLnkItem()
 {
 }
 
 
 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") ) );
 	return result;
 }
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
@@ -11,65 +11,65 @@
 //
 //
 #include "datebooksearch.h"
 #include "eventitem.h"
 
 #include <opie2/odebug.h>
 #include <opie2/opimevent.h>
 #include <opie2/opimrecurrence.h>
 
 #include <qpe/resource.h>
 #include <qpe/config.h>
 
 #include <qaction.h>
 #include <qpopupmenu.h>
 
 
 
 DatebookSearch::DatebookSearch(QListView* parent, QString name)
 : SearchGroup(parent, name), _dates(0), _popupMenu(0)
 {
 	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()
 {
 	 _dates = new ODateBookAccess();
 	 _dates->load();
 }
 
 int DatebookSearch::search()
 {
 	OPimRecordList<OPimEvent> results = _dates->matchRegexp(_search);
 	for (uint i = 0; i < results.count(); i++)
 		insertItem( new OPimEvent( results[i] ) );
 	return _resultCount;
 }
 
 void DatebookSearch::insertItem( void *rec )
 {
 	OPimEvent *ev = (OPimEvent*)rec;
 	if ( !actionShowPastEvents->isOn() &&
 	      ev->endDateTime() < QDateTime::currentDateTime() &&
 	      !ev->recurrence().doesRecur()
 	    ) return;
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
@@ -34,48 +34,48 @@ DocLnkItem::~DocLnkItem()
 
 QString DocLnkItem::toRichText()
 {
     QString text;
     text += "<b><h3>" + _doc->name() + "</b></h3><br>";
     text += _doc->comment() + "<br>";
     text += QObject::tr("File: ") + _doc->file() + "<br>";
     text += QObject::tr("Link: ") + _doc->linkFile() + "<br>";
     text += QObject::tr("Mimetype: ") + _doc->type() + "<br>";
     if ( _doc->type().contains( "text" ) ){
 	text += "<br><br><hr><br>";
   	QFile f(_doc->file());
   	if ( f.open(IO_ReadOnly) ) {
        		QTextStream t( &f );
         	while ( !t.eof() )
        	    		text += t.readLine() + "<br>";
         }
   	f.close();
     }
    /* text += "<br><br>`";
     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") ) );
 	return result;
 }
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
@@ -201,65 +201,65 @@ void MainWindow::makeMenu()
   ClearSearchText = new QToolButton( searchBar, "ClearSearchText");
   ClearSearchText->setText( tr( "" ) );
   ClearSearchText->setPixmap( image1 );
 
   connect( searchEdit, SIGNAL( textChanged(const QString&) ),this, SLOT( setSearch(const QString&) ) );
   connect( ClearSearchText, SIGNAL( clicked() ), searchEdit, SLOT( clear() ) );
 
 }
 
 MainWindow::~MainWindow()
 {
    Config cfg( "osearch", Config::User );
    cfg.setGroup( "search_settings" );
    cfg.writeEntry( "caseSensitiv", actionCaseSensitiv->isOn() );
    cfg.writeEntry( "wildcards", actionWildcards->isOn() );
    //cfg.writeEntry( "whole_words_only", actionWholeWordsOnly->isOn() );
 }
 
 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();
 		}
 		_buttonCount = acts.count();
 		detailsFrame->show();
                 buttonBox->show();
 
 	}else {
             detailsFrame->hide();
             buttonBox->hide();
         }
 	popupTimer->start( 300, true );
 }
 
 void MainWindow::stopTimer(QListViewItem*)
 {
         popupTimer->stop();
 }
 
 void MainWindow::showPopup()
 {
 	popupTimer->stop();
         if (!_currentItem) return;