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

List:       kde-commits
Subject:    branches/KDE/4.1/kdenetwork/kopete/protocols/groupwise
From:       Will Stephenson <wstephenson () kde ! org>
Date:       2008-09-26 14:45:07
Message-ID: 1222440307.466042.5011.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 865058 by wstephens:

Merge -r865057 - various memory management cleanups

 M  +1 -4      gwaccount.cpp  
 M  +1 -1      gwaccount.h  
 M  +21 -17    ui/gwsearch.cpp  
 M  +1 -0      ui/gwsearch.h  


--- branches/KDE/4.1/kdenetwork/kopete/protocols/groupwise/gwaccount.cpp \
#865057:865058 @@ -92,7 +92,6 @@
 										 SLOT( slotPrivacy() ) );
 			
 	m_connector = 0;
-    m_qcaInit = new QCA::Initializer;
 	m_QCATLS = 0;
 	m_tlsHandler = 0;
 	m_clientStream = 0;
@@ -266,10 +265,8 @@
 	}
 	// set up network classes
 	m_connector = new KNetworkConnector( 0 );
-	//myConnector->setOptHostPort( "localhost", 8300 );
 	m_connector->setOptHostPort( server(), port() );
 	m_connector->setOptSSL( true );
-	Q_ASSERT( QCA::isSupported("tls") );
 	m_QCATLS = new QCA::TLS;
 	m_tlsHandler = new QCATLSHandler( m_QCATLS );
 	if( QCA::haveSystemStore() )
@@ -302,7 +299,7 @@
 	// not implemented: error
 	QObject::connect( m_clientStream, SIGNAL( error(int) ), SLOT( slotCSError(int) ) );
 
-	m_client = new Client( this, CMSGPRES_GW_6_5 );
+	m_client = new Client( 0, CMSGPRES_GW_6_5 );
 
 	// NB these are prefixed with QObject:: to avoid any chance of a clash with our \
connect() methods.  // we connected successfully
--- branches/KDE/4.1/kdenetwork/kopete/protocols/groupwise/gwaccount.h #865057:865058
@@ -337,7 +337,7 @@
 	KAction * m_actionJoinChatRoom;
 	// Network code
 	KNetworkConnector * m_connector;
-	QCA::Initializer * m_qcaInit;
+	QCA::Initializer m_qcaInit;
 	QCA::TLS * m_QCATLS;
 	QCATLSHandler *	m_tlsHandler;
 	ClientStream * m_clientStream;
--- branches/KDE/4.1/kdenetwork/kopete/protocols/groupwise/ui/gwsearch.cpp \
#865057:865058 @@ -246,19 +246,12 @@
 };
 
 GroupWiseContactSearch::GroupWiseContactSearch( GroupWiseAccount * account, \
                QAbstractItemView::SelectionMode mode, bool onlineOnly,  QWidget \
                *parent )
- : QWidget( parent ), m_account( account )
+ : QWidget( parent ), m_account( account ), m_model(0), m_proxyModel(0), \
m_onlineOnly(onlineOnly)  {
 	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 );
@@ -368,17 +361,20 @@
 GroupWise::ContactDetails GroupWiseContactSearch::detailsAtIndex( const QModelIndex \
& index ) const  {
 	GroupWise::ContactDetails dt;
-	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(); +	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(); +	}
 	return dt;
 }
+
 void GroupWiseContactSearch::slotGotSearchResults()
 {
 	kDebug() ;
@@ -386,7 +382,15 @@
 	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 );
--- branches/KDE/4.1/kdenetwork/kopete/protocols/groupwise/ui/gwsearch.h \
#865057:865058 @@ -58,6 +58,7 @@
 	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]