Ignore:
Timestamp:
Jan 9, 2017, 11:09:38 AM (3 years ago)
Author:
jrpelegrina
Message:

Update new version: 3.15.02

File:
1 edited

Legend:

Unmodified
Added
Removed
  • filezilla/trunk/fuentes/src/interface/filter.cpp

    r130 r3185  
    55#include "inputdialog.h"
    66#include "ipcmutex.h"
    7 #include "local_filesys.h"
    87#include "Mainfrm.h"
    98#include "Options.h"
    109#include "state.h"
    1110#include "xmlfunctions.h"
     11
     12#include <libfilezilla/local_filesys.hpp>
    1213
    1314#include <wx/regex.h>
     
    126127}
    127128
    128 void CFilterDialog::OnCancel(wxCommandEvent& event)
     129void CFilterDialog::OnCancel(wxCommandEvent&)
    129130{
    130131        EndModal(wxID_CANCEL);
    131132}
    132133
    133 void CFilterDialog::OnEdit(wxCommandEvent& event)
     134void CFilterDialog::OnEdit(wxCommandEvent&)
    134135{
    135136        CFilterEditDialog dlg;
     
    328329}
    329330
    330 void CFilterDialog::OnSaveAs(wxCommandEvent& event)
     331void CFilterDialog::OnSaveAs(wxCommandEvent&)
    331332{
    332333        CInputDialog dlg;
     
    373374}
    374375
    375 void CFilterDialog::OnRename(wxCommandEvent& event)
     376void CFilterDialog::OnRename(wxCommandEvent&)
    376377{
    377378        wxChoice* pChoice = XRCCTRL(*this, "ID_SETS", wxChoice);
     
    433434}
    434435
    435 void CFilterDialog::OnDeleteSet(wxCommandEvent& event)
     436void CFilterDialog::OnDeleteSet(wxCommandEvent&)
    436437{
    437438        wxChoice* pChoice = XRCCTRL(*this, "ID_SETS", wxChoice);
     
    567568}
    568569
    569 bool CFilterManager::FilenameFiltered(const wxString& name, const wxString& path, bool dir, int64_t size, bool local, int attributes, CDateTime const& date) const
     570bool CFilterManager::FilenameFiltered(const wxString& name, const wxString& path, bool dir, int64_t size, bool local, int attributes, fz::datetime const& date) const
    570571{
    571572        if (m_filters_disabled)
     
    593594}
    594595
    595 bool CFilterManager::FilenameFiltered(std::vector<CFilter> const& filters, const wxString& name, const wxString& path, bool dir, int64_t size, bool local, int attributes, CDateTime const& date) const
     596bool CFilterManager::FilenameFiltered(std::vector<CFilter> const& filters, const wxString& name, const wxString& path, bool dir, int64_t size, int attributes, fz::datetime const& date) const
    596597{
    597598        for (auto const& filter : filters) {
     
    675676}
    676677
    677 bool CFilterManager::FilenameFilteredByFilter(const CFilter& filter, const wxString& name, const wxString& path, bool dir, int64_t size, int attributes, CDateTime const& date)
     678bool CFilterManager::FilenameFilteredByFilter(const CFilter& filter, const wxString& name, const wxString& path, bool dir, int64_t size, int attributes, fz::datetime const& date)
    678679{
    679680        if (dir && !filter.filterDirs)
     
    802803                        break;
    803804                case filter_date:
    804                         if (date.IsValid()) {
    805                                 int cmp = date.Compare( condition.date );
     805                        if (date.empty()) {
     806                                int cmp = date.compare( condition.date );
    806807                                switch (condition.condition)
    807808                                {
     
    938939                }
    939940                else if (condition.type == filter_date) {
    940                         condition.date = CDateTime(condition.strValue, CDateTime::local);
    941                         if (!condition.date.IsValid()) {
     941                        condition.date = fz::datetime(condition.strValue.ToStdWstring(), fz::datetime::local);
     942                        if (!condition.date.empty()) {
    942943                                continue;
    943944                        }
     
    960961
    961962        wxString file(wxGetApp().GetSettingsFile(_T("filters")));
    962         if (CLocalFileSystem::GetSize(file) < 1) {
     963        if (fz::local_filesys::get_size(fz::to_native(file)) < 1) {
    963964                file = wxGetApp().GetResourceDir().GetPath() + _T("defaultfilters.xml");
    964965        }
Note: See TracChangeset for help on using the changeset viewer.