From b916407a2a06f8452e82b74dc44c54acbcc572b0 Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:27:42 +0200 Subject: 5.21 --- ui/tree_view.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'ui/tree_view.h') diff --git a/ui/tree_view.h b/ui/tree_view.h index d7289d17..719212dd 100644 --- a/ui/tree_view.h +++ b/ui/tree_view.h @@ -57,12 +57,12 @@ public: //--------------------------------------------------------------------- struct Node { - Node(int percent, UInt64 bytes, int itemCount, size_t level, NodeStatus status) : + Node(int percent, UInt64 bytes, int itemCount, unsigned int level, NodeStatus status) : percent_(percent), level_(level), status_(status), bytes_(bytes), itemCount_(itemCount) {} virtual ~Node() {} const int percent_; //[0, 100] - const size_t level_; + const unsigned int level_; const NodeStatus status_; const UInt64 bytes_; const int itemCount_; @@ -70,13 +70,13 @@ public: struct FilesNode : public Node { - FilesNode(int percent, UInt64 bytes, int itemCount, size_t level, const std::vector& filesAndLinks) : Node(percent, bytes, itemCount, level, STATUS_EMPTY), filesAndLinks_(filesAndLinks) {} + FilesNode(int percent, UInt64 bytes, int itemCount, unsigned int level, const std::vector& filesAndLinks) : Node(percent, bytes, itemCount, level, STATUS_EMPTY), filesAndLinks_(filesAndLinks) {} std::vector filesAndLinks_; //files or symlinks; pointers are bound! }; struct DirNode : public Node { - DirNode(int percent, UInt64 bytes, int itemCount, size_t level, NodeStatus status, DirPair& dirObj) : Node(percent, bytes, itemCount, level, status), dirObj_(dirObj) {} + DirNode(int percent, UInt64 bytes, int itemCount, unsigned int level, NodeStatus status, DirPair& dirObj) : Node(percent, bytes, itemCount, level, status), dirObj_(dirObj) {} DirPair& dirObj_; }; @@ -137,9 +137,9 @@ private: struct TreeLine { - TreeLine(size_t level, int percent, const Container* node, enum NodeType type) : level_(level), percent_(percent), node_(node), type_(type) {} + TreeLine(unsigned int level, int percent, const Container* node, enum NodeType type) : level_(level), percent_(percent), node_(node), type_(type) {} - size_t level_; + unsigned int level_; int percent_; //[0, 100] const Container* node_; // NodeType type_; //we choose to increase size of "flatTree" rather than "folderCmpView" by not using dynamic polymorphism! @@ -148,7 +148,7 @@ private: static void compressNode(Container& cont); template static void extractVisibleSubtree(HierarchyObject& hierObj, Container& cont, Function includeObject); - void getChildren(const Container& cont, size_t level, std::vector& output); + void getChildren(const Container& cont, unsigned int level, std::vector& output); template void updateView(Predicate pred); void applySubView(std::vector&& newView); -- cgit