← Back to branch summary

~ubuntu-branches/ubuntu/raring/kdepim/raring-proposed

« back to all changes in this revision

Viewing changes to korganizer/views/journalview/kojournalview.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2012-06-07 07:56:38 UTC
  • mfrom: (0.2.27)
  • Revision ID: package-import@ubuntu.com-20120607075638-0luhdq11z7sgvs4m
Tags: 4:4.8.80-0ubuntu1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
korganizer/views/journalview/kojournalview.cpp
27
27
 
28
28
#include "kojournalview.h"
29
29
#include "journalview.h"
30
 
#include "koglobals.h"
31
30
#include "koprefs.h"
32
31
 
33
32
#include <calendarsupport/calendar.h>
34
33
#include <calendarsupport/utils.h>
35
34
 
36
 
#include <KDebug>
37
 
#include <KLocale>
38
35
#include <KVBox>
39
36
 
 
37
#include <QEvent>
40
38
#include <QScrollArea>
41
 
#include <QLayout>
42
 
#include <QLabel>
43
39
#include <QVBoxLayout>
44
40
 
45
41
using namespace KOrg;
166
162
  Q_UNUSED( date );
167
163
  clearEntries();
168
164
  Q_FOREACH ( const Akonadi::Item &i, incidences ) {
169
 
    if ( const Journal::Ptr j = CalendarSupport::journal( i ) ) {
 
165
    if ( const KCalCore::Journal::Ptr j = CalendarSupport::journal( i ) ) {
170
166
      appendJournal( i, j->dtStart().date() );
171
167
    }
172
168
  }
174
170
 
175
171
void KOJournalView::changeIncidenceDisplay( const Akonadi::Item &incidence, int action )
176
172
{
177
 
  if ( Journal::Ptr journal = CalendarSupport::journal( incidence ) ) {
178
 
    switch(action) {
 
173
  if ( KCalCore::Journal::Ptr journal = CalendarSupport::journal( incidence ) ) {
 
174
    switch ( action ) {
179
175
    case CalendarSupport::IncidenceChanger::INCIDENCEADDED:
180
176
      appendJournal( incidence, journal->dtStart().date() );
181
177
      break;
214
210
bool KOJournalView::eventFilter ( QObject *object, QEvent *event )
215
211
{
216
212
  Q_UNUSED( object );
217
 
  switch( event->type() ) {
 
213
  switch ( event->type() ) {
218
214
  case QEvent::MouseButtonDblClick:
219
215
    emit newJournalSignal( QDate() );
220
216
    return true;