diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-09-13 19:08:41 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-09-13 13:54:59 -0700 |
| commit | a01ab817139be16906c30f89e16a0a3fbbe026cd (patch) | |
| tree | bd77786542d82f0a3f2fccd6079e70f1f4e118f3 /packaging/ios | |
| parent | fcdb48779b0e109942ad2261670c6fc9344e2da3 (diff) | |
| download | subsurface-a01ab817139be16906c30f89e16a0a3fbbe026cd.tar.gz | |
cleanup: fold core/divecomputer.cpp into core/device.c
core/device.h was declaring a number of functions that were related
to divecomputers (dcs): creating a fake dc for manually entered dives
and registering / accessing dc nicknames. On could argue whether
these should be lumped together, but it is what it is.
However, part of that was implemented in C++/Qt code in a separate
core/divecomputer.cpp file. Some function therein where only
accessible to C++ and declared in core/divecomputer.h.
All in all, a big mess. Let's simply combine the files and
conditionally compile the C++-only functions depending on
the __cplusplus define.
Yes, that means turning device.c into device.cpp. A brave soul
might turn the C++/Qt code into C code if they whish later on.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'packaging/ios')
| -rw-r--r-- | packaging/ios/Subsurface-mobile.pro | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/packaging/ios/Subsurface-mobile.pro b/packaging/ios/Subsurface-mobile.pro index 1281d0377..322e2b9a2 100644 --- a/packaging/ios/Subsurface-mobile.pro +++ b/packaging/ios/Subsurface-mobile.pro @@ -36,7 +36,6 @@ SOURCES += ../../subsurface-mobile-main.cpp \ ../../core/checkcloudconnection.cpp \ ../../core/color.cpp \ ../../core/configuredivecomputer.cpp \ - ../../core/divecomputer.cpp \ ../../core/divelogexportlogic.cpp \ ../../core/divesitehelpers.cpp \ ../../core/errorhelper.c \ @@ -52,7 +51,7 @@ SOURCES += ../../subsurface-mobile-main.cpp \ ../../core/subsurfacestartup.c \ ../../core/ios.cpp \ ../../core/profile.c \ - ../../core/device.c \ + ../../core/device.cpp \ ../../core/dive.c \ ../../core/divefilter.cpp \ ../../core/divelist.c \ @@ -217,7 +216,6 @@ HEADERS += \ ../../core/datatrak.h \ ../../core/deco.h \ ../../core/display.h \ - ../../core/divecomputer.h \ ../../core/divefilter.h \ ../../core/divelist.h \ ../../core/divelogexportlogic.h \ @@ -232,7 +230,6 @@ HEADERS += \ ../../core/metrics.h \ ../../core/qt-gui.h \ ../../core/selection.h \ - ../../core/divecomputer.h \ ../../core/sha1.h \ ../../core/strndup.h \ ../../core/subsurfacestartup.h \ |