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>

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

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()                              \

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)

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