← Back to branch summary

~ubuntu-branches/ubuntu/trusty/digikam/trusty

« back to all changes in this revision

Viewing changes to extra/kipi-plugins/removeredeyes/plugin/workerthread.h

  • Committer: Package Import Robot
  • Author(s): Rohan Garg
  • Date: 2012-11-26 18:24:20 UTC
  • mfrom: (1.9.1) (3.1.23 experimental)
  • Revision ID: package-import@ubuntu.com-20121126182420-qoy6z0nx4ai0wzcl
Tags: 4:3.0.0~beta3-0ubuntu1
https://launchpad.net/bugs/890059
https://launchpad.net/bugs/1011211
https://launchpad.net/bugs/658047
* New upstream release
  - Add build-deps :  libhupnp-dev, libqtgstreamer-dev, libmagickcore-dev
* Merge from debian, remaining changes:
  - Make sure libqt4-opengl-dev, libgl1-mesa-dev and libglu1-mesa-dev only
    install on i386,amd64 and powerpc
  - Depend on libtiff-dev instead of libtiff4-dev
  - Drop digikam breaks/replaces kipi-plugins-common since we're past the
    LTS release now
  - digikam to recommend mplayerthumbs | ffmpegthumbs. We currently only
    have latter in the archives, even though former is also supposed to
    be part of kdemultimedia. (LP: #890059)
  - kipi-plugins to recommend www-browser rather than konqueror directly
    since 2.8 no direct usage of konqueror is present in the flickr
    plugin anymore (LP: #1011211)
  - Keep kubuntu_mysqld_executable_name.diff
  - Don't install libkipi translations
  - Keep deps on libcv-dev, libcvaux-dev
  - Keep split packaging of libraries
  - Replace icons from KDE 3 time in debian/xpm.d/*.xpm with the new
    versions (LP: #658047)
* Update debian/not-installed

Show diffs side-by-side

added added

removed removed

Lines of Context:
extra/kipi-plugins/removeredeyes/plugin/workerthread.h
26
26
 
27
27
// Qt includes
28
28
 
29
 
#include <ThreadWeaver/Job>
 
29
#include <QMutex>
30
30
 
31
31
// KDE includes
32
32
 
33
33
#include <kurl.h>
 
34
#include <threadweaver/Job.h>
 
35
 
 
36
// Libkdcraw includes
 
37
 
 
38
#include <libkdcraw/ractionthreadbase.h>
34
39
 
35
40
// local includes
36
41
 
37
 
#include "kpactionthreadbase.h"
38
42
#include "commonsettings.h"
39
43
#include "savemethods.h"
40
44
#include "locator.h"
41
45
#include "workerthreaddata.h"
42
46
 
43
 
using namespace KIPIPlugins;
 
47
using namespace KDcrawIface;
44
48
 
45
49
namespace KIPIRemoveRedEyesPlugin
46
50
{
47
51
 
48
52
class WorkerThreadData;
49
 
struct WorkerThreadPriv;
50
53
 
51
 
class WorkerThread : public KPActionThreadBase
 
54
class WorkerThread : public RActionThreadBase
52
55
{
53
56
    Q_OBJECT
54
57
 
89
92
 
90
93
    void cancel();
91
94
 
 
95
public:
 
96
 
 
97
    class Private;
 
98
 
92
99
private:
93
100
 
94
 
    WorkerThreadPriv* const pd;
 
101
    Private* const pd;
95
102
};
96
103
 
97
104
// --------------------------------------------------------------------------
98
105
 
99
 
struct WorkerThreadPriv
 
106
class WorkerThread::Private
100
107
{
101
 
    WorkerThreadPriv()
 
108
public:
 
109
 
 
110
    Private()
102
111
    {
103
112
        runtype             = WorkerThread::Testrun;
104
113
        cancel              = false;
132
141
 
133
142
public:
134
143
 
135
 
    Task(const KUrl& url, QObject* const parent = 0, WorkerThreadPriv* const d = 0);
 
144
    Task(const KUrl& url, QObject* const parent = 0, WorkerThread::Private* const d = 0);
136
145
 
137
146
    const KUrl& url;
138
147
 
140
149
 
141
150
    void calculationFinished(WorkerThreadData*);
142
151
 
143
 
private:
144
 
 
145
 
    WorkerThreadPriv* ld;
146
 
 
147
152
protected:
148
153
 
149
154
    void run();
 
155
 
 
156
private:
 
157
 
 
158
    WorkerThread::Private* ld;
150
159
};
151
160
 
152
161
} // namespace KIPIRemoveRedEyesPlugin