From c110b4a23809ef7702653383d666bdd7a48ee775 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Tue, 1 Nov 2016 15:44:30 +0100 Subject: More preference handling fixes Remove a few uneeded lines and add more loading code for the preferences. Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- core/subsurface-qt/SettingsObjectWrapper.cpp | 2 ++ desktop-widgets/subsurfacewebservices.cpp | 2 -- profile-widget/diveprofileitem.cpp | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/core/subsurface-qt/SettingsObjectWrapper.cpp b/core/subsurface-qt/SettingsObjectWrapper.cpp index 68fdf195e..60efe9afb 100644 --- a/core/subsurface-qt/SettingsObjectWrapper.cpp +++ b/core/subsurface-qt/SettingsObjectWrapper.cpp @@ -2296,6 +2296,8 @@ void SettingsObjectWrapper::load() GET_TXT("time_format", time_format); GET_TXT("date_format", date_format); GET_TXT("date_format_short", date_format_short); + GET_BOOL("time_format_override", time_format_override); + GET_BOOL("date_format_override", date_format_override); s.endGroup(); } diff --git a/desktop-widgets/subsurfacewebservices.cpp b/desktop-widgets/subsurfacewebservices.cpp index 312e82314..15a14965d 100644 --- a/desktop-widgets/subsurfacewebservices.cpp +++ b/desktop-widgets/subsurfacewebservices.cpp @@ -380,8 +380,6 @@ void WebServices::resetState() SubsurfaceWebServices::SubsurfaceWebServices(QWidget *parent, Qt::WindowFlags f) : WebServices(parent, f) { - QSettings s; - // figure out if we know (or can determine) the user's web service userid QString userid(prefs.userid); diff --git a/profile-widget/diveprofileitem.cpp b/profile-widget/diveprofileitem.cpp index 240032034..c3c716539 100644 --- a/profile-widget/diveprofileitem.cpp +++ b/profile-widget/diveprofileitem.cpp @@ -14,8 +14,6 @@ #include "libdivecomputer/parser.h" #include "profile-widget/profilewidget2.h" -#include - AbstractProfilePolygonItem::AbstractProfilePolygonItem() : QObject(), QGraphicsPolygonItem(), hAxis(NULL), vAxis(NULL), dataModel(NULL), hDataColumn(-1), vDataColumn(-1) { setCacheMode(DeviceCoordinateCache); -- cgit v1.2.3-70-g09d2