22 files changed, 302 insertions, 302 deletions

diff --git a/core/settings/qPrefCloudStorage.cpp b/core/settings/qPrefCloudStorage.cpp
index d8aa92094..741a14077 100644
--- a/core/settings/qPrefCloudStorage.cpp
+++ b/core/settings/qPrefCloudStorage.cpp
@@ -37,7 +37,7 @@ void qPrefCloudStorage::set_cloud_base_url(const QString &value)
 		}
 
 		disk_cloud_base_url(true);
-		emit instance()->cloud_base_url_changed(value);
+		emit instance()->cloud_base_urlChanged(value);
 	}
 }
 void qPrefCloudStorage::disk_cloud_base_url(bool doSync)
@@ -59,7 +59,7 @@ void qPrefCloudStorage::set_cloud_storage_password(const QString &value)
 	if (value != prefs.cloud_storage_password) {
 		qPrefPrivate::copy_txt(&prefs.cloud_storage_password, value);
 		disk_cloud_storage_password(true);
-		emit instance()->cloud_storage_password_changed(value);
+		emit instance()->cloud_storage_passwordChanged(value);
 	}
 }
 void qPrefCloudStorage::disk_cloud_storage_password(bool doSync)
diff --git a/core/settings/qPrefCloudStorage.h b/core/settings/qPrefCloudStorage.h
index d8beda9d0..0cb4cc03c 100644
--- a/core/settings/qPrefCloudStorage.h
+++ b/core/settings/qPrefCloudStorage.h
@@ -7,15 +7,15 @@
 
 class qPrefCloudStorage : public QObject {
 	Q_OBJECT
-	Q_PROPERTY(QString cloud_base_url READ cloud_base_url WRITE set_cloud_base_url NOTIFY cloud_base_url_changed);
+	Q_PROPERTY(QString cloud_base_url READ cloud_base_url WRITE set_cloud_base_url NOTIFY cloud_base_urlChanged);
 	Q_PROPERTY(QString cloud_git_url READ cloud_git_url);
-	Q_PROPERTY(QString cloud_storage_email READ cloud_storage_email WRITE set_cloud_storage_email NOTIFY cloud_storage_email_changed);
-	Q_PROPERTY(QString cloud_storage_email_encoded READ cloud_storage_email_encoded WRITE set_cloud_storage_email_encoded NOTIFY cloud_storage_email_encoded_changed);
-	Q_PROPERTY(QString cloud_storage_password READ cloud_storage_password WRITE set_cloud_storage_password NOTIFY cloud_storage_password_changed);
-	Q_PROPERTY(QString cloud_storage_pin READ cloud_storage_pin WRITE set_cloud_storage_pin NOTIFY cloud_storage_pin_changed);
-	Q_PROPERTY(int cloud_verification_status READ cloud_verification_status WRITE set_cloud_verification_status NOTIFY cloud_verification_status_changed);
-	Q_PROPERTY(int cloud_timeout READ cloud_timeout WRITE set_cloud_timeout NOTIFY cloud_timeout_changed);
-	Q_PROPERTY(bool save_password_local READ save_password_local WRITE set_save_password_local NOTIFY save_password_local_changed);
+	Q_PROPERTY(QString cloud_storage_email READ cloud_storage_email WRITE set_cloud_storage_email NOTIFY cloud_storage_emailChanged);
+	Q_PROPERTY(QString cloud_storage_email_encoded READ cloud_storage_email_encoded WRITE set_cloud_storage_email_encoded NOTIFY cloud_storage_email_encodedChanged);
+	Q_PROPERTY(QString cloud_storage_password READ cloud_storage_password WRITE set_cloud_storage_password NOTIFY cloud_storage_passwordChanged);
+	Q_PROPERTY(QString cloud_storage_pin READ cloud_storage_pin WRITE set_cloud_storage_pin NOTIFY cloud_storage_pinChanged);
+	Q_PROPERTY(int cloud_verification_status READ cloud_verification_status WRITE set_cloud_verification_status NOTIFY cloud_verification_statusChanged);
+	Q_PROPERTY(int cloud_timeout READ cloud_timeout WRITE set_cloud_timeout NOTIFY cloud_timeoutChanged);
+	Q_PROPERTY(bool save_password_local READ save_password_local WRITE set_save_password_local NOTIFY save_password_localChanged);
 
 public:
 	qPrefCloudStorage(QObject *parent = NULL);
@@ -48,14 +48,14 @@ public slots:
 	static void set_save_password_local(bool value);
 
 signals:
-	void cloud_base_url_changed(const QString &value);
-	void cloud_storage_email_changed(const QString &value);
-	void cloud_storage_email_encoded_changed(const QString &value);
-	void cloud_storage_password_changed(const QString &value);
-	void cloud_storage_pin_changed(const QString &value);
-	void cloud_timeout_changed(int value);
-	void cloud_verification_status_changed(int value);
-	void save_password_local_changed(bool value);
+	void cloud_base_urlChanged(const QString &value);
+	void cloud_storage_emailChanged(const QString &value);
+	void cloud_storage_email_encodedChanged(const QString &value);
+	void cloud_storage_passwordChanged(const QString &value);
+	void cloud_storage_pinChanged(const QString &value);
+	void cloud_timeoutChanged(int value);
+	void cloud_verification_statusChanged(int value);
+	void save_password_localChanged(bool value);
 
 private:
 	// functions to load/sync variable with disk
diff --git a/core/settings/qPrefDisplay.cpp b/core/settings/qPrefDisplay.cpp
index c22c6b5b6..4d218e19e 100644
--- a/core/settings/qPrefDisplay.cpp
+++ b/core/settings/qPrefDisplay.cpp
@@ -84,7 +84,7 @@ void qPrefDisplay::set_divelist_font(const QString &value)
 		disk_divelist_font(true);
 
 		qApp->setFont(QFont(newValue));
-		emit instance()->divelist_font_changed(value);
+		emit instance()->divelist_fontChanged(value);
 	}
 }
 void qPrefDisplay::disk_divelist_font(bool doSync)
@@ -104,7 +104,7 @@ void qPrefDisplay::set_font_size(double value)
 		QFont defaultFont = qApp->font();
 		defaultFont.setPointSizeF(prefs.font_size);
 		qApp->setFont(defaultFont);
-		emit instance()->font_size_changed(value);
+		emit instance()->font_sizeChanged(value);
 	}
 }
 void qPrefDisplay::disk_font_size(bool doSync)
diff --git a/core/settings/qPrefDisplay.h b/core/settings/qPrefDisplay.h
index 5a7eb7aac..bd1abb8a1 100644
--- a/core/settings/qPrefDisplay.h
+++ b/core/settings/qPrefDisplay.h
@@ -8,22 +8,22 @@
 
 class qPrefDisplay : public QObject {
 	Q_OBJECT
-	Q_PROPERTY(int animation_speed READ animation_speed WRITE set_animation_speed NOTIFY animation_speed_changed);
-	Q_PROPERTY(QString divelist_font READ divelist_font WRITE set_divelist_font NOTIFY divelist_font_changed);
-	Q_PROPERTY(double font_size READ font_size WRITE set_font_size NOTIFY font_size_changed);
-	Q_PROPERTY(bool display_invalid_dives READ display_invalid_dives WRITE set_display_invalid_dives NOTIFY display_invalid_dives_changed);
-	Q_PROPERTY(QString lastDir READ lastDir WRITE set_lastDir NOTIFY lastDir_changed);
-	Q_PROPERTY(bool show_developer READ show_developer WRITE set_show_developer NOTIFY show_developer_changed);
-	Q_PROPERTY(QString theme READ theme WRITE set_theme NOTIFY theme_changed);
-	Q_PROPERTY(QPointF tooltip_position READ tooltip_position WRITE set_tooltip_position NOTIFY tooltip_position_changed);
-	Q_PROPERTY(QString UserSurvey READ UserSurvey WRITE set_UserSurvey NOTIFY UserSurvey_changed);
-	Q_PROPERTY(QByteArray mainSplitter READ mainSplitter WRITE set_mainSplitter NOTIFY mainSplitter_changed);
-	Q_PROPERTY(QByteArray topSplitter READ topSplitter WRITE set_topSplitter NOTIFY topSplitter_changed);
-	Q_PROPERTY(QByteArray bottomSplitter READ bottomSplitter WRITE set_bottomSplitter NOTIFY bottomSplitter_changed);
-	Q_PROPERTY(bool maximized READ maximized WRITE set_maximized NOTIFY maximized_changed);
-	Q_PROPERTY(QByteArray geometry READ geometry WRITE set_geometry NOTIFY geometry_changed);
-	Q_PROPERTY(QByteArray windowState READ windowState WRITE set_windowState NOTIFY windowState_changed);
-	Q_PROPERTY(int lastState READ lastState WRITE set_lastState NOTIFY lastState_changed);
+	Q_PROPERTY(int animation_speed READ animation_speed WRITE set_animation_speed NOTIFY animation_speedChanged);
+	Q_PROPERTY(QString divelist_font READ divelist_font WRITE set_divelist_font NOTIFY divelist_fontChanged);
+	Q_PROPERTY(double font_size READ font_size WRITE set_font_size NOTIFY font_sizeChanged);
+	Q_PROPERTY(bool display_invalid_dives READ display_invalid_dives WRITE set_display_invalid_dives NOTIFY display_invalid_divesChanged);
+	Q_PROPERTY(QString lastDir READ lastDir WRITE set_lastDir NOTIFY lastDirChanged);
+	Q_PROPERTY(bool show_developer READ show_developer WRITE set_show_developer NOTIFY show_developerChanged);
+	Q_PROPERTY(QString theme READ theme WRITE set_theme NOTIFY themeChanged);
+	Q_PROPERTY(QPointF tooltip_position READ tooltip_position WRITE set_tooltip_position NOTIFY tooltip_positionChanged);
+	Q_PROPERTY(QString UserSurvey READ UserSurvey WRITE set_UserSurvey NOTIFY UserSurveyChanged);
+	Q_PROPERTY(QByteArray mainSplitter READ mainSplitter WRITE set_mainSplitter NOTIFY mainSplitterChanged);
+	Q_PROPERTY(QByteArray topSplitter READ topSplitter WRITE set_topSplitter NOTIFY topSplitterChanged);
+	Q_PROPERTY(QByteArray bottomSplitter READ bottomSplitter WRITE set_bottomSplitter NOTIFY bottomSplitterChanged);
+	Q_PROPERTY(bool maximized READ maximized WRITE set_maximized NOTIFY maximizedChanged);
+	Q_PROPERTY(QByteArray geometry READ geometry WRITE set_geometry NOTIFY geometryChanged);
+	Q_PROPERTY(QByteArray windowState READ windowState WRITE set_windowState NOTIFY windowStateChanged);
+	Q_PROPERTY(int lastState READ lastState WRITE set_lastState NOTIFY lastStateChanged);
 
 public:
 	qPrefDisplay(QObject *parent = NULL);
@@ -71,22 +71,22 @@ public slots:
 	static void set_lastState(int value);
 
 signals:
-	void animation_speed_changed(int value);
-	void divelist_font_changed(const QString &value);
-	void font_size_changed(double value);
-	void display_invalid_dives_changed(bool value);
-	void lastDir_changed(const QString &value);
-	void show_developer_changed(bool value);
-	void theme_changed(const QString &value);
-	void tooltip_position_changed(const QPointF &value);
-	void UserSurvey_changed(const QString &value);
-	void mainSplitter_changed(const QByteArray &value);
-	void topSplitter_changed(const QByteArray &value);
-	void bottomSplitter_changed(const QByteArray &value);
-	void maximized_changed(bool value);
-	void geometry_changed(const QByteArray& value);
-	void windowState_changed(const QByteArray& value);
-	void lastState_changed(int value);
+	void animation_speedChanged(int value);
+	void divelist_fontChanged(const QString &value);
+	void font_sizeChanged(double value);
+	void display_invalid_divesChanged(bool value);
+	void lastDirChanged(const QString &value);
+	void show_developerChanged(bool value);
+	void themeChanged(const QString &value);
+	void tooltip_positionChanged(const QPointF &value);
+	void UserSurveyChanged(const QString &value);
+	void mainSplitterChanged(const QByteArray &value);
+	void topSplitterChanged(const QByteArray &value);
+	void bottomSplitterChanged(const QByteArray &value);
+	void maximizedChanged(bool value);
+	void geometryChanged(const QByteArray& value);
+	void windowStateChanged(const QByteArray& value);
+	void lastStateChanged(int value);
 
 private:
 	// functions to load/sync variable with disk
diff --git a/core/settings/qPrefDiveComputer.h b/core/settings/qPrefDiveComputer.h
index 99ff6575b..924c4f280 100644
--- a/core/settings/qPrefDiveComputer.h
+++ b/core/settings/qPrefDiveComputer.h
@@ -7,11 +7,11 @@
 
 class qPrefDiveComputer : public QObject {
 	Q_OBJECT
-	Q_PROPERTY(QString device READ device WRITE set_device NOTIFY device_changed);
-	Q_PROPERTY(QString device_name READ device_name WRITE set_device_name NOTIFY device_name_changed);
-	Q_PROPERTY(int download_mode READ download_mode WRITE set_download_mode NOTIFY download_mode_changed);
-	Q_PROPERTY(QString product READ product WRITE set_product NOTIFY product_changed);
-	Q_PROPERTY(QString vendor READ vendor WRITE set_vendor NOTIFY vendor_changed);
+	Q_PROPERTY(QString device READ device WRITE set_device NOTIFY deviceChanged);
+	Q_PROPERTY(QString device_name READ device_name WRITE set_device_name NOTIFY device_nameChanged);
+	Q_PROPERTY(int download_mode READ download_mode WRITE set_download_mode NOTIFY download_modeChanged);
+	Q_PROPERTY(QString product READ product WRITE set_product NOTIFY productChanged);
+	Q_PROPERTY(QString vendor READ vendor WRITE set_vendor NOTIFY vendorChanged);
 
 public:
 	qPrefDiveComputer(QObject *parent = NULL);
@@ -37,11 +37,11 @@ public slots:
 	static void set_vendor(const QString &vendor);
 
 signals:
-	void device_changed(const QString &device);
-	void device_name_changed(const QString &device_name);
-	void download_mode_changed(int mode);
-	void product_changed(const QString &product);
-	void vendor_changed(const QString &vendor);
+	void deviceChanged(const QString &device);
+	void device_nameChanged(const QString &device_name);
+	void download_modeChanged(int mode);
+	void productChanged(const QString &product);
+	void vendorChanged(const QString &vendor);
 
 private:
 	// functions to load/sync variable with disk
diff --git a/core/settings/qPrefDivePlanner.h b/core/settings/qPrefDivePlanner.h
index fa6ecb80c..35d519fb9 100644
--- a/core/settings/qPrefDivePlanner.h
+++ b/core/settings/qPrefDivePlanner.h
@@ -7,31 +7,31 @@
 
 class qPrefDivePlanner : public QObject {
 	Q_OBJECT
-	Q_PROPERTY(int ascratelast6m READ ascratelast6m WRITE set_ascratelast6m NOTIFY ascratelast6m_changed);
-	Q_PROPERTY(int ascratestops READ ascratestops WRITE set_ascratestops NOTIFY ascratestops_changed);
-	Q_PROPERTY(int ascrate50 READ ascrate50 WRITE set_ascrate50 NOTIFY ascrate50_changed);
-	Q_PROPERTY(int ascrate75 READ ascrate75 WRITE set_ascrate75 NOTIFY ascrate75_changed);
-	Q_PROPERTY(depth_t bestmixend READ bestmixend WRITE set_bestmixend NOTIFY bestmixend_changed);
-	Q_PROPERTY(int bottompo2 READ bottompo2 WRITE set_bottompo2 NOTIFY bottompo2_changed);
-	Q_PROPERTY(int bottomsac READ bottomsac WRITE set_bottomsac NOTIFY bottomsac_changed);
-	Q_PROPERTY(int decopo2 READ decopo2 WRITE set_decopo2 NOTIFY decopo2_changed);
-	Q_PROPERTY(int decosac READ decosac WRITE set_decosac NOTIFY decosac_changed);
-	Q_PROPERTY(int descrate READ descrate WRITE set_descrate NOTIFY descrate_changed);
-	Q_PROPERTY(bool display_duration READ display_duration WRITE set_display_duration NOTIFY display_duration_changed);
-	Q_PROPERTY(bool display_runtime READ display_runtime WRITE set_display_runtime NOTIFY display_runtime_changed);
-	Q_PROPERTY(bool display_transitions READ display_transitions WRITE set_display_transitions NOTIFY      display_transitions_changed);
-	Q_PROPERTY(bool display_variations READ display_variations WRITE set_display_variations NOTIFY display_variations_changed);
-	Q_PROPERTY(bool doo2breaks READ doo2breaks WRITE set_doo2breaks NOTIFY doo2breaks_changed);
-	Q_PROPERTY(bool drop_stone_mode READ drop_stone_mode WRITE set_drop_stone_mode NOTIFY drop_stone_mode_changed);
-	Q_PROPERTY(bool last_stop READ last_stop WRITE set_last_stop NOTIFY last_stop_changed);
-	Q_PROPERTY(int min_switch_duration READ min_switch_duration WRITE set_min_switch_duration NOTIFY min_switch_duration_changed);
-	Q_PROPERTY(deco_mode planner_deco_mode READ planner_deco_mode WRITE set_planner_deco_mode NOTIFY planner_deco_mode_changed);
-	Q_PROPERTY(int problemsolvingtime READ problemsolvingtime WRITE set_problemsolvingtime NOTIFY problemsolvingtime_changed);
-	Q_PROPERTY(int reserve_gas READ reserve_gas WRITE set_reserve_gas NOTIFY reserve_gas_changed);
-	Q_PROPERTY(int sacfactor READ sacfactor WRITE set_sacfactor NOTIFY sacfactor_changed);
-	Q_PROPERTY(bool safetystop READ safetystop WRITE set_safetystop NOTIFY safetystop_changed);
-	Q_PROPERTY(bool switch_at_req_stop READ switch_at_req_stop WRITE set_switch_at_req_stop NOTIFY switch_at_req_stop_changed);
-	Q_PROPERTY(bool verbatim_plan READ verbatim_plan WRITE set_verbatim_plan NOTIFY verbatim_plan_changed);
+	Q_PROPERTY(int ascratelast6m READ ascratelast6m WRITE set_ascratelast6m NOTIFY ascratelast6mChanged);
+	Q_PROPERTY(int ascratestops READ ascratestops WRITE set_ascratestops NOTIFY ascratestopsChanged);
+	Q_PROPERTY(int ascrate50 READ ascrate50 WRITE set_ascrate50 NOTIFY ascrate50Changed);
+	Q_PROPERTY(int ascrate75 READ ascrate75 WRITE set_ascrate75 NOTIFY ascrate75Changed);
+	Q_PROPERTY(depth_t bestmixend READ bestmixend WRITE set_bestmixend NOTIFY bestmixendChanged);
+	Q_PROPERTY(int bottompo2 READ bottompo2 WRITE set_bottompo2 NOTIFY bottompo2Changed);
+	Q_PROPERTY(int bottomsac READ bottomsac WRITE set_bottomsac NOTIFY bottomsacChanged);
+	Q_PROPERTY(int decopo2 READ decopo2 WRITE set_decopo2 NOTIFY decopo2Changed);
+	Q_PROPERTY(int decosac READ decosac WRITE set_decosac NOTIFY decosacChanged);
+	Q_PROPERTY(int descrate READ descrate WRITE set_descrate NOTIFY descrateChanged);
+	Q_PROPERTY(bool display_duration READ display_duration WRITE set_display_duration NOTIFY display_durationChanged);
+	Q_PROPERTY(bool display_runtime READ display_runtime WRITE set_display_runtime NOTIFY display_runtimeChanged);
+	Q_PROPERTY(bool display_transitions READ display_transitions WRITE set_display_transitions NOTIFY      display_transitionsChanged);
+	Q_PROPERTY(bool display_variations READ display_variations WRITE set_display_variations NOTIFY display_variationsChanged);
+	Q_PROPERTY(bool doo2breaks READ doo2breaks WRITE set_doo2breaks NOTIFY doo2breaksChanged);
+	Q_PROPERTY(bool drop_stone_mode READ drop_stone_mode WRITE set_drop_stone_mode NOTIFY drop_stone_modeChanged);
+	Q_PROPERTY(bool last_stop READ last_stop WRITE set_last_stop NOTIFY last_stopChanged);
+	Q_PROPERTY(int min_switch_duration READ min_switch_duration WRITE set_min_switch_duration NOTIFY min_switch_durationChanged);
+	Q_PROPERTY(deco_mode planner_deco_mode READ planner_deco_mode WRITE set_planner_deco_mode NOTIFY planner_deco_modeChanged);
+	Q_PROPERTY(int problemsolvingtime READ problemsolvingtime WRITE set_problemsolvingtime NOTIFY problemsolvingtimeChanged);
+	Q_PROPERTY(int reserve_gas READ reserve_gas WRITE set_reserve_gas NOTIFY reserve_gasChanged);
+	Q_PROPERTY(int sacfactor READ sacfactor WRITE set_sacfactor NOTIFY sacfactorChanged);
+	Q_PROPERTY(bool safetystop READ safetystop WRITE set_safetystop NOTIFY safetystopChanged);
+	Q_PROPERTY(bool switch_at_req_stop READ switch_at_req_stop WRITE set_switch_at_req_stop NOTIFY switch_at_req_stopChanged);
+	Q_PROPERTY(bool verbatim_plan READ verbatim_plan WRITE set_verbatim_plan NOTIFY verbatim_planChanged);
 
 public:
 	qPrefDivePlanner(QObject *parent = NULL);
@@ -97,31 +97,31 @@ public slots:
 	static void set_verbatim_plan(bool value);
 
 signals:
-	void ascratelast6m_changed(int value);
-	void ascratestops_changed(int value);
-	void ascrate50_changed(int value);
-	void ascrate75_changed(int value);
-	void bestmixend_changed(depth_t value);
-	void bottompo2_changed(int value);
-	void bottomsac_changed(int value);
-	void decopo2_changed(int value);
-	void decosac_changed(int value);
-	void descrate_changed(int value);
-	void display_duration_changed(bool value);
-	void display_runtime_changed(bool value);
-	void display_transitions_changed(bool value);
-	void display_variations_changed(bool value);
-	void doo2breaks_changed(bool value);
-	void drop_stone_mode_changed(bool value);
-	void last_stop_changed(bool value);
-	void min_switch_duration_changed(int value);
-	void planner_deco_mode_changed(deco_mode value);
-	void problemsolvingtime_changed(int value);
-	void reserve_gas_changed(int value);
-	void sacfactor_changed(int value);
-	void safetystop_changed(bool value);
-	void switch_at_req_stop_changed(bool value);
-	void verbatim_plan_changed(bool value);
+	void ascratelast6mChanged(int value);
+	void ascratestopsChanged(int value);
+	void ascrate50Changed(int value);
+	void ascrate75Changed(int value);
+	void bestmixendChanged(depth_t value);
+	void bottompo2Changed(int value);
+	void bottomsacChanged(int value);
+	void decopo2Changed(int value);
+	void decosacChanged(int value);
+	void descrateChanged(int value);
+	void display_durationChanged(bool value);
+	void display_runtimeChanged(bool value);
+	void display_transitionsChanged(bool value);
+	void display_variationsChanged(bool value);
+	void doo2breaksChanged(bool value);
+	void drop_stone_modeChanged(bool value);
+	void last_stopChanged(bool value);
+	void min_switch_durationChanged(int value);
+	void planner_deco_modeChanged(deco_mode value);
+	void problemsolvingtimeChanged(int value);
+	void reserve_gasChanged(int value);
+	void sacfactorChanged(int value);
+	void safetystopChanged(bool value);
+	void switch_at_req_stopChanged(bool value);
+	void verbatim_planChanged(bool value);
 
 private:
 	static void disk_ascratelast6m(bool doSync);
diff --git a/core/settings/qPrefFacebook.cpp b/core/settings/qPrefFacebook.cpp
index 8728313ab..8ce8faf08 100644
--- a/core/settings/qPrefFacebook.cpp
+++ b/core/settings/qPrefFacebook.cpp
@@ -22,7 +22,7 @@ void qPrefFacebook::set_access_token(const QString &value)
 {
 	if (value != prefs.facebook.access_token) {
 		qPrefPrivate::copy_txt(&prefs.facebook.access_token, value);
-		emit instance()->access_token_changed(value);
+		emit instance()->access_tokenChanged(value);
 	}
 }
 
@@ -30,7 +30,7 @@ void qPrefFacebook::set_album_id(const QString &value)
 {
 	if (value != prefs.facebook.album_id) {
 		qPrefPrivate::copy_txt(&prefs.facebook.album_id, value);
-		emit instance()->album_id_changed(value);
+		emit instance()->album_idChanged(value);
 	}
 }
 
@@ -38,6 +38,6 @@ void qPrefFacebook::set_user_id(const QString &value)
 {
 	if (value != prefs.facebook.user_id) {
 		qPrefPrivate::copy_txt(&prefs.facebook.user_id, value);
-		emit instance()->access_token_changed(value);
+		emit instance()->access_tokenChanged(value);
 	}
 }
diff --git a/core/settings/qPrefFacebook.h b/core/settings/qPrefFacebook.h
index 0493b8ca9..fcd8f1f7c 100644
--- a/core/settings/qPrefFacebook.h
+++ b/core/settings/qPrefFacebook.h
@@ -8,9 +8,9 @@
 
 class qPrefFacebook : public QObject {
 	Q_OBJECT
-	Q_PROPERTY(QString access_token READ access_token WRITE set_access_token NOTIFY access_token_changed);
-	Q_PROPERTY(QString album_id READ album_id WRITE set_album_id NOTIFY album_id_changed);
-	Q_PROPERTY(QString user_id READ user_id WRITE set_user_id NOTIFY user_id_changed);
+	Q_PROPERTY(QString access_token READ access_token WRITE set_access_token NOTIFY access_tokenChanged);
+	Q_PROPERTY(QString album_id READ album_id WRITE set_album_id NOTIFY album_idChanged);
+	Q_PROPERTY(QString user_id READ user_id WRITE set_user_id NOTIFY user_idChanged);
 
 public:
 	qPrefFacebook(QObject *parent = NULL);
@@ -32,9 +32,9 @@ public slots:
 	static void set_user_id(const QString& value);
 
 signals:
-	void access_token_changed(const QString& value);
-	void album_id_changed(const QString& value);
-	void user_id_changed(const QString& value);
+	void access_tokenChanged(const QString& value);
+	void album_idChanged(const QString& value);
+	void user_idChanged(const QString& value);
 
 private:
 	static void disk_access_token(bool doSync);
diff --git a/core/settings/qPrefGeneral.cpp b/core/settings/qPrefGeneral.cpp
index 4e8dc3a10..f2ae46494 100644
--- a/core/settings/qPrefGeneral.cpp
+++ b/core/settings/qPrefGeneral.cpp
@@ -61,7 +61,7 @@ void qPrefGeneral::set_default_file_behavior(enum def_file_behavior value)
 		prefs.default_file_behavior = value;
 	}
 	disk_default_file_behavior(true);
-	emit qPrefGeneral::instance()->default_file_behavior_changed(value);
+	emit qPrefGeneral::instance()->default_file_behaviorChanged(value);
 	}
 }
 void qPrefGeneral::disk_default_file_behavior(bool doSync)
diff --git a/core/settings/qPrefGeneral.h b/core/settings/qPrefGeneral.h
index 4d35c3817..41b2928ad 100644
--- a/core/settings/qPrefGeneral.h
+++ b/core/settings/qPrefGeneral.h
@@ -7,19 +7,19 @@
 
 class qPrefGeneral : public QObject {
 	Q_OBJECT
-	Q_PROPERTY(bool auto_recalculate_thumbnails READ auto_recalculate_thumbnails WRITE set_auto_recalculate_thumbnails NOTIFY auto_recalculate_thumbnails_changed);
-	Q_PROPERTY(QString default_cylinder READ default_cylinder WRITE set_default_cylinder NOTIFY default_cylinder_changed);
-	Q_PROPERTY(QString default_filename READ default_filename WRITE set_default_filename NOTIFY default_filename_changed);
-	Q_PROPERTY(enum def_file_behavior default_file_behavior READ default_file_behavior WRITE set_default_file_behavior NOTIFY default_file_behavior_changed);
-	Q_PROPERTY(int defaultsetpoint READ defaultsetpoint WRITE set_defaultsetpoint NOTIFY defaultsetpoint_changed);
-	Q_PROPERTY(bool extract_video_thumbnails READ extract_video_thumbnails WRITE set_extract_video_thumbnails NOTIFY extract_video_thumbnails_changed);
-	Q_PROPERTY(int extract_video_thumbnails_position READ extract_video_thumbnails_position WRITE set_extract_video_thumbnails_position NOTIFY extract_video_thumbnails_position_changed);
-	Q_PROPERTY(QString ffmpeg_executable READ ffmpeg_executable WRITE set_ffmpeg_executable  NOTIFY ffmpeg_executable_changed);
-	Q_PROPERTY(int o2consumption READ o2consumption WRITE set_o2consumption NOTIFY o2consumption_changed);
-	Q_PROPERTY(int pscr_ratio READ pscr_ratio WRITE set_pscr_ratio NOTIFY pscr_ratio_changed);
-	Q_PROPERTY(bool use_default_file READ use_default_file WRITE set_use_default_file NOTIFY use_default_file_changed);
-	Q_PROPERTY(QString diveshareExport_uid READ diveshareExport_uid WRITE set_diveshareExport_uid NOTIFY diveshareExport_uid_changed);
-	Q_PROPERTY(bool diveshareExport_private READ diveshareExport_private WRITE set_diveshareExport_private NOTIFY diveshareExport_private_changed);
+	Q_PROPERTY(bool auto_recalculate_thumbnails READ auto_recalculate_thumbnails WRITE set_auto_recalculate_thumbnails NOTIFY auto_recalculate_thumbnailsChanged);
+	Q_PROPERTY(QString default_cylinder READ default_cylinder WRITE set_default_cylinder NOTIFY default_cylinderChanged);
+	Q_PROPERTY(QString default_filename READ default_filename WRITE set_default_filename NOTIFY default_filenameChanged);
+	Q_PROPERTY(enum def_file_behavior default_file_behavior READ default_file_behavior WRITE set_default_file_behavior NOTIFY default_file_behaviorChanged);
+	Q_PROPERTY(int defaultsetpoint READ defaultsetpoint WRITE set_defaultsetpoint NOTIFY defaultsetpointChanged);
+	Q_PROPERTY(bool extract_video_thumbnails READ extract_video_thumbnails WRITE set_extract_video_thumbnails NOTIFY extract_video_thumbnailsChanged);
+	Q_PROPERTY(int extract_video_thumbnails_position READ extract_video_thumbnails_position WRITE set_extract_video_thumbnails_position NOTIFY extract_video_thumbnails_positionChanged);
+	Q_PROPERTY(QString ffmpeg_executable READ ffmpeg_executable WRITE set_ffmpeg_executable  NOTIFY ffmpeg_executableChanged);
+	Q_PROPERTY(int o2consumption READ o2consumption WRITE set_o2consumption NOTIFY o2consumptionChanged);
+	Q_PROPERTY(int pscr_ratio READ pscr_ratio WRITE set_pscr_ratio NOTIFY pscr_ratioChanged);
+	Q_PROPERTY(bool use_default_file READ use_default_file WRITE set_use_default_file NOTIFY use_default_fileChanged);
+	Q_PROPERTY(QString diveshareExport_uid READ diveshareExport_uid WRITE set_diveshareExport_uid NOTIFY diveshareExport_uidChanged);
+	Q_PROPERTY(bool diveshareExport_private READ diveshareExport_private WRITE set_diveshareExport_private NOTIFY diveshareExport_privateChanged);
 
 public:
 	qPrefGeneral(QObject *parent = NULL);
@@ -61,19 +61,19 @@ public slots:
 	static void set_diveshareExport_private(bool value);
 
 signals:
-	void auto_recalculate_thumbnails_changed(bool value);
-	void default_cylinder_changed(const QString& value);
-	void default_filename_changed(const QString& value);
-	void default_file_behavior_changed(enum def_file_behavior value);
-	void defaultsetpoint_changed(int value);
-	void extract_video_thumbnails_changed(bool value);
-	void extract_video_thumbnails_position_changed(int value);
-	void ffmpeg_executable_changed(const QString& value);
-	void o2consumption_changed(int value);
-	void pscr_ratio_changed(int value);
-	void use_default_file_changed(bool value);
-	void diveshareExport_uid_changed(const QString& value);
-	void diveshareExport_private_changed(bool value);
+	void auto_recalculate_thumbnailsChanged(bool value);
+	void default_cylinderChanged(const QString& value);
+	void default_filenameChanged(const QString& value);
+	void default_file_behaviorChanged(enum def_file_behavior value);
+	void defaultsetpointChanged(int value);
+	void extract_video_thumbnailsChanged(bool value);
+	void extract_video_thumbnails_positionChanged(int value);
+	void ffmpeg_executableChanged(const QString& value);
+	void o2consumptionChanged(int value);
+	void pscr_ratioChanged(int value);
+	void use_default_fileChanged(bool value);
+	void diveshareExport_uidChanged(const QString& value);
+	void diveshareExport_privateChanged(bool value);
 
 private:
 	static void disk_auto_recalculate_thumbnails(bool doSync);
diff --git a/core/settings/qPrefGeocoding.cpp b/core/settings/qPrefGeocoding.cpp
index 404ce40d5..9597799ca 100644
--- a/core/settings/qPrefGeocoding.cpp
+++ b/core/settings/qPrefGeocoding.cpp
@@ -26,7 +26,7 @@ void qPrefGeocoding::set_first_taxonomy_category(taxonomy_category value)
 	if (value != prefs.geocoding.category[0]) {
 		prefs.geocoding.category[0] = value;
 		disk_first_taxonomy_category(true);
-		emit instance()->first_taxonomy_category_changed(value);
+		emit instance()->first_taxonomy_categoryChanged(value);
 	}
 }
 void qPrefGeocoding::disk_first_taxonomy_category(bool doSync)
@@ -43,7 +43,7 @@ void qPrefGeocoding::set_second_taxonomy_category(taxonomy_category value)
 	if (value != prefs.geocoding.category[1]) {
 		prefs.geocoding.category[1] = value;
 		disk_second_taxonomy_category(true);
-		emit instance()->second_taxonomy_category_changed(value);
+		emit instance()->second_taxonomy_categoryChanged(value);
 	}
 }
 void qPrefGeocoding::disk_second_taxonomy_category(bool doSync)
@@ -60,7 +60,7 @@ void qPrefGeocoding::set_third_taxonomy_category(taxonomy_category value)
 	if (value != prefs.geocoding.category[2]) {
 		prefs.geocoding.category[2] = value;
 		disk_third_taxonomy_category(true);
-		emit instance()->third_taxonomy_category_changed(value);
+		emit instance()->third_taxonomy_categoryChanged(value);
 	}
 }
 void qPrefGeocoding::disk_third_taxonomy_category(bool doSync)
diff --git a/core/settings/qPrefGeocoding.h b/core/settings/qPrefGeocoding.h
index 03c9f59c8..3ed3fb034 100644
--- a/core/settings/qPrefGeocoding.h
+++ b/core/settings/qPrefGeocoding.h
@@ -8,9 +8,9 @@
 
 class qPrefGeocoding : public QObject {
 	Q_OBJECT
-	Q_PROPERTY(taxonomy_category first_taxonomy_category READ first_taxonomy_category WRITE set_first_taxonomy_category NOTIFY first_taxonomy_category_changed);
-	Q_PROPERTY(taxonomy_category second_taxonomy_category READ second_taxonomy_category WRITE set_second_taxonomy_category NOTIFY second_taxonomy_category_changed);
-	Q_PROPERTY(taxonomy_category third_taxonomy_category READ third_taxonomy_category WRITE set_third_taxonomy_category NOTIFY third_taxonomy_category_changed);
+	Q_PROPERTY(taxonomy_category first_taxonomy_category READ first_taxonomy_category WRITE set_first_taxonomy_category NOTIFY first_taxonomy_categoryChanged);
+	Q_PROPERTY(taxonomy_category second_taxonomy_category READ second_taxonomy_category WRITE set_second_taxonomy_category NOTIFY second_taxonomy_categoryChanged);
+	Q_PROPERTY(taxonomy_category third_taxonomy_category READ third_taxonomy_category WRITE set_third_taxonomy_category NOTIFY third_taxonomy_categoryChanged);
 
 public:
 	qPrefGeocoding(QObject *parent = NULL);
@@ -32,9 +32,9 @@ public slots:
 	static void set_third_taxonomy_category(taxonomy_category value);
 
 signals:
-	void first_taxonomy_category_changed(taxonomy_category value);
-	void second_taxonomy_category_changed(taxonomy_category value);
-	void third_taxonomy_category_changed(taxonomy_category value);
+	void first_taxonomy_categoryChanged(taxonomy_category value);
+	void second_taxonomy_categoryChanged(taxonomy_category value);
+	void third_taxonomy_categoryChanged(taxonomy_category value);
 
 private:
 	static void disk_first_taxonomy_category(bool doSync);
diff --git a/core/settings/qPrefLanguage.h b/core/settings/qPrefLanguage.h
index e004f79d3..f3c15823a 100644
--- a/core/settings/qPrefLanguage.h
+++ b/core/settings/qPrefLanguage.h
@@ -7,14 +7,14 @@
 
 class qPrefLanguage : public QObject {
 	Q_OBJECT
-	Q_PROPERTY(QString date_format READ date_format WRITE set_date_format NOTIFY date_format_changed);
-	Q_PROPERTY(bool date_format_override READ date_format_override WRITE set_date_format_override NOTIFY date_format_override_changed);
-	Q_PROPERTY(QString date_format_short READ date_format_short WRITE set_date_format_short NOTIFY date_format_short_changed);
-	Q_PROPERTY(QString language READ language WRITE set_language NOTIFY language_changed);
-	Q_PROPERTY(QString lang_locale READ lang_locale WRITE set_lang_locale NOTIFY lang_locale_changed);
-	Q_PROPERTY(QString time_format READ time_format WRITE set_time_format NOTIFY time_format_changed);
-	Q_PROPERTY(bool time_format_override READ time_format_override WRITE set_time_format_override NOTIFY time_format_override_changed);
-	Q_PROPERTY(bool use_system_language READ use_system_language WRITE set_use_system_language NOTIFY use_system_language_changed);
+	Q_PROPERTY(QString date_format READ date_format WRITE set_date_format NOTIFY date_formatChanged);
+	Q_PROPERTY(bool date_format_override READ date_format_override WRITE set_date_format_override NOTIFY date_format_overrideChanged);
+	Q_PROPERTY(QString date_format_short READ date_format_short WRITE set_date_format_short NOTIFY date_format_shortChanged);
+	Q_PROPERTY(QString language READ language WRITE set_language NOTIFY languageChanged);
+	Q_PROPERTY(QString lang_locale READ lang_locale WRITE set_lang_locale NOTIFY lang_localeChanged);
+	Q_PROPERTY(QString time_format READ time_format WRITE set_time_format NOTIFY time_formatChanged);
+	Q_PROPERTY(bool time_format_override READ time_format_override WRITE set_time_format_override NOTIFY time_format_overrideChanged);
+	Q_PROPERTY(bool use_system_language READ use_system_language WRITE set_use_system_language NOTIFY use_system_languageChanged);
 
 public:
 	qPrefLanguage(QObject *parent = NULL);
@@ -46,14 +46,14 @@ public slots:
 	static void set_use_system_language(bool value);
 
 signals:
-	void date_format_changed(const QString& value);
-	void date_format_override_changed(bool value);
-	void date_format_short_changed(const QString& value);
-	void language_changed(const QString& value);
-	void lang_locale_changed(const QString& value);
-	void time_format_changed(const QString& value);
-	void time_format_override_changed(bool value);
-	void use_system_language_changed(bool value);
+	void date_formatChanged(const QString& value);
+	void date_format_overrideChanged(bool value);
+	void date_format_shortChanged(const QString& value);
+	void languageChanged(const QString& value);
+	void lang_localeChanged(const QString& value);
+	void time_formatChanged(const QString& value);
+	void time_format_overrideChanged(bool value);
+	void use_system_languageChanged(bool value);
 
 private:
 	static void disk_date_format(bool doSync);
diff --git a/core/settings/qPrefLocationService.h b/core/settings/qPrefLocationService.h
index 676f2bbf8..6fdca8385 100644
--- a/core/settings/qPrefLocationService.h
+++ b/core/settings/qPrefLocationService.h
@@ -8,8 +8,8 @@
 
 class qPrefLocationService : public QObject {
 	Q_OBJECT
-	Q_PROPERTY(int distance_threshold READ distance_threshold WRITE set_distance_threshold NOTIFY distance_threshold_changed);
-	Q_PROPERTY(int time_threshold READ time_threshold WRITE set_time_threshold NOTIFY time_threshold_changed);
+	Q_PROPERTY(int distance_threshold READ distance_threshold WRITE set_distance_threshold NOTIFY distance_thresholdChanged);
+	Q_PROPERTY(int time_threshold READ time_threshold WRITE set_time_threshold NOTIFY time_thresholdChanged);
 
 public:
 	qPrefLocationService(QObject *parent = NULL);
@@ -29,8 +29,8 @@ public slots:
 	static void set_time_threshold(int value);
 
 signals:
-	void distance_threshold_changed(int value);
-	void time_threshold_changed(int value);
+	void distance_thresholdChanged(int value);
+	void time_thresholdChanged(int value);
 
 
 private:
diff --git a/core/settings/qPrefPartialPressureGas.h b/core/settings/qPrefPartialPressureGas.h
index c87711658..2f20d980e 100644
--- a/core/settings/qPrefPartialPressureGas.h
+++ b/core/settings/qPrefPartialPressureGas.h
@@ -7,13 +7,13 @@
 
 class qPrefPartialPressureGas : public QObject {
 	Q_OBJECT
-	Q_PROPERTY(bool phe READ phe WRITE set_phe NOTIFY phe_changed);
-	Q_PROPERTY(double phe_threshold READ phe_threshold WRITE set_phe_threshold NOTIFY phe_threshold_changed);
-	Q_PROPERTY(bool pn2 READ pn2 WRITE set_pn2 NOTIFY pn2_changed);
-	Q_PROPERTY(double pn2_threshold READ pn2_threshold WRITE set_pn2_threshold NOTIFY pn2_threshold_changed);
-	Q_PROPERTY(bool po2 READ po2 WRITE set_po2 NOTIFY po2_changed);
-	Q_PROPERTY(double po2_threshold_max READ po2_threshold_max WRITE set_po2_threshold_max NOTIFY po2_threshold_max_changed);
-	Q_PROPERTY(double po2_threshold_min READ po2_threshold_min WRITE set_po2_threshold_min NOTIFY po2_threshold_min_changed);
+	Q_PROPERTY(bool phe READ phe WRITE set_phe NOTIFY pheChanged);
+	Q_PROPERTY(double phe_threshold READ phe_threshold WRITE set_phe_threshold NOTIFY phe_thresholdChanged);
+	Q_PROPERTY(bool pn2 READ pn2 WRITE set_pn2 NOTIFY pn2Changed);
+	Q_PROPERTY(double pn2_threshold READ pn2_threshold WRITE set_pn2_threshold NOTIFY pn2_thresholdChanged);
+	Q_PROPERTY(bool po2 READ po2 WRITE set_po2 NOTIFY po2Changed);
+	Q_PROPERTY(double po2_threshold_max READ po2_threshold_max WRITE set_po2_threshold_max NOTIFY po2_threshold_maxChanged);
+	Q_PROPERTY(double po2_threshold_min READ po2_threshold_min WRITE set_po2_threshold_min NOTIFY po2_threshold_minChanged);
 
 public:
 	qPrefPartialPressureGas(QObject *parent = NULL);
@@ -43,13 +43,13 @@ public slots:
 	static void set_po2_threshold_max(double value);
 
 signals:
-	void phe_changed(bool value);
-	void phe_threshold_changed(double value);
-	void pn2_changed(bool value);
-	void pn2_threshold_changed(double value);
-	void po2_changed(bool value);
-	void po2_threshold_max_changed(double value);
-	void po2_threshold_min_changed(double value);
+	void pheChanged(bool value);
+	void phe_thresholdChanged(double value);
+	void pn2Changed(bool value);
+	void pn2_thresholdChanged(double value);
+	void po2Changed(bool value);
+	void po2_threshold_maxChanged(double value);
+	void po2_threshold_minChanged(double value);
 
 private:
 	static void disk_phe(bool doSync);
diff --git a/core/settings/qPrefPrivate.h b/core/settings/qPrefPrivate.h
index d4f60542c..95466cece 100644
--- a/core/settings/qPrefPrivate.h
+++ b/core/settings/qPrefPrivate.h
@@ -152,7 +152,7 @@ extern QString keyFromGroupAndName(QString group, QString name);
 		if (value != prefs.usestruct field) { \
 			prefs.usestruct field = value; \
 			disk_##field(true); \
-			emit qPref##usegroup::instance()->field##_changed(value); \
+			emit qPref##usegroup::instance()->field##Changed(value); \
 		} \
 	}
 #define SET_PREFERENCE_BOOL(usegroup, field) \
@@ -164,7 +164,7 @@ extern QString keyFromGroupAndName(QString group, QString name);
 		if (value != prefs.usestruct field) { \
 			prefs.usestruct field = value; \
 			disk_##field(true); \
-			emit qPref##usegroup::instance()->field##_changed(value); \
+			emit qPref##usegroup::instance()->field##Changed(value); \
 		} \
 	}
 #define SET_PREFERENCE_DOUBLE(usegroup, field) \
@@ -176,7 +176,7 @@ extern QString keyFromGroupAndName(QString group, QString name);
 		if (value != prefs.usestruct field) { \
 			prefs.usestruct field = value; \
 			disk_##field(true); \
-			emit qPref##usegroup::instance()->field##_changed(value); \
+			emit qPref##usegroup::instance()->field##Changed(value); \
 		} \
 	}
 #define SET_PREFERENCE_ENUM(usegroup, type, field) \
@@ -188,7 +188,7 @@ extern QString keyFromGroupAndName(QString group, QString name);
 		if (value != prefs.usestruct field) { \
 			prefs.usestruct field = value; \
 			disk_##field(true); \
-			emit qPref##usegroup::instance()->field##_changed(value); \
+			emit qPref##usegroup::instance()->field##Changed(value); \
 		} \
 	}
 #define SET_PREFERENCE_INT(usegroup, field) \
@@ -200,7 +200,7 @@ extern QString keyFromGroupAndName(QString group, QString name);
 		if (value. var != prefs.usestruct field . var) { \
 			prefs.usestruct field . var = value . var; \
 			disk_##field(true); \
-			emit qPref##usegroup::instance()->field##_changed(value); \
+			emit qPref##usegroup::instance()->field##Changed(value); \
 		} \
 	}
 #define SET_PREFERENCE_STRUCT(usegroup, type, field, var) \
@@ -212,7 +212,7 @@ extern QString keyFromGroupAndName(QString group, QString name);
 		if (value != prefs.usestruct field) { \
 			qPrefPrivate::copy_txt(&prefs.usestruct field, value); \
 			disk_##field(true); \
-			emit qPref##usegroup::instance()->field##_changed(value); \
+			emit qPref##usegroup::instance()->field##Changed(value); \
 		} \
 	}
 #define SET_PREFERENCE_TXT(usegroup, field) \
@@ -267,7 +267,7 @@ extern QString keyFromGroupAndName(QString group, QString name);
 		if (value != st_##field) { \
 			st_##field = value; \
 			qPrefPrivate::propSetValue(name, st_##field, QPointF()); \
-			emit qPref##useclass::instance()->field##_changed(value); \
+			emit qPref##useclass::instance()->field##Changed(value); \
 		} \
 	} \
 	void qPref##useclass::load_##field() \
@@ -281,7 +281,7 @@ extern QString keyFromGroupAndName(QString group, QString name);
 		if (value != st_##field) { \
 			st_##field = value; \
 			qPrefPrivate::propSetValue(name, st_##field, ""); \
-			emit qPref##useclass::instance()->field##_changed(value); \
+			emit qPref##useclass::instance()->field##Changed(value); \
 		} \
 	} \
 	void qPref##useclass::load_##field() \
@@ -295,7 +295,7 @@ extern QString keyFromGroupAndName(QString group, QString name);
 		if (value != st_##field) { \
 			st_##field = value; \
 			qPrefPrivate::propSetValue(name, st_##field, false); \
-			emit qPref##useclass::instance()->field##_changed(value); \
+			emit qPref##useclass::instance()->field##Changed(value); \
 		} \
 	} \
 	void qPref##useclass::load_##field() \
@@ -309,7 +309,7 @@ extern QString keyFromGroupAndName(QString group, QString name);
 		if (value != st_##field) { \
 			st_##field = value; \
 			qPrefPrivate::propSetValue(name, st_##field, 0.0); \
-			emit qPref##useclass::instance()->field##_changed(value); \
+			emit qPref##useclass::instance()->field##Changed(value); \
 		} \
 	} \
 	void qPref##useclass::load_##field() \
@@ -323,7 +323,7 @@ extern QString keyFromGroupAndName(QString group, QString name);
 		if (value != st_##field) { \
 			st_##field = value; \
 			qPrefPrivate::propSetValue(name, st_##field, 0); \
-			emit qPref##useclass::instance()->field##_changed(value); \
+			emit qPref##useclass::instance()->field##Changed(value); \
 		} \
 	} \
 	void qPref##useclass::load_##field() \
@@ -337,7 +337,7 @@ extern QString keyFromGroupAndName(QString group, QString name);
 		if (value != st_##field) { \
 			st_##field = value; \
 			qPrefPrivate::propSetValue(name, st_##field, QByteArray()); \
-			emit qPref##useclass::instance()->field##_changed(value); \
+			emit qPref##useclass::instance()->field##Changed(value); \
 		} \
 	} \
 	void qPref##useclass::load_##field() \
diff --git a/core/settings/qPrefProxy.h b/core/settings/qPrefProxy.h
index e1ead178e..2940c2642 100644
--- a/core/settings/qPrefProxy.h
+++ b/core/settings/qPrefProxy.h
@@ -8,12 +8,12 @@
 
 class qPrefProxy : public QObject {
 	Q_OBJECT
-	Q_PROPERTY(bool proxy_auth READ proxy_auth WRITE set_proxy_auth NOTIFY proxy_auth_changed);
-	Q_PROPERTY(QString proxy_host READ proxy_host WRITE set_proxy_host NOTIFY proxy_host_changed);
-	Q_PROPERTY(QString proxy_pass READ proxy_pass WRITE set_proxy_pass NOTIFY proxy_pass_changed);
-	Q_PROPERTY(int proxy_port READ proxy_port WRITE set_proxy_port NOTIFY proxy_port_changed);
-	Q_PROPERTY(int proxy_type READ proxy_type WRITE set_proxy_type NOTIFY proxy_type_changed);
-	Q_PROPERTY(QString proxy_user READ proxy_user WRITE set_proxy_user NOTIFY proxy_user_changed);
+	Q_PROPERTY(bool proxy_auth READ proxy_auth WRITE set_proxy_auth NOTIFY proxy_authChanged);
+	Q_PROPERTY(QString proxy_host READ proxy_host WRITE set_proxy_host NOTIFY proxy_hostChanged);
+	Q_PROPERTY(QString proxy_pass READ proxy_pass WRITE set_proxy_pass NOTIFY proxy_passChanged);
+	Q_PROPERTY(int proxy_port READ proxy_port WRITE set_proxy_port NOTIFY proxy_portChanged);
+	Q_PROPERTY(int proxy_type READ proxy_type WRITE set_proxy_type NOTIFY proxy_typeChanged);
+	Q_PROPERTY(QString proxy_user READ proxy_user WRITE set_proxy_user NOTIFY proxy_userChanged);
 
 public:
 	qPrefProxy(QObject *parent = NULL);
@@ -41,12 +41,12 @@ public slots:
 	static void set_proxy_user(const QString &value);
 
 signals:
-	void proxy_auth_changed(bool value);
-	void proxy_host_changed(const QString &value);
-	void proxy_pass_changed(const QString &value);
-	void proxy_port_changed(int value);
-	void proxy_type_changed(int value);
-	void proxy_user_changed(const QString &value);
+	void proxy_authChanged(bool value);
+	void proxy_hostChanged(const QString &value);
+	void proxy_passChanged(const QString &value);
+	void proxy_portChanged(int value);
+	void proxy_typeChanged(int value);
+	void proxy_userChanged(const QString &value);
 
 private:
 	static void disk_proxy_auth(bool doSync);
diff --git a/core/settings/qPrefTechnicalDetails.h b/core/settings/qPrefTechnicalDetails.h
index b9a58c3c9..bf82f2099 100644
--- a/core/settings/qPrefTechnicalDetails.h
+++ b/core/settings/qPrefTechnicalDetails.h
@@ -8,33 +8,33 @@
 
 class qPrefTechnicalDetails : public QObject {
 	Q_OBJECT
-	Q_PROPERTY(bool calcalltissues READ calcalltissues WRITE set_calcalltissues NOTIFY calcalltissues_changed);
-	Q_PROPERTY(bool calcceiling READ calcceiling WRITE set_calcceiling NOTIFY calcceiling_changed);
-	Q_PROPERTY(bool calcceiling3m READ calcceiling3m WRITE set_calcceiling3m NOTIFY calcceiling3m_changed);
-	Q_PROPERTY(bool calcndltts READ calcndltts WRITE set_calcndltts NOTIFY calcndltts_changed);
-	Q_PROPERTY(bool dcceiling READ dcceiling WRITE set_dcceiling NOTIFY dcceiling_changed);
-	Q_PROPERTY(deco_mode display_deco_mode READ display_deco_mode WRITE set_display_deco_mode NOTIFY display_deco_mode_changed);
-	Q_PROPERTY(bool display_unused_tanks READ display_unused_tanks WRITE set_display_unused_tanks NOTIFY display_unused_tanks_changed);
-	Q_PROPERTY(bool ead READ ead WRITE set_ead NOTIFY ead_changed);
-	Q_PROPERTY(int gfhigh READ gfhigh WRITE set_gfhigh NOTIFY gfhigh_changed);
-	Q_PROPERTY(int gflow READ gflow WRITE set_gflow NOTIFY gflow_changed);
-	Q_PROPERTY(bool gf_low_at_maxdepth READ gf_low_at_maxdepth WRITE set_gf_low_at_maxdepth NOTIFY gf_low_at_maxdepth_changed);
-	Q_PROPERTY(bool hrgraph READ hrgraph WRITE set_hrgraph NOTIFY hrgraph_changed);
-	Q_PROPERTY(bool mod READ mod WRITE set_mod NOTIFY mod_changed);
-	Q_PROPERTY(double modpO2 READ modpO2 WRITE set_modpO2 NOTIFY modpO2_changed);
-	Q_PROPERTY(bool percentagegraph READ percentagegraph WRITE set_percentagegraph NOTIFY percentagegraph_changed);
-	Q_PROPERTY(bool redceiling READ redceiling WRITE set_redceiling NOTIFY redceiling_changed);
-	Q_PROPERTY(bool rulergraph READ rulergraph WRITE set_rulergraph NOTIFY rulergraph_changed);
-	Q_PROPERTY(bool show_average_depth READ show_average_depth WRITE set_show_average_depth NOTIFY show_average_depth_changed);
-	Q_PROPERTY(bool show_ccr_sensors READ show_ccr_sensors WRITE set_show_ccr_sensors NOTIFY show_ccr_sensors_changed);
-	Q_PROPERTY(bool show_ccr_setpoint READ show_ccr_setpoint WRITE set_show_ccr_setpoint NOTIFY show_ccr_setpoint_changed);
-	Q_PROPERTY(bool show_icd READ show_icd WRITE set_show_icd NOTIFY show_icd_changed);
-	Q_PROPERTY(bool show_pictures_in_profile READ show_pictures_in_profile WRITE set_show_pictures_in_profile NOTIFY show_pictures_in_profile_changed);
-	Q_PROPERTY(bool show_sac READ show_sac WRITE set_show_sac NOTIFY show_sac_changed);
-	Q_PROPERTY(bool show_scr_ocpo2 READ show_scr_ocpo2 WRITE set_show_scr_ocpo2 NOTIFY show_scr_ocpo2_changed);
-	Q_PROPERTY(bool tankbar READ tankbar WRITE set_tankbar NOTIFY tankbar_changed);
-	Q_PROPERTY(int vpmb_conservatism READ vpmb_conservatism WRITE set_vpmb_conservatism NOTIFY vpmb_conservatism_changed);
-	Q_PROPERTY(bool zoomed_plot READ zoomed_plot WRITE set_zoomed_plot NOTIFY zoomed_plot_changed);
+	Q_PROPERTY(bool calcalltissues READ calcalltissues WRITE set_calcalltissues NOTIFY calcalltissuesChanged);
+	Q_PROPERTY(bool calcceiling READ calcceiling WRITE set_calcceiling NOTIFY calcceilingChanged);
+	Q_PROPERTY(bool calcceiling3m READ calcceiling3m WRITE set_calcceiling3m NOTIFY calcceiling3mChanged);
+	Q_PROPERTY(bool calcndltts READ calcndltts WRITE set_calcndltts NOTIFY calcndlttsChanged);
+	Q_PROPERTY(bool dcceiling READ dcceiling WRITE set_dcceiling NOTIFY dcceilingChanged);
+	Q_PROPERTY(deco_mode display_deco_mode READ display_deco_mode WRITE set_display_deco_mode NOTIFY display_deco_modeChanged);
+	Q_PROPERTY(bool display_unused_tanks READ display_unused_tanks WRITE set_display_unused_tanks NOTIFY display_unused_tanksChanged);
+	Q_PROPERTY(bool ead READ ead WRITE set_ead NOTIFY eadChanged);
+	Q_PROPERTY(int gfhigh READ gfhigh WRITE set_gfhigh NOTIFY gfhighChanged);
+	Q_PROPERTY(int gflow READ gflow WRITE set_gflow NOTIFY gflowChanged);
+	Q_PROPERTY(bool gf_low_at_maxdepth READ gf_low_at_maxdepth WRITE set_gf_low_at_maxdepth NOTIFY gf_low_at_maxdepthChanged);
+	Q_PROPERTY(bool hrgraph READ hrgraph WRITE set_hrgraph NOTIFY hrgraphChanged);
+	Q_PROPERTY(bool mod READ mod WRITE set_mod NOTIFY modChanged);
+	Q_PROPERTY(double modpO2 READ modpO2 WRITE set_modpO2 NOTIFY modpO2Changed);
+	Q_PROPERTY(bool percentagegraph READ percentagegraph WRITE set_percentagegraph NOTIFY percentagegraphChanged);
+	Q_PROPERTY(bool redceiling READ redceiling WRITE set_redceiling NOTIFY redceilingChanged);
+	Q_PROPERTY(bool rulergraph READ rulergraph WRITE set_rulergraph NOTIFY rulergraphChanged);
+	Q_PROPERTY(bool show_average_depth READ show_average_depth WRITE set_show_average_depth NOTIFY show_average_depthChanged);
+	Q_PROPERTY(bool show_ccr_sensors READ show_ccr_sensors WRITE set_show_ccr_sensors NOTIFY show_ccr_sensorsChanged);
+	Q_PROPERTY(bool show_ccr_setpoint READ show_ccr_setpoint WRITE set_show_ccr_setpoint NOTIFY show_ccr_setpointChanged);
+	Q_PROPERTY(bool show_icd READ show_icd WRITE set_show_icd NOTIFY show_icdChanged);
+	Q_PROPERTY(bool show_pictures_in_profile READ show_pictures_in_profile WRITE set_show_pictures_in_profile NOTIFY show_pictures_in_profileChanged);
+	Q_PROPERTY(bool show_sac READ show_sac WRITE set_show_sac NOTIFY show_sacChanged);
+	Q_PROPERTY(bool show_scr_ocpo2 READ show_scr_ocpo2 WRITE set_show_scr_ocpo2 NOTIFY show_scr_ocpo2Changed);
+	Q_PROPERTY(bool tankbar READ tankbar WRITE set_tankbar NOTIFY tankbarChanged);
+	Q_PROPERTY(int vpmb_conservatism READ vpmb_conservatism WRITE set_vpmb_conservatism NOTIFY vpmb_conservatismChanged);
+	Q_PROPERTY(bool zoomed_plot READ zoomed_plot WRITE set_zoomed_plot NOTIFY zoomed_plotChanged);
 
 public:
 	qPrefTechnicalDetails(QObject *parent = NULL);
@@ -104,33 +104,33 @@ public slots:
 	static void set_zoomed_plot(bool value);
 
 signals:
-	void calcalltissues_changed(bool value);
-	void calcceiling_changed(bool value);
-	void calcceiling3m_changed(bool value);
-	void calcndltts_changed(bool value);
-	void dcceiling_changed(bool value);
-	void display_deco_mode_changed(deco_mode value);
-	void display_unused_tanks_changed(bool value);
-	void ead_changed(bool value);
-	void gfhigh_changed(int value);
-	void gflow_changed(int value);
-	void gf_low_at_maxdepth_changed(bool value);
-	void hrgraph_changed(bool value);
-	void mod_changed(bool value);
-	void modpO2_changed(double value);
-	void percentagegraph_changed(bool value);
-	void redceiling_changed(bool value);
-	void rulergraph_changed(bool value);
-	void show_average_depth_changed(bool value);
-	void show_ccr_sensors_changed(bool value);
-	void show_ccr_setpoint_changed(bool value);
-	void show_icd_changed(bool value);
-	void show_pictures_in_profile_changed(bool value);
-	void show_scr_ocpo2_changed(bool value);
-	void show_sac_changed(bool value);
-	void tankbar_changed(bool value);
-	void vpmb_conservatism_changed(int value);
-	void zoomed_plot_changed(bool value);
+	void calcalltissuesChanged(bool value);
+	void calcceilingChanged(bool value);
+	void calcceiling3mChanged(bool value);
+	void calcndlttsChanged(bool value);
+	void dcceilingChanged(bool value);
+	void display_deco_modeChanged(deco_mode value);
+	void display_unused_tanksChanged(bool value);
+	void eadChanged(bool value);
+	void gfhighChanged(int value);
+	void gflowChanged(int value);
+	void gf_low_at_maxdepthChanged(bool value);
+	void hrgraphChanged(bool value);
+	void modChanged(bool value);
+	void modpO2Changed(double value);
+	void percentagegraphChanged(bool value);
+	void redceilingChanged(bool value);
+	void rulergraphChanged(bool value);
+	void show_average_depthChanged(bool value);
+	void show_ccr_sensorsChanged(bool value);
+	void show_ccr_setpointChanged(bool value);
+	void show_icdChanged(bool value);
+	void show_pictures_in_profileChanged(bool value);
+	void show_scr_ocpo2Changed(bool value);
+	void show_sacChanged(bool value);
+	void tankbarChanged(bool value);
+	void vpmb_conservatismChanged(int value);
+	void zoomed_plotChanged(bool value);
 
 private:
 	static void disk_calcalltissues(bool doSync);
diff --git a/core/settings/qPrefUnit.cpp b/core/settings/qPrefUnit.cpp
index 38f09ed44..c2f47b225 100644
--- a/core/settings/qPrefUnit.cpp
+++ b/core/settings/qPrefUnit.cpp
@@ -63,7 +63,7 @@ void qPrefUnits::set_unit_system(const QString& value)
 			prefs.unit_system = PERSONALIZE;
 		}
 		disk_unit_system(true);
-		emit instance()->unit_system_changed(value);
+		emit instance()->unit_systemChanged(value);
 	}
 }
 DISK_LOADSYNC_ENUM(Units, "unit_system", unit_system_values, unit_system);
diff --git a/core/settings/qPrefUnit.h b/core/settings/qPrefUnit.h
index bc4273546..737d7814a 100644
--- a/core/settings/qPrefUnit.h
+++ b/core/settings/qPrefUnit.h
@@ -8,16 +8,16 @@
 
 class qPrefUnits : public QObject {
 	Q_OBJECT
-	Q_PROPERTY(bool coordinates_traditional READ coordinates_traditional WRITE set_coordinates_traditional NOTIFY coordinates_traditional_changed);
-	Q_PROPERTY(units::DURATION duration_units READ duration_units WRITE set_duration_units NOTIFY duration_units_changed);
-	Q_PROPERTY(units::LENGTH length READ length WRITE set_length NOTIFY length_changed);
-	Q_PROPERTY(units::PRESSURE pressure READ pressure WRITE set_pressure NOTIFY pressure_changed);
-	Q_PROPERTY(bool show_units_table READ show_units_table WRITE set_show_units_table NOTIFY show_units_table_changed);
-	Q_PROPERTY(units::TEMPERATURE temperature READ temperature WRITE set_temperature NOTIFY temperature_changed);
-	Q_PROPERTY(QString unit_system READ unit_system WRITE set_unit_system NOTIFY unit_system_changed);
-	Q_PROPERTY(units::TIME vertical_speed_time READ vertical_speed_time WRITE set_vertical_speed_time NOTIFY vertical_speed_time_changed);
-	Q_PROPERTY(units::VOLUME volume READ volume WRITE set_volume NOTIFY volume_changed);
-	Q_PROPERTY(units::WEIGHT weight READ weight WRITE set_weight NOTIFY weight_changed);
+	Q_PROPERTY(bool coordinates_traditional READ coordinates_traditional WRITE set_coordinates_traditional NOTIFY coordinates_traditionalChanged);
+	Q_PROPERTY(units::DURATION duration_units READ duration_units WRITE set_duration_units NOTIFY duration_unitsChanged);
+	Q_PROPERTY(units::LENGTH length READ length WRITE set_length NOTIFY lengthChanged);
+	Q_PROPERTY(units::PRESSURE pressure READ pressure WRITE set_pressure NOTIFY pressureChanged);
+	Q_PROPERTY(bool show_units_table READ show_units_table WRITE set_show_units_table NOTIFY show_units_tableChanged);
+	Q_PROPERTY(units::TEMPERATURE temperature READ temperature WRITE set_temperature NOTIFY temperatureChanged);
+	Q_PROPERTY(QString unit_system READ unit_system WRITE set_unit_system NOTIFY unit_systemChanged);
+	Q_PROPERTY(units::TIME vertical_speed_time READ vertical_speed_time WRITE set_vertical_speed_time NOTIFY vertical_speed_timeChanged);
+	Q_PROPERTY(units::VOLUME volume READ volume WRITE set_volume NOTIFY volumeChanged);
+	Q_PROPERTY(units::WEIGHT weight READ weight WRITE set_weight NOTIFY weightChanged);
 
 public:
 	qPrefUnits(QObject *parent = NULL);
@@ -53,16 +53,16 @@ public slots:
 	static void set_weight(units::WEIGHT value);
 
 signals:
-	void coordinates_traditional_changed(bool value);
-	void duration_units_changed(int value);
-	void length_changed(int value);
-	void pressure_changed(int value);
-	void show_units_table_changed(bool value);
-	void temperature_changed(int value);
-	void unit_system_changed(const QString& value);
-	void vertical_speed_time_changed(int value);
-	void volume_changed(int value);
-	void weight_changed(int value);
+	void coordinates_traditionalChanged(bool value);
+	void duration_unitsChanged(int value);
+	void lengthChanged(int value);
+	void pressureChanged(int value);
+	void show_units_tableChanged(bool value);
+	void temperatureChanged(int value);
+	void unit_systemChanged(const QString& value);
+	void vertical_speed_timeChanged(int value);
+	void volumeChanged(int value);
+	void weightChanged(int value);
 
 private:
 	static void disk_coordinates_traditional(bool doSync);
diff --git a/core/settings/qPrefUpdateManager.cpp b/core/settings/qPrefUpdateManager.cpp
index 97ccead6d..518296fea 100644
--- a/core/settings/qPrefUpdateManager.cpp
+++ b/core/settings/qPrefUpdateManager.cpp
@@ -36,7 +36,7 @@ void qPrefUpdateManager::set_dont_check_exists(bool value)
 {
 	if (value != prefs.update_manager.dont_check_exists) {
 		prefs.update_manager.dont_check_exists = value;
-		emit instance()->dont_check_exists_changed(value);
+		emit instance()->dont_check_existsChanged(value);
 	}
 	// DO NOT STORE ON DISK
 }
@@ -51,7 +51,7 @@ void qPrefUpdateManager::set_next_check(const QDate& value)
 	if (time_value != prefs.update_manager.next_check) {
 		prefs.update_manager.next_check = time_value;
 		disk_next_check(true);
-		emit instance()->next_check_changed(value);
+		emit instance()->next_checkChanged(value);
 	}
 }
 void qPrefUpdateManager::disk_next_check(bool doSync)
diff --git a/core/settings/qPrefUpdateManager.h b/core/settings/qPrefUpdateManager.h
index 151c2edc4..ee62f0349 100644
--- a/core/settings/qPrefUpdateManager.h
+++ b/core/settings/qPrefUpdateManager.h
@@ -8,11 +8,11 @@
 
 class qPrefUpdateManager : public QObject {
 	Q_OBJECT
-	Q_PROPERTY(bool dont_check_for_updates READ dont_check_for_updates WRITE set_dont_check_for_updates NOTIFY dont_check_for_updates_changed);
-	Q_PROPERTY(bool dont_check_exists READ dont_check_exists WRITE set_dont_check_exists NOTIFY dont_check_exists_changed);
-	Q_PROPERTY(const QString last_version_used READ last_version_used WRITE set_last_version_used NOTIFY last_version_used_changed);
-	Q_PROPERTY(const QDate next_check READ next_check WRITE set_next_check NOTIFY next_check_changed);
-	Q_PROPERTY(const QString uuidString READ uuidString WRITE set_uuidString NOTIFY uuidString_changed);
+	Q_PROPERTY(bool dont_check_for_updates READ dont_check_for_updates WRITE set_dont_check_for_updates NOTIFY dont_check_for_updatesChanged);
+	Q_PROPERTY(bool dont_check_exists READ dont_check_exists WRITE set_dont_check_exists NOTIFY dont_check_existsChanged);
+	Q_PROPERTY(const QString last_version_used READ last_version_used WRITE set_last_version_used NOTIFY last_version_usedChanged);
+	Q_PROPERTY(const QDate next_check READ next_check WRITE set_next_check NOTIFY next_checkChanged);
+	Q_PROPERTY(const QString uuidString READ uuidString WRITE set_uuidString NOTIFY uuidStringChanged);
 
 public:
 	qPrefUpdateManager(QObject *parent = NULL);
@@ -38,11 +38,11 @@ public slots:
 	static void set_uuidString(const QString& value);
 
 signals:
-	void dont_check_for_updates_changed(bool value);
-	void dont_check_exists_changed(bool value);
-	void last_version_used_changed(const QString& value);
-	void next_check_changed(const QDate& value);
-	void uuidString_changed(const QString& value);
+	void dont_check_for_updatesChanged(bool value);
+	void dont_check_existsChanged(bool value);
+	void last_version_usedChanged(const QString& value);
+	void next_checkChanged(const QDate& value);
+	void uuidStringChanged(const QString& value);
 
 private:
 	static void disk_dont_check_for_updates(bool doSync);