~ubuntu-branches/ubuntu/saucy/kdepimlibs/saucy-proposed

« back to all changes in this revision

Viewing changes to akonadi/collection_p.h

  • Committer: Package Import Robot
  • Author(s): Scott Kitterman, Jonathan Riddell, Scott Kitterman
  • Date: 2012-11-19 17:32:30 UTC
  • mfrom: (1.1.85)
  • Revision ID: package-import@ubuntu.com-20121119173230-xi32j2vpz82zlmmh
Tags: 4:4.9.80-0ubuntu1
[ Jonathan Riddell ]
* New upstream beta release
* Remove 03_hide_akonadi_progressbar.diff now upstream
* Update .symbols file

[ Scott Kitterman ]
* Add libqjson-dev to build-depends since it is required for 4.10
* Update symbols files
* Drop FindAkonadi.cmake from debian/kdepimlibs5-dev.install since it is no
  longer provided by upstream
* Add FindQtOAuth.cmake to debian/kdepimlibs5-dev.install
* Document files we don't install in debian/NOT-INSTALLED
* Add new binary, libakonadi-socialutils4
  - Add to debian/control
  - Add to kdepimlibs metapackage depends
  - Add debian/libakonadi-socialutils4.install
  - Add debian/libakonadi-socialutils4.symbols 
* Update kdepimlibs5-dev.install for new headers for 4.10
* Add googletalkprotocol.desktop to debian/libakonadi-contact4.install
* Add missing symbols files for libakonadi-notes4 and libkalarmcal2
* Add dont_break_libkabc_abi.diff to fix ABI break - patch from José Manuel
  Santamaría Lema

Show diffs side-by-side

added added

removed removed

Lines of Context:
38
38
    CollectionPrivate( Collection::Id id = -1 ) :
39
39
      EntityPrivate( id ),
40
40
      contentTypesChanged( false ),
41
 
      cachePolicyChanged( false )
 
41
      cachePolicyChanged( false ),
 
42
      isVirtual( false )
42
43
    {}
43
44
 
44
45
    CollectionPrivate( const CollectionPrivate &other ) :
51
52
      cachePolicy = other.cachePolicy;
52
53
      contentTypesChanged = other.contentTypesChanged;
53
54
      cachePolicyChanged = other.cachePolicyChanged;
 
55
      isVirtual = other.isVirtual;
54
56
    }
55
57
 
56
58
    ~CollectionPrivate()
84
86
    QStringList contentTypes;
85
87
    static const Collection root;
86
88
    CachePolicy cachePolicy;
87
 
    bool contentTypesChanged;
88
 
    bool cachePolicyChanged;
 
89
    bool contentTypesChanged: 1;
 
90
    bool cachePolicyChanged: 1;
 
91
    bool isVirtual: 1;
89
92
};
90
93
 
91
94
#endif