diff options
| author | Thomas Tanner <trtanner@btinternet.com> | 2015-09-26 12:21:43 +0100 |
|---|---|---|
| committer | Thomas Tanner <trtanner@btinternet.com> | 2015-09-26 12:21:43 +0100 |
| commit | 364c385f1a5f71c3eb6a80b44c26ddd7af012ec8 (patch) | |
| tree | 48083f2b8d9e914fcb96ed0e0857ac79a34994f8 /src/mainwindow.cpp | |
| parent | 3c1c50fefc4245235ad2f92ac65efa5656f825cb (diff) | |
| parent | 462c549f7725810e55131a62f731357c6b2396ae (diff) | |
Merge branch 'master' of https://github.com/TanninOne/modorganizer.git
# Conflicts:
# .gitignore
Diffstat (limited to 'src/mainwindow.cpp')
| -rw-r--r-- | src/mainwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 41ca1589..26ff4b98 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -2091,7 +2091,7 @@ void MainWindow::addContentFilters() void MainWindow::addCategoryFilters(QTreeWidgetItem *root, const std::set<int> &categoriesUsed, int targetID)
{
- for (unsigned i = 1; i < m_CategoryFactory.numCategories(); ++i) {
+ for (size_t i = 1; i < m_CategoryFactory.numCategories(); ++i) {
if ((m_CategoryFactory.getParentID(i) == targetID)) {
int categoryID = m_CategoryFactory.getCategoryID(i);
if (categoriesUsed.find(categoryID) != categoriesUsed.end()) {
@@ -2626,7 +2626,7 @@ bool MainWindow::populateMenuCategories(QMenu *menu, int targetID) bool childEnabled = false;
- for (unsigned i = 1; i < m_CategoryFactory.numCategories(); ++i) {
+ for (size_t i = 1; i < m_CategoryFactory.numCategories(); ++i) {
if (m_CategoryFactory.getParentID(i) == targetID) {
QMenu *targetMenu = menu;
if (m_CategoryFactory.hasChildren(i)) {
|