← Back to branch summary

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

« back to all changes in this revision

Viewing changes to digikam/imageattributeswatch.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/imageattributeswatch.h
45
45
 
46
46
public:
47
47
 
48
 
    static ImageAttributesWatch *instance();
 
48
    static ImageAttributesWatch* instance();
49
49
    static void cleanUp();
50
50
    static void shutDown();
51
51
 
52
 
/*
53
 
    void imageTagsChanged(qint64 imageId);
54
 
    void imagesChanged(int albumId);
 
52
    /*
 
53
        void imageTagsChanged(qint64 imageId);
 
54
        void imagesChanged(int albumId);
55
55
 
56
 
    void imageRatingChanged(qint64 imageId);
57
 
    void imageDateChanged(qint64 imageId);
58
 
    void imageCaptionChanged(qint64 imageId);
59
 
*/
 
56
        void imageRatingChanged(qint64 imageId);
 
57
        void imageDateChanged(qint64 imageId);
 
58
        void imageCaptionChanged(qint64 imageId);
 
59
    */
60
60
 
61
61
    void fileMetadataChanged(const KUrl& url);
62
62
 
96
96
    ImageAttributesWatch();
97
97
    ~ImageAttributesWatch();
98
98
 
99
 
    static ImageAttributesWatch *m_instance;
 
99
    static ImageAttributesWatch* m_instance;
100
100
 
101
101
private Q_SLOTS:
102
102