comparison widgets/SubdividingMenu.h @ 810:b68af2be4545 tonioni

Merge from branch warnfix_no_size_t
author Chris Cannam
date Wed, 18 Jun 2014 13:42:25 +0100
parents e4773943c9c1
children edfc38ade098
comparison
equal deleted inserted replaced
802:584b11df8e4f 810:b68af2be4545
37 class SubdividingMenu : public QMenu 37 class SubdividingMenu : public QMenu
38 { 38 {
39 Q_OBJECT 39 Q_OBJECT
40 40
41 public: 41 public:
42 SubdividingMenu(size_t lowerLimit = 0, size_t upperLimit = 0, 42 SubdividingMenu(int lowerLimit = 0, int upperLimit = 0,
43 QWidget *parent = 0); 43 QWidget *parent = 0);
44 SubdividingMenu(const QString &title, size_t lowerLimit = 0, 44 SubdividingMenu(const QString &title, int lowerLimit = 0,
45 size_t upperLimit = 0, QWidget *parent = 0); 45 int upperLimit = 0, QWidget *parent = 0);
46 virtual ~SubdividingMenu(); 46 virtual ~SubdividingMenu();
47 47
48 void setEntries(const std::set<QString> &entries); 48 void setEntries(const std::set<QString> &entries);
49 void entriesAdded(); 49 void entriesAdded();
50 50
63 virtual void addMenu(const QString &entry, QMenu *); 63 virtual void addMenu(const QString &entry, QMenu *);
64 64
65 protected: 65 protected:
66 std::map<QString, QMenu *> m_nameToChunkMenuMap; 66 std::map<QString, QMenu *> m_nameToChunkMenuMap;
67 67
68 size_t m_lowerLimit; 68 int m_lowerLimit;
69 size_t m_upperLimit; 69 int m_upperLimit;
70 70
71 bool m_entriesSet; 71 bool m_entriesSet;
72 std::map<QString, QObject *> m_pendingEntries; 72 std::map<QString, QObject *> m_pendingEntries;
73 }; 73 };
74 74