SVN_SILENT - sigh have to merge one by one, since group merge is timing out. No fun.

Merged revisions 817604 via svnmerge from 
svn+ssh://pradeepto@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r817604 | tilladam | 2008-06-06 17:30:23 +0530 (Fri, 06 Jun 2008) | 2 lines
  
  Coding style, don't crash on search, initialize the new member.
........

svn path=/branches/KDE/3.5/kdepim/; revision=828994
wilder-work
Pradeepto Bhattacharya 18 years ago
parent c1994be4b6
commit 1acacda112
  1. 11
      recipientspicker.cpp
  2. 6
      recipientspicker.h

@ -345,6 +345,7 @@ RecipientsPicker::RecipientsPicker( QWidget *parent )
#ifndef KDEPIM_NEW_DISTRLISTS
, mDistributionListManager( 0 )
#endif
,mLdapSearchDialog( 0 )
{
// KWin::setType( winId(), NET::Dock );
@ -842,12 +843,12 @@ void RecipientsPicker::resetSearch()
void RecipientsPicker::slotSearchLDAP()
{
if ( !ldapSearchDialog ) {
ldapSearchDialog = new KPIM::LDAPSearchDialog( this );
connect( ldapSearchDialog, SIGNAL( addresseesAdded() ),
if ( !mLdapSearchDialog ) {
mLdapSearchDialog = new KPIM::LDAPSearchDialog( this );
connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ),
SLOT(ldapSearchResult() ) );
}
ldapSearchDialog->show();
mLdapSearchDialog->show();
}
@ -855,7 +856,7 @@ void RecipientsPicker::ldapSearchResult()
{
kdDebug() << k_funcinfo ;
QStringList emails = QStringList::split(',', ldapSearchDialog->selectedEMails() );
QStringList emails = QStringList::split(',', mLdapSearchDialog->selectedEMails() );
QStringList::iterator it( emails.begin() );
QStringList::iterator end( emails.end() );
for ( ; it != end; ++it ){

@ -229,10 +229,10 @@ class RecipientsPicker : public QDialog
QPushButton *mToButton;
QPushButton *mCcButton;
QPushButton *mBccButton;
QPushButton *mSearchLDAPButton;
KPIM::LDAPSearchDialog *ldapSearchDialog;
KPIM::LDAPSearchDialog *mLdapSearchDialog;
QMap<int,RecipientsCollection *> mCollectionMap;
RecipientsCollection *mAllRecipients;
RecipientsCollection *mDistributionLists;

Loading…
Cancel
Save