[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/pim/mailody/src
From: Stephen Kelly <steveire () gmail ! com>
Date: 2009-12-30 17:46:53
Message-ID: 1262195213.984849.5054.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1067825 by skelly:
Update mailody for ETM changes.
M +3 -3 composer.cpp
M +2 -3 contacttreemodel.cpp
M +1 -1 contacttreemodel.h
M +1 -1 mainwindow.cpp
M +1 -2 messagewidget.cpp
--- trunk/extragear/pim/mailody/src/composer.cpp #1067824:1067825
@@ -92,8 +92,7 @@
monitor->setMimeTypeMonitored( KABC::Addressee::mimeType(), true );
//monitor->setMimeTypeMonitored( KABC::ContactGroup::mimeType(), true );
- ContactTreeModel* addressbookModel =
- new ContactTreeModel( Session::defaultSession(), monitor, this );
+ ContactTreeModel* addressbookModel = new ContactTreeModel( monitor, this );
addressbookModel->setIncludeRootCollection( false );
ContactToolTipProxyModel* tooltip =
@@ -141,11 +140,12 @@
Session *session = new Session( QByteArray( "ImageViewAplication-" ) + \
QByteArray::number( qrand() ), this );
ChangeRecorder *changeRecorder = new ChangeRecorder( this );
+ changeRecorder->setSession( session );
changeRecorder->setItemFetchScope( scope );
changeRecorder->setCollectionMonitored( Collection::root() );
changeRecorder->setMimeTypeMonitored( "application/x-vnd.kde.image", true );
- EntityTreeModel *model = new EntityTreeModel( session, changeRecorder, this );
+ EntityTreeModel *model = new EntityTreeModel( changeRecorder, this );
model->setItemPopulationStrategy( EntityTreeModel::NoItemPopulation );
EntityTreeView *lv = new EntityTreeView( splitter );
--- trunk/extragear/pim/mailody/src/contacttreemodel.cpp #1067824:1067825
@@ -28,9 +28,8 @@
using namespace Mailody;
-ContactTreeModel::ContactTreeModel( Akonadi::Session *session,
- Akonadi::ChangeRecorder *monitor, QObject \
*parent )
- : Akonadi::EntityTreeModel( session, monitor, parent )
+ContactTreeModel::ContactTreeModel( Akonadi::ChangeRecorder *monitor, QObject \
*parent ) + : Akonadi::EntityTreeModel( monitor, parent )
{
}
--- trunk/extragear/pim/mailody/src/contacttreemodel.h #1067824:1067825
@@ -39,7 +39,7 @@
enum Role { AddressRole = EntityTreeModel::UserRole+1,
UserRole = EntityTreeModel::UserRole+1000
};
- ContactTreeModel( Akonadi::Session*, Akonadi::ChangeRecorder*, QObject* );
+ ContactTreeModel( Akonadi::ChangeRecorder*, QObject* );
protected:
virtual QVariant data( const QModelIndex &index, int role=Qt::DisplayRole ) \
const;
--- trunk/extragear/pim/mailody/src/mainwindow.cpp #1067824:1067825
@@ -286,7 +286,7 @@
monitor->setMimeTypeMonitored( "message/rfc822" );
monitor->itemFetchScope().fetchFullPayload( true );
- Akonadi::EntityTreeModel* collectionModel = new EntityTreeModel( session, \
monitor, this ); + Akonadi::EntityTreeModel* collectionModel = new \
EntityTreeModel( monitor, this );
collectionModel->setItemPopulationStrategy( EntityTreeModel::LazyPopulation );
EntityMimeTypeFilterModel *collectionFilter = new EntityMimeTypeFilterModel( \
this );
--- trunk/extragear/pim/mailody/src/messagewidget.cpp #1067824:1067825
@@ -49,8 +49,7 @@
monitor->setCollectionMonitored( Akonadi::Collection::root() );
monitor->setMimeTypeMonitored( KABC::Addressee::mimeType(), true );
- m_addressbookModel = new ContactTreeModel( Akonadi::Session::defaultSession(),
- monitor, this );
+ m_addressbookModel = new ContactTreeModel( monitor, this );
m_addressbookModel->setIncludeRootCollection( false );
m_addressbookModel->setItemPopulationStrategy( \
ContactTreeModel::NoItemPopulation );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic