Convert to ODP

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
@@ -12,17 +12,17 @@
 //
 #include "searchgroup.h"
 
 #include <opie2/owait.h>
 
 #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)
 {
 	_name = name;
 	loaded = false;
 }
@@ -63,17 +63,17 @@ void SearchGroup::setSearch(QRegExp re)
 	if (isOpen()) expand();
 	else new OListViewItem( this, "searching...");
 }
 
 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 *************");
 	OWait( "searching" );
 #endif
 	if (!loaded) load();
 	_resultCount = 0;