Commit 7198ea0c authored by Allen Winter's avatar Allen Winter
Browse files

use new CalendarSupport::displayName()

parent fc2aa277
......@@ -209,7 +209,7 @@ AlarmDialog::AlarmDialog( CalendarSupport::Calendar *calendar, QWidget *parent )
connect( mIncidenceTree, SIGNAL(itemSelectionChanged()),
SLOT(update()) );
mDetailView = new CalendarSupport::IncidenceViewer( topBox );
mDetailView = new CalendarSupport::IncidenceViewer( mCalendar, topBox );
QString s;
s = i18nc( "@info default incidence details string",
"<emphasis>Select an event or to-do from the list above "
......@@ -333,7 +333,7 @@ void AlarmDialog::addIncidence( const Akonadi::Item &incidenceitem,
item->mTrigger, false, true, KDateTime::Spec::LocalZone() ) );
QString tip =
IncidenceFormatter::toolTipStr(
CalendarSupport::displayName( incidenceitem.parentCollection() ),
CalendarSupport::displayName( mCalendar, incidenceitem.parentCollection() ),
incidence,
item->mRemindAt.date(), true,
KDateTime::Spec::LocalZone() );
......@@ -934,8 +934,10 @@ bool AlarmDialog::openIncidenceEditorNG( const Akonadi::Item &item )
IncidenceEditorNG::GroupwareIntegration::activate( mCalendar );
}
Incidence::Ptr incidence = CalendarSupport::incidence( item );
IncidenceEditorNG::IncidenceDialog *dialog = IncidenceEditorNG::IncidenceDialogFactory::create( false/*doesn't need initial saving*/,
incidence->type(), this );
IncidenceEditorNG::IncidenceDialog *dialog =
IncidenceEditorNG::IncidenceDialogFactory::create(
false, /*doesn't need initial saving*/
incidence->type(), this );
dialog->load( item );
return true;
}
......
......@@ -692,7 +692,7 @@ QVariant KOTodoModel::data( const QModelIndex &index, int role ) const
case DescriptionColumn:
return QVariant( todo->description() );
case CalendarColumn:
return QVariant( CalendarSupport::displayName( node->mTodo.parentCollection() ) );
return QVariant( CalendarSupport::displayName( mCalendar, node->mTodo.parentCollection() ) );
}
return QVariant();
}
......@@ -714,7 +714,7 @@ QVariant KOTodoModel::data( const QModelIndex &index, int role ) const
case DescriptionColumn:
return QVariant( todo->description() );
case CalendarColumn:
return QVariant( CalendarSupport::displayName( node->mTodo.parentCollection() ) );
return QVariant( CalendarSupport::displayName( mCalendar, node->mTodo.parentCollection() ) );
}
return QVariant();
}
......@@ -723,7 +723,7 @@ QVariant KOTodoModel::data( const QModelIndex &index, int role ) const
if ( role == Qt::ToolTipRole ) {
if ( KOPrefs::instance()->enableToolTips() ) {
return QVariant( IncidenceFormatter::toolTipStr(
CalendarSupport::displayName( node->mTodo.parentCollection() ),
CalendarSupport::displayName( mCalendar, node->mTodo.parentCollection() ),
todo, QDate(), true,
CalendarSupport::KCalPrefs::instance()->timeSpec() ) );
} else {
......
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