← Back to branch summary

~ubuntu-branches/ubuntu/maverick/digikam/maverick

« back to all changes in this revision

Viewing changes to libs/database/searchxml.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Luka Renko
  • Date: 2009-03-17 23:07:56 UTC
  • mfrom: (1.2.20 upstream) (3.1.4 experimental)
  • Revision ID: james.westby@ubuntu.com-20090317230756-db5b8rqjwb2j35e5
Tags: 2:0.10.0-1ubuntu1
* Remaining changes to Debian (committed to Debian SVN):
  - Depends: kde-icons-oxygen dropped (included through kdelibs)
  - Recommends: kipi-plugins added (provides major functionality)
  - debian/digikamthemedesigner.manpage: add missing manpage
* Remaning change to Debian:
  - Section: devel for -dbg package (no debug in Jaunty)

Show diffs side-by-side

added added

removed removed

Lines of Context:
libs/database/searchxml.cpp
299
299
        return SearchXml::Or;
300
300
    else if (op == "andnot")
301
301
        return SearchXml::AndNot;
 
302
    else if (op == "ornot")
 
303
        return SearchXml::OrNot;
302
304
 
303
305
    return defaultOperator;
304
306
}
573
575
        case SearchXml::AndNot:
574
576
            writeAttribute(attributeName, "andnot");
575
577
            break;
 
578
        case SearchXml::OrNot:
 
579
            writeAttribute(attributeName, "ornot");
 
580
            break;
576
581
    }
577
582
}
578
583