summaryrefslogtreecommitdiff
Unidiff
Diffstat (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 @@
12// 12//
13#include "applnkitem.h" 13#include "applnkitem.h"
14 14
15#include <opie2/odebug.h>
16
15#include <qpe/applnk.h> 17#include <qpe/applnk.h>
16#include <qpe/qcopenvelope_qws.h> 18#include <qpe/qcopenvelope_qws.h>
17 19
18
19AppLnkItem::AppLnkItem(OListViewItem* parent, AppLnk *app) 20AppLnkItem::AppLnkItem(OListViewItem* parent, AppLnk *app)
20 : ResultItem(parent) 21 : ResultItem(parent)
21{ 22{
@@ -43,7 +44,7 @@ QString AppLnkItem::toRichText()
43 44
44void AppLnkItem::action( int act ) 45void AppLnkItem::action( int act )
45{ 46{
46 if (!_app->isValid()) qDebug("INVALID"); 47 if (!_app->isValid()) Opie::Core::odebug << "INVALID" << oendl;
47 if (act == 0) _app->execute(); 48 if (act == 0) _app->execute();
48 else if (act == 1){ 49 else if (act == 1){
49 QCopEnvelope e("QPE/Application/advancedfm", "setDocument(QString)"); 50 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 @@
1 config OSEARCH 1 config OSEARCH
2 boolean "opie-osearch (searches throught your PDA)" 2 boolean "opie-osearch (searches throught your PDA)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && LIBOPIE2PIM 4 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 @@
13#include "datebooksearch.h" 13#include "datebooksearch.h"
14#include "eventitem.h" 14#include "eventitem.h"
15 15
16#include <opie2/odebug.h>
16#include <opie2/opimevent.h> 17#include <opie2/opimevent.h>
17#include <opie2/opimrecurrence.h> 18#include <opie2/opimrecurrence.h>
18 19
19
20#include <qpe/resource.h> 20#include <qpe/resource.h>
21#include <qpe/config.h> 21#include <qpe/config.h>
22 22
@@ -40,7 +40,7 @@ DatebookSearch::DatebookSearch(QListView* parent, QString name)
40 40
41DatebookSearch::~DatebookSearch() 41DatebookSearch::~DatebookSearch()
42{ 42{
43 qDebug("SAVE DATEBOOK SEARCH CONFIG"); 43 Opie::Core::odebug << "SAVE DATEBOOK SEARCH CONFIG" << oendl;
44 Config cfg( "osearch", Config::User ); 44 Config cfg( "osearch", Config::User );
45 cfg.setGroup( "datebook_settings" ); 45 cfg.setGroup( "datebook_settings" );
46 cfg.writeEntry( "show_past_events", actionShowPastEvents->isOn() ); 46 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 @@
12// 12//
13#include "doclnkitem.h" 13#include "doclnkitem.h"
14 14
15#include <opie2/odebug.h>
16
15#include <qpe/applnk.h> 17#include <qpe/applnk.h>
16#include <qpe/qcopenvelope_qws.h> 18#include <qpe/qcopenvelope_qws.h>
17 19
@@ -61,8 +63,8 @@ QString DocLnkItem::toRichText()
61 63
62void DocLnkItem::action( int act ) 64void DocLnkItem::action( int act )
63{ 65{
64 qDebug("action %i",act); 66 Opie::Core::odebug << "action" << act << oendl;
65 if (!_doc->isValid()) qDebug("INVALID"); 67 if (!_doc->isValid()) Opie::Core::odebug << "INVALID" << oendl;
66 if (act == 0) _doc->execute(); 68 if (act == 0) _doc->execute();
67 else if (act == 1){ 69 else if (act == 1){
68 QCopEnvelope e("QPE/Application/advancedfm", "setDocument(QString)"); 70 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 @@
20#include "doclnksearch.h" 20#include "doclnksearch.h"
21#include "mainwindow.h" 21#include "mainwindow.h"
22 22
23#include <opie2/odebug.h>
23#include <opie2/owait.h> 24#include <opie2/owait.h>
24 25
25#include <qpe/qpemessagebox.h> 26#include <qpe/qpemessagebox.h>
@@ -229,7 +230,7 @@ void MainWindow::setCurrent(QListViewItem *item)
229 for (uint i = 0; i < acts.count(); i++){ 230 for (uint i = 0; i < acts.count(); i++){
230 button = buttonMap[i]; 231 button = buttonMap[i];
231 if (!button) { 232 if (!button) {
232 qWarning(" no button for %s", (*acts[i]).latin1() ); 233 Opie::Core::owarn << " no button for " << *acts[i] << oendl;
233 button = new QPushButton( buttonBox ); 234 button = new QPushButton( buttonBox );
234 buttonMap.insert( i, button ); 235 buttonMap.insert( i, button );
235 signalMapper->setMapping(button, i ); 236 signalMapper->setMapping(button, i );
@@ -283,7 +284,7 @@ void MainWindow::searchStringChanged()
283 //ss = Global::stringQuote( _searchString ); 284 //ss = Global::stringQuote( _searchString );
284 //if (actionWholeWordsOnly->isOn()) 285 //if (actionWholeWordsOnly->isOn())
285 // ss = "\\s"+_searchString+"\\s"; 286 // ss = "\\s"+_searchString+"\\s";
286 //qDebug(" set searchString >%s<",ss.latin1()); 287 //Opie:Core::odebug << " set searchString >" << ss << "<" << oendl;
287 QRegExp re( ss ); 288 QRegExp re( ss );
288 re.setCaseSensitive( actionCaseSensitiv->isOn() ); 289 re.setCaseSensitive( actionCaseSensitiv->isOn() );
289 re.setWildcard( actionWildcards->isOn() ); 290 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
4Section: opie/pim 4Section: opie/pim
5Maintainer: Patrick S. Vogt <tille@handhelds.org> 5Maintainer: Patrick S. Vogt <tille@handhelds.org>
6Architecture: arm 6Architecture: arm
7Depends: task-opie-minimal 7Depends: task-opie-minimal, libopiecore2, libopieui2, libopiepim2
8Description: Search through all PIM data 8Description: Search through all PIM data
9Version: $QPE_VERSION$EXTRAVERSION 9Version: $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 @@
12// 12//
13#include "searchgroup.h" 13#include "searchgroup.h"
14 14
15#include <opie2/odebug.h>
15#include <opie2/owait.h> 16#include <opie2/owait.h>
16 17
17#include <qapplication.h> 18#include <qapplication.h>
@@ -72,7 +73,7 @@ int SearchGroup::realSearch()
72 wait->show(); 73 wait->show();
73 qApp->processEvents(); 74 qApp->processEvents();
74#else 75#else
75 qDebug("********** NEW_OWAIT *************"); 76 Opie:Core::odebug << "********** NEW_OWAIT *************" << oendl;
76 OWait( "searching" ); 77 OWait( "searching" );
77#endif 78#endif
78 if (!loaded) load(); 79 if (!loaded) load();