[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/protocols/groupwise/ui
From:       Will Stephenson <wstephenson () kde ! org>
Date:       2008-09-26 19:37:37
Message-ID: 1222457857.108667.15016.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 865128 by wstephens:

Revert guesswork; apply correct fix for \
https://bugzilla.novell.com/show_bug.cgi?id=336059

 M  +18 -22    gwsearch.cpp  
 M  +0 -1      gwsearch.h  


--- trunk/KDE/kdenetwork/kopete/protocols/groupwise/ui/gwsearch.cpp #865127:865128
@@ -246,12 +246,19 @@
 };
 
 GroupWiseContactSearch::GroupWiseContactSearch( GroupWiseAccount * account, \
                QAbstractItemView::SelectionMode mode, bool onlineOnly,  QWidget \
                *parent )
- : QWidget( parent ), m_account( account ), m_model(0), m_proxyModel(0), \
m_onlineOnly(onlineOnly) + : QWidget( parent ), m_account( account )
 {
 	setupUi( this );
 	connect( m_details, SIGNAL( clicked() ), SLOT( slotShowDetails() ) );
 	connect( m_search, SIGNAL( clicked() ), SLOT( slotDoSearch() ) );
 	connect( m_clear, SIGNAL( clicked() ), SLOT( slotClear() ) );
+	if ( onlineOnly ) {
+		m_proxyModel = new OnlineOnlyGroupWiseContactSearchSortProxyModel( this );
+	} else {
+		m_proxyModel = new GroupWiseContactSearchSortProxyModel( this );
+	}
+	m_proxyModel->setDynamicSortFilter(true);
+
 	m_results->header()->setClickable( true );
 	m_results->header()->setSortIndicator( 0, Qt::DescendingOrder );
 	m_results->header()->setSortIndicatorShown( true );
@@ -361,20 +368,17 @@
 GroupWise::ContactDetails GroupWiseContactSearch::detailsAtIndex( const QModelIndex \
& index ) const  {
 	GroupWise::ContactDetails dt;
-	if (m_proxyModel) {
-		dt.dn = m_proxyModel->data( index, GroupWiseContactSearchModel::DnRole \
                ).toString();
-		dt.givenName = m_proxyModel->data( index, \
                GroupWiseContactSearchModel::GivenNameRole ).toString();
-		dt.surname = m_proxyModel->data( index, GroupWiseContactSearchModel::SurnameRole \
                ).toString();
-		dt.fullName = m_proxyModel->data( index, GroupWiseContactSearchModel::FullNameRole \
                ).toString();
-		dt.awayMessage = m_proxyModel->data( index, \
                GroupWiseContactSearchModel::AwayMessageRole ).toString();
-		dt.authAttribute = m_proxyModel->data( index, \
                GroupWiseContactSearchModel::AuthAttributeRole ).toString();
-		dt.status = m_proxyModel->data( index, GroupWiseContactSearchModel::StatusRole \
                ).toInt();
-		dt.archive = m_proxyModel->data( index, GroupWiseContactSearchModel::ArchiveRole \
                ).toBool();
-		dt.properties = m_proxyModel->data( index, \
                GroupWiseContactSearchModel::PropertiesRole ).toMap();
-	}
+	dt.dn = m_proxyModel->data( index, GroupWiseContactSearchModel::DnRole \
).toString(); +	dt.givenName = m_proxyModel->data( index, \
GroupWiseContactSearchModel::GivenNameRole ).toString(); +	dt.surname = \
m_proxyModel->data( index, GroupWiseContactSearchModel::SurnameRole ).toString(); \
+	dt.fullName = m_proxyModel->data( index, GroupWiseContactSearchModel::FullNameRole \
).toString(); +	dt.awayMessage = m_proxyModel->data( index, \
GroupWiseContactSearchModel::AwayMessageRole ).toString(); +	dt.authAttribute = \
m_proxyModel->data( index, GroupWiseContactSearchModel::AuthAttributeRole \
).toString(); +	dt.status = m_proxyModel->data( index, \
GroupWiseContactSearchModel::StatusRole ).toInt(); +	dt.archive = m_proxyModel->data( \
index, GroupWiseContactSearchModel::ArchiveRole ).toBool(); +	dt.properties = \
m_proxyModel->data( index, GroupWiseContactSearchModel::PropertiesRole ).toMap();  \
return dt;  }
-
 void GroupWiseContactSearch::slotGotSearchResults()
 {
 	kDebug() ;
@@ -382,15 +386,7 @@
 	m_lastSearchResults.clear();
 	m_lastSearchResults = st->results();
 
-	delete m_proxyModel;
-	delete m_model;
 	m_model = new GroupWiseContactSearchModel( m_lastSearchResults, m_account, this );
-	if ( m_onlineOnly ) {
-		m_proxyModel = new OnlineOnlyGroupWiseContactSearchSortProxyModel( this );
-	} else {
-		m_proxyModel = new GroupWiseContactSearchSortProxyModel( this );
-	}
-	m_proxyModel->setDynamicSortFilter(true);
 	//new ModelTest( m_model, this );
 	m_proxyModel->setSourceModel( m_model );
 	m_results->setModel( m_proxyModel );
@@ -403,7 +399,7 @@
 	{
 		QItemSelectionModel * selectionModel = m_results->selectionModel();
 		QItemSelection rowSelection;
-		rowSelection.select( m_model->index( 0, 0, QModelIndex() ), m_model->index(0, 3, \
QModelIndex() ) ); +		rowSelection.select( m_proxyModel->index( 0, 0, QModelIndex() \
), m_proxyModel->index(0, 3, QModelIndex() ) );  selectionModel->select( \
rowSelection, QItemSelectionModel::Select );  }
 	kDebug() << "selectionModel is " << m_results->selectionModel();
--- trunk/KDE/kdenetwork/kopete/protocols/groupwise/ui/gwsearch.h #865127:865128
@@ -58,7 +58,6 @@
 	GroupWiseContactSearchSortProxyModel * m_proxyModel;
 	GroupWiseAccount * m_account;
 	QList< GroupWise::ContactDetails > m_lastSearchResults;
-	bool m_onlineOnly;
 };
 
 #endif


[prev in list] [next in list] [prev in thread] [next in thread]