← Back to branch summary

~ubuntu-branches/ubuntu/quantal/kdepim/quantal

« back to all changes in this revision

Viewing changes to mobile/contacts/contacteditorview.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2011-12-15 14:17:51 UTC
  • mto: This revision was merged to the branch mainline in revision 193.
  • Revision ID: package-import@ubuntu.com-20111215141751-bmhdpiwl23wd9w26
Tags: upstream-4.7.90
Import upstream version 4.7.90

Show diffs side-by-side

added added

removed removed

Lines of Context:
mobile/contacts/contacteditorview.cpp
219
219
  qmlRegisterType<DeclarativeEditorCrypto>( "org.kde.contacteditors", 4, 5, "ContactEditorCrypto" );
220
220
  qmlRegisterType<DeclarativeEditorMore>( "org.kde.contacteditors", 4, 5, "ContactEditorMore" );
221
221
 
222
 
  connect( d->mItemManager, SIGNAL( itemSaveFinished( IncidenceEditorNG::EditorItemManager::SaveAction ) ),
223
 
           SLOT( saveFinished() ) );
224
 
  connect( d->mItemManager, SIGNAL( itemSaveFailed( IncidenceEditorNG::EditorItemManager::SaveAction, QString ) ),
225
 
           SLOT( saveFailed( IncidenceEditorNG::EditorItemManager::SaveAction, QString ) ) );
 
222
  connect( d->mItemManager, SIGNAL(itemSaveFinished(IncidenceEditorNG::EditorItemManager::SaveAction)),
 
223
           SLOT(saveFinished()) );
 
224
  connect( d->mItemManager, SIGNAL(itemSaveFailed(IncidenceEditorNG::EditorItemManager::SaveAction,QString)),
 
225
           SLOT(saveFailed(IncidenceEditorNG::EditorItemManager::SaveAction,QString)) );
226
226
}
227
227
 
228
228
ContactEditorView::~ContactEditorView()
241
241
    if ( d->mCollection.isValid() ) {
242
242
      d->mEditorGeneral->setDefaultCollection( d->mCollection );
243
243
    }
244
 
    connect( d->mEditorGeneral, SIGNAL( saveClicked() ), SLOT( save() ) );
245
 
    connect( d->mEditorGeneral, SIGNAL( cancelClicked() ), SLOT( cancel() ) );
246
 
    connect( d->mEditorGeneral, SIGNAL( collectionChanged( Akonadi::Collection ) ),
247
 
             SLOT( collectionChanged( Akonadi::Collection ) ) );
248
 
    connect( d->mEditorGeneral, SIGNAL( requestLaunchAccountWizard() ),
249
 
             this, SIGNAL( requestLaunchAccountWizard() ) );
 
244
    connect( d->mEditorGeneral, SIGNAL(saveClicked()), SLOT(save()) );
 
245
    connect( d->mEditorGeneral, SIGNAL(cancelClicked()), SLOT(cancel()) );
 
246
    connect( d->mEditorGeneral, SIGNAL(collectionChanged(Akonadi::Collection)),
 
247
             SLOT(collectionChanged(Akonadi::Collection)) );
 
248
    connect( d->mEditorGeneral, SIGNAL(requestLaunchAccountWizard()),
 
249
             this, SIGNAL(requestLaunchAccountWizard()) );
250
250
  }
251
251
}
252
252
 
272
272
  d->mEditorMore = editor;
273
273
 
274
274
  if ( d->mEditorBusiness ) {
275
 
    connect( d->mEditorBusiness, SIGNAL( organizationChanged( const QString& ) ),
276
 
             d->mEditorMore, SLOT( updateOrganization( const QString& ) ) );
 
275
    connect( d->mEditorBusiness, SIGNAL(organizationChanged(QString)),
 
276
             d->mEditorMore, SLOT(updateOrganization(QString)) );
277
277
  } else {
278
278
    qWarning( "No business editor set!" );
279
279
  }
280
280
 
281
 
  connect( d->mEditorGeneral, SIGNAL( nameChanged( const KABC::Addressee& ) ),
282
 
           d->mEditorMore, SLOT( updateName( const KABC::Addressee& ) ) );
283
 
  connect( d->mEditorMore, SIGNAL( nameChanged( const KABC::Addressee& ) ),
284
 
           d->mEditorGeneral, SLOT( updateName( const KABC::Addressee& ) ) );
 
281
  connect( d->mEditorGeneral, SIGNAL(nameChanged(KABC::Addressee)),
 
282
           d->mEditorMore, SLOT(updateName(KABC::Addressee)) );
 
283
  connect( d->mEditorMore, SIGNAL(nameChanged(KABC::Addressee)),
 
284
           d->mEditorGeneral, SLOT(updateName(KABC::Addressee)) );
285
285
}
286
286
 
287
287
void ContactEditorView::setDefaultCollection( const Akonadi::Collection &collection )