1 files changed, 7 insertions, 86 deletions

diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp
index 49e66ad..60f3177 100644
--- a/core/pim/addressbook/abtable.cpp
+++ b/core/pim/addressbook/abtable.cpp
@@ -115,25 +115,26 @@ void AbPickItem::setContentFromEditor( QWidget *w )
 AbTable::AbTable( const QValueList<int> order, QWidget *parent, const char *name )
         : QTable( parent, name ),
           lastSortCol( -1 ),
           asc( TRUE ),
           intFields( order ),
           enablePainting( true ),
           columnVisible( true ),
           countNested( 0 )
 {
                 //odebug << "C'tor start" << oendl;
         setSelectionMode( NoSelection );
         init();
-        setSorting( TRUE );
+        setSorting( false ); // The table should not sort by itself!
+
         connect( this, SIGNAL(clicked(int,int,int,const QPoint&)),
                  this, SLOT(itemClicked(int,int)) );
 
         // contactList.clear();
                 //odebug << "C'tor end" << oendl;
 }
 
 AbTable::~AbTable()
 {
 }
 
 void AbTable::init()
@@ -147,35 +148,28 @@ void AbTable::init()
         setLeftMargin( 0 );
         verticalHeader()->hide();
         columnVisible = true;
 }
 
 void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList )
 {
         odebug << "AbTable::setContacts()" << oendl;
 
         clear();
         m_viewList = viewList;
 
-        setSorting( false );
         setPaintingEnabled( FALSE );
 
         setNumRows( m_viewList.count() );
-        //int row = 0;
-        // for ( it = m_viewList.begin(); it != m_viewList.end(); ++it )
-        //      insertIntoTable( *it, row++ );
-
-        // setSorting( true );
 
-        // resort();
 
         updateVisible();
 
         setPaintingEnabled( TRUE );
 
 }
 
 void AbTable::setOrderedList( const QValueList<int> ordered )
 {
         intFields = ordered;
 }
 
@@ -199,83 +193,40 @@ bool AbTable::selectContact( int UID )
         odebug << "Search end" << oendl;
 
         if ( !found ){
                 ensureCellVisible( 0,0 );
                 setCurrentCell( 0, 0 );
         }
 
         setPaintingEnabled( TRUE );
 
         return true;
 }
 
-#if 0
-void AbTable::insertIntoTable( const Opie::OPimContact& cnt, int row )
-{
-        odebug << "void AbTable::insertIntoTable( const Opie::OPimContact& cnt, "
-                                        << row << " )" << oendl;
-        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;
+        odebug << "columClicked(" << col << ")" << oendl;
 
-        if ( col == lastSortCol ) {
+        if ( col == 0 ){
+                odebug << "Change sort order: " << asc << oendl;
                 asc = !asc;
-        } else {
-                lastSortCol = col;
-                asc = TRUE;
+                emit signalSortOrderChanged( asc );
         }
-        //QMessageBox::information( this, "resort", "columnClicked" );
-        resort();
 }
 
 void AbTable::resort()
 {
         owarn << "void AbTable::resort() NOT POSSIBLE !!" << oendl;
-#if 0
-        setPaintingEnabled( FALSE );
-        if ( sorting() ) {
-                if ( lastSortCol == -1 )
-                        lastSortCol = 0;
-                sortColumn( lastSortCol, asc, TRUE );
-                //QMessageBox::information( this, "resort", "resort" );
-                updateVisible();
-        }
-        setPaintingEnabled( TRUE );
-#endif
+
 }
 
 Opie::OPimContact AbTable::currentEntry()
 {
         return m_viewList[currentRow()];
 }
 
 int AbTable::currentEntry_UID()
 {
         return ( currentEntry().uid() );
 }
 
@@ -348,54 +299,24 @@ void AbTable::keyPressEvent( QKeyEvent *e )
         //      emit signalKeyDown();
         //      break;
         default:
                 QTable::keyPressEvent( e );
         }
 
 }
 
 void AbTable::moveTo( char /*c*/ )
 {
         odebug << "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" << oendl;
 
-#if 0
-        int rows = numRows();
-        QString value;
-        AbTableItem *abi;
-        int r;
-        if ( asc ) {
-                r = 0;
-                while ( r < rows-1) {
-                        abi = static_cast<AbTableItem*>( item(r, 0) );
-                        QChar first = abi->key()[0];
-                        //### is there a bug in QChar to char comparison???
-                        if ( first.row() || first.cell() >= c )
-                                break;
-                        r++;
-                }
-        } else {
-                //### should probably disable reverse sorting instead
-                r = rows - 1;
-                while ( r > 0 ) {
-                        abi = static_cast<AbTableItem*>( item(r, 0) );
-                        QChar first = abi->key()[0];
-                        //### is there a bug in QChar to char comparison???
-                        if ( first.row() || first.cell() >= c )
-                                break;
-                        r--;
-                }
-        }
-        setCurrentCell( r, currentColumn() );
-
-#endif
 }
 
 #if 0
 // Useless.. Nobody uses it .. (se)
 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();
                 if ( str.isEmpty() ) {