← Back to branch summary

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

« back to all changes in this revision

Viewing changes to utilities/slideshow/slideshow.h

  • 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:
utilities/slideshow/slideshow.h
92
92
    void allowScreenSaver();
93
93
    void makeCornerRectangles(const QRect& desktopRect, const QSize& size,
94
94
                              QRect* topLeft, QRect* topRight, QRect* bottomLeft, QRect* bottomRight,
95
 
                              QRect* topLeftLarger, QRect* topRightLarger, QRect* bottomLeftLarger, 
 
95
                              QRect* topLeftLarger, QRect* topRightLarger, QRect* bottomLeftLarger,
96
96
                              QRect* bottomRightLarger);
97
97
 
98
98
private: