← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libs/models/imagefiltermodelthreads.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/imagefiltermodelthreads.h
41
41
 
42
42
public:
43
43
 
44
 
    ImageFilterModelWorker(ImageFilterModelPrivate *d);
 
44
    ImageFilterModelWorker(ImageFilterModelPrivate* d);
45
45
 
46
 
    void shutDown() { thread->quit(); thread->wait(); }
 
46
    void shutDown()
 
47
    {
 
48
        thread->quit();
 
49
        thread->wait();
 
50
    }
47
51
 
48
52
    bool checkVersion(const ImageFilterModelTodoPackage& package)
49
 
    { return d->version == package.version; }
 
53
    {
 
54
        return d->version == package.version;
 
55
    }
50
56
 
51
57
public Q_SLOTS:
52
58
 
61
67
 
62
68
    class Thread : public QThread
63
69
    {
64
 
        public:
65
 
        Thread(QObject *parent = 0) : QThread(parent) {}
66
 
        virtual void run() { exec(); }
 
70
    public:
 
71
        Thread(QObject* parent = 0) : QThread(parent) {}
 
72
        virtual void run()
 
73
        {
 
74
            exec();
 
75
        }
67
76
    };
68
 
    Thread                  *thread;
 
77
    Thread*                  thread;
69
78
 
70
 
    ImageFilterModelPrivate *d;
 
79
    ImageFilterModelPrivate* d;
71
80
};
72
81
 
73
82
class DIGIKAM_DATABASE_EXPORT ImageFilterModelPreparer : public ImageFilterModelWorker
76
85
 
77
86
public:
78
87
 
79
 
    ImageFilterModelPreparer(ImageFilterModelPrivate *d)
 
88
    ImageFilterModelPreparer(ImageFilterModelPrivate* d)
80
89
        : ImageFilterModelWorker(d) {}
81
90
 
82
91
    void process(ImageFilterModelTodoPackage package);
88
97
 
89
98
public:
90
99
 
91
 
    ImageFilterModelFilterer(ImageFilterModelPrivate *d)
 
100
    ImageFilterModelFilterer(ImageFilterModelPrivate* d)
92
101
        : ImageFilterModelWorker(d) {}
93
102
 
94
103
    void process(ImageFilterModelTodoPackage package);