summaryrefslogtreecommitdiff
authordrw <drw>2004-04-02 21:24:41 (UTC)
committer drw <drw>2004-04-02 21:24:41 (UTC)
commitebe03c3cd5d2bc1e1ae94f123da7ab27b2188f6a (patch) (side-by-side diff)
tree2b642af98abf3825cca6aef0f2adfb0934634e76
parent8b67cce78d89fdbb5c2a70f257aaef0e8162d767 (diff)
downloadopie-ebe03c3cd5d2bc1e1ae94f123da7ab27b2188f6a.zip
opie-ebe03c3cd5d2bc1e1ae94f123da7ab27b2188f6a.tar.gz
opie-ebe03c3cd5d2bc1e1ae94f123da7ab27b2188f6a.tar.bz2
Use ODebug (another 7 down...)
Diffstat (more/less context) (show 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
@@ -9,16 +9,17 @@
//
// Copyright: See COPYING file that comes with this distribution
//
//
#include "applnkitem.h"
+#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() );
@@ -40,13 +41,13 @@ QString AppLnkItem::toRichText()
text += "<br>`" + _app->linkFile() + "`<br>";
return text;
}
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)");
e << _app->linkFile();
}
}
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
@@ -10,16 +10,16 @@
// Copyright: See COPYING file that comes with this distribution
//
//
#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>
@@ -37,13 +37,13 @@ DatebookSearch::DatebookSearch(QListView* parent, QString name)
actionShowPastEvents->setOn( cfg.readBoolEntry( "show_past_events", false ) );
actionSearchInDates->setOn( cfg.readBoolEntry( "search_in_dates", true ) );
}
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() );
cfg.writeEntry( "search_in_dates", actionSearchInDates->isOn() );
delete _dates;
delete _popupMenu;
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
@@ -9,12 +9,14 @@
//
// Copyright: See COPYING file that comes with this distribution
//
//
#include "doclnkitem.h"
+#include <opie2/odebug.h>
+
#include <qpe/applnk.h>
#include <qpe/qcopenvelope_qws.h>
#include <qtextstream.h>
#include <qfileinfo.h>
@@ -58,14 +60,14 @@ QString DocLnkItem::toRichText()
}
return text;
}
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)");
e << _doc->file();
}
}
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
@@ -17,12 +17,13 @@
#include "todosearch.h"
#include "datebooksearch.h"
#include "applnksearch.h"
#include "doclnksearch.h"
#include "mainwindow.h"
+#include <opie2/odebug.h>
#include <opie2/owait.h>
#include <qpe/qpemessagebox.h>
#include <qpe/resource.h>
#include <qpe/config.h>
@@ -226,13 +227,13 @@ void MainWindow::setCurrent(QListViewItem *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) {
- 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 );
connect(button, SIGNAL(clicked() ), signalMapper, SLOT(map() ) );
}
button->setText( *acts[i] );
@@ -280,13 +281,13 @@ void MainWindow::searchStringChanged()
#endif
searchTimer->stop();
QString ss = _searchString;
//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() );
for (SearchGroup *s = searches.first(); s != 0; s = searches.next() )
s->setSearch( re );
}
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
@@ -1,9 +1,9 @@
Package: opie-osearch
Files: plugins/application/libosearch.so* bin/osearch apps/1Pim/osearch.desktop pics/osearch/*.png
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
@@ -9,12 +9,13 @@
//
// Copyright: See COPYING file that comes with this distribution
//
//
#include "searchgroup.h"
+#include <opie2/odebug.h>
#include <opie2/owait.h>
#include <qapplication.h>
#ifndef NEW_OWAIT
static Opie::Ui::OWait *wait = 0;
@@ -69,13 +70,13 @@ int SearchGroup::realSearch()
if (_lastSearch == _search) return _resultCount;
#ifndef NEW_OWAIT
if (!wait) wait = new Opie::Ui::OWait( qApp->mainWidget(), "osearch" );
wait->show();
qApp->processEvents();
#else
- qDebug("********** NEW_OWAIT *************");
+ Opie:Core::odebug << "********** NEW_OWAIT *************" << oendl;
OWait( "searching" );
#endif
if (!loaded) load();
_resultCount = 0;
_resultCount = search();
_lastSearch = _search;