aboutsummaryrefslogtreecommitdiffstats
path: root/qt-models/completionmodels.cpp
diff options
context:
space:
mode:
authorGravatar Tomaz Canabrava <tomaz.canabrava@intel.com>2015-09-02 21:22:29 -0300
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-10-30 10:36:48 -0700
commit6cd711a11b1a2d9484eb05915de0bd5dc60907b2 (patch)
treeb53b675a0c54fb5421558b48bec2bcabab5c51d0 /qt-models/completionmodels.cpp
parent4c0156e3d51b389db8eccc3fa3da4b8f248f9b13 (diff)
downloadsubsurface-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/completionmodels.cpp')
-rw-r--r--qt-models/completionmodels.cpp3
1 files changed, 2 insertions, 1 deletions
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() \