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
@@ -126,3 +126,4 @@ AbTable::AbTable( const QValueList<int> order, QWidget *parent, const char *name
 	init();
-	setSorting( TRUE );
+	setSorting( false ); // The table should not sort by itself!
+
 	connect( this, SIGNAL(clicked(int,int,int,const QPoint&)),
@@ -158,3 +159,2 @@ void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList )
 
-	setSorting( false );
 	setPaintingEnabled( FALSE );
@@ -162,9 +162,3 @@ void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList )
 	setNumRows( m_viewList.count() );
-//	int row = 0;
-// 	for ( it = m_viewList.begin(); it != m_viewList.end(); ++it )
-// 		insertIntoTable( *it, row++ );
-
-// 	setSorting( true );
 
-// 	resort();
 
@@ -210,28 +204,2 @@ bool AbTable::selectContact( int UID )
 
-#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
-
 
@@ -239,16 +207,9 @@ 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();
 }
@@ -258,13 +219,3 @@ 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
+
 }
@@ -359,32 +310,2 @@ void AbTable::moveTo( char /*c*/ )
 
-#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
 }