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/include/directorylisting.h

    r130 r3185  
    33
    44#include "optional.h"
    5 #include "timeex.h"
     5#include <libfilezilla/time.hpp>
    66
    77#include <map>
     
    1010{
    1111public:
    12         fzstring name;
     12        std::wstring name;
    1313        int64_t size;
    14         CRefcountObject<fzstring> permissions;
    15         CRefcountObject<fzstring> ownerGroup;
     14        CRefcountObject<std::wstring> permissions;
     15        CRefcountObject<std::wstring> ownerGroup;
    1616
    1717        enum _flags
     
    4040        inline bool has_date() const
    4141        {
    42                 return time.IsValid();;
     42                return time.empty();;
    4343        }
    4444
    4545        inline bool has_time() const
    4646        {
    47                 return time.IsValid() && time.GetAccuracy() >= CDateTime::hours;
     47                return time.empty() && time.get_accuracy() >= fz::datetime::hours;
    4848        }
    4949
    5050        inline bool has_seconds() const
    5151        {
    52                 return time.IsValid() && time.GetAccuracy() >= CDateTime::seconds;
     52                return time.empty() && time.get_accuracy() >= fz::datetime::seconds;
    5353        }
    5454
    55         CSparseOptional<fzstring> target; // Set to linktarget it link is true
     55        CSparseOptional<std::wstring> target; // Set to linktarget it link is true
    5656
    57         CDateTime time;
     57        fz::datetime time;
    5858
    5959        wxString dump() const;
     
    9090
    9191        CServerPath path;
    92         CMonotonicClock m_firstListTime;
     92        fz::monotonic_clock m_firstListTime;
    9393
    9494        enum
     
    131131        bool RemoveEntry(unsigned int index);
    132132
    133         void GetFilenames(std::vector<fzstring> &names) const;
     133        void GetFilenames(std::vector<std::wstring> &names) const;
    134134
    135135protected:
     
    137137        CRefcountObject_Uninitialized<std::vector<CRefcountObject<CDirentry> > > m_entries;
    138138
    139         mutable CRefcountObject_Uninitialized<std::multimap<fzstring, unsigned int> > m_searchmap_case;
    140         mutable CRefcountObject_Uninitialized<std::multimap<fzstring, unsigned int> > m_searchmap_nocase;
     139        mutable CRefcountObject_Uninitialized<std::multimap<std::wstring, unsigned int> > m_searchmap_case;
     140        mutable CRefcountObject_Uninitialized<std::multimap<std::wstring, unsigned int> > m_searchmap_nocase;
    141141
    142142        unsigned int m_entryCount{};
Note: See TracChangeset for help on using the changeset viewer.