← Back to branch summary

~smartboyhw/ubuntu/raring/calligra/2.6.0-0ubuntu1

« back to all changes in this revision

Viewing changes to plan/libs/models/kptresourceallocationmodel.h

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2012-10-23 21:09:16 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20121023210916-m82w6zxnxhaxz7va
Tags: 1:2.5.90-0ubuntu1
https://launchpad.net/bugs/1070436
https://launchpad.net/bugs/1071686
* New upstream alpha release (LP: #1070436)
  - Add libkactivities-dev and libopenimageio-dev to build-depends
  - Add kubuntu_build_calligraactive.diff to build calligraactive by default
  - Add package for calligraauthor and move files that are shared between
    calligrawords and calligraauthor to calligrawords-common
* Document the patches
* Remove numbers from patches so they follow the same naming scheme as
  the rest of our patches.
* calligra-data breaks replaces krita-data (<< 1:2.5.3) (LP: #1071686)

Show diffs side-by-side

added added

removed removed

Lines of Context:
plan/libs/models/kptresourceallocationmodel.h
100
100
    virtual const QMetaEnum columnMap() const { return m_model.columnMap(); }
101
101
 
102
102
    virtual void setProject( Project *project );
103
 
    void setTask( Task *task );
104
103
    Task *task() const { return m_model.task(); }
105
104
 
106
105
    virtual Qt::ItemFlags flags( const QModelIndex & index ) const;
129
128
    Resource *resource( const QModelIndex &idx ) const;
130
129
    void setRequired( const QModelIndex &idx, const QList<Resource*> &lst );
131
130
    QList<Resource*> required( const QModelIndex &idx ) const;
132
 
    
 
131
 
 
132
public slots:
 
133
    void setTask( Task *task );
 
134
 
133
135
protected slots:
134
136
    void slotResourceChanged( Resource* );
135
137
    void slotResourceGroupChanged( ResourceGroup * );