subsurface.git/qt-models, branch v4.7.6

cleanup: less than operators shall not use equal

2017-12-29T21:16:58Z

See also commit c032006d91ee3c. Compare functions passed to sort functions need to compare for less-than and not less-or-equal. Signed-off-by: Jan Mulder

cleanup: Uninitialized scalar field

2017-12-28T16:30:25Z

CID 45184 Signed-off-by: Jan Mulder

cleanup: Uninitialized scalar field

2017-12-28T16:30:25Z

CID 208317 CID 208325 Signed-off-by: Jan Mulder

cleanup: Logically dead code

2017-12-28T16:30:25Z

CID 208318 Signed-off-by: Jan Mulder

cleanup: Argument cannot be negative

2017-12-28T16:30:25Z

CID 208296. IndexOf can return -1 when not found, which will not happen in this context, so just to silence Coverity. Signed-off-by: Jan Mulder

filter: fix trip header bug

2017-12-28T16:30:13Z

With commit 5962f00679fae555, a well known problem was introduced. Incorrect width setting for the spanning trip lines. And as there is even a specific functon for that, just call this. The reason the mentioned commit introduces this, is that invalidate() causes layoutChanged signals, and invalidateFilter() does not. Signed-off-by: Jan Mulder

filter: setStringList() at end of every change

2017-12-28T16:30:13Z

This is mainly code maintenance. Instead of emitting explicit dataChanged signals, we can make sure that setStringList() is called after all model data manipulation is ready. Accoording to the Qt docs: "The model will notify any attached views that its underlying data has changed". In itself, this does not solve the tripped assert mentioned in commit 5962f00679fae5, but this calling at the end just feels better. Signed-off-by: Jan Mulder

filter: prevent assert trap on exit filters

2017-12-28T16:30:13Z

This "bug" is found using Qt 5.10 compiled in developer mode. Access the filers, click a little around here, close the filters. Almost every time the following assert is triggered: ASSERT failure in QPersistentModelIndex::~QPersistentModelIndex: "persistent model indexes corrupted", file itemmodels/qabstractitemmodel.cpp, line 643 This is relatively deep down in Qt, and it is triggered by clearing the filters. Trying to force a crash when using the same scenario in Qt 5.10 compiled for production (so no active asserts) did not result in a crash. So, upto this time, it is unclear if the Qt assert points out a real problem, or it is some false alarm (for whatever reason). Further investigation shows that the assert can be solved by changing the invalidate() to an invalidateFilter(). Indeed, the last variant is a little more lightweigt, and does seem to do the same job from a functional point of view (in this case). Signed-off-by: Jan Mulder

Remove unnecessary dynamic_cast<>s in filter code

2017-12-28T08:11:12Z

FilterModelBase is a direct subclass of QAbstractItemModel. Therefore, dynamic_cast<>ing the former to the latter is unnecessary. Probably an artifact of previous code. Signed-off-by: Berthold Stoeger

Cleanup: avoid a few memory leaks

2017-12-26T21:41:58Z

Coverity CID 215199 Coverity CID 215195 Coverity CID 215196 Coverity CID 215198 Signed-off-by: Dirk Hohndel