← Back to branch summary

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

« back to all changes in this revision

Viewing changes to utilities/searchwindow/searchgroup.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:
utilities/searchwindow/searchgroup.cpp
580
580
 
581
581
SearchXml::Operator SearchGroupLabel::groupOperator() const
582
582
{
583
 
    /*
584
 
    if (m_groupOpBox && m_groupOpBox->currentIndex() != -1)
585
 
    {
586
 
        SearchXml::Operator op = (SearchXml::Operator)m_groupOpBox->itemData(m_groupOpBox->currentIndex()).toInt();
587
 
    */
588
 
    if (!m_groupOpLabel || m_groupOp == SearchXml::And)
589
 
    {
590
 
        if (m_allBox->isChecked() || m_anyBox->isChecked())
591
 
            return SearchXml::And;
592
 
        else
593
 
            return SearchXml::AndNot;
594
 
    }
595
 
    else // m_groupOp == SearchXml::Or
596
 
    {
597
 
        if (m_allBox->isChecked() || m_anyBox->isChecked())
598
 
            return SearchXml::Or;
599
 
        else
600
 
            return SearchXml::OrNot;
601
 
    }
 
583
    return m_groupOp;
602
584
}
603
585
 
604
586
SearchXml::Operator SearchGroupLabel::defaultFieldOperator() const