-rw-r--r-- | core/pim/osearch/applnkitem.cpp | 5 | ||||
-rw-r--r-- | core/pim/osearch/config.in | 2 | ||||
-rw-r--r-- | core/pim/osearch/datebooksearch.cpp | 4 | ||||
-rw-r--r-- | core/pim/osearch/doclnkitem.cpp | 6 | ||||
-rw-r--r-- | core/pim/osearch/mainwindow.cpp | 5 | ||||
-rw-r--r-- | core/pim/osearch/opie-osearch.control | 2 | ||||
-rw-r--r-- | core/pim/osearch/searchgroup.cpp | 3 |
7 files changed, 16 insertions, 11 deletions
diff --git a/core/pim/osearch/applnkitem.cpp b/core/pim/osearch/applnkitem.cpp index 19e765e..ca54eef 100644 --- a/core/pim/osearch/applnkitem.cpp +++ b/core/pim/osearch/applnkitem.cpp @@ -13,8 +13,9 @@ #include "applnkitem.h" +#include <opie2/odebug.h> + #include <qpe/applnk.h> #include <qpe/qcopenvelope_qws.h> - AppLnkItem::AppLnkItem(OListViewItem* parent, AppLnk *app) : ResultItem(parent) @@ -44,5 +45,5 @@ QString AppLnkItem::toRichText() void AppLnkItem::action( int act ) { - if (!_app->isValid()) qDebug("INVALID"); + if (!_app->isValid()) Opie::Core::odebug << "INVALID" << oendl; if (act == 0) _app->execute(); else if (act == 1){ diff --git a/core/pim/osearch/config.in b/core/pim/osearch/config.in index ec0da27..71191ce 100644 --- a/core/pim/osearch/config.in +++ b/core/pim/osearch/config.in @@ -2,3 +2,3 @@ boolean "opie-osearch (searches throught your PDA)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && LIBOPIE2PIM + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM diff --git a/core/pim/osearch/datebooksearch.cpp b/core/pim/osearch/datebooksearch.cpp index eeea54b..af6b194 100644 --- a/core/pim/osearch/datebooksearch.cpp +++ b/core/pim/osearch/datebooksearch.cpp @@ -14,8 +14,8 @@ #include "eventitem.h" +#include <opie2/odebug.h> #include <opie2/opimevent.h> #include <opie2/opimrecurrence.h> - #include <qpe/resource.h> #include <qpe/config.h> @@ -41,5 +41,5 @@ DatebookSearch::DatebookSearch(QListView* parent, QString name) DatebookSearch::~DatebookSearch() { - qDebug("SAVE DATEBOOK SEARCH CONFIG"); + Opie::Core::odebug << "SAVE DATEBOOK SEARCH CONFIG" << oendl; Config cfg( "osearch", Config::User ); cfg.setGroup( "datebook_settings" ); diff --git a/core/pim/osearch/doclnkitem.cpp b/core/pim/osearch/doclnkitem.cpp index df8e856..d908f7c 100644 --- a/core/pim/osearch/doclnkitem.cpp +++ b/core/pim/osearch/doclnkitem.cpp @@ -13,4 +13,6 @@ #include "doclnkitem.h" +#include <opie2/odebug.h> + #include <qpe/applnk.h> #include <qpe/qcopenvelope_qws.h> @@ -62,6 +64,6 @@ QString DocLnkItem::toRichText() void DocLnkItem::action( int act ) { - qDebug("action %i",act); - if (!_doc->isValid()) qDebug("INVALID"); + Opie::Core::odebug << "action" << act << oendl; + if (!_doc->isValid()) Opie::Core::odebug << "INVALID" << oendl; if (act == 0) _doc->execute(); else if (act == 1){ diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp index 8b6a5df..f329e83 100644 --- a/core/pim/osearch/mainwindow.cpp +++ b/core/pim/osearch/mainwindow.cpp @@ -21,4 +21,5 @@ #include "mainwindow.h" +#include <opie2/odebug.h> #include <opie2/owait.h> @@ -230,5 +231,5 @@ void MainWindow::setCurrent(QListViewItem *item) button = buttonMap[i]; if (!button) { - qWarning(" no button for %s", (*acts[i]).latin1() ); + Opie::Core::owarn << " no button for " << *acts[i] << oendl; button = new QPushButton( buttonBox ); buttonMap.insert( i, button ); @@ -284,5 +285,5 @@ void MainWindow::searchStringChanged() // if (actionWholeWordsOnly->isOn()) // ss = "\\s"+_searchString+"\\s"; -// qDebug(" set searchString >%s<",ss.latin1()); +// Opie:Core::odebug << " set searchString >" << ss << "<" << oendl; QRegExp re( ss ); re.setCaseSensitive( actionCaseSensitiv->isOn() ); diff --git a/core/pim/osearch/opie-osearch.control b/core/pim/osearch/opie-osearch.control index 9bf0607..73838b9 100644 --- a/core/pim/osearch/opie-osearch.control +++ b/core/pim/osearch/opie-osearch.control @@ -5,5 +5,5 @@ Section: opie/pim Maintainer: Patrick S. Vogt <tille@handhelds.org> Architecture: arm -Depends: task-opie-minimal +Depends: task-opie-minimal, libopiecore2, libopieui2, libopiepim2 Description: Search through all PIM data Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/pim/osearch/searchgroup.cpp b/core/pim/osearch/searchgroup.cpp index 9166f72..2ca37cf 100644 --- a/core/pim/osearch/searchgroup.cpp +++ b/core/pim/osearch/searchgroup.cpp @@ -13,4 +13,5 @@ #include "searchgroup.h" +#include <opie2/odebug.h> #include <opie2/owait.h> @@ -73,5 +74,5 @@ int SearchGroup::realSearch() qApp->processEvents(); #else - qDebug("********** NEW_OWAIT *************"); + Opie:Core::odebug << "********** NEW_OWAIT *************" << oendl; OWait( "searching" ); #endif |