diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | qt-models/completionmodels.cpp | 3 | ||||
| -rw-r--r-- | qt-models/filtermodels.cpp | 11 | ||||
| -rw-r--r-- | qt-ui/CMakeLists.txt | 5 |
4 files changed, 17 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a14db6de..f1c143b36 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,6 +37,7 @@ set(CMAKE_MODULE_PATH include_directories(. ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}/qt-ui qt-ui qt-models qt-ui/profile diff --git a/qt-models/completionmodels.cpp b/qt-models/completionmodels.cpp index 838d239d2..a8b61aed5 100644 --- a/qt-models/completionmodels.cpp +++ b/qt-models/completionmodels.cpp @@ -1,6 +1,7 @@ #include "completionmodels.h" #include "dive.h" -#include "mainwindow.h" +#include <QSet> +#include <QString> #define CREATE_UPDATE_METHOD(Class, diveStructMember) \ void Class::updateModel() \ 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) diff --git a/qt-ui/CMakeLists.txt b/qt-ui/CMakeLists.txt index a860faed5..45447771a 100644 --- a/qt-ui/CMakeLists.txt +++ b/qt-ui/CMakeLists.txt @@ -8,6 +8,11 @@ if(BTSUPPORT) set(BT_SRC_FILES btdeviceselectiondialog.cpp) endif() +include_directories(. + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} +) + # the interface, in C++ set(SUBSURFACE_INTERFACE updatemanager.cpp |