← Back to branch summary

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

« back to all changes in this revision

Viewing changes to extra/kipi-plugins/dngconverter/plugin/actionthread.cpp

  • 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/dngconverter/plugin/actionthread.cpp
157
157
                destPath = fi.absolutePath() + QString("/") + ".kipi-dngconverter-tmp-" +
158
158
                        QString::number(QDateTime::currentDateTime().toTime_t()) + QString(m_url.fileName());
159
159
 
 
160
                m_d->mutex.lock();
160
161
                m_d->dngProcessor.reset();
161
162
                m_d->dngProcessor.setInputFile(m_url.toLocalFile());
162
163
                m_d->dngProcessor.setOutputFile(destPath);
165
166
                m_d->dngProcessor.setUpdateFileDate(m_d->updateFileDate);
166
167
                m_d->dngProcessor.setPreviewMode(m_d->previewMode);
167
168
                ret = m_d->dngProcessor.convert();
 
169
                m_d->mutex.unlock();
168
170
            }
169
171
 
170
172
            ActionData ad2;
187
189
// ----------------------------------------------------------------------------------------------------------------
188
190
 
189
191
ActionThread::ActionThread(QObject* const parent)
190
 
    : KPActionThreadBase(parent), d(new Private)
 
192
    : RActionThreadBase(parent), d(new Private)
191
193
{
192
194
    qRegisterMetaType<ActionData>();
193
195
}
279
281
void ActionThread::cancel()
280
282
{
281
283
    d->cancel = true;
282
 
    KPActionThreadBase::cancel();
 
284
    RActionThreadBase::cancel();
283
285
}
284
286
 
285
287
}  // namespace KIPIDNGConverterPlugin