Commit 569b43cc authored by Laurent Montel's avatar Laurent Montel 😁

Use Akonadi::Collection here

parent 3f35e0bb
......@@ -435,12 +435,12 @@ class EVENTVIEWS_EXPORT EventView : public QWidget
/**
* Copy the incidence to the specified resource.
*/
void copyIncidenceToResourceSignal( const Akonadi::Item &, const QString & );
void copyIncidenceToResourceSignal( const Akonadi::Item &, const Akonadi::Collection & );
/**
* Move the incidence to the specified resource.
*/
void moveIncidenceToResourceSignal( const Akonadi::Item &, const QString & );
void moveIncidenceToResourceSignal( const Akonadi::Item &, const Akonadi::Collection & );
/** Dissociate from a recurring incidence the occurrence on the given
* date to a new incidence or dissociate all occurrences from the
......
......@@ -1410,7 +1410,7 @@ void CalendarView::toggleTodoCompleted( const Akonadi::Item &todoItem )
mChanger->endAtomicOperation();
}
void CalendarView::copyIncidenceToResource( const Akonadi::Item &item, const QString &resourceId )
void CalendarView::copyIncidenceToResource( const Akonadi::Item &item, const Akonadi::Collection &col )
{
#ifdef AKONADI_PORT_DISABLED
if ( !incidence ) {
......@@ -1474,13 +1474,13 @@ void CalendarView::copyIncidenceToResource( const Akonadi::Item &item, const QSt
i18nc( "@title:window", "Copying Failed" ) );
}
#else
Q_UNUSED( resourceId );
Q_UNUSED( col );
Q_UNUSED( item );
kDebug() << "AKONADI PORT: Disabled code in " << Q_FUNC_INFO;
#endif
}
void CalendarView::moveIncidenceToResource( const Akonadi::Item &item, const QString &resourceId )
void CalendarView::moveIncidenceToResource( const Akonadi::Item &item, const Akonadi::Collection &col )
{
#ifdef AKONADI_PORT_DISABLED
if ( !incidence ) {
......@@ -1560,7 +1560,7 @@ void CalendarView::moveIncidenceToResource( const Akonadi::Item &item, const QSt
i18nc( "@title:window", "Moving Failed" ) );
}
#else
Q_UNUSED( resourceId );
Q_UNUSED( col );
Q_UNUSED( item );
kDebug() << "AKONADI PORT: Disabled code in " << Q_FUNC_INFO;
#endif
......
......@@ -387,8 +387,8 @@ class KORGANIZERPRIVATE_EXPORT CalendarView : public KOrg::CalendarViewBase,
void toggleAlarm( const Akonadi::Item &incidence );
void toggleTodoCompleted( const Akonadi::Item &incidence );
void copyIncidenceToResource( const Akonadi::Item &incidence, const QString &resourceId );
void moveIncidenceToResource( const Akonadi::Item &incidence, const QString &resourceId );
void copyIncidenceToResource(const Akonadi::Item &incidence, const Akonadi::Collection &col );
void moveIncidenceToResource( const Akonadi::Item &incidence, const Akonadi::Collection &col );
void dissociateOccurrences( const Akonadi::Item &incidence, const QDate &date );
/**
......
......@@ -303,12 +303,12 @@ class KORGANIZER_INTERFACES_EXPORT BaseView : public QWidget
/**
* Copy the incidence to the specified resource.
*/
void copyIncidenceToResourceSignal( const Akonadi::Item &, const QString & );
void copyIncidenceToResourceSignal( const Akonadi::Item &, const Akonadi::Collection & );
/**
* Move the incidence to the specified resource.
*/
void moveIncidenceToResourceSignal( const Akonadi::Item &, const QString & );
void moveIncidenceToResourceSignal( const Akonadi::Item &, const Akonadi::Collection & );
/** Dissociate from a recurring incidence the occurrence on the given
* date to a new incidence or dissociate all occurrences from the
......
......@@ -69,8 +69,8 @@ class KOEventPopupMenu : public QMenu
void pasteIncidenceSignal();
void toggleAlarmSignal( const Akonadi::Item & );
void toggleTodoCompletedSignal( const Akonadi::Item & );
void copyIncidenceToResourceSignal( const Akonadi::Item &, const QString & );
void moveIncidenceToResourceSignal( const Akonadi::Item &, const QString & );
void copyIncidenceToResourceSignal( const Akonadi::Item &, const Akonadi::Collection & );
void moveIncidenceToResourceSignal( const Akonadi::Item &, const Akonadi::Collection & );
void dissociateOccurrencesSignal( const Akonadi::Item &, const QDate & );
private:
......
......@@ -86,10 +86,10 @@ KOEventPopupMenu *KOEventView::eventPopup()
SIGNAL(toggleAlarmSignal(Akonadi::Item)));
connect( eventPopup, SIGNAL(toggleTodoCompletedSignal(Akonadi::Item)),
SIGNAL(toggleTodoCompletedSignal(Akonadi::Item)));
connect( eventPopup, SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,QString)),
SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,QString)));
connect( eventPopup, SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,QString)),
SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,QString)));
connect( eventPopup, SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)),
SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)));
connect( eventPopup, SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)),
SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)));
connect( eventPopup, SIGNAL(dissociateOccurrencesSignal(Akonadi::Item,QDate)),
SIGNAL(dissociateOccurrencesSignal(Akonadi::Item,QDate)) );
......
......@@ -312,10 +312,10 @@ void KOViewManager::connectView( KOrg::BaseView *view )
mMainView, SLOT(toggleAlarm(Akonadi::Item)) );
connect( view, SIGNAL(toggleTodoCompletedSignal(Akonadi::Item)),
mMainView, SLOT(toggleTodoCompleted(Akonadi::Item)) );
connect( view, SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,QString)),
mMainView, SLOT(copyIncidenceToResource(Akonadi::Item,QString)) );
connect( view, SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,QString)),
mMainView, SLOT(moveIncidenceToResource(Akonadi::Item,QString)) );
connect( view, SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)),
mMainView, SLOT(copyIncidenceToResource(Akonadi::Item,Akonadi::Collection)) );
connect( view, SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)),
mMainView, SLOT(moveIncidenceToResource(Akonadi::Item,Akonadi::Collection)) );
connect( view, SIGNAL(dissociateOccurrencesSignal(Akonadi::Item,QDate)),
mMainView, SLOT(dissociateOccurrences(Akonadi::Item,QDate)) );
......
......@@ -109,11 +109,11 @@ KOAgendaView::KOAgendaView( QWidget *parent, bool isSideBySide ) :
connect( d->mAgendaView, SIGNAL(toggleTodoCompletedSignal(Akonadi::Item)),
SIGNAL(toggleTodoCompletedSignal(Akonadi::Item)) );
connect( d->mAgendaView, SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,QString)),
SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,QString)) );
connect( d->mAgendaView, SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)),
SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)) );
connect( d->mAgendaView, SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,QString)),
SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,QString)) );
connect( d->mAgendaView, SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)),
SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)) );
connect( d->mAgendaView, SIGNAL(dissociateOccurrencesSignal(Akonadi::Item,QDate)),
SIGNAL(dissociateOccurrencesSignal(Akonadi::Item,QDate)) );
......
......@@ -79,11 +79,11 @@ KOJournalView::KOJournalView( QWidget *parent )
connect( mJournalView, SIGNAL(toggleTodoCompletedSignal(Akonadi::Item)),
SIGNAL(toggleTodoCompletedSignal(Akonadi::Item)) );
connect( mJournalView, SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,QString)),
SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,QString)) );
connect( mJournalView, SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)),
SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)) );
connect( mJournalView, SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,QString)),
SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,QString)) );
connect( mJournalView, SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)),
SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)) );
connect( mJournalView, SIGNAL(dissociateOccurrencesSignal(Akonadi::Item,QDate)),
SIGNAL(dissociateOccurrencesSignal(Akonadi::Item,QDate)) );
......
......@@ -84,11 +84,11 @@ KOListView::KOListView( const Akonadi::ETMCalendar::Ptr &calendar,
connect( mListView, SIGNAL(toggleTodoCompletedSignal(Akonadi::Item)),
SIGNAL(toggleTodoCompletedSignal(Akonadi::Item)) );
connect( mListView, SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,QString)),
SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,QString)) );
connect( mListView, SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)),
SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)) );
connect( mListView, SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,QString)),
SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,QString)) );
connect( mListView, SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)),
SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)) );
connect( mListView, SIGNAL(dissociateOccurrencesSignal(Akonadi::Item,QDate)),
SIGNAL(dissociateOccurrencesSignal(Akonadi::Item,QDate)) );
......
......@@ -95,11 +95,11 @@ MonthView::MonthView( QWidget *parent )
connect( d->mMonthView, SIGNAL(toggleTodoCompletedSignal(Akonadi::Item)),
SIGNAL(toggleTodoCompletedSignal(Akonadi::Item)) );
connect( d->mMonthView, SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,QString)),
SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,QString)) );
connect( d->mMonthView, SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)),
SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)) );
connect( d->mMonthView, SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,QString)),
SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,QString)) );
connect( d->mMonthView, SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)),
SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)) );
connect( d->mMonthView, SIGNAL(dissociateOccurrencesSignal(Akonadi::Item,QDate)),
SIGNAL(dissociateOccurrencesSignal(Akonadi::Item,QDate)) );
......
......@@ -108,11 +108,11 @@ MultiAgendaView::MultiAgendaView( QWidget *parent )
connect( d->mMultiAgendaView, SIGNAL(toggleTodoCompletedSignal(Akonadi::Item)),
SIGNAL(toggleTodoCompletedSignal(Akonadi::Item)) );
connect( d->mMultiAgendaView, SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,QString)),
SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,QString)) );
connect( d->mMultiAgendaView, SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)),
SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)) );
connect( d->mMultiAgendaView, SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,QString)),
SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,QString)) );
connect( d->mMultiAgendaView, SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)),
SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)) );
connect( d->mMultiAgendaView, SIGNAL(dissociateOccurrencesSignal(Akonadi::Item,QDate)),
SIGNAL(dissociateOccurrencesSignal(Akonadi::Item,QDate)) );
......
......@@ -96,11 +96,11 @@ KOTimelineView::KOTimelineView( QWidget *parent )
connect( d->mTimeLineView, SIGNAL(toggleTodoCompletedSignal(Akonadi::Item)),
SIGNAL(toggleTodoCompletedSignal(Akonadi::Item)) );
connect( d->mTimeLineView, SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,QString)),
SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,QString)) );
connect( d->mTimeLineView, SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)),
SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)) );
connect( d->mTimeLineView, SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,QString)),
SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,QString)) );
connect( d->mTimeLineView, SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)),
SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)) );
connect( d->mTimeLineView, SIGNAL(dissociateOccurrencesSignal(Akonadi::Item,QDate)),
SIGNAL(dissociateOccurrencesSignal(Akonadi::Item,QDate)) );
......
......@@ -67,11 +67,11 @@ KOTimeSpentView::KOTimeSpentView( QWidget *parent )
connect( mView, SIGNAL(toggleTodoCompletedSignal(Akonadi::Item)),
SIGNAL(toggleTodoCompletedSignal(Akonadi::Item)) );
connect( mView, SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,QString)),
SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,QString)) );
connect( mView, SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)),
SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)) );
connect( mView, SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,QString)),
SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,QString)) );
connect( mView, SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)),
SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)) );
connect( mView, SIGNAL(dissociateOccurrencesSignal(Akonadi::Item,QDate)),
SIGNAL(dissociateOccurrencesSignal(Akonadi::Item,QDate)) );
......
......@@ -74,11 +74,11 @@ KOTodoView::KOTodoView( bool sidebarView, QWidget *parent )
connect( mView, SIGNAL(toggleTodoCompletedSignal(Akonadi::Item)),
SIGNAL(toggleTodoCompletedSignal(Akonadi::Item)) );
connect( mView, SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,QString)),
SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,QString)) );
connect( mView, SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)),
SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)) );
connect( mView, SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,QString)),
SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,QString)) );
connect( mView, SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)),
SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)) );
connect( mView, SIGNAL(dissociateOccurrencesSignal(Akonadi::Item,QDate)),
SIGNAL(dissociateOccurrencesSignal(Akonadi::Item,QDate)) );
......
......@@ -59,11 +59,11 @@ KOWhatsNextView::KOWhatsNextView( QWidget *parent )
connect( mView, SIGNAL(toggleTodoCompletedSignal(Akonadi::Item)),
SIGNAL(toggleTodoCompletedSignal(Akonadi::Item)) );
connect( mView, SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,QString)),
SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,QString)) );
connect( mView, SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)),
SIGNAL(copyIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)) );
connect( mView, SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,QString)),
SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,QString)) );
connect( mView, SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)),
SIGNAL(moveIncidenceToResourceSignal(Akonadi::Item,Akonadi::Collection)) );
connect( mView, SIGNAL(dissociateOccurrencesSignal(Akonadi::Item,QDate)),
SIGNAL(dissociateOccurrencesSignal(Akonadi::Item,QDate)) );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment