← Back to branch summary

~ubuntu-branches/ubuntu/saucy/digikam/saucy

« back to all changes in this revision

Viewing changes to digikam/digikamimageview_p.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-12-21 23:19:11 UTC
  • mfrom: (1.2.33 upstream) (3.1.7 experimental)
  • Revision ID: james.westby@ubuntu.com-20101221231911-z9jip7s5aht1jqn9
Tags: 2:1.7.0-1ubuntu1
* Merge from Debian Experimental. Remaining Ubuntu changes:
  - Export .pot name and copy to plugins in debian/rules
  - Version build-depends on kipi-plugins-dev to ensure build is against the
    same version on all archs
* Drop debian/patches/kubuntu_01_linker.diff, incoporated upstream
* Remove patches directory and unused patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
digikam/digikamimageview_p.cpp
28
28
namespace Digikam
29
29
{
30
30
 
31
 
DigikamImageViewPriv::DigikamImageViewPriv(DigikamImageView *qq)
32
 
                    : overlaysActive(false), q_ptr(qq)
 
31
DigikamImageViewPriv::DigikamImageViewPriv(DigikamImageView* qq)
 
32
    : overlaysActive(false), q_ptr(qq)
33
33
{
34
34
    utilities          = 0;
35
35
    rotateLeftOverlay  = 0;
42
42
 
43
43
void DigikamImageViewPriv::updateOverlays()
44
44
{
45
 
    AlbumSettings *settings = AlbumSettings::instance();
 
45
    AlbumSettings* settings = AlbumSettings::instance();
46
46
 
47
47
    if (overlaysActive)
48
48
    {