1 files changed, 42 insertions, 43 deletions

diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp
index 29f4383..cd77b13 100644
--- a/core/pim/addressbook/abtable.cpp
+++ b/core/pim/addressbook/abtable.cpp
@@ -17,18 +17,17 @@
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 
+#include <opie2/opimrecordlist.h>
+
 #include <qpe/timestring.h>
 #include <qpe/resource.h>
 
-#include <opie/orecordlist.h>
-
-
 #include "abtable.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -36,13 +35,13 @@
 #include <ctype.h> //toupper() for key hack
 
 #if 0
 
 /*!
   \class AbTableItem abtable.h
-  
+
   \brief QTableItem based class for showing a field of an entry
 */
 
 AbTableItem::AbTableItem( QTable *t, EditType et, const QString &s,
                           const QString &secondSortKey)
         : QTableItem( t, et, s )
@@ -63,19 +62,19 @@ QString AbTableItem::key() const
 
 // A way to reset the item, without out doing a delete or a new...
 void AbTableItem::setItem( const QString &txt, const QString &secondKey )
 {
         setText( txt );
         sortKey = Qtopia::buildSortKey( txt, secondKey );
-        
+
         //    sortKey = txt.lower() + QChar( '\0' ) + secondKey.lower();
 }
 
 /*!
   \class AbPickItem abtable.h
-  
+
   \brief QTableItem based class for showing slection of an entry
 */
 
 AbPickItem::AbPickItem( QTable *t ) :
         QTableItem(t, WhenCurrent, "?")
 {
@@ -106,13 +105,13 @@ void AbPickItem::setContentFromEditor( QWidget *w )
 }
 
 #endif
 
 /*!
   \class AbTable abtable.h
-  
+
   \brief QTable based class for showing a list of entries
 */
 
 AbTable::AbTable( const QValueList<int> order, QWidget *parent, const char *name )
         : QTable( parent, name ),
           lastSortCol( -1 ),
@@ -140,36 +139,36 @@ AbTable::~AbTable()
 
 void AbTable::init()
 {
         // :SX showChar = '\0';
         setNumRows( 0 );
         setNumCols( 2 );
-        
+
         horizontalHeader()->setLabel( 0, tr( "Full Name" ));
         horizontalHeader()->setLabel( 1, tr( "Contact" ));
         setLeftMargin( 0 );
         verticalHeader()->hide();
         columnVisible = true;
 }
 
-void AbTable::setContacts( const OContactAccess::List& viewList )
+void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList )
 {
         qWarning("AbTable::setContacts()");
 
         clear();
         m_viewList = viewList;
 
         setSorting( false );
         setPaintingEnabled( FALSE );
-        
-        OContactAccess::List::Iterator it;
+
+        Opie::OPimContactAccess::List::Iterator it;
         setNumRows( m_viewList.count() );
         //int row = 0;
         // for ( it = m_viewList.begin(); it != m_viewList.end(); ++it )
         //      insertIntoTable( *it, row++ );
-        
+
         // setSorting( true );
 
         // resort();
 
         updateVisible();
 
@@ -184,13 +183,13 @@ void AbTable::setOrderedList( const QValueList<int> ordered )
 
 
 bool AbTable::selectContact( int UID )
 {
         qWarning( "AbTable::selectContact( %d )", UID );
         int rows = numRows();
-        OContact* foundContact = 0l;
+        Opie::OPimContact* foundContact = 0l;
         bool found = false;
 
         setPaintingEnabled( FALSE );
         qWarning( "search start" );
         for ( int r = 0; r < rows; ++r ) {
                 if ( m_viewList.uidAt( r ) == UID ){
@@ -210,45 +209,45 @@ bool AbTable::selectContact( int UID )
         setPaintingEnabled( TRUE );
 
         return true;
 }
 
 #if 0
-void AbTable::insertIntoTable( const OContact& cnt, int row )
+void AbTable::insertIntoTable( const Opie::OPimContact& cnt, int row )
 {
-        qWarning( "void AbTable::insertIntoTable( const OContact& cnt, %d )", row );
+        qWarning( "void AbTable::insertIntoTable( const Opie::OPimContact& cnt, %d )", row );
         QString strName;
         ContactItem contactItem;
-        
+
         strName = findContactName( cnt );
         contactItem = findContactContact( cnt, row );
-        
+
         AbTableItem *ati;
         ati = new AbTableItem( this, QTableItem::Never, strName, contactItem.value );
         contactList.insert( ati, cnt );
         setItem( row, 0, ati );
         ati = new AbTableItem( this, QTableItem::Never, contactItem.value, strName);
         if ( !contactItem.icon.isNull() )
                 ati->setPixmap( contactItem.icon );
         setItem( row, 1, ati );
-        
+
         //### cannot do this; table only has two columns at this point
         //    setItem( row, 2, new AbPickItem( this ) );
-        
+
 }
 #endif
 
 
 void AbTable::columnClicked( int col )
 {
         if ( !sorting() )
                 return;
-        
+
         if ( lastSortCol == -1 )
                 lastSortCol = col;
-        
+
         if ( col == lastSortCol ) {
                 asc = !asc;
         } else {
                 lastSortCol = col;
                 asc = TRUE;
         }
@@ -269,14 +268,14 @@ void AbTable::resort()
                 updateVisible();
         }
         setPaintingEnabled( TRUE );
 #endif
 }
 
-OContact AbTable::currentEntry()
-        {
+Opie::OPimContact AbTable::currentEntry()
+{
         return m_viewList[currentRow()];
 }
 
 int AbTable::currentEntry_UID()
 {
         return ( currentEntry().uid() );
@@ -328,16 +327,16 @@ void AbTable::refresh()
 #endif
 }
 
 void AbTable::keyPressEvent( QKeyEvent *e )
 {
         char key = toupper( e->ascii() );
-        
+
         if ( key >= 'A' && key <= 'Z' )
                 moveTo( key );
-        
+
                 //qWarning("Received key ..");
         switch( e->key() ) {
         case Qt::Key_Space:
         case Qt::Key_Return:
         case Qt::Key_Enter:
                 emit signalSwitch();
@@ -350,19 +349,19 @@ void AbTable::keyPressEvent( QKeyEvent *e )
         //      qWarning("b");
         //      emit signalKeyDown();
         //      break;
         default:
                 QTable::keyPressEvent( e );
         }
-                
+
 }
 
 void AbTable::moveTo( char c )
 {
         qWarning( "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" );
-        
+
 #if 0
         int rows = numRows();
         QString value;
         AbTableItem *abi;
         int r;
         if ( asc ) {
@@ -391,13 +390,13 @@ void AbTable::moveTo( char c )
 
 #endif
 }
 
 #if 0
 // Useless.. Nobody uses it .. (se)
-QString AbTable::findContactName( const OContact &entry )
+QString AbTable::findContactName( const Opie::OPimContact &entry )
 {
         // We use the fileAs, then company, defaultEmail
         QString str;
         str = entry.fileAs();
         if ( str.isEmpty() ) {
                 str = entry.company();
@@ -472,23 +471,23 @@ void QTable::paintEmptyArea( QPainter *p, int cx, int cy, int cw, int ch )
 
 
 
 void AbTable::fitColumns()
 {
         qWarning( "void AbTable::fitColumns()" );
-        int contentsWidth = visibleWidth() / 2; 
+        int contentsWidth = visibleWidth() / 2;
         // Fix to better value
-        // contentsWidth = 130; 
+        // contentsWidth = 130;
 
         setPaintingEnabled( FALSE );
-        
+
         if ( columnVisible == false ){
                 showColumn(0);
                 columnVisible = true;
         }
-        
+
                 //qWarning("Width: %d", contentsWidth);
 
         setColumnWidth( 0, contentsWidth );
         adjustColumn(1);
         if ( columnWidth(1) < contentsWidth )
                 setColumnWidth( 1, contentsWidth );
@@ -544,21 +543,21 @@ void AbTable::setChoiceSelection( const QValueList<int>& list )
 }
 
 QStringList AbTable::choiceSelection(int /*index*/) const
 {
         QStringList r;
         /* ######
-           
+
         QString selname = choicenames.at(index);
         for (each row) {
-        OContact *c = contactForRow(row);
+        Opie::OPimContact *c = contactForRow(row);
         if ( text(row,2) == selname ) {
         r.append(c->email);
         }
         }
-        
+
         */
         return r;
 }
 
 
 void AbTable::updateVisible()
@@ -566,15 +565,15 @@ void AbTable::updateVisible()
                 //qWarning("void AbTable::updateVisible()");
 
         int visible,
                 totalRows,
                 row,
                 selectedRow = 0;
-                
+
         visible = 0;
-        
+
         setPaintingEnabled( FALSE );
 
         realignTable();
 
         totalRows = numRows();
         for ( row = 0; row < totalRows; row++ ) {
@@ -589,13 +588,13 @@ void AbTable::updateVisible()
 
         if ( selectedRow )
                 setCurrentCell( selectedRow, 0 );
 
         if ( !visible )
                 setCurrentCell( -1, 0 );
-        
+
         setPaintingEnabled( TRUE );
 }
 
 
 void AbTable::setPaintingEnabled( bool e )
 {
@@ -628,13 +627,13 @@ void AbTable::paintCell(QPainter* p,  int row, int col, const QRect& cr, bool )
     const QColorGroup &cg = colorGroup();
 
     p->save();
 
     //qWarning( "Paint row: %d", row );
 
-    OContact act_contact = m_viewList[row];
+    Opie::OPimContact act_contact = m_viewList[row];
 
     // Paint alternating background bars
     if (  (row % 2 ) == 0 ) {
         p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Base ) );
         p->setPen( QPen( cg.text() ) );
     }
@@ -650,25 +649,25 @@ void AbTable::paintCell(QPainter* p,  int row, int col, const QRect& cr, bool )
     int x = 0;
     int y = ( cr.height() - 14 ) / 2;
 
     QString nameText    = act_contact.fileAs();
 
     switch( col ){
-            case 0: 
+            case 0:
                     p->drawText( x + marg,2 + fm.ascent(), nameText );
             break;
             case 1:{
 
                     ContactItem contactItem = findContactContact( act_contact, 0 );
                     QPixmap contactPic  = contactItem.icon; /* pixmap( row, col ); */
                     QString contactText = contactItem.value;
-                            
+
                     if ( !contactPic.isNull() )
                             {
                                     p->drawPixmap( x + marg, y, contactPic );
-                                    p->drawText( x + marg + contactPic.width() 
+                                    p->drawText( x + marg + contactPic.width()
                                                  + 4,2 + fm.ascent(), contactText );
                             }
                     else
                             {
                                     p->drawText( x + marg,2 + fm.ascent(), contactText );
                             }
@@ -681,13 +680,13 @@ void AbTable::paintCell(QPainter* p,  int row, int col, const QRect& cr, bool )
 
 void AbTable::rowHeightChanged( int row )
 {
         if ( enablePainting )
                 QTable::rowHeightChanged( row );
 }
-ContactItem AbTable::findContactContact( const OContact &entry, int /* row */ )
+ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /* row */ )
 {
 
         ContactItem item;
 
         item.value = "";