← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libs/imageproperties/imagepropertiesmetadatatab.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:
libs/imageproperties/imagepropertiesmetadatatab.h
13
13
 * Public License as published by the Free Software Foundation;
14
14
 * either version 2, or (at your option)
15
15
 * any later version.
16
 
 * 
 
16
 *
17
17
 * This program is distributed in the hope that it will be useful,
18
18
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19
19
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
55
55
    void applySettings();
56
56
 
57
57
    void setCurrentURL(const KUrl& url=KUrl());
58
 
    void setCurrentData(const DMetadata& metadata=DMetadata(), 
 
58
    void setCurrentData(const DMetadata& metadata=DMetadata(),
59
59
                        const QString& filename=QString());
60
60
 
61
61
private: