diff widgets/SubdividingMenu.h @ 811:c4ef666721bf

Merge from branch warnfix_no_size_t

--- a/widgets/SubdividingMenu.h	Tue Jun 03 11:10:52 2014 +0100
+++ b/widgets/SubdividingMenu.h	Wed Jun 18 13:51:27 2014 +0100
@@ -39,10 +39,10 @@
     Q_OBJECT
 
 public:
-    SubdividingMenu(size_t lowerLimit = 0, size_t upperLimit = 0,
+    SubdividingMenu(int lowerLimit = 0, int upperLimit = 0,
                     QWidget *parent = 0);
-    SubdividingMenu(const QString &title, size_t lowerLimit = 0,
-                    size_t upperLimit = 0, QWidget *parent = 0);
+    SubdividingMenu(const QString &title, int lowerLimit = 0,
+                    int upperLimit = 0, QWidget *parent = 0);
     virtual ~SubdividingMenu();
 
     void setEntries(const std::set<QString> &entries);
@@ -65,8 +65,8 @@
 protected:
     std::map<QString, QMenu *> m_nameToChunkMenuMap;
 
-    size_t m_lowerLimit;
-    size_t m_upperLimit;
+    int m_lowerLimit;
+    int m_upperLimit;
 
     bool m_entriesSet;
     std::map<QString, QObject *> m_pendingEntries;