Git commit bbd1e9130ea1e58c9e6fae7c8db42af7935eea63 by Allen Winter. Committed on 01/05/2012 at 00:28. Pushed by winterz into branch 'master'. fix deprecated i18n usage minor style fixes M +21 -15 resources/google/calendar/calendarresource.cpp M +30 -22 resources/google/calendar/resource_events.cpp http://commits.kde.org/kdepim-runtime/bbd1e9130ea1e58c9e6fae7c8db42af7935ee= a63 diff --git a/resources/google/calendar/calendarresource.cpp b/resources/goo= gle/calendar/calendarresource.cpp index 04868fb..dd9c415 100644 --- a/resources/google/calendar/calendarresource.cpp +++ b/resources/google/calendar/calendarresource.cpp @@ -152,8 +152,9 @@ void CalendarResource::reloadConfig() = Account::Ptr CalendarResource::getAccount() { - if ( !m_account.isNull() ) + if ( !m_account.isNull() ) { return m_account; + } = Auth *auth =3D Auth::instance(); try { @@ -240,7 +241,6 @@ void CalendarResource::cachedItemsRetrieved( KJob *job ) fetchJob->start(); } = - bool CalendarResource::retrieveItem( const Akonadi::Item &item, const QSet= < QByteArray >& parts ) { Q_UNUSED( parts ); @@ -299,12 +299,14 @@ void CalendarResource::retrieveCollections() = FetchListJob *fetchJob; = - fetchJob =3D new FetchListJob( Services::Calendar::fetchCalendarsUrl(), = "Calendar", account->accountName() ); + fetchJob =3D new FetchListJob( Services::Calendar::fetchCalendarsUrl(), + "Calendar", account->accountName() ); connect( fetchJob, SIGNAL(finished(KJob*)), this, SLOT(calendarsReceived(KJob*)) ); fetchJob->start(); = - fetchJob =3D new FetchListJob( Services::Tasks::fetchTaskListsUrl(), "Ta= sks", account->accountName() ); + fetchJob =3D new FetchListJob( Services::Tasks::fetchTaskListsUrl(), + "Tasks", account->accountName() ); connect( fetchJob, SIGNAL(finished(KJob*)), this, SLOT(taskListReceived(KJob*)) ); fetchJob->start(); @@ -347,14 +349,15 @@ void CalendarResource::itemAdded( const Akonadi::Item= &item, const Akonadi::Coll = service =3D "Tasks"; url =3D Services::Tasks::createTaskUrl( collection.remoteId() ); - if ( !todo->relatedTo( Incidence::RelTypeParent ).isEmpty() ) + if ( !todo->relatedTo( Incidence::RelTypeParent ).isEmpty() ) { url.addQueryItem( "parent", todo->relatedTo( Incidence::RelTypeParen= t ) ); + } = Services::Tasks service; data =3D service.objectToJSON( static_cast< KGoogle::Object * >( &ktod= o ) ); = } else { - cancelTask( i18n( "Unknown payload type '%1'" ).arg( item.mimeType() )= ); + cancelTask( i18n( "Unknown payload type '%1'", item.mimeType() ) ); return; } = @@ -366,7 +369,8 @@ void CalendarResource::itemAdded( const Akonadi::Item &= item, const Akonadi::Coll m_gam->sendRequest( request ); } = -void CalendarResource::itemChanged( const Akonadi::Item &item, const QSet<= QByteArray >& partIdentifiers ) +void CalendarResource::itemChanged( const Akonadi::Item &item, + const QSet< QByteArray > &partIdentifi= ers ) { QUrl url; QByteArray data; @@ -420,7 +424,7 @@ void CalendarResource::itemChanged( const Akonadi::Item= &item, const QSet< QByte m_gam->sendRequest( request ); = } else { - cancelTask( i18n( "Unknown payload type '%1'" ).arg( item.mimeType() )= ); + cancelTask( i18n( "Unknown payload type '%1'", item.mimeType() ) ); return; } = @@ -432,7 +436,6 @@ void CalendarResource::itemRemoved( const Akonadi::Item= &item ) QString service; QUrl url; = - Account::Ptr account =3D getAccount(); if ( account.isNull() ) { deferTask(); @@ -462,13 +465,15 @@ void CalendarResource::itemRemoved( const Akonadi::It= em &item ) fetchJob->start(); = } else { - cancelTask( i18n( "Unknown payload type '%1'" ).arg( item.mimeType() )= ); + cancelTask( i18n( "Unknown payload type '%1'", item.mimeType() ) ); return; } = } = -void CalendarResource::itemMoved( const Item &item, const Collection &coll= ectionSource, const Collection &collectionDestination ) +void CalendarResource::itemMoved( const Item &item, + const Collection &collectionSource, + const Collection &collectionDestination ) { QString service; QUrl url; @@ -485,17 +490,19 @@ void CalendarResource::itemMoved( const Item &item, c= onst Collection &collection } = /* Moving tasks between task lists is not supported */ - if ( item.mimeType() !=3D Event::eventMimeType() ) + if ( item.mimeType() !=3D Event::eventMimeType() ) { return; + } = - url =3D Services::Calendar::moveEventUrl( collectionSource.remoteId(), c= ollectionDestination.remoteId(), item.remoteId() ); + url =3D Services::Calendar::moveEventUrl( collectionSource.remoteId(), + collectionDestination.remoteId(), + item.remoteId() ); Request *request =3D new Request( url, KGoogle::Request::Move, "Calendar= ", account ); request->setProperty( "Item", qVariantFromValue( item ) ); = m_gam->sendRequest( request ); } = - void CalendarResource::replyReceived( KGoogle::Reply *reply ) { switch ( reply->requestType() ) { @@ -648,5 +655,4 @@ void CalendarResource::emitPercent( KJob *job, ulong pr= ogress ) Q_EMIT percent( progress ); } = - AKONADI_RESOURCE_MAIN( CalendarResource ); diff --git a/resources/google/calendar/resource_events.cpp b/resources/goog= le/calendar/resource_events.cpp index b9b69f4..3491f65 100644 --- a/resources/google/calendar/resource_events.cpp +++ b/resources/google/calendar/resource_events.cpp @@ -42,7 +42,7 @@ using namespace KGoogle; void CalendarResource::calendarsReceived( KJob *job ) { if ( job->error() ) { - Q_EMIT status( Broken, i18n( "Failed to fetch calendars: %1" ).arg( jo= b->errorString() ) ); + Q_EMIT status( Broken, i18n( "Failed to fetch calendars: %1", job->err= orString() ) ); cancelTask(); return; } @@ -56,22 +56,27 @@ void CalendarResource::calendarsReceived( KJob *job ) = Objects::Calendar *calendar =3D static_cast< Objects::Calendar * >( re= plyData ); = - if ( !calendars.contains( calendar->uid() ) ) + if ( !calendars.contains( calendar->uid() ) ) { continue; + } = Collection collection; collection.setRemoteId( calendar->uid() ); collection.setParentCollection( m_collections.first() ); collection.setContentMimeTypes( QStringList() << Event::eventMimeType(= ) ); collection.setName( calendar->title() ); - collection.setRights( Collection::CanCreateItem | Collection::CanChang= eItem | Collection::CanDeleteItem ); + collection.setRights( Collection::CanCreateItem | + Collection::CanChangeItem | + Collection::CanDeleteItem ); = EntityDisplayAttribute *attr =3D new EntityDisplayAttribute; attr->setDisplayName( calendar->title() ); attr->setIconName( "text-calendar" ); collection.addAttribute( attr ); = - DefaultReminderAttribute *reminderAttr =3D new DefaultReminderAttribut= e( calendar->defaultReminders() ); + DefaultReminderAttribute *reminderAttr =3D + new DefaultReminderAttribute( calendar->defaultReminders() ); + collection.addAttribute( reminderAttr ); = m_collections.append( collection ); @@ -93,14 +98,14 @@ void CalendarResource::eventReceived( KGoogle::Reply *r= eply ) { if ( reply->error() !=3D OK ) { cancelTask(); - Q_EMIT status( Broken, i18n( "Failed to fetch event: %1" ).arg( reply-= >errorString() ) ); + Q_EMIT status( Broken, i18n( "Failed to fetch event: %1", reply->error= String() ) ); return; } = QList< Object * > data =3D reply->replyData(); if ( data.length() !=3D 1 ) { kWarning() << "Server send " << data.length() << "items, which is not = OK"; - cancelTask( i18n( "Expected a single item, server sent %1 items." ).ar= g( data.length() ) ); + cancelTask( i18n( "Expected a single item, server sent %1 items.", dat= a.length() ) ); return; } = @@ -110,10 +115,11 @@ void CalendarResource::eventReceived( KGoogle::Reply = *reply ) = if ( event->useDefaultReminders() ) { Collection collection =3D item.parentCollection(); - DefaultReminderAttribute *attr =3D dynamic_cast< DefaultReminderAttrib= ute * >( collection.attribute( "defaultReminders" ) ); + DefaultReminderAttribute *attr =3D + dynamic_cast< DefaultReminderAttribute * >( collection.attribute( "d= efaultReminders" ) ); if ( attr ) { Alarm::List alarms =3D attr->alarms( event ); - Q_FOREACH( Alarm::Ptr alarm, alarms ) { + Q_FOREACH ( Alarm::Ptr alarm, alarms ) { event->addAlarm( alarm ); } } @@ -124,22 +130,24 @@ void CalendarResource::eventReceived( KGoogle::Reply = *reply ) item.setMimeType( Event::eventMimeType() ); item.setPayload< Event::Ptr >( EventPtr( event ) ); = - if ( event->deleted() ) + if ( event->deleted() ) { itemsRetrievedIncremental( Item::List(), Item::List() << item ); - else + } else { itemRetrieved( item ); + } } = void CalendarResource::eventsReceived( KJob *job ) { if ( job->error() ) { - cancelTask( i18n( "Failed to fetch events: %1" ).arg( job->errorString= () ) ); + cancelTask( i18n( "Failed to fetch events: %1", job->errorString() ) ); return; } = FetchListJob *fetchJob =3D dynamic_cast< FetchListJob * >( job ); Collection collection =3D fetchJob->property( "collection" ).value< Coll= ection >(); - DefaultReminderAttribute *attr =3D dynamic_cast< DefaultReminderAttribut= e * >( collection.attribute( "defaultReminders" ) ); + DefaultReminderAttribute *attr =3D + dynamic_cast< DefaultReminderAttribute * >( collection.attribute( "def= aultReminders" ) ); = Item::List removed; Item::List changed; @@ -152,7 +160,7 @@ void CalendarResource::eventsReceived( KJob *job ) = if ( event->useDefaultReminders() && attr ) { Alarm::List alarms =3D attr->alarms( event ); - Q_FOREACH( Alarm::Ptr alarm, alarms ) { + Q_FOREACH ( Alarm::Ptr alarm, alarms ) { event->addAlarm( alarm ); } } @@ -182,11 +190,11 @@ void CalendarResource::eventsReceived( KJob *job ) item.setMimeType( Event::eventMimeType() ); item.setParentCollection( collection ); = - if ( event->deleted() ) + if ( event->deleted() ) { removed << item; - else + } else { changed << item; - + } } = /* Now process the recurrent events */ @@ -213,14 +221,14 @@ void CalendarResource::eventsReceived( KJob *job ) void CalendarResource::eventCreated( KGoogle::Reply *reply ) { if ( reply->error() !=3D OK ) { - cancelTask( i18n( "Failed to create a new event: %1" ).arg( reply->err= orString() ) ); + cancelTask( i18n( "Failed to create a new event: %1", reply->errorStri= ng() ) ); return; } = QList< Object * > data =3D reply->replyData(); if ( data.length() !=3D 1 ) { kWarning() << "Server send " << data.length() << "items, which is not = OK"; - cancelTask( i18n( "Expected a single item, server sent %1 items." ).ar= g( data.length() ) ); + cancelTask( i18n( "Expected a single item, server sent %1 items.", dat= a.length() ) ); return; } = @@ -239,14 +247,14 @@ void CalendarResource::eventCreated( KGoogle::Reply *= reply ) void CalendarResource::eventUpdated( KGoogle::Reply *reply ) { if ( reply->error() !=3D OK ) { - cancelTask( i18n( "Failed to update an event: %1" ).arg( reply->errorS= tring() ) ); + cancelTask( i18n( "Failed to update an event: %1", reply->errorString(= ) ) ); return; } = QList< Object * > data =3D reply->replyData(); if ( data.length() !=3D 1 ) { kWarning() << "Server send " << data.length() << "items, which is not = OK"; - cancelTask( i18n( "Expected a single item, server sent %1 items." ).ar= g( data.length() ) ); + cancelTask( i18n( "Expected a single item, server sent %1 items.", dat= a.length() ) ); return; } = @@ -261,7 +269,7 @@ void CalendarResource::eventUpdated( KGoogle::Reply *re= ply ) void CalendarResource::eventRemoved( KGoogle::Reply *reply ) { if ( reply->error() !=3D NoContent ) { - cancelTask( i18n( "Failed to delete event: %1" ).arg( reply->errorStri= ng() ) ); + cancelTask( i18n( "Failed to delete event: %1", reply->errorString() )= ); return; } = @@ -272,7 +280,7 @@ void CalendarResource::eventRemoved( KGoogle::Reply *re= ply ) void CalendarResource::eventMoved( KGoogle::Reply *reply ) { if ( reply->error() !=3D OK ) { - cancelTask( i18n( "Failed to move event: %1" ).arg( reply->errorString= () ) ); + cancelTask( i18n( "Failed to move event: %1", reply->errorString() ) ); return; } =