← Back to branch summary

~ubuntu-branches/ubuntu/natty/koffice/natty-security

« back to all changes in this revision

Viewing changes to kplato/libs/kernel/kpttask.h

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2011-01-19 12:29:32 UTC
  • mfrom: (0.17.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20110119122932-8acdswnc4rc2owxq
Tags: 1:2.3.1-0ubuntu1
* New upstream release
* Add kubuntu_03_libwpg_02.diff from Fedora for libwpg 0.2 support,
  add back libwpg-dev build-depend
* Depend on libwpd-dev not libwpd8-dev
* Remove kubuntu_02_kpresenterpart.diff now upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
kplato/libs/kernel/kpttask.h
205
205
    /**
206
206
     * Returns a map of all actual effort and cost entered
207
207
     */
208
 
    virtual EffortCostMap actualEffortCost( long id ) const;
 
208
    virtual EffortCostMap actualEffortCost( long id, EffortCostCalculationType type = ECCT_All ) const;
209
209
 
210
210
    void addUsedEffort( const Resource *resource, UsedEffort *value = 0 );
211
211
    UsedEffort *takeUsedEffort( const Resource *r ) { return m_usedEffort.take( const_cast<Resource*>( r ) ); changed(); }
463
463
    virtual double budgetedCostPerformed( const QDate &date, long id = CURRENTSCHEDULE ) const;
464
464
 
465
465
    /// Return map of Budgeted Cost of Work Scheduled pr day
466
 
    virtual EffortCostMap bcwsPrDay( long id = CURRENTSCHEDULE ) const;
 
466
    virtual EffortCostMap bcwsPrDay( long id = CURRENTSCHEDULE, EffortCostCalculationType type = ECCT_All ) const;
467
467
    
468
468
    /// Budgeted Cost of Work Scheduled
469
469
    virtual double bcws( const QDate &date, long id = CURRENTSCHEDULE ) const;
470
470
 
471
471
    /// Return map of Budgeted Cost of Work Performed pr day (also includes bcwsPrDay)
472
 
    virtual EffortCostMap bcwpPrDay( long id = CURRENTSCHEDULE ) const;
 
472
    virtual EffortCostMap bcwpPrDay( long id = CURRENTSCHEDULE, EffortCostCalculationType type = ECCT_All ) const;
473
473
    /// Budgeted Cost of Work Performed
474
474
    virtual double bcwp( long id = CURRENTSCHEDULE ) const;
475
475
    /// Budgeted Cost of Work Performed ( up to @p date )
476
476
    virtual double bcwp( const QDate &date, long id = CURRENTSCHEDULE ) const;
477
477
 
478
478
    /// Map of Actual Cost of Work Performed
479
 
    virtual EffortCostMap acwp( long id = CURRENTSCHEDULE ) const;
 
479
    virtual EffortCostMap acwp( long id = CURRENTSCHEDULE, EffortCostCalculationType type = ECCT_All ) const;
480
480
    /// Actual Cost of Work Performed up to dat
481
481
    virtual EffortCost acwp( const QDate &date, long id = CURRENTSCHEDULE ) const;
482
482