diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 4aad3ddf0..b6459ef3e 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -163,7 +163,6 @@ set(SUBSURFACE_CORE_LIB_SRCS selection.h sha1.cpp sha1.h - ssrf.h statistics.cpp statistics.h string-format.h diff --git a/core/cochran.cpp b/core/cochran.cpp index e63013d8e..ed65950ab 100644 --- a/core/cochran.cpp +++ b/core/cochran.cpp @@ -4,7 +4,6 @@ #pragma clang diagnostic ignored "-Wmissing-field-initializers" #endif -#include "ssrf.h" #include #include #include diff --git a/core/datatrak.cpp b/core/datatrak.cpp index 1f1f215e3..c1f005756 100644 --- a/core/datatrak.cpp +++ b/core/datatrak.cpp @@ -19,7 +19,6 @@ #include "dive.h" #include "divelog.h" #include "errorhelper.h" -#include "ssrf.h" #include "tag.h" static unsigned int two_bytes_to_int(unsigned char x, unsigned char y) diff --git a/core/deco.cpp b/core/deco.cpp index 7c8b6bdee..663a87991 100644 --- a/core/deco.cpp +++ b/core/deco.cpp @@ -21,7 +21,6 @@ #include #include "deco.h" -#include "ssrf.h" #include "dive.h" #include "gas.h" #include "subsurface-string.h" diff --git a/core/file.cpp b/core/file.cpp index 93ba907d5..f6c81a0c2 100644 --- a/core/file.cpp +++ b/core/file.cpp @@ -1,5 +1,4 @@ // SPDX-License-Identifier: GPL-2.0 -#include "ssrf.h" #include #include #include diff --git a/core/gaspressures.cpp b/core/gaspressures.cpp index 891b36100..2e3b30357 100644 --- a/core/gaspressures.cpp +++ b/core/gaspressures.cpp @@ -12,7 +12,6 @@ * -> get_pr_interpolate_data() */ -#include "ssrf.h" #include "dive.h" #include "event.h" #include "profile.h" diff --git a/core/git-access.cpp b/core/git-access.cpp index 0543a1089..7abc690c3 100644 --- a/core/git-access.cpp +++ b/core/git-access.cpp @@ -4,7 +4,6 @@ #pragma clang diagnostic ignored "-Wmissing-field-initializers" #endif -#include "ssrf.h" #include #include #include diff --git a/core/import-cobalt.cpp b/core/import-cobalt.cpp index 2b199ba9c..ba30e63c5 100644 --- a/core/import-cobalt.cpp +++ b/core/import-cobalt.cpp @@ -5,7 +5,6 @@ #endif #include -#include "ssrf.h" #include "dive.h" #include "divesite.h" #include "errorhelper.h" diff --git a/core/import-csv.cpp b/core/import-csv.cpp index a528f6399..ed677c0ad 100644 --- a/core/import-csv.cpp +++ b/core/import-csv.cpp @@ -5,7 +5,6 @@ #include "dive.h" #include "errorhelper.h" -#include "ssrf.h" #include "subsurface-string.h" #include "divelist.h" #include "divelog.h" diff --git a/core/import-divinglog.cpp b/core/import-divinglog.cpp index c2bc75573..182a5ee88 100644 --- a/core/import-divinglog.cpp +++ b/core/import-divinglog.cpp @@ -4,7 +4,6 @@ #pragma clang diagnostic ignored "-Wmissing-field-initializers" #endif -#include "ssrf.h" #include "dive.h" #include "divesite.h" #include "sample.h" diff --git a/core/import-seac.cpp b/core/import-seac.cpp index a99128da5..1cad1df57 100644 --- a/core/import-seac.cpp +++ b/core/import-seac.cpp @@ -6,7 +6,6 @@ #include #include "qthelper.h" -#include "ssrf.h" #include "dive.h" #include "sample.h" #include "subsurface-string.h" diff --git a/core/import-shearwater.cpp b/core/import-shearwater.cpp index 8f559ca6c..1b7003cbf 100644 --- a/core/import-shearwater.cpp +++ b/core/import-shearwater.cpp @@ -4,7 +4,6 @@ #pragma clang diagnostic ignored "-Wmissing-field-initializers" #endif -#include "ssrf.h" #include "dive.h" #include "sample.h" #include "subsurface-string.h" diff --git a/core/import-suunto.cpp b/core/import-suunto.cpp index b6e4bc6db..80aa137c7 100644 --- a/core/import-suunto.cpp +++ b/core/import-suunto.cpp @@ -4,7 +4,6 @@ #pragma clang diagnostic ignored "-Wmissing-field-initializers" #endif -#include "ssrf.h" #include "dive.h" #include "parse.h" #include "sample.h" diff --git a/core/libdivecomputer.cpp b/core/libdivecomputer.cpp index da5637336..4e77f2f8d 100644 --- a/core/libdivecomputer.cpp +++ b/core/libdivecomputer.cpp @@ -4,7 +4,6 @@ #pragma clang diagnostic ignored "-Wmissing-field-initializers" #endif -#include "ssrf.h" #include #include #include diff --git a/core/liquivision.cpp b/core/liquivision.cpp index aedeffc03..660bd7df6 100644 --- a/core/liquivision.cpp +++ b/core/liquivision.cpp @@ -2,7 +2,6 @@ #include #include -#include "ssrf.h" #include "divesite.h" #include "dive.h" #include "divelog.h" diff --git a/core/load-git.cpp b/core/load-git.cpp index aa20000a6..d4a42e447 100644 --- a/core/load-git.cpp +++ b/core/load-git.cpp @@ -1,5 +1,4 @@ // SPDX-License-Identifier: GPL-2.0 -#include "ssrf.h" #include #include #include diff --git a/core/macos.cpp b/core/macos.cpp index 50f32448e..9a23e47d9 100644 --- a/core/macos.cpp +++ b/core/macos.cpp @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* macos.c */ /* implements Mac OS X specific functions */ -#include "ssrf.h" #include #include #include diff --git a/core/ostctools.cpp b/core/ostctools.cpp index 5d4b7631d..b13adea83 100644 --- a/core/ostctools.cpp +++ b/core/ostctools.cpp @@ -4,7 +4,6 @@ #include #include "errorhelper.h" -#include "ssrf.h" #include "subsurface-string.h" #include "gettext.h" #include "dive.h" diff --git a/core/parse-xml.cpp b/core/parse-xml.cpp index 13caf6f19..3b29b182e 100644 --- a/core/parse-xml.cpp +++ b/core/parse-xml.cpp @@ -4,8 +4,6 @@ #pragma clang diagnostic ignored "-Wmissing-field-initializers" #endif -#include "ssrf.h" - #include #include #include diff --git a/core/parse.cpp b/core/parse.cpp index d2b935370..17b5e9952 100644 --- a/core/parse.cpp +++ b/core/parse.cpp @@ -1,4 +1,3 @@ -#include "ssrf.h" #include #include #include diff --git a/core/planner.cpp b/core/planner.cpp index 6784637bf..d78eb52d1 100644 --- a/core/planner.cpp +++ b/core/planner.cpp @@ -10,7 +10,6 @@ #include #include #include -#include "ssrf.h" #include "dive.h" #include "divelist.h" // for init_decompression() #include "sample.h" diff --git a/core/profile.cpp b/core/profile.cpp index 92ffb048e..9cdee6bfb 100644 --- a/core/profile.cpp +++ b/core/profile.cpp @@ -2,7 +2,6 @@ /* profile.c */ /* creates all the necessary data for drawing the dive profile */ -#include "ssrf.h" #include "gettext.h" #include #include diff --git a/core/save-git.cpp b/core/save-git.cpp index bbe493bcd..83f867c40 100644 --- a/core/save-git.cpp +++ b/core/save-git.cpp @@ -4,7 +4,6 @@ #pragma clang diagnostic ignored "-Wmissing-field-initializers" #endif -#include "ssrf.h" #include #include #include diff --git a/core/ssrf.h b/core/ssrf.h deleted file mode 100644 index 0397f572d..000000000 --- a/core/ssrf.h +++ /dev/null @@ -1,10 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#ifndef SSRF_H -#define SSRF_H - -#ifdef __clang__ -// Clang has a bug on zero-initialization of C structs. -#pragma clang diagnostic ignored "-Wmissing-field-initializers" -#endif - -#endif // SSRF_H diff --git a/core/unix.cpp b/core/unix.cpp index 9692fd136..f2346c165 100644 --- a/core/unix.cpp +++ b/core/unix.cpp @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* unix.c */ /* implements UNIX specific functions */ -#include "ssrf.h" #include "dive.h" #include "file.h" #include "subsurface-string.h" diff --git a/core/windows.cpp b/core/windows.cpp index ae8e64b76..6f475b009 100644 --- a/core/windows.cpp +++ b/core/windows.cpp @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* windows.c */ /* implements Windows specific functions */ -#include "ssrf.h" #include #include "dive.h" #include "device.h" diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index 7ca829ec2..44d07c607 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -39,7 +39,6 @@ #include "core/string-format.h" #include "core/pref.h" #include "core/selection.h" -#include "core/ssrf.h" #include "core/save-profiledata.h" #include "core/settings/qPrefLog.h" #include "core/settings/qPrefTechnicalDetails.h" diff --git a/subsurface-helper.cpp b/subsurface-helper.cpp index b881cab37..df40cb433 100644 --- a/subsurface-helper.cpp +++ b/subsurface-helper.cpp @@ -13,7 +13,6 @@ #include "core/globals.h" #include "core/qt-gui.h" #include "core/settings/qPref.h" -#include "core/ssrf.h" #ifdef SUBSURFACE_MOBILE #include diff --git a/subsurface-mobile-main.cpp b/subsurface-mobile-main.cpp index 399db7159..975186478 100644 --- a/subsurface-mobile-main.cpp +++ b/subsurface-mobile-main.cpp @@ -29,7 +29,6 @@ #include // Implementation of STP logging -#include "core/ssrf.h" int main(int argc, char **argv) {