osearch libopie1->libopie2

1 files changed, 9 insertions, 10 deletions

diff --git a/core/pim/osearch/adresssearch.cpp b/core/pim/osearch/adresssearch.cpp
index 7681ea2..dbd6df6 100644
--- a/core/pim/osearch/adresssearch.cpp
+++ b/core/pim/osearch/adresssearch.cpp
@@ -8,29 +8,28 @@
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #include "adresssearch.h"
+#include "contactitem.h"
+
+#include <qpe/resource.h>
 
 #include <qstring.h>
 #include <qiconset.h>
 //#include <qwhatsthis.h>
-#include <qpe/resource.h>
-#include <opie/ocontactaccess.h>
-
-#include "contactitem.h"
 
 AdressSearch::AdressSearch(QListView* parent, QString name):
         SearchGroup(parent, name)
 {
         _contacts = 0;
-                QIconSet is = Resource::loadIconSet( "addressbook/AddressBookSmall" );
+        QIconSet is = Resource::loadIconSet( "addressbook/AddressBookSmall" );
         setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
-        
-        
+
+
         //QWhatsThis::add( this, QObject::tr("Search the addressbook") );
         /*QPixmap pix = Resource::loadPixmap( "addressbook/AddressBook" );
         QImage img = pix.convertToImage();
         img.smoothScale( 14, 14 );
         pix.convertFromImage( img );
         setPixmap( 0, pix );*/
@@ -41,20 +40,20 @@ AdressSearch::~AdressSearch()
 {
         delete _contacts;
 }
 
 void AdressSearch::load()
 {
-        _contacts = new OContactAccess("osearch");
+        _contacts = new OPimContactAccess("osearch");
 }
 
 int AdressSearch::search()
 {
-        ORecordList<OContact> results = _contacts->matchRegexp(_search);
+        OPimRecordList<OPimContact> results = _contacts->matchRegexp(_search);
         for (uint i = 0; i < results.count(); i++) {
-                (void)new ContactItem( this, new OContact( results[i] ));
+                (void)new ContactItem( this, new OPimContact( results[i] ));
         }
         return results.count();
 }
 
 void AdressSearch::insertItem( void* )
 {