← Back to branch summary

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

« back to all changes in this revision

Viewing changes to digikam/tagmodificationhelper.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:
digikam/tagmodificationhelper.h
79
79
     * @param iconName an optional name for the icon to suggest for the new tag
80
80
     * @return new tag album or 0 if not created
81
81
     */
82
 
    TAlbum* slotTagNew(TAlbum* parent, const QString &title = QString(),
83
 
                       const QString &iconName = QString());
 
82
    TAlbum* slotTagNew(TAlbum* parent, const QString& title = QString(),
 
83
                       const QString& iconName = QString());
84
84
 
85
85
    /**
86
86
     * Same as above, but this slot is using the parent TAlbum set previously