From 39313c5b3340683b9e4475987308dac24491a982 Mon Sep 17 00:00:00 2001
From: Tomaz Canabrava <tcanabrava@kde.org>
Date: Sun, 6 Mar 2016 06:52:55 -0800
Subject: Clean up handling of various include file

This is in the context of the iOS port and shouldn't impact any of the
other builds.

[Dirk Hohndel: refactored the iOS patches]

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 profile-widget/divepixmapitem.cpp  |  2 +-
 profile-widget/diveprofileitem.cpp |  2 +-
 profile-widget/profilewidget2.cpp  | 12 +++++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'profile-widget')

diff --git a/profile-widget/divepixmapitem.cpp b/profile-widget/divepixmapitem.cpp
index 7b0d4993e..698172cc6 100644
--- a/profile-widget/divepixmapitem.cpp
+++ b/profile-widget/divepixmapitem.cpp
@@ -1,6 +1,6 @@
 #include "divepixmapitem.h"
 #include "animationfunctions.h"
-#include "divepicturemodel.h"
+#include "qt-models/divepicturemodel.h"
 #include "pref.h"
 #ifndef SUBSURFACE_MOBILE
 #include "preferences/preferencesdialog.h"
diff --git a/profile-widget/diveprofileitem.cpp b/profile-widget/diveprofileitem.cpp
index 4262326d7..93c954fd4 100644
--- a/profile-widget/diveprofileitem.cpp
+++ b/profile-widget/diveprofileitem.cpp
@@ -8,7 +8,7 @@
 #ifndef SUBSURFACE_MOBILE
 #include "preferences/preferencesdialog.h"
 #endif
-#include "diveplannermodel.h"
+#include "qt-models/diveplannermodel.h"
 #include "helpers.h"
 #include <subsurface-qt/SettingsObjectWrapper.h>
 #include "libdivecomputer/parser.h"
diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp
index 0d6e38588..38276b235 100644
--- a/profile-widget/profilewidget2.cpp
+++ b/profile-widget/profilewidget2.cpp
@@ -1,5 +1,5 @@
 #include "profilewidget2.h"
-#include "diveplotdatamodel.h"
+#include "qt-models/diveplotdatamodel.h"
 #include "helpers.h"
 #include "profile.h"
 #include "diveeventitem.h"
@@ -10,15 +10,15 @@
 #include "ruleritem.h"
 #include "tankitem.h"
 #include "pref.h"
-#include "divepicturewidget.h"
-#include "diveplannermodel.h"
-#include "models.h"
-#include "divepicturemodel.h"
+#include "qt-models/diveplannermodel.h"
+#include "qt-models/models.h"
+#include "qt-models/divepicturemodel.h"
 #include "divelist.h"
 #include <subsurface-qt/SettingsObjectWrapper.h>
 #ifndef SUBSURFACE_MOBILE
 #include "diveplanner.h"
 #include "simplewidgets.h"
+#include "divepicturewidget.h"
 #endif
 
 #include <libdivecomputer/parser.h>
@@ -34,7 +34,9 @@
 #ifndef QT_NO_DEBUG
 #include <QTableView>
 #endif
+#ifndef SUBSURFACE_MOBILE
 #include "preferences/preferencesdialog.h"
+#endif
 #include <QtWidgets>
 
 // a couple of helpers we need
-- 
cgit v1.2.3-70-g09d2