← Back to branch summary

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

« back to all changes in this revision

Viewing changes to utilities/queuemanager/batchtool.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:
utilities/queuemanager/batchtool.h
280
280
{
281
281
public:
282
282
 
283
 
    AssignedBatchTools(){};
 
283
    AssignedBatchTools() {};
284
284
 
285
285
    QString targetSuffix(bool* extSet = 0) const
286
286
    {
288
288
        foreach(BatchToolSet set, m_toolsMap)
289
289
        {
290
290
            QString s = set.tool->outputSuffix();
 
291
 
291
292
            if (!s.isEmpty())
292
293
            {
293
294
                suffix = s;
 
295
 
294
296
                if (extSet != 0)
295
297
                {
296
298
                    *extSet = true;
304
306
            {
305
307
                *extSet = false;
306
308
            }
 
309
 
307
310
            return (QFileInfo(m_itemUrl.fileName()).suffix());
308
311
        }
309
312