summaryrefslogtreecommitdiff
path: root/core
Side-by-side diff
Diffstat (limited to 'core') (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/osearch/applnkitem.cpp5
-rw-r--r--core/pim/osearch/config.in2
-rw-r--r--core/pim/osearch/datebooksearch.cpp4
-rw-r--r--core/pim/osearch/doclnkitem.cpp6
-rw-r--r--core/pim/osearch/mainwindow.cpp5
-rw-r--r--core/pim/osearch/opie-osearch.control2
-rw-r--r--core/pim/osearch/searchgroup.cpp3
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
@@ -12,10 +12,11 @@
//
#include "applnkitem.h"
+#include <opie2/odebug.h>
+
#include <qpe/applnk.h>
#include <qpe/qcopenvelope_qws.h>
-
AppLnkItem::AppLnkItem(OListViewItem* parent, AppLnk *app)
: ResultItem(parent)
{
@@ -43,7 +44,7 @@ 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){
QCopEnvelope e("QPE/Application/advancedfm", "setDocument(QString)");
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
@@ -1,4 +1,4 @@
config OSEARCH
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
@@ -13,10 +13,10 @@
#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>
@@ -40,7 +40,7 @@ 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" );
cfg.writeEntry( "show_past_events", actionShowPastEvents->isOn() );
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
@@ -12,6 +12,8 @@
//
#include "doclnkitem.h"
+#include <opie2/odebug.h>
+
#include <qpe/applnk.h>
#include <qpe/qcopenvelope_qws.h>
@@ -61,8 +63,8 @@ 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){
QCopEnvelope e("QPE/Application/advancedfm", "setDocument(QString)");
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
@@ -20,6 +20,7 @@
#include "doclnksearch.h"
#include "mainwindow.h"
+#include <opie2/odebug.h>
#include <opie2/owait.h>
#include <qpe/qpemessagebox.h>
@@ -229,7 +230,7 @@ void MainWindow::setCurrent(QListViewItem *item)
for (uint i = 0; i < acts.count(); i++){
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 );
signalMapper->setMapping(button, i );
@@ -283,7 +284,7 @@ void MainWindow::searchStringChanged()
//ss = Global::stringQuote( _searchString );
// 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() );
re.setWildcard( actionWildcards->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
@@ -4,6 +4,6 @@ Priority: optional
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
@@ -12,6 +12,7 @@
//
#include "searchgroup.h"
+#include <opie2/odebug.h>
#include <opie2/owait.h>
#include <qapplication.h>
@@ -72,7 +73,7 @@ int SearchGroup::realSearch()
wait->show();
qApp->processEvents();
#else
- qDebug("********** NEW_OWAIT *************");
+ Opie:Core::odebug << "********** NEW_OWAIT *************" << oendl;
OWait( "searching" );
#endif
if (!loaded) load();