mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: make qPrefDisplay getters static and inline

Browse source 
Add static and inline to getter in all qPref header files
Remove call to GET_PREFERENCE_* in qPrefDisplay.cpp

static inline is slightly faster than a function call, but it saves
a lot of coding lines (no lines in qPref*.cpp). Getters are a direct
reference to struct preferences, so they will normally only be used
from QML.

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-07-18 22:15:07 +02:00 • committed by Dirk Hohndel
parent 7f4123d0d1
commit 87d8963c78
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/settings/qPrefDisplay.cpp
View file

@ -26,7 +26,6 @@ void qPrefDisplay::loadSync(bool doSync)
disk_theme(doSync); disk_theme(doSync);
} }
GET_PREFERENCE_TXT(Display, divelist_font);
void qPrefDisplay::set_divelist_font(const QString& value) void qPrefDisplay::set_divelist_font(const QString& value)
{ {
QString newValue = value; QString newValue = value;
@ -50,7 +49,6 @@ void qPrefDisplay::disk_divelist_font(bool doSync)
setCorrectFont(); setCorrectFont();
} }
GET_PREFERENCE_DOUBLE(Display, font_size);
void qPrefDisplay::set_font_size(double value) void qPrefDisplay::set_font_size(double value)
{ {
if (value != prefs.font_size) { if (value != prefs.font_size) {

11
core/settings/qPrefDisplay.h
View file

@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#ifndef QPREFDISPLAY_H #ifndef QPREFDISPLAY_H
#define QPREFDISPLAY_H #define QPREFDISPLAY_H
#include "core/pref.h"
#include <QObject> #include <QObject>
@ -22,11 +23,11 @@ public:
void sync() { loadSync(true); } void sync() { loadSync(true); }
public: public:
const QString divelist_font() const; static inline const QString divelist_font() {return QString(prefs.divelist_font); };
double font_size() const; static inline double font_size() {return prefs.font_size; };
bool display_invalid_dives() const; static inline bool display_invalid_dives() {return prefs.display_invalid_dives; };
bool show_developer() const; static inline bool show_developer() {return prefs.show_developer; };
const QString theme() const; static inline const QString theme() {return QString(prefs.theme); };
public slots: public slots:
void set_divelist_font(const QString& value); void set_divelist_font(const QString& value);