← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/kdepim/oneiric-security

« back to all changes in this revision

Viewing changes to kaddressbook/mainwidget.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-12-22 18:24:40 UTC
  • mfrom: (0.2.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20101222182440-ju0oewt2kl096yii
Tags: 4:4.4.9-0ubuntu1
* New upstream release
* Readd kubuntu_02_kalarm_kstatusnotifieritem.diff inadvertently left out of
  debian/patches/series

Show diffs side-by-side

added added

removed removed

Lines of Context:
kaddressbook/mainwidget.cpp
142
142
  mItemTree->addMimeTypeExclusionFilter( Akonadi::Collection::mimeType() );
143
143
  mItemTree->setHeaderGroup( Akonadi::EntityTreeModel::ItemListHeaders );
144
144
 
145
 
  mContactsFilterModel = new Akonadi::ContactsFilterModel( this );
 
145
  mContactsFilterModel = new AkonadiFuture::ContactsFilterModel( this );
146
146
  mContactsFilterModel->setSourceModel( mItemTree );
147
147
  connect( mQuickSearchWidget, SIGNAL( filterStringChanged( const QString& ) ),
148
148
           mContactsFilterModel, SLOT( setFilterString( const QString& ) ) );
173
173
 
174
174
  Akonadi::Control::widgetNeedsAkonadi( this );
175
175
 
176
 
  mActionManager = new Akonadi::StandardContactActionManager( guiClient->actionCollection(), this );
 
176
  mActionManager = new AkonadiFuture::StandardContactActionManager( guiClient->actionCollection(), this );
177
177
  mActionManager->setCollectionSelectionModel( mCollectionView->selectionModel() );
178
178
  mActionManager->setItemSelectionModel( mItemView->selectionModel() );
179
179
 
180
180
  mActionManager->createAllActions();
181
181
 
182
 
  connect( mActionManager->action( Akonadi::StandardContactActionManager::CreateContact ), SIGNAL( triggered( bool ) ),
 
182
  connect( mActionManager->action( AkonadiFuture::StandardContactActionManager::CreateContact ), SIGNAL( triggered( bool ) ),
183
183
           this, SLOT( newContact() ) );
184
 
  connect( mActionManager->action( Akonadi::StandardContactActionManager::CreateContactGroup ), SIGNAL( triggered( bool ) ),
 
184
  connect( mActionManager->action( AkonadiFuture::StandardContactActionManager::CreateContactGroup ), SIGNAL( triggered( bool ) ),
185
185
           this, SLOT( newGroup() ) );
186
186
  connect( mActionManager, SIGNAL( editItem( const Akonadi::Item& ) ),
187
187
           this, SLOT( editItem( const Akonadi::Item& ) ) );