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

Update new version: 3.15.02

File:
1 edited

Legend:

Unmodified
Added
Removed
  • filezilla/trunk/fuentes/src/engine/directorylisting.cpp

    r130 r3185  
    55        wxString str = wxString::Format(_T("name=%s\nsize=%lld\npermissions=%s\nownerGroup=%s\ndir=%d\nlink=%d\ntarget=%s\nunsure=%d\n"),
    66                                name, static_cast<long long>(size), *permissions, *ownerGroup, flags & flag_dir, flags & flag_link,
    7                                 target ? *target : wxString(), flags & flag_unsure);
     7                                target ? *target : std::wstring(), flags & flag_unsure);
    88
    99        if( has_date() ) {
    10                 str += _T("date=") + time.Format(_T("%Y-%m-%d"), CDateTime::local) + _T("\n");
     10                str += _T("date=") + time.format(_T("%Y-%m-%d"), fz::datetime::local) + _T("\n");
    1111        }
    1212        if( has_time() ) {
    13                 str += _T("time=") + time.Format(_T("%H-%M-%S"), CDateTime::local) + _T("\n");
     13                str += _T("time=") + time.format(_T("%H-%M-%S"), fz::datetime::local) + _T("\n");
    1414        }
    1515        return str;
     
    124124}
    125125
    126 void CDirectoryListing::GetFilenames(std::vector<fzstring> &names) const
     126void CDirectoryListing::GetFilenames(std::vector<std::wstring> &names) const
    127127{
    128128        names.reserve(GetCount());
     
    140140
    141141        // Search map
    142         auto iter = m_searchmap_case->find(to_fzstring(name));
     142        auto iter = m_searchmap_case->find(to_wstring(name));
    143143        if (iter != m_searchmap_case->end())
    144144                return iter->second;
     
    153153        std::vector<CRefcountObject<CDirentry> >::const_iterator entry_iter = m_entries->begin() + i;
    154154        for (; entry_iter != m_entries->end(); ++entry_iter, ++i) {
    155                 fzstring const& entry_name = (*entry_iter)->name;
    156                 searchmap_case.insert(std::pair<fzstring const, unsigned int>(entry_name, i));
     155                std::wstring const& entry_name = (*entry_iter)->name;
     156                searchmap_case.insert(std::pair<std::wstring const, unsigned int>(entry_name, i));
    157157
    158158                if (entry_name == name)
     
    175175
    176176        // Search map
    177         auto iter = m_searchmap_nocase->find(to_fzstring(name));
     177        auto iter = m_searchmap_nocase->find(to_wstring(name));
    178178        if (iter != m_searchmap_nocase->end())
    179179                return iter->second;
     
    190190                wxString entry_name = (*entry_iter)->name;
    191191                entry_name.MakeLower();
    192                 searchmap_nocase.insert(std::pair<fzstring const, unsigned int>(to_fzstring(entry_name), i));
     192                searchmap_nocase.insert(std::pair<std::wstring const, unsigned int>(to_wstring(entry_name), i));
    193193
    194194                if (entry_name == name)
Note: See TracChangeset for help on using the changeset viewer.