author | mickeyl <mickeyl> | 2004-04-04 17:12:42 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-04-04 17:12:42 (UTC) |
commit | b49dbce74737411736d63358319e709d1af810bb (patch) (unidiff) | |
tree | 90be52c8315be6274806592c69b31eba61d66314 | |
parent | 77185b587adfa158dadab204f3c78db94af3e099 (diff) | |
download | opie-b49dbce74737411736d63358319e709d1af810bb.zip opie-b49dbce74737411736d63358319e709d1af810bb.tar.gz opie-b49dbce74737411736d63358319e709d1af810bb.tar.bz2 |
catch up with new define in odebug.h
-rw-r--r-- | core/pim/osearch/applnkitem.cpp | 2 | ||||
-rw-r--r-- | core/pim/osearch/datebooksearch.cpp | 2 | ||||
-rw-r--r-- | core/pim/osearch/doclnkitem.cpp | 4 | ||||
-rw-r--r-- | core/pim/osearch/mainwindow.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/core/pim/osearch/applnkitem.cpp b/core/pim/osearch/applnkitem.cpp index ca54eef..f9ff565 100644 --- a/core/pim/osearch/applnkitem.cpp +++ b/core/pim/osearch/applnkitem.cpp | |||
@@ -39,17 +39,17 @@ QString AppLnkItem::toRichText() | |||
39 | text += "<br>`" + _app->exec() + "`<br>"; | 39 | text += "<br>`" + _app->exec() + "`<br>"; |
40 | text += "<br>`" + _app->file() + "`<br>"; | 40 | text += "<br>`" + _app->file() + "`<br>"; |
41 | text += "<br>`" + _app->linkFile() + "`<br>"; | 41 | text += "<br>`" + _app->linkFile() + "`<br>"; |
42 | return text; | 42 | return text; |
43 | } | 43 | } |
44 | 44 | ||
45 | void AppLnkItem::action( int act ) | 45 | void AppLnkItem::action( int act ) |
46 | { | 46 | { |
47 | if (!_app->isValid()) Opie::Core::odebug << "INVALID" << oendl; | 47 | if (!_app->isValid()) odebug << "INVALID" << oendl; |
48 | if (act == 0) _app->execute(); | 48 | if (act == 0) _app->execute(); |
49 | else if (act == 1){ | 49 | else if (act == 1){ |
50 | QCopEnvelope e("QPE/Application/advancedfm", "setDocument(QString)"); | 50 | QCopEnvelope e("QPE/Application/advancedfm", "setDocument(QString)"); |
51 | e << _app->linkFile(); | 51 | e << _app->linkFile(); |
52 | } | 52 | } |
53 | } | 53 | } |
54 | 54 | ||
55 | QIntDict<QString> AppLnkItem::actions() | 55 | QIntDict<QString> AppLnkItem::actions() |
diff --git a/core/pim/osearch/datebooksearch.cpp b/core/pim/osearch/datebooksearch.cpp index af6b194..34cf0ce 100644 --- a/core/pim/osearch/datebooksearch.cpp +++ b/core/pim/osearch/datebooksearch.cpp | |||
@@ -35,17 +35,17 @@ DatebookSearch::DatebookSearch(QListView* parent, QString name) | |||
35 | Config cfg( "osearch", Config::User ); | 35 | Config cfg( "osearch", Config::User ); |
36 | cfg.setGroup( "datebook_settings" ); | 36 | cfg.setGroup( "datebook_settings" ); |
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 | Opie::Core::odebug << "SAVE DATEBOOK SEARCH CONFIG" << oendl; | 43 | 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; |
50 | delete actionShowPastEvents; | 50 | delete actionShowPastEvents; |
51 | delete actionSearchInDates; | 51 | delete actionSearchInDates; |
diff --git a/core/pim/osearch/doclnkitem.cpp b/core/pim/osearch/doclnkitem.cpp index d908f7c..2e09a63 100644 --- a/core/pim/osearch/doclnkitem.cpp +++ b/core/pim/osearch/doclnkitem.cpp | |||
@@ -58,18 +58,18 @@ QString DocLnkItem::toRichText() | |||
58 | for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) { | 58 | for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) { |
59 | text += QString::number( i++) + " - " + *it ; | 59 | text += QString::number( i++) + " - " + *it ; |
60 | } | 60 | } |
61 | return text; | 61 | return text; |
62 | } | 62 | } |
63 | 63 | ||
64 | void DocLnkItem::action( int act ) | 64 | void DocLnkItem::action( int act ) |
65 | { | 65 | { |
66 | Opie::Core::odebug << "action" << act << oendl; | 66 | odebug << "action" << act << oendl; |
67 | if (!_doc->isValid()) Opie::Core::odebug << "INVALID" << oendl; | 67 | if (!_doc->isValid()) odebug << "INVALID" << oendl; |
68 | if (act == 0) _doc->execute(); | 68 | if (act == 0) _doc->execute(); |
69 | else if (act == 1){ | 69 | else if (act == 1){ |
70 | QCopEnvelope e("QPE/Application/advancedfm", "setDocument(QString)"); | 70 | QCopEnvelope e("QPE/Application/advancedfm", "setDocument(QString)"); |
71 | e << _doc->file(); | 71 | e << _doc->file(); |
72 | } | 72 | } |
73 | } | 73 | } |
74 | 74 | ||
75 | QIntDict<QString> DocLnkItem::actions() | 75 | QIntDict<QString> DocLnkItem::actions() |
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp index f329e83..3edc8de 100644 --- a/core/pim/osearch/mainwindow.cpp +++ b/core/pim/osearch/mainwindow.cpp | |||
@@ -225,17 +225,17 @@ void MainWindow::setCurrent(QListViewItem *item) | |||
225 | ResultItem *res = (ResultItem*)item; | 225 | ResultItem *res = (ResultItem*)item; |
226 | // ResultItem *res = dynamic_cast<ResultItem*>(item); | 226 | // ResultItem *res = dynamic_cast<ResultItem*>(item); |
227 | richEdit->setText( res->toRichText() ); | 227 | richEdit->setText( res->toRichText() ); |
228 | QIntDict<QString> acts = res->actions(); | 228 | QIntDict<QString> acts = res->actions(); |
229 | QButton *button; | 229 | QButton *button; |
230 | for (uint i = 0; i < acts.count(); i++){ | 230 | for (uint i = 0; i < acts.count(); i++){ |
231 | button = buttonMap[i]; | 231 | button = buttonMap[i]; |
232 | if (!button) { | 232 | if (!button) { |
233 | Opie::Core::owarn << " no button for " << *acts[i] << oendl; | 233 | owarn << " no button for " << *acts[i] << oendl; |
234 | button = new QPushButton( buttonBox ); | 234 | button = new QPushButton( buttonBox ); |
235 | buttonMap.insert( i, button ); | 235 | buttonMap.insert( i, button ); |
236 | signalMapper->setMapping(button, i ); | 236 | signalMapper->setMapping(button, i ); |
237 | connect(button, SIGNAL(clicked() ), signalMapper, SLOT(map() ) ); | 237 | connect(button, SIGNAL(clicked() ), signalMapper, SLOT(map() ) ); |
238 | } | 238 | } |
239 | button->setText( *acts[i] ); | 239 | button->setText( *acts[i] ); |
240 | button->show(); | 240 | button->show(); |
241 | } | 241 | } |