author | drw <drw> | 2004-04-02 21:24:41 (UTC) |
---|---|---|
committer | drw <drw> | 2004-04-02 21:24:41 (UTC) |
commit | ebe03c3cd5d2bc1e1ae94f123da7ab27b2188f6a (patch) (unidiff) | |
tree | 2b642af98abf3825cca6aef0f2adfb0934634e76 /core/pim | |
parent | 8b67cce78d89fdbb5c2a70f257aaef0e8162d767 (diff) | |
download | opie-ebe03c3cd5d2bc1e1ae94f123da7ab27b2188f6a.zip opie-ebe03c3cd5d2bc1e1ae94f123da7ab27b2188f6a.tar.gz opie-ebe03c3cd5d2bc1e1ae94f123da7ab27b2188f6a.tar.bz2 |
Use ODebug (another 7 down...)
-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 | |||
@@ -9,16 +9,17 @@ | |||
9 | // | 9 | // |
10 | // Copyright: See COPYING file that comes with this distribution | 10 | // Copyright: See COPYING file that comes with this distribution |
11 | // | 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 | |||
19 | AppLnkItem::AppLnkItem(OListViewItem* parent, AppLnk *app) | 20 | AppLnkItem::AppLnkItem(OListViewItem* parent, AppLnk *app) |
20 | : ResultItem(parent) | 21 | : ResultItem(parent) |
21 | { | 22 | { |
22 | _app = app; | 23 | _app = app; |
23 | setText(0, _app->name() ); | 24 | setText(0, _app->name() ); |
24 | setPixmap(0, _app->pixmap() ); | 25 | setPixmap(0, _app->pixmap() ); |
@@ -40,13 +41,13 @@ QString AppLnkItem::toRichText() | |||
40 | text += "<br>`" + _app->linkFile() + "`<br>"; | 41 | text += "<br>`" + _app->linkFile() + "`<br>"; |
41 | return text; | 42 | return text; |
42 | } | 43 | } |
43 | 44 | ||
44 | void AppLnkItem::action( int act ) | 45 | void 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)"); |
50 | e << _app->linkFile(); | 51 | e << _app->linkFile(); |
51 | } | 52 | } |
52 | } | 53 | } |
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 | |||
@@ -10,16 +10,16 @@ | |||
10 | // Copyright: See COPYING file that comes with this distribution | 10 | // Copyright: See COPYING file that comes with this distribution |
11 | // | 11 | // |
12 | // | 12 | // |
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 | ||
23 | #include <qaction.h> | 23 | #include <qaction.h> |
24 | #include <qpopupmenu.h> | 24 | #include <qpopupmenu.h> |
25 | 25 | ||
@@ -37,13 +37,13 @@ DatebookSearch::DatebookSearch(QListView* parent, QString name) | |||
37 | actionShowPastEvents->setOn( cfg.readBoolEntry( "show_past_events", false ) ); | 37 | actionShowPastEvents->setOn( cfg.readBoolEntry( "show_past_events", false ) ); |
38 | actionSearchInDates->setOn( cfg.readBoolEntry( "search_in_dates", true ) ); | 38 | actionSearchInDates->setOn( cfg.readBoolEntry( "search_in_dates", true ) ); |
39 | } | 39 | } |
40 | 40 | ||
41 | DatebookSearch::~DatebookSearch() | 41 | DatebookSearch::~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() ); |
47 | cfg.writeEntry( "search_in_dates", actionSearchInDates->isOn() ); | 47 | cfg.writeEntry( "search_in_dates", actionSearchInDates->isOn() ); |
48 | delete _dates; | 48 | delete _dates; |
49 | delete _popupMenu; | 49 | 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 @@ | |||
9 | // | 9 | // |
10 | // Copyright: See COPYING file that comes with this distribution | 10 | // Copyright: See COPYING file that comes with this distribution |
11 | // | 11 | // |
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 | ||
18 | #include <qtextstream.h> | 20 | #include <qtextstream.h> |
19 | #include <qfileinfo.h> | 21 | #include <qfileinfo.h> |
20 | 22 | ||
@@ -58,14 +60,14 @@ QString DocLnkItem::toRichText() | |||
58 | } | 60 | } |
59 | return text; | 61 | return text; |
60 | } | 62 | } |
61 | 63 | ||
62 | void DocLnkItem::action( int act ) | 64 | void 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)"); |
69 | e << _doc->file(); | 71 | e << _doc->file(); |
70 | } | 72 | } |
71 | } | 73 | } |
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 @@ | |||
17 | #include "todosearch.h" | 17 | #include "todosearch.h" |
18 | #include "datebooksearch.h" | 18 | #include "datebooksearch.h" |
19 | #include "applnksearch.h" | 19 | #include "applnksearch.h" |
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> |
26 | #include <qpe/resource.h> | 27 | #include <qpe/resource.h> |
27 | #include <qpe/config.h> | 28 | #include <qpe/config.h> |
28 | 29 | ||
@@ -226,13 +227,13 @@ void MainWindow::setCurrent(QListViewItem *item) | |||
226 | richEdit->setText( res->toRichText() ); | 227 | richEdit->setText( res->toRichText() ); |
227 | QIntDict<QString> acts = res->actions(); | 228 | QIntDict<QString> acts = res->actions(); |
228 | QButton *button; | 229 | QButton *button; |
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 ); |
236 | connect(button, SIGNAL(clicked() ), signalMapper, SLOT(map() ) ); | 237 | connect(button, SIGNAL(clicked() ), signalMapper, SLOT(map() ) ); |
237 | } | 238 | } |
238 | button->setText( *acts[i] ); | 239 | button->setText( *acts[i] ); |
@@ -280,13 +281,13 @@ void MainWindow::searchStringChanged() | |||
280 | #endif | 281 | #endif |
281 | searchTimer->stop(); | 282 | searchTimer->stop(); |
282 | QString ss = _searchString; | 283 | QString ss = _searchString; |
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() ); |
290 | for (SearchGroup *s = searches.first(); s != 0; s = searches.next() ) | 291 | for (SearchGroup *s = searches.first(); s != 0; s = searches.next() ) |
291 | s->setSearch( re ); | 292 | s->setSearch( re ); |
292 | } | 293 | } |
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 @@ | |||
1 | Package: opie-osearch | 1 | Package: opie-osearch |
2 | Files: plugins/application/libosearch.so* bin/osearch apps/1Pim/osearch.desktop pics/osearch/*.png | 2 | Files: plugins/application/libosearch.so* bin/osearch apps/1Pim/osearch.desktop pics/osearch/*.png |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/pim | 4 | Section: opie/pim |
5 | Maintainer: Patrick S. Vogt <tille@handhelds.org> | 5 | Maintainer: Patrick S. Vogt <tille@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal, libopiecore2, libopieui2, libopiepim2 |
8 | Description: Search through all PIM data | 8 | Description: Search through all PIM data |
9 | Version: $QPE_VERSION$EXTRAVERSION | 9 | 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 @@ | |||
9 | // | 9 | // |
10 | // Copyright: See COPYING file that comes with this distribution | 10 | // Copyright: See COPYING file that comes with this distribution |
11 | // | 11 | // |
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> |
18 | 19 | ||
19 | #ifndef NEW_OWAIT | 20 | #ifndef NEW_OWAIT |
20 | static Opie::Ui::OWait *wait = 0; | 21 | static Opie::Ui::OWait *wait = 0; |
@@ -69,13 +70,13 @@ int SearchGroup::realSearch() | |||
69 | if (_lastSearch == _search) return _resultCount; | 70 | if (_lastSearch == _search) return _resultCount; |
70 | #ifndef NEW_OWAIT | 71 | #ifndef NEW_OWAIT |
71 | if (!wait) wait = new Opie::Ui::OWait( qApp->mainWidget(), "osearch" ); | 72 | if (!wait) wait = new Opie::Ui::OWait( qApp->mainWidget(), "osearch" ); |
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(); |
79 | _resultCount = 0; | 80 | _resultCount = 0; |
80 | _resultCount = search(); | 81 | _resultCount = search(); |
81 | _lastSearch = _search; | 82 | _lastSearch = _search; |