← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libs/models/imagefiltermodelpriv.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/models/imagefiltermodelpriv.h
71
71
    ImageFilterModelPrivate();
72
72
    ~ImageFilterModelPrivate();
73
73
 
74
 
    void init(ImageFilterModel *q);
 
74
    void init(ImageFilterModel* q);
75
75
    void setupWorkers();
76
76
    void infosToProcess(const QList<ImageInfo>& infos, bool forReAdd);
77
77
 
78
78
public:
79
79
 
80
 
    ImageFilterModel          *q;
 
80
    ImageFilterModel*          q;
81
81
 
82
 
    ImageModel                *imageModel;
 
82
    ImageModel*                imageModel;
83
83
 
84
84
    ImageFilterSettings        filter;
85
85
    ImageSortSettings          sorter;
90
90
    int                        sentOut;
91
91
    int                        sentOutForReAdd;
92
92
 
93
 
    QTimer                    *updateFilterTimer;
 
93
    QTimer*                    updateFilterTimer;
94
94
 
95
95
    bool                       needPrepare;
96
96
    bool                       needPrepareComments;
98
98
 
99
99
    QMutex                     mutex;
100
100
    ImageFilterSettings        filterCopy;
101
 
    ImageFilterModelPreparer  *preparer;
102
 
    ImageFilterModelFilterer  *filterer;
 
101
    ImageFilterModelPreparer*  preparer;
 
102
    ImageFilterModelFilterer*  filterer;
103
103
 
104
104
    QHash<qlonglong, bool>     filterResults;
105
105
    bool                       hasOneMatch;