| author | zecke <zecke> | 2004-03-14 19:06:30 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2004-03-14 19:06:30 (UTC) |
| commit | 601330a1173afbc7736d103a584b8bde20646dee (patch) (side-by-side diff) | |
| 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 @@ config OSEARCH boolean "opie-osearch (searches throught your PDA)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + 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 @@ #include "mainwindow.h" -#include <opie/oapplicationfactory.h> +#include <opie2/oapplicationfactory.h> +using namespace Opie::Core; 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 @@ #include <qapplication.h> #ifndef NEW_OWAIT -static OWait *wait = 0; +static Opie::Ui::OWait *wait = 0; #endif SearchGroup::SearchGroup(QListView* parent, QString name) : OListViewItem(parent, name) @@ -67,9 +67,9 @@ void SearchGroup::setSearch(QRegExp re) int SearchGroup::realSearch() { if (_lastSearch == _search) return _resultCount; #ifndef NEW_OWAIT - if (!wait) wait = new OWait( qApp->mainWidget(), "osearch" ); + if (!wait) wait = new Opie::Ui::OWait( qApp->mainWidget(), "osearch" ); wait->show(); qApp->processEvents(); #else qDebug("********** NEW_OWAIT *************"); |