tests: use new style syntax to connect QSignalSpy

Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>

13 files changed, 134 insertions, 134 deletions

diff --git a/tests/testqPrefCloudStorage.cpp b/tests/testqPrefCloudStorage.cpp
index d4358349d..d18c7a6e7 100644
--- a/tests/testqPrefCloudStorage.cpp
+++ b/tests/testqPrefCloudStorage.cpp
@@ -217,15 +217,15 @@ void TestQPrefCloudStorage::test_oldPreferences()
 
 void TestQPrefCloudStorage::test_signals()
 {
-	QSignalSpy spy1(qPrefCloudStorage::instance(), SIGNAL(cloud_base_urlChanged(QString)));
-	QSignalSpy spy2(qPrefCloudStorage::instance(), SIGNAL(cloud_storage_emailChanged(QString)));
-	QSignalSpy spy3(qPrefCloudStorage::instance(), SIGNAL(cloud_storage_email_encodedChanged(QString)));
-	QSignalSpy spy4(qPrefCloudStorage::instance(), SIGNAL(cloud_storage_passwordChanged(QString)));
-	QSignalSpy spy5(qPrefCloudStorage::instance(), SIGNAL(cloud_storage_pinChanged(QString)));
-	QSignalSpy spy6(qPrefCloudStorage::instance(), SIGNAL(cloud_timeoutChanged(int)));
-	QSignalSpy spy7(qPrefCloudStorage::instance(), SIGNAL(cloud_verification_statusChanged(int)));
-	QSignalSpy spy9(qPrefCloudStorage::instance(), SIGNAL(save_password_localChanged(bool)));
-	QSignalSpy spy10(qPrefCloudStorage::instance(), SIGNAL(cloud_auto_syncChanged(bool)));
+	QSignalSpy spy1(qPrefCloudStorage::instance(), &qPrefCloudStorage::cloud_base_urlChanged);
+	QSignalSpy spy2(qPrefCloudStorage::instance(), &qPrefCloudStorage::cloud_storage_emailChanged);
+	QSignalSpy spy3(qPrefCloudStorage::instance(), &qPrefCloudStorage::cloud_storage_email_encodedChanged);
+	QSignalSpy spy4(qPrefCloudStorage::instance(), &qPrefCloudStorage::cloud_storage_passwordChanged);
+	QSignalSpy spy5(qPrefCloudStorage::instance(), &qPrefCloudStorage::cloud_storage_pinChanged);
+	QSignalSpy spy6(qPrefCloudStorage::instance(), &qPrefCloudStorage::cloud_timeoutChanged);
+	QSignalSpy spy7(qPrefCloudStorage::instance(), &qPrefCloudStorage::cloud_verification_statusChanged);
+	QSignalSpy spy9(qPrefCloudStorage::instance(), &qPrefCloudStorage::save_password_localChanged);
+	QSignalSpy spy10(qPrefCloudStorage::instance(), &qPrefCloudStorage::cloud_auto_syncChanged);
 
 	qPrefCloudStorage::set_cloud_base_url("signal url");
 	qPrefCloudStorage::set_cloud_storage_email("signal myEmail");
diff --git a/tests/testqPrefDisplay.cpp b/tests/testqPrefDisplay.cpp
index 7e385896d..32fe1b927 100644
--- a/tests/testqPrefDisplay.cpp
+++ b/tests/testqPrefDisplay.cpp
@@ -168,22 +168,22 @@ void TestQPrefDisplay::test_multiple()
 
 void TestQPrefDisplay::test_signals()
 {
-	QSignalSpy spy1(qPrefDisplay::instance(), SIGNAL(animation_speedChanged(int)));
-	QSignalSpy spy2(qPrefDisplay::instance(), SIGNAL(display_invalid_divesChanged(bool)));
-	QSignalSpy spy3(qPrefDisplay::instance(), SIGNAL(divelist_fontChanged(QString)));
-	QSignalSpy spy4(qPrefDisplay::instance(), SIGNAL(font_sizeChanged(double)));
-	QSignalSpy spy5(qPrefDisplay::instance(), SIGNAL(show_developerChanged(bool)));
-	QSignalSpy spy6(qPrefDisplay::instance(), SIGNAL(themeChanged(QString)));
-	QSignalSpy spy7(qPrefDisplay::instance(), SIGNAL(lastDirChanged(QString)));
-	QSignalSpy spy8(qPrefDisplay::instance(), SIGNAL(tooltip_positionChanged(QPointF)));
-	QSignalSpy spy9(qPrefDisplay::instance(), SIGNAL(userSurveyChanged(QString)));
-	QSignalSpy spy10(qPrefDisplay::instance(), SIGNAL(mainSplitterChanged(QByteArray)));
-	QSignalSpy spy11(qPrefDisplay::instance(), SIGNAL(topSplitterChanged(QByteArray)));
-	QSignalSpy spy12(qPrefDisplay::instance(), SIGNAL(bottomSplitterChanged(QByteArray)));
-	QSignalSpy spy13(qPrefDisplay::instance(), SIGNAL(maximizedChanged(bool)));
-	QSignalSpy spy14(qPrefDisplay::instance(), SIGNAL(geometryChanged(QByteArray)));
-	QSignalSpy spy15(qPrefDisplay::instance(), SIGNAL(windowStateChanged(QByteArray)));
-	QSignalSpy spy16(qPrefDisplay::instance(), SIGNAL(lastStateChanged(int)));
+	QSignalSpy spy1(qPrefDisplay::instance(), &qPrefDisplay::animation_speedChanged);
+	QSignalSpy spy2(qPrefDisplay::instance(), &qPrefDisplay::display_invalid_divesChanged);
+	QSignalSpy spy3(qPrefDisplay::instance(), &qPrefDisplay::divelist_fontChanged);
+	QSignalSpy spy4(qPrefDisplay::instance(), &qPrefDisplay::font_sizeChanged);
+	QSignalSpy spy5(qPrefDisplay::instance(), &qPrefDisplay::show_developerChanged);
+	QSignalSpy spy6(qPrefDisplay::instance(), &qPrefDisplay::themeChanged);
+	QSignalSpy spy7(qPrefDisplay::instance(), &qPrefDisplay::lastDirChanged);
+	QSignalSpy spy8(qPrefDisplay::instance(), &qPrefDisplay::tooltip_positionChanged);
+	QSignalSpy spy9(qPrefDisplay::instance(), &qPrefDisplay::userSurveyChanged);
+	QSignalSpy spy10(qPrefDisplay::instance(), &qPrefDisplay::mainSplitterChanged);
+	QSignalSpy spy11(qPrefDisplay::instance(), &qPrefDisplay::topSplitterChanged);
+	QSignalSpy spy12(qPrefDisplay::instance(), &qPrefDisplay::bottomSplitterChanged);
+	QSignalSpy spy13(qPrefDisplay::instance(), &qPrefDisplay::maximizedChanged);
+	QSignalSpy spy14(qPrefDisplay::instance(), &qPrefDisplay::geometryChanged);
+	QSignalSpy spy15(qPrefDisplay::instance(), &qPrefDisplay::windowStateChanged);
+	QSignalSpy spy16(qPrefDisplay::instance(), &qPrefDisplay::lastStateChanged);
 
 	qPrefDisplay::set_animation_speed(1);
 	qPrefDisplay::set_display_invalid_dives(false);
diff --git a/tests/testqPrefDiveComputer.cpp b/tests/testqPrefDiveComputer.cpp
index 8a05db8fb..fff589c17 100644
--- a/tests/testqPrefDiveComputer.cpp
+++ b/tests/testqPrefDiveComputer.cpp
@@ -138,10 +138,10 @@ void TestQPrefDiveComputer::test_oldPreferences()
 
 void TestQPrefDiveComputer::test_signals()
 {
-	QSignalSpy spy1(qPrefDiveComputer::instance(), SIGNAL(deviceChanged(QString)));
-	QSignalSpy spy2(qPrefDiveComputer::instance(), SIGNAL(device_nameChanged(QString)));
-	QSignalSpy spy4(qPrefDiveComputer::instance(), SIGNAL(productChanged(QString)));
-	QSignalSpy spy5(qPrefDiveComputer::instance(), SIGNAL(vendorChanged(QString)));
+	QSignalSpy spy1(qPrefDiveComputer::instance(), &qPrefDiveComputer::deviceChanged);
+	QSignalSpy spy2(qPrefDiveComputer::instance(), &qPrefDiveComputer::device_nameChanged);
+	QSignalSpy spy4(qPrefDiveComputer::instance(), &qPrefDiveComputer::productChanged);
+	QSignalSpy spy5(qPrefDiveComputer::instance(), &qPrefDiveComputer::vendorChanged);
 
 	qPrefDiveComputer::set_device("t_signal device");
 	qPrefDiveComputer::set_device_name("t_signal device name");
diff --git a/tests/testqPrefDivePlanner.cpp b/tests/testqPrefDivePlanner.cpp
index 5580acf80..55cbb9348 100644
--- a/tests/testqPrefDivePlanner.cpp
+++ b/tests/testqPrefDivePlanner.cpp
@@ -439,31 +439,31 @@ void TestQPrefDivePlanner::test_oldPreferences()
 
 void TestQPrefDivePlanner::test_signals()
 {
-	QSignalSpy spy1(qPrefDivePlanner::instance(), SIGNAL(ascratelast6mChanged(int)));
-	QSignalSpy spy2(qPrefDivePlanner::instance(), SIGNAL(ascratestopsChanged(int)));
-	QSignalSpy spy3(qPrefDivePlanner::instance(), SIGNAL(ascrate50Changed(int)));
-	QSignalSpy spy4(qPrefDivePlanner::instance(), SIGNAL(ascrate75Changed(int)));
-	QSignalSpy spy5(qPrefDivePlanner::instance(), SIGNAL(bestmixendChanged(int)));
-	QSignalSpy spy6(qPrefDivePlanner::instance(), SIGNAL(bottompo2Changed(int)));
-	QSignalSpy spy7(qPrefDivePlanner::instance(), SIGNAL(bottomsacChanged(int)));
-	QSignalSpy spy8(qPrefDivePlanner::instance(), SIGNAL(decopo2Changed(int)));
-	QSignalSpy spy9(qPrefDivePlanner::instance(), SIGNAL(decosacChanged(int)));
-	QSignalSpy spy10(qPrefDivePlanner::instance(), SIGNAL(descrateChanged(int)));
-	QSignalSpy spy11(qPrefDivePlanner::instance(), SIGNAL(display_durationChanged(bool)));
-	QSignalSpy spy12(qPrefDivePlanner::instance(), SIGNAL(display_runtimeChanged(bool)));
-	QSignalSpy spy13(qPrefDivePlanner::instance(), SIGNAL(display_transitionsChanged(bool)));
-	QSignalSpy spy14(qPrefDivePlanner::instance(), SIGNAL(display_variationsChanged(bool)));
-	QSignalSpy spy15(qPrefDivePlanner::instance(), SIGNAL(doo2breaksChanged(bool)));
-	QSignalSpy spy16(qPrefDivePlanner::instance(), SIGNAL(drop_stone_modeChanged(bool)));
-	QSignalSpy spy17(qPrefDivePlanner::instance(), SIGNAL(last_stopChanged(bool)));
-	QSignalSpy spy18(qPrefDivePlanner::instance(), SIGNAL(min_switch_durationChanged(int)));
-	QSignalSpy spy19(qPrefDivePlanner::instance(), SIGNAL(planner_deco_modeChanged(deco_mode)));
-	QSignalSpy spy20(qPrefDivePlanner::instance(), SIGNAL(problemsolvingtimeChanged(int)));
-	QSignalSpy spy21(qPrefDivePlanner::instance(), SIGNAL(reserve_gasChanged(int)));
-	QSignalSpy spy22(qPrefDivePlanner::instance(), SIGNAL(sacfactorChanged(int)));
-	QSignalSpy spy23(qPrefDivePlanner::instance(), SIGNAL(safetystopChanged(bool)));
-	QSignalSpy spy24(qPrefDivePlanner::instance(), SIGNAL(switch_at_req_stopChanged(bool)));
-	QSignalSpy spy25(qPrefDivePlanner::instance(), SIGNAL(verbatim_planChanged(bool)));
+	QSignalSpy spy1(qPrefDivePlanner::instance(), &qPrefDivePlanner::ascratelast6mChanged);
+	QSignalSpy spy2(qPrefDivePlanner::instance(), &qPrefDivePlanner::ascratestopsChanged);
+	QSignalSpy spy3(qPrefDivePlanner::instance(), &qPrefDivePlanner::ascrate50Changed);
+	QSignalSpy spy4(qPrefDivePlanner::instance(), &qPrefDivePlanner::ascrate75Changed);
+	QSignalSpy spy5(qPrefDivePlanner::instance(), &qPrefDivePlanner::bestmixendChanged);
+	QSignalSpy spy6(qPrefDivePlanner::instance(), &qPrefDivePlanner::bottompo2Changed);
+	QSignalSpy spy7(qPrefDivePlanner::instance(), &qPrefDivePlanner::bottomsacChanged);
+	QSignalSpy spy8(qPrefDivePlanner::instance(), &qPrefDivePlanner::decopo2Changed);
+	QSignalSpy spy9(qPrefDivePlanner::instance(), &qPrefDivePlanner::decosacChanged);
+	QSignalSpy spy10(qPrefDivePlanner::instance(), &qPrefDivePlanner::descrateChanged);
+	QSignalSpy spy11(qPrefDivePlanner::instance(), &qPrefDivePlanner::display_durationChanged);
+	QSignalSpy spy12(qPrefDivePlanner::instance(), &qPrefDivePlanner::display_runtimeChanged);
+	QSignalSpy spy13(qPrefDivePlanner::instance(), &qPrefDivePlanner::display_transitionsChanged);
+	QSignalSpy spy14(qPrefDivePlanner::instance(), &qPrefDivePlanner::display_variationsChanged);
+	QSignalSpy spy15(qPrefDivePlanner::instance(), &qPrefDivePlanner::doo2breaksChanged);
+	QSignalSpy spy16(qPrefDivePlanner::instance(), &qPrefDivePlanner::drop_stone_modeChanged);
+	QSignalSpy spy17(qPrefDivePlanner::instance(), &qPrefDivePlanner::last_stopChanged);
+	QSignalSpy spy18(qPrefDivePlanner::instance(), &qPrefDivePlanner::min_switch_durationChanged);
+	QSignalSpy spy19(qPrefDivePlanner::instance(), &qPrefDivePlanner::planner_deco_modeChanged);
+	QSignalSpy spy20(qPrefDivePlanner::instance(), &qPrefDivePlanner::problemsolvingtimeChanged);
+	QSignalSpy spy21(qPrefDivePlanner::instance(), &qPrefDivePlanner::reserve_gasChanged);
+	QSignalSpy spy22(qPrefDivePlanner::instance(), &qPrefDivePlanner::sacfactorChanged);
+	QSignalSpy spy23(qPrefDivePlanner::instance(), &qPrefDivePlanner::safetystopChanged);
+	QSignalSpy spy24(qPrefDivePlanner::instance(), &qPrefDivePlanner::switch_at_req_stopChanged);
+	QSignalSpy spy25(qPrefDivePlanner::instance(), &qPrefDivePlanner::verbatim_planChanged);
 
 	qPrefDivePlanner::set_ascratelast6m(-20);
 	qPrefDivePlanner::set_ascratestops(-21);
diff --git a/tests/testqPrefGeneral.cpp b/tests/testqPrefGeneral.cpp
index 9e87d4289..0265fb59c 100644
--- a/tests/testqPrefGeneral.cpp
+++ b/tests/testqPrefGeneral.cpp
@@ -239,19 +239,19 @@ void TestQPrefGeneral::test_oldPreferences()
 
 void TestQPrefGeneral::test_signals()
 {
-	QSignalSpy spy1(qPrefGeneral::instance(), SIGNAL(auto_recalculate_thumbnailsChanged(bool)));
-	QSignalSpy spy2(qPrefGeneral::instance(), SIGNAL(default_cylinderChanged(QString)));
-	QSignalSpy spy3(qPrefGeneral::instance(), SIGNAL(default_filenameChanged(QString)));
-	QSignalSpy spy4(qPrefGeneral::instance(), SIGNAL(default_file_behaviorChanged(def_file_behavior)));
-	QSignalSpy spy5(qPrefGeneral::instance(), SIGNAL(defaultsetpointChanged(int)));
-	QSignalSpy spy6(qPrefGeneral::instance(), SIGNAL(extract_video_thumbnailsChanged(bool)));
-	QSignalSpy spy7(qPrefGeneral::instance(), SIGNAL(extract_video_thumbnails_positionChanged(int)));
-	QSignalSpy spy8(qPrefGeneral::instance(), SIGNAL(ffmpeg_executableChanged(QString)));
-	QSignalSpy spy9(qPrefGeneral::instance(), SIGNAL(o2consumptionChanged(int)));
-	QSignalSpy spy10(qPrefGeneral::instance(), SIGNAL(pscr_ratioChanged(int)));
-	QSignalSpy spy11(qPrefGeneral::instance(), SIGNAL(use_default_fileChanged(bool)));
-	QSignalSpy spy12(qPrefGeneral::instance(), SIGNAL(diveshareExport_uidChanged(QString)));
-	QSignalSpy spy13(qPrefGeneral::instance(), SIGNAL(diveshareExport_privateChanged(bool)));
+	QSignalSpy spy1(qPrefGeneral::instance(), &qPrefGeneral::auto_recalculate_thumbnailsChanged);
+	QSignalSpy spy2(qPrefGeneral::instance(), &qPrefGeneral::default_cylinderChanged);
+	QSignalSpy spy3(qPrefGeneral::instance(), &qPrefGeneral::default_filenameChanged);
+	QSignalSpy spy4(qPrefGeneral::instance(), &qPrefGeneral::default_file_behaviorChanged);
+	QSignalSpy spy5(qPrefGeneral::instance(), &qPrefGeneral::defaultsetpointChanged);
+	QSignalSpy spy6(qPrefGeneral::instance(), &qPrefGeneral::extract_video_thumbnailsChanged);
+	QSignalSpy spy7(qPrefGeneral::instance(), &qPrefGeneral::extract_video_thumbnails_positionChanged);
+	QSignalSpy spy8(qPrefGeneral::instance(), &qPrefGeneral::ffmpeg_executableChanged);
+	QSignalSpy spy9(qPrefGeneral::instance(), &qPrefGeneral::o2consumptionChanged);
+	QSignalSpy spy10(qPrefGeneral::instance(), &qPrefGeneral::pscr_ratioChanged);
+	QSignalSpy spy11(qPrefGeneral::instance(), &qPrefGeneral::use_default_fileChanged);
+	QSignalSpy spy12(qPrefGeneral::instance(), &qPrefGeneral::diveshareExport_uidChanged);
+	QSignalSpy spy13(qPrefGeneral::instance(), &qPrefGeneral::diveshareExport_privateChanged);
 
 	prefs.auto_recalculate_thumbnails = true;
 	qPrefGeneral::set_auto_recalculate_thumbnails(false);
diff --git a/tests/testqPrefGeocoding.cpp b/tests/testqPrefGeocoding.cpp
index 4be621d80..aec602339 100644
--- a/tests/testqPrefGeocoding.cpp
+++ b/tests/testqPrefGeocoding.cpp
@@ -132,9 +132,9 @@ void TestQPrefGeocoding::test_oldPreferences()
 
 void TestQPrefGeocoding::test_signals()
 {
-	QSignalSpy spy1(qPrefGeocoding::instance(), SIGNAL(first_taxonomy_categoryChanged(taxonomy_category)));
-	QSignalSpy spy2(qPrefGeocoding::instance(), SIGNAL(second_taxonomy_categoryChanged(taxonomy_category)));
-	QSignalSpy spy3(qPrefGeocoding::instance(), SIGNAL(third_taxonomy_categoryChanged(taxonomy_category)));
+	QSignalSpy spy1(qPrefGeocoding::instance(), &qPrefGeocoding::first_taxonomy_categoryChanged);
+	QSignalSpy spy2(qPrefGeocoding::instance(), &qPrefGeocoding::second_taxonomy_categoryChanged);
+	QSignalSpy spy3(qPrefGeocoding::instance(), &qPrefGeocoding::third_taxonomy_categoryChanged);
 
 	prefs.geocoding.category[0] = TC_NONE;
 	qPrefGeocoding::set_first_taxonomy_category(TC_COUNTRY);
diff --git a/tests/testqPrefLanguage.cpp b/tests/testqPrefLanguage.cpp
index f94946e76..96caebd0f 100644
--- a/tests/testqPrefLanguage.cpp
+++ b/tests/testqPrefLanguage.cpp
@@ -201,14 +201,14 @@ void TestQPrefLanguage::test_oldPreferences()
 
 void TestQPrefLanguage::test_signals()
 {
-	QSignalSpy spy1(qPrefLanguage::instance(), SIGNAL(date_formatChanged(QString)));
-	QSignalSpy spy2(qPrefLanguage::instance(), SIGNAL(date_format_overrideChanged(bool)));
-	QSignalSpy spy3(qPrefLanguage::instance(), SIGNAL(date_format_shortChanged(QString)));
-	QSignalSpy spy4(qPrefLanguage::instance(), SIGNAL(languageChanged(QString)));
-	QSignalSpy spy5(qPrefLanguage::instance(), SIGNAL(lang_localeChanged(QString)));
-	QSignalSpy spy6(qPrefLanguage::instance(), SIGNAL(time_formatChanged(QString)));
-	QSignalSpy spy7(qPrefLanguage::instance(), SIGNAL(time_format_overrideChanged(bool)));
-	QSignalSpy spy8(qPrefLanguage::instance(), SIGNAL(use_system_languageChanged(bool)));
+	QSignalSpy spy1(qPrefLanguage::instance(), &qPrefLanguage::date_formatChanged);
+	QSignalSpy spy2(qPrefLanguage::instance(), &qPrefLanguage::date_format_overrideChanged);
+	QSignalSpy spy3(qPrefLanguage::instance(), &qPrefLanguage::date_format_shortChanged);
+	QSignalSpy spy4(qPrefLanguage::instance(), &qPrefLanguage::languageChanged);
+	QSignalSpy spy5(qPrefLanguage::instance(), &qPrefLanguage::lang_localeChanged);
+	QSignalSpy spy6(qPrefLanguage::instance(), &qPrefLanguage::time_formatChanged);
+	QSignalSpy spy7(qPrefLanguage::instance(), &qPrefLanguage::time_format_overrideChanged);
+	QSignalSpy spy8(qPrefLanguage::instance(), &qPrefLanguage::use_system_languageChanged);
 
 	qPrefLanguage::set_date_format("signal date2");
 	prefs.date_format_override = true;
diff --git a/tests/testqPrefLocationService.cpp b/tests/testqPrefLocationService.cpp
index 0f383212c..4e0d410cb 100644
--- a/tests/testqPrefLocationService.cpp
+++ b/tests/testqPrefLocationService.cpp
@@ -117,8 +117,8 @@ void TestQPrefLocationService::test_oldPreferences()
 
 void TestQPrefLocationService::test_signals()
 {
-	QSignalSpy spy1(qPrefLocationService::instance(), SIGNAL(distance_thresholdChanged(int)));
-	QSignalSpy spy2(qPrefLocationService::instance(), SIGNAL(time_thresholdChanged(int)));
+	QSignalSpy spy1(qPrefLocationService::instance(), &qPrefLocationService::distance_thresholdChanged);
+	QSignalSpy spy2(qPrefLocationService::instance(), &qPrefLocationService::time_thresholdChanged);
 
 	qPrefLocationService::set_distance_threshold(-2000);
 	qPrefLocationService::set_time_threshold(-90);
diff --git a/tests/testqPrefPartialPressureGas.cpp b/tests/testqPrefPartialPressureGas.cpp
index 31b1850c7..fa68270e9 100644
--- a/tests/testqPrefPartialPressureGas.cpp
+++ b/tests/testqPrefPartialPressureGas.cpp
@@ -187,13 +187,13 @@ void TestQPrefPartialPressureGas::test_oldPreferences()
 
 void TestQPrefPartialPressureGas::test_signals()
 {
-	QSignalSpy spy1(qPrefPartialPressureGas::instance(), SIGNAL(pheChanged(bool)));
-	QSignalSpy spy2(qPrefPartialPressureGas::instance(), SIGNAL(phe_thresholdChanged(double)));
-	QSignalSpy spy3(qPrefPartialPressureGas::instance(), SIGNAL(pn2Changed(bool)));
-	QSignalSpy spy4(qPrefPartialPressureGas::instance(), SIGNAL(pn2_thresholdChanged(double)));
-	QSignalSpy spy5(qPrefPartialPressureGas::instance(), SIGNAL(po2Changed(bool)));
-	QSignalSpy spy6(qPrefPartialPressureGas::instance(), SIGNAL(po2_threshold_maxChanged(double)));
-	QSignalSpy spy7(qPrefPartialPressureGas::instance(), SIGNAL(po2_threshold_minChanged(double)));
+	QSignalSpy spy1(qPrefPartialPressureGas::instance(), &qPrefPartialPressureGas::pheChanged);
+	QSignalSpy spy2(qPrefPartialPressureGas::instance(), &qPrefPartialPressureGas::phe_thresholdChanged);
+	QSignalSpy spy3(qPrefPartialPressureGas::instance(), &qPrefPartialPressureGas::pn2Changed);
+	QSignalSpy spy4(qPrefPartialPressureGas::instance(), &qPrefPartialPressureGas::pn2_thresholdChanged);
+	QSignalSpy spy5(qPrefPartialPressureGas::instance(), &qPrefPartialPressureGas::po2Changed);
+	QSignalSpy spy6(qPrefPartialPressureGas::instance(), &qPrefPartialPressureGas::po2_threshold_maxChanged);
+	QSignalSpy spy7(qPrefPartialPressureGas::instance(), &qPrefPartialPressureGas::po2_threshold_minChanged);
 
 	prefs.pp_graphs.phe = true;
 	qPrefPartialPressureGas::set_phe(false);
diff --git a/tests/testqPrefProxy.cpp b/tests/testqPrefProxy.cpp
index ed8c3a0ed..0568cd7b5 100644
--- a/tests/testqPrefProxy.cpp
+++ b/tests/testqPrefProxy.cpp
@@ -174,12 +174,12 @@ void TestQPrefProxy::test_oldPreferences()
 
 void TestQPrefProxy::test_signals()
 {
-	QSignalSpy spy1(qPrefProxy::instance(), SIGNAL(proxy_authChanged(bool)));
-	QSignalSpy spy2(qPrefProxy::instance(), SIGNAL(proxy_hostChanged(QString)));
-	QSignalSpy spy3(qPrefProxy::instance(), SIGNAL(proxy_passChanged(QString)));
-	QSignalSpy spy4(qPrefProxy::instance(), SIGNAL(proxy_portChanged(int)));
-	QSignalSpy spy5(qPrefProxy::instance(), SIGNAL(proxy_typeChanged(int)));
-	QSignalSpy spy6(qPrefProxy::instance(), SIGNAL(proxy_userChanged(QString)));
+	QSignalSpy spy1(qPrefProxy::instance(), &qPrefProxy::proxy_authChanged);
+	QSignalSpy spy2(qPrefProxy::instance(), &qPrefProxy::proxy_hostChanged);
+	QSignalSpy spy3(qPrefProxy::instance(), &qPrefProxy::proxy_passChanged);
+	QSignalSpy spy4(qPrefProxy::instance(), &qPrefProxy::proxy_portChanged);
+	QSignalSpy spy5(qPrefProxy::instance(), &qPrefProxy::proxy_typeChanged);
+	QSignalSpy spy6(qPrefProxy::instance(), &qPrefProxy::proxy_userChanged);
 
 	prefs.proxy_auth = true;
 	qPrefProxy::set_proxy_auth(false);
diff --git a/tests/testqPrefTechnicalDetails.cpp b/tests/testqPrefTechnicalDetails.cpp
index d1c02543c..a0b70f7fb 100644
--- a/tests/testqPrefTechnicalDetails.cpp
+++ b/tests/testqPrefTechnicalDetails.cpp
@@ -450,33 +450,33 @@ void TestQPrefTechnicalDetails::test_oldPreferences()
 
 void TestQPrefTechnicalDetails::test_signals()
 {
-	QSignalSpy spy1(qPrefTechnicalDetails::instance(), SIGNAL(calcalltissuesChanged(bool)));
-	QSignalSpy spy2(qPrefTechnicalDetails::instance(), SIGNAL(calcceilingChanged(bool)));
-	QSignalSpy spy3(qPrefTechnicalDetails::instance(), SIGNAL(calcceiling3mChanged(bool)));
-	QSignalSpy spy4(qPrefTechnicalDetails::instance(), SIGNAL(calcndlttsChanged(bool)));
-	QSignalSpy spy5(qPrefTechnicalDetails::instance(), SIGNAL(dcceilingChanged(bool)));
-	QSignalSpy spy6(qPrefTechnicalDetails::instance(), SIGNAL(display_deco_modeChanged(deco_mode)));
-	QSignalSpy spy7(qPrefTechnicalDetails::instance(), SIGNAL(display_unused_tanksChanged(bool)));
-	QSignalSpy spy8(qPrefTechnicalDetails::instance(), SIGNAL(eadChanged(bool)));
-	QSignalSpy spy9(qPrefTechnicalDetails::instance(), SIGNAL(gfhighChanged(int)));
-	QSignalSpy spy10(qPrefTechnicalDetails::instance(), SIGNAL(gflowChanged(int)));
-	QSignalSpy spy11(qPrefTechnicalDetails::instance(), SIGNAL(gf_low_at_maxdepthChanged(bool)));
-	QSignalSpy spy12(qPrefTechnicalDetails::instance(), SIGNAL(hrgraphChanged(bool)));
-	QSignalSpy spy13(qPrefTechnicalDetails::instance(), SIGNAL(modChanged(bool)));
-	QSignalSpy spy14(qPrefTechnicalDetails::instance(), SIGNAL(modpO2Changed(double)));
-	QSignalSpy spy15(qPrefTechnicalDetails::instance(), SIGNAL(percentagegraphChanged(bool)));
-	QSignalSpy spy16(qPrefTechnicalDetails::instance(), SIGNAL(redceilingChanged(bool)));
-	QSignalSpy spy17(qPrefTechnicalDetails::instance(), SIGNAL(rulergraphChanged(bool)));
-	QSignalSpy spy18(qPrefTechnicalDetails::instance(), SIGNAL(show_average_depthChanged(bool)));
-	QSignalSpy spy19(qPrefTechnicalDetails::instance(), SIGNAL(show_ccr_sensorsChanged(bool)));
-	QSignalSpy spy20(qPrefTechnicalDetails::instance(), SIGNAL(show_ccr_setpointChanged(bool)));
-	QSignalSpy spy21(qPrefTechnicalDetails::instance(), SIGNAL(show_icdChanged(bool)));
-	QSignalSpy spy22(qPrefTechnicalDetails::instance(), SIGNAL(show_pictures_in_profileChanged(bool)));
-	QSignalSpy spy23(qPrefTechnicalDetails::instance(), SIGNAL(show_sacChanged(bool)));
-	QSignalSpy spy24(qPrefTechnicalDetails::instance(), SIGNAL(show_scr_ocpo2Changed(bool)));
-	QSignalSpy spy25(qPrefTechnicalDetails::instance(), SIGNAL(tankbarChanged(bool)));
-	QSignalSpy spy26(qPrefTechnicalDetails::instance(), SIGNAL(vpmb_conservatismChanged(int)));
-	QSignalSpy spy27(qPrefTechnicalDetails::instance(), SIGNAL(zoomed_plotChanged(bool)));
+	QSignalSpy spy1(qPrefTechnicalDetails::instance(), &qPrefTechnicalDetails::calcalltissuesChanged);
+	QSignalSpy spy2(qPrefTechnicalDetails::instance(), &qPrefTechnicalDetails::calcceilingChanged);
+	QSignalSpy spy3(qPrefTechnicalDetails::instance(), &qPrefTechnicalDetails::calcceiling3mChanged);
+	QSignalSpy spy4(qPrefTechnicalDetails::instance(), &qPrefTechnicalDetails::calcndlttsChanged);
+	QSignalSpy spy5(qPrefTechnicalDetails::instance(), &qPrefTechnicalDetails::dcceilingChanged);
+	QSignalSpy spy6(qPrefTechnicalDetails::instance(), &qPrefTechnicalDetails::display_deco_modeChanged);
+	QSignalSpy spy7(qPrefTechnicalDetails::instance(), &qPrefTechnicalDetails::display_unused_tanksChanged);
+	QSignalSpy spy8(qPrefTechnicalDetails::instance(), &qPrefTechnicalDetails::eadChanged);
+	QSignalSpy spy9(qPrefTechnicalDetails::instance(), &qPrefTechnicalDetails::gfhighChanged);
+	QSignalSpy spy10(qPrefTechnicalDetails::instance(), &qPrefTechnicalDetails::gflowChanged);
+	QSignalSpy spy11(qPrefTechnicalDetails::instance(), &qPrefTechnicalDetails::gf_low_at_maxdepthChanged);
+	QSignalSpy spy12(qPrefTechnicalDetails::instance(), &qPrefTechnicalDetails::hrgraphChanged);
+	QSignalSpy spy13(qPrefTechnicalDetails::instance(), &qPrefTechnicalDetails::modChanged);
+	QSignalSpy spy14(qPrefTechnicalDetails::instance(), &qPrefTechnicalDetails::modpO2Changed);
+	QSignalSpy spy15(qPrefTechnicalDetails::instance(), &qPrefTechnicalDetails::percentagegraphChanged);
+	QSignalSpy spy16(qPrefTechnicalDetails::instance(), &qPrefTechnicalDetails::redceilingChanged);
+	QSignalSpy spy17(qPrefTechnicalDetails::instance(), &qPrefTechnicalDetails::rulergraphChanged);
+	QSignalSpy spy18(qPrefTechnicalDetails::instance(), &qPrefTechnicalDetails::show_average_depthChanged);
+	QSignalSpy spy19(qPrefTechnicalDetails::instance(), &qPrefTechnicalDetails::show_ccr_sensorsChanged);
+	QSignalSpy spy20(qPrefTechnicalDetails::instance(), &qPrefTechnicalDetails::show_ccr_setpointChanged);
+	QSignalSpy spy21(qPrefTechnicalDetails::instance(), &qPrefTechnicalDetails::show_icdChanged);
+	QSignalSpy spy22(qPrefTechnicalDetails::instance(), &qPrefTechnicalDetails::show_pictures_in_profileChanged);
+	QSignalSpy spy23(qPrefTechnicalDetails::instance(), &qPrefTechnicalDetails::show_sacChanged);
+	QSignalSpy spy24(qPrefTechnicalDetails::instance(), &qPrefTechnicalDetails::show_scr_ocpo2Changed);
+	QSignalSpy spy25(qPrefTechnicalDetails::instance(), &qPrefTechnicalDetails::tankbarChanged);
+	QSignalSpy spy26(qPrefTechnicalDetails::instance(), &qPrefTechnicalDetails::vpmb_conservatismChanged);
+	QSignalSpy spy27(qPrefTechnicalDetails::instance(), &qPrefTechnicalDetails::zoomed_plotChanged);
 
 	prefs.calcalltissues = true;
 	qPrefTechnicalDetails::set_calcalltissues(false);
diff --git a/tests/testqPrefUnits.cpp b/tests/testqPrefUnits.cpp
index a3416e1f2..122a35ce9 100644
--- a/tests/testqPrefUnits.cpp
+++ b/tests/testqPrefUnits.cpp
@@ -236,15 +236,15 @@ void TestQPrefUnits::test_oldPreferences()
 
 void TestQPrefUnits::test_signals()
 {
-	QSignalSpy spy1(qPrefUnits::instance(), SIGNAL(coordinates_traditionalChanged(bool)));
-	QSignalSpy spy2(qPrefUnits::instance(), SIGNAL(duration_unitsChanged(int)));
-	QSignalSpy spy3(qPrefUnits::instance(), SIGNAL(lengthChanged(int)));
-	QSignalSpy spy4(qPrefUnits::instance(), SIGNAL(pressureChanged(int)));
-	QSignalSpy spy5(qPrefUnits::instance(), SIGNAL(show_units_tableChanged(bool)));
-	QSignalSpy spy6(qPrefUnits::instance(), SIGNAL(temperatureChanged(int)));
-	QSignalSpy spy7(qPrefUnits::instance(), SIGNAL(vertical_speed_timeChanged(int)));
-	QSignalSpy spy8(qPrefUnits::instance(), SIGNAL(volumeChanged(int)));
-	QSignalSpy spy9(qPrefUnits::instance(), SIGNAL(weightChanged(int)));
+	QSignalSpy spy1(qPrefUnits::instance(), &qPrefUnits::coordinates_traditionalChanged);
+	QSignalSpy spy2(qPrefUnits::instance(), &qPrefUnits::duration_unitsChanged);
+	QSignalSpy spy3(qPrefUnits::instance(), &qPrefUnits::lengthChanged);
+	QSignalSpy spy4(qPrefUnits::instance(), &qPrefUnits::pressureChanged);
+	QSignalSpy spy5(qPrefUnits::instance(), &qPrefUnits::show_units_tableChanged);
+	QSignalSpy spy6(qPrefUnits::instance(), &qPrefUnits::temperatureChanged);
+	QSignalSpy spy7(qPrefUnits::instance(), &qPrefUnits::vertical_speed_timeChanged);
+	QSignalSpy spy8(qPrefUnits::instance(), &qPrefUnits::volumeChanged);
+	QSignalSpy spy9(qPrefUnits::instance(), &qPrefUnits::weightChanged);
 
 	prefs.coordinates_traditional = true;
 	qPrefUnits::set_coordinates_traditional(false);
diff --git a/tests/testqPrefUpdateManager.cpp b/tests/testqPrefUpdateManager.cpp
index f11505654..259813cbe 100644
--- a/tests/testqPrefUpdateManager.cpp
+++ b/tests/testqPrefUpdateManager.cpp
@@ -166,11 +166,11 @@ void TestQPrefUpdateManager::test_oldPreferences()
 
 void TestQPrefUpdateManager::test_signals()
 {
-	QSignalSpy spy1(qPrefUpdateManager::instance(), SIGNAL(dont_check_for_updatesChanged(bool)));
-	QSignalSpy spy2(qPrefUpdateManager::instance(), SIGNAL(dont_check_existsChanged(bool)));
-	QSignalSpy spy3(qPrefUpdateManager::instance(), SIGNAL(last_version_usedChanged(QString)));
-	QSignalSpy spy4(qPrefUpdateManager::instance(), SIGNAL(next_checkChanged(QDate)));
-	QSignalSpy spy5(qPrefUpdateManager::instance(), SIGNAL(uuidStringChanged(QString)));
+	QSignalSpy spy1(qPrefUpdateManager::instance(), &qPrefUpdateManager::dont_check_for_updatesChanged);
+	QSignalSpy spy2(qPrefUpdateManager::instance(), &qPrefUpdateManager::dont_check_existsChanged);
+	QSignalSpy spy3(qPrefUpdateManager::instance(), &qPrefUpdateManager::last_version_usedChanged);
+	QSignalSpy spy4(qPrefUpdateManager::instance(), &qPrefUpdateManager::next_checkChanged);
+	QSignalSpy spy5(qPrefUpdateManager::instance(), &qPrefUpdateManager::uuidStringChanged);
 
 	prefs.update_manager.dont_check_for_updates = true;
 	qPrefUpdateManager::set_dont_check_for_updates(false);