summaryrefslogtreecommitdiff
path: root/fpdfsdk/fxedit/fxet_list.h
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2017-03-23 14:18:37 -0700
committerChromium commit bot <commit-bot@chromium.org>2017-03-23 21:32:07 +0000
commit7388470573be4437b0062ec16ba2178bf380790d (patch)
tree2472d139e6e467385ba09d87caa68c896634d731 /fpdfsdk/fxedit/fxet_list.h
parent41fdbdf0bc46edd44377a72ff09f12dd68519112 (diff)
downloadpdfium-7388470573be4437b0062ec16ba2178bf380790d.tar.xz
Use std::map<> in CPLST_Select
Replace integer state value with an enum. Change-Id: I78eacf90465692946640ea5a031af03259fd417f Reviewed-on: https://pdfium-review.googlesource.com/3155 Commit-Queue: Tom Sepez <tsepez@chromium.org> Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'fpdfsdk/fxedit/fxet_list.h')
-rw-r--r--fpdfsdk/fxedit/fxet_list.h27
1 files changed, 9 insertions, 18 deletions
diff --git a/fpdfsdk/fxedit/fxet_list.h b/fpdfsdk/fxedit/fxet_list.h
index 65426e0681..d0fef1ca4b 100644
--- a/fpdfsdk/fxedit/fxet_list.h
+++ b/fpdfsdk/fxedit/fxet_list.h
@@ -7,6 +7,7 @@
#ifndef FPDFSDK_FXEDIT_FXET_LIST_H_
#define FPDFSDK_FXEDIT_FXET_LIST_H_
+#include <map>
#include <memory>
#include <vector>
@@ -169,36 +170,26 @@ class CFX_ListContainer {
CLST_Rect m_rcContent; // positive forever!
};
-struct CPLST_Select_Item {
- CPLST_Select_Item(int32_t other_nItemIndex, int32_t other_nState) {
- nItemIndex = other_nItemIndex;
- nState = other_nState;
- }
-
- int32_t nItemIndex;
- int32_t nState; // 0:normal select -1:to deselect 1: to select
-};
-
class CPLST_Select {
public:
+ enum State { DESELECTING = -1, NORMAL = 0, SELECTING = 1 };
+ using const_iterator = std::map<int32_t, State>::const_iterator;
+
CPLST_Select();
virtual ~CPLST_Select();
- public:
void Add(int32_t nItemIndex);
void Add(int32_t nBeginIndex, int32_t nEndIndex);
void Sub(int32_t nItemIndex);
void Sub(int32_t nBeginIndex, int32_t nEndIndex);
- bool IsExist(int32_t nItemIndex) const;
- int32_t Find(int32_t nItemIndex) const;
- int32_t GetCount() const;
- int32_t GetItemIndex(int32_t nIndex) const;
- int32_t GetState(int32_t nIndex) const;
- void Done();
void DeselectAll();
+ void Done();
+
+ const_iterator begin() const { return m_Items.begin(); }
+ const_iterator end() const { return m_Items.end(); }
private:
- CFX_ArrayTemplate<CPLST_Select_Item*> m_aItems;
+ std::map<int32_t, State> m_Items;
};
class CFX_ListCtrl : protected CFX_ListContainer {