← Back to branch summary

~ubuntu-branches/ubuntu/saucy/filezilla/saucy-proposed

« back to all changes in this revision

Viewing changes to src/interface/filter_conditions_dialog.cpp

  • Committer: Package Import Robot
  • Author(s): Adrien Cunin
  • Date: 2012-12-07 17:17:17 UTC
  • mfrom: (1.1.31)
  • Revision ID: package-import@ubuntu.com-20121207171717-nt6as62u4pa1uv11
Tags: 3.6.0.2-1ubuntu1
* Merge from Debian experimental. Remaining Ubuntu change:
   - Added debian/patches/11_use-decimal-si-by-default.patch in order to
     comply with UnitsPolicy

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/interface/filter_conditions_dialog.cpp
235
235
        std::set<int> selected;
236
236
        selected.insert(item);
237
237
        OnRemove(selected);
238
 
        if (!m_filterControls.size())
 
238
        if (m_filterControls.empty())
239
239
                OnMore();
240
240
}
241
241
 
515
515
        // Create new controls
516
516
        m_currentFilter = filter;
517
517
 
518
 
        if (!m_currentFilter.filters.size())
 
518
        if (m_currentFilter.filters.empty())
519
519
                m_currentFilter.filters.push_back(CFilterCondition());
520
520
 
521
521
        for (unsigned int i = 0; i < m_currentFilter.filters.size(); i++)
603
603
 
604
604
                filter.filters.push_back(condition);
605
605
        }
606
 
        
 
606
 
607
607
        switch (XRCCTRL(*this, "ID_MATCHTYPE", wxChoice)->GetSelection())
608
608
        {
609
609
        case 1:
782
782
        {
783
783
                if (source == m_pAdd)
784
784
                {
785
 
                        if (m_filterControls.size())
 
785
                        if (!m_filterControls.empty())
786
786
                                target = m_filterControls[m_filterControls.size() - 1].pRemove;
787
787
                }
788
788
                else