diff options
| author |  Tomaz Canabrava <tomaz.canabrava@intel.com> | 2015-09-02 21:22:29 -0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-10-30 10:36:48 -0700 |
| commit | 6cd711a11b1a2d9484eb05915de0bd5dc60907b2 (patch) | |
| tree | b53b675a0c54fb5421558b48bec2bcabab5c51d0 /qt-models/filtermodels.cpp | |
| parent | 4c0156e3d51b389db8eccc3fa3da4b8f248f9b13 (diff) | |
| download | subsurface-6cd711a11b1a2d9484eb05915de0bd5dc60907b2.tar.gz | |
Modify code to make it compile after rebase
Did a git rebase and some stuff changed in the meantime;
This is a compatibility commit: Add a few include directories
on the cmake to quiet some ui_headers.h not being found (the
ones that are created automatically by uic) and a few noiseances
like models requiring interface functionality.
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-models/filtermodels.cpp')
| -rw-r--r-- | qt-models/filtermodels.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/qt-models/filtermodels.cpp b/qt-models/filtermodels.cpp index 80ed0cfd5..29853cb3d 100644 --- a/qt-models/filtermodels.cpp +++ b/qt-models/filtermodels.cpp @@ -1,5 +1,4 @@ #include "filtermodels.h" -#include "mainwindow.h" #include "models.h" #include "divelistview.h" #include "display.h" @@ -355,9 +354,16 @@ bool MultiFilterSortModel::filterAcceptsRow(int source_row, const QModelIndex &s void MultiFilterSortModel::myInvalidate() { + //WARNING: + //TODO: + // THIS CODE BELOW IS COMPLETELY BROKEN. I KNOW, I WROTE IT. + // REMOVE THIS, MAKE IT SANE. + // GRRRRR. + +#if 0 int i; struct dive *d; - DiveListView *dlv = MainWindow::instance()->dive_list(); + // DiveListView *dlv = MainWindow::instance()->dive_list(); divesDisplayed = 0; @@ -395,6 +401,7 @@ void MultiFilterSortModel::myInvalidate() if (curr_dive_site) { dlv->expandAll(); } +#endif } void MultiFilterSortModel::addFilterModel(MultiFilterInterface *model) |