On 04/10/2014 07:14 PM, Dirk Hohndel wrote:
On Tue, 2014-04-08 at 14:11 +0200, Gehad wrote:
This patch changes some references of QSettings to the preference struct.
Thanks.
BTW, you don't need the explicit path in this:
@@ -1,7 +1,8 @@
#include "animationfunctions.h"
+#include "../../dive.h"
+#include "../../pref.h"
#include <QPropertyAnimation>
the include path is set up correctly, so all you need is
@@ -1,7 +1,8 @@
#include "animationfunctions.h"
+#include "dive.h"
+#include "pref.h"
#include <QPropertyAnimation>
The attached patch fixes some more explicit paths in includes like that.
I fixed this in your commit before pushing it.
/D
--
Regards,
Gehad Elrobey
>From baa8f40b2d01847e54e53f037044d85018d55d94 Mon Sep 17 00:00:00 2001
From: Gehad elrobey <[email protected]>
Date: Fri, 11 Apr 2014 09:22:50 +0200
Subject: [PATCH] Removing some unneeded explicit paths in includes
The include path is set up correctly so we don't need these explicit
paths in includes.
Signed-off-by: Gehad elrobey <[email protected]>
---
qt-ui/mainwindow.cpp | 10 +++++-----
qt-ui/preferences.h | 4 ++--
qt-ui/subsurfacewebservices.cpp | 8 ++++----
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index 216f182..8d3de40 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -22,11 +22,11 @@
#include "divelistview.h"
#include "starwidget.h"
-#include "../dive.h"
-#include "../display.h"
-#include "../divelist.h"
-#include "../pref.h"
-#include "../helpers.h"
+#include "dive.h"
+#include "display.h"
+#include "divelist.h"
+#include "pref.h"
+#include "helpers.h"
#include "modeldelegates.h"
#include "models.h"
#include "downloadfromdivecomputer.h"
diff --git a/qt-ui/preferences.h b/qt-ui/preferences.h
index 5c434ec..9c384ac 100644
--- a/qt-ui/preferences.h
+++ b/qt-ui/preferences.h
@@ -2,8 +2,8 @@
#define PREFERENCES_H
#include <QDialog>
-#include "../dive.h"
-#include "../pref.h"
+#include "dive.h"
+#include "pref.h"
#include "ui_preferences.h"
diff --git a/qt-ui/subsurfacewebservices.cpp b/qt-ui/subsurfacewebservices.cpp
index a8bce4a..d6d0deb 100644
--- a/qt-ui/subsurfacewebservices.cpp
+++ b/qt-ui/subsurfacewebservices.cpp
@@ -1,5 +1,5 @@
#include "subsurfacewebservices.h"
-#include "../webservice.h"
+#include "webservice.h"
#include "mainwindow.h"
#include <libxml/parser.h>
#include <zip.h>
@@ -15,9 +15,9 @@
#include <QXmlStreamReader>
#include <qdesktopservices.h>
-#include "../dive.h"
-#include "../divelist.h"
-#include "../display.h"
+#include "dive.h"
+#include "divelist.h"
+#include "display.h"
#ifdef Q_OS_UNIX
#include <unistd.h> // for dup(2)
--
1.8.3.2
_______________________________________________
subsurface mailing list
[email protected]
http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface
