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/interface/queue.h

    r130 r3185  
    5656        virtual QueueItemType GetType() const = 0;
    5757
    58         CDateTime GetTime() const { return m_time; }
    59         void UpdateTime() { m_time = CDateTime::Now(); }
     58        fz::datetime GetTime() const { return m_time; }
     59        void UpdateTime() { m_time = fz::datetime::now(); }
    6060
    6161        int GetRemovedAtFront() const { return m_removed_at_front; }
     
    6868        friend class CServerItem;
    6969
    70         CDateTime m_time;
     70        fz::datetime m_time;
    7171
    7272private:
     
    157157        QueuePriority GetPriority() const;
    158158
    159         fzstring const& GetLocalFile() const { return !Download() ? GetSourceFile() : (m_targetFile ? *m_targetFile : m_sourceFile); }
    160         fzstring const& GetRemoteFile() const { return Download() ? GetSourceFile() : (m_targetFile ? *m_targetFile : m_sourceFile); }
    161         fzstring const& GetSourceFile() const { return m_sourceFile; }
    162         CSparseOptional<fzstring> const& GetTargetFile() const { return m_targetFile; }
     159        std::wstring const& GetLocalFile() const { return !Download() ? GetSourceFile() : (m_targetFile ? *m_targetFile : m_sourceFile); }
     160        std::wstring const& GetRemoteFile() const { return Download() ? GetSourceFile() : (m_targetFile ? *m_targetFile : m_sourceFile); }
     161        std::wstring const& GetSourceFile() const { return m_sourceFile; }
     162        CSparseOptional<std::wstring> const& GetTargetFile() const { return m_targetFile; }
    163163        CLocalPath const& GetLocalPath() const { return m_localPath; }
    164164        CServerPath const& GetRemotePath() const { return m_remotePath; }
     
    192192        virtual void SaveItem(pugi::xml_node& element) const;
    193193
    194         virtual bool TryRemoveAll(); // Removes a inactive childrens, queues active children for removal.
     194        virtual bool TryRemoveAll(); // Removes inactive children, queues active children for removal.
    195195                                                                 // Returns true if item can be removed itself
    196196
     
    262262
    263263protected:
    264         fzstring const m_sourceFile;
    265         CSparseOptional<fzstring> m_targetFile;
     264        std::wstring const m_sourceFile;
     265        CSparseOptional<std::wstring> m_targetFile;
    266266        CLocalPath const m_localPath;
    267267        CServerPath const m_remotePath;
Note: See TracChangeset for help on using the changeset viewer.