author | zecke <zecke> | 2004-03-14 19:06:30 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-14 19:06:30 (UTC) |
commit | 601330a1173afbc7736d103a584b8bde20646dee (patch) (unidiff) | |
tree | ed095c532224e721df2b9caa828926bf0617abd8 | |
parent | d91c046d1faaf9fb039bda5cc186c96d4ff2c227 (diff) | |
download | opie-601330a1173afbc7736d103a584b8bde20646dee.zip opie-601330a1173afbc7736d103a584b8bde20646dee.tar.gz opie-601330a1173afbc7736d103a584b8bde20646dee.tar.bz2 |
Convert to ODP
-rw-r--r-- | core/pim/osearch/config.in | 2 | ||||
-rw-r--r-- | core/pim/osearch/main.cpp | 3 | ||||
-rw-r--r-- | core/pim/osearch/searchgroup.cpp | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/core/pim/osearch/config.in b/core/pim/osearch/config.in index 8d51307..8a162d4 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 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIEUI2 && LIBOPIEPIM2 |
diff --git a/core/pim/osearch/main.cpp b/core/pim/osearch/main.cpp index e0a2de3..c440c6a 100644 --- a/core/pim/osearch/main.cpp +++ b/core/pim/osearch/main.cpp | |||
@@ -1,6 +1,7 @@ | |||
1 | 1 | ||
2 | #include "mainwindow.h" | 2 | #include "mainwindow.h" |
3 | 3 | ||
4 | #include <opie/oapplicationfactory.h> | 4 | #include <opie2/oapplicationfactory.h> |
5 | 5 | ||
6 | using namespace Opie::Core; | ||
6 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) | 7 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) |
diff --git a/core/pim/osearch/searchgroup.cpp b/core/pim/osearch/searchgroup.cpp index 7a0b5a7..9166f72 100644 --- a/core/pim/osearch/searchgroup.cpp +++ b/core/pim/osearch/searchgroup.cpp | |||
@@ -16,9 +16,9 @@ | |||
16 | 16 | ||
17 | #include <qapplication.h> | 17 | #include <qapplication.h> |
18 | 18 | ||
19 | #ifndef NEW_OWAIT | 19 | #ifndef NEW_OWAIT |
20 | static OWait *wait = 0; | 20 | static Opie::Ui::OWait *wait = 0; |
21 | #endif | 21 | #endif |
22 | 22 | ||
23 | SearchGroup::SearchGroup(QListView* parent, QString name) | 23 | SearchGroup::SearchGroup(QListView* parent, QString name) |
24 | : OListViewItem(parent, name) | 24 | : OListViewItem(parent, name) |
@@ -67,9 +67,9 @@ void SearchGroup::setSearch(QRegExp re) | |||
67 | int SearchGroup::realSearch() | 67 | int SearchGroup::realSearch() |
68 | { | 68 | { |
69 | if (_lastSearch == _search) return _resultCount; | 69 | if (_lastSearch == _search) return _resultCount; |
70 | #ifndef NEW_OWAIT | 70 | #ifndef NEW_OWAIT |
71 | if (!wait) wait = new OWait( qApp->mainWidget(), "osearch" ); | 71 | if (!wait) wait = new Opie::Ui::OWait( qApp->mainWidget(), "osearch" ); |
72 | wait->show(); | 72 | wait->show(); |
73 | qApp->processEvents(); | 73 | qApp->processEvents(); |
74 | #else | 74 | #else |
75 | qDebug("********** NEW_OWAIT *************"); | 75 | qDebug("********** NEW_OWAIT *************"); |