summaryrefslogtreecommitdiffstats
path: root/profile-widget
diff options
context:
space:
mode:
authorGravatar Tomaz Canabrava <tomaz.canabrava@intel.com>2015-10-31 21:02:16 -0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-11-02 12:52:15 -0800
commitff57881265a305fe06691b065bc3f0efae88e6b3 (patch)
tree517a07b28aea6446ac904344aeb1b5cd54f4d72f /profile-widget
parent8a3fb854c2b835271cc03ea02e1046f2ec0fd5d5 (diff)
downloadsubsurface-ff57881265a305fe06691b065bc3f0efae88e6b3.tar.gz
Preferences: Remove the old dialog and use the new one
The new preferences dialog still needs a bit of fine tuning but should already work. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'profile-widget')
-rw-r--r--profile-widget/divecartesianaxis.cpp2
-rw-r--r--profile-widget/divepixmapitem.cpp2
-rw-r--r--profile-widget/diveprofileitem.cpp2
-rw-r--r--profile-widget/profilewidget2.cpp2
-rw-r--r--profile-widget/ruleritem.cpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/profile-widget/divecartesianaxis.cpp b/profile-widget/divecartesianaxis.cpp
index bf5a5380c..f40e1c3e5 100644
--- a/profile-widget/divecartesianaxis.cpp
+++ b/profile-widget/divecartesianaxis.cpp
@@ -1,7 +1,7 @@
#include "divecartesianaxis.h"
#include "divetextitem.h"
#include "helpers.h"
-#include "preferences.h"
+#include "preferences/preferencesdialog.h"
#include "diveplotdatamodel.h"
#include "animationfunctions.h"
#include "mainwindow.h"
diff --git a/profile-widget/divepixmapitem.cpp b/profile-widget/divepixmapitem.cpp
index 581f6f9b4..627473c2f 100644
--- a/profile-widget/divepixmapitem.cpp
+++ b/profile-widget/divepixmapitem.cpp
@@ -1,7 +1,7 @@
#include "divepixmapitem.h"
#include "animationfunctions.h"
#include "divepicturemodel.h"
-#include <preferences.h>
+#include "preferences/preferencesdialog.h"
#include <QDesktopServices>
#include <QGraphicsView>
diff --git a/profile-widget/diveprofileitem.cpp b/profile-widget/diveprofileitem.cpp
index 7cdccee32..14efa9123 100644
--- a/profile-widget/diveprofileitem.cpp
+++ b/profile-widget/diveprofileitem.cpp
@@ -5,7 +5,7 @@
#include "animationfunctions.h"
#include "dive.h"
#include "profile.h"
-#include "preferences.h"
+#include "preferences/preferencesdialog.h"
#include "diveplannermodel.h"
#include "helpers.h"
#include "libdivecomputer/parser.h"
diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp
index 3ccd1bb6d..8ff8e8669 100644
--- a/profile-widget/profilewidget2.cpp
+++ b/profile-widget/profilewidget2.cpp
@@ -29,7 +29,7 @@
#include <QTableView>
#endif
#include "mainwindow.h"
-#include <preferences.h>
+#include "preferences/preferencesdialog.h"
/* This is the global 'Item position' variable.
* it should tell you where to position things up
diff --git a/profile-widget/ruleritem.cpp b/profile-widget/ruleritem.cpp
index 830985552..a5a61c0fe 100644
--- a/profile-widget/ruleritem.cpp
+++ b/profile-widget/ruleritem.cpp
@@ -1,5 +1,5 @@
#include "ruleritem.h"
-#include "preferences.h"
+#include "preferences/preferencesdialog.h"
#include "mainwindow.h"
#include "profilewidget2.h"
#include "display.h"