diff options
| -rw-r--r-- | Rules.mk | 2 | ||||
| -rw-r--r-- | download-dialog.c | 2 | ||||
| -rw-r--r-- | gtk-gui.c | 2 | ||||
| -rw-r--r-- | macos.c | 6 | ||||
| -rw-r--r-- | main.cpp | 1 | ||||
| -rw-r--r-- | planner-gtk.c | 1 | ||||
| -rw-r--r-- | qthelper.h | 4 | ||||
| -rw-r--r-- | webservice.c | 1 | ||||
| -rw-r--r-- | windows.c | 6 |
9 files changed, 9 insertions, 16 deletions
@@ -48,7 +48,7 @@ CREATOR_FILES = $(NAME).config $(NAME).creator $(NAME).files $(NAME).includes all: $(TARGET) doc -$(TARGET): gen_version_file $(ALL_OBJS) $(MSGOBJS) $(INFOPLIST) +$(TARGET): gen_version_file $(ALL_OBJS) $(INFOPLIST) @$(PRETTYECHO) ' LINK' $(TARGET) $(COMPILE_PREFIX)$(CXX) $(LDFLAGS) -o $(TARGET) $(ALL_OBJS) $(LIBS) diff --git a/download-dialog.c b/download-dialog.c index b98562571..b5632d593 100644 --- a/download-dialog.c +++ b/download-dialog.c @@ -1,5 +1,3 @@ -#include <libintl.h> -#include <glib/gi18n.h> #include "dive.h" #include "divelist.h" #include "display.h" @@ -8,8 +8,6 @@ * functions. It's renamed back to gtk-ui.c to keep the old Gtk code * around for reference in case we still need it... all that has now been * ripped out of qt-gui.cpp */ -#include <libintl.h> -#include <glib/gi18n.h> #include <stdio.h> #include <string.h> #include <stdlib.h> @@ -42,7 +42,7 @@ void subsurface_set_conf(const char *name, const char *value) CFPreferencesSetAppValue(CFSTR_VAR(name), CFSTR_VAR(value), SUBSURFACE_PREFERENCES); } -void subsurface_set_conf_bool(const char *name, int value) +void subsurface_set_conf_bool(const char *name, bool value) { CFPreferencesSetAppValue(CFSTR_VAR(name), value ? kCFBooleanTrue : kCFBooleanFalse, SUBSURFACE_PREFERENCES); @@ -252,12 +252,12 @@ void subsurface_command_line_exit(int *argc, char ***argv) /* this is a no-op */ } -int subsurface_os_feature_available(os_feature_t f) +bool subsurface_os_feature_available(os_feature_t f) { return TRUE; } -int subsurface_launch_for_uri(const char* uri) +bool subsurface_launch_for_uri(const char* uri) { CFURLRef urlref = CFURLCreateWithBytes(NULL, uri, strlen(uri), kCFStringEncodingMacRoman, NULL); OSStatus status = LSOpenCFURLRef(urlref, NULL); @@ -4,7 +4,6 @@ #include <string.h> #include <stdlib.h> #include <time.h> -#include <libintl.h> #include "qt-gui.h" #include "version.h" diff --git a/planner-gtk.c b/planner-gtk.c index d5fddec46..b6306bdee 100644 --- a/planner-gtk.c +++ b/planner-gtk.c @@ -4,7 +4,6 @@ * * (c) Dirk Hohndel 2013 */ -#include <libintl.h> #include <glib/gi18n.h> #include <unistd.h> #include <ctype.h> diff --git a/qthelper.h b/qthelper.h index 0bb7c19f1..0ab184b78 100644 --- a/qthelper.h +++ b/qthelper.h @@ -29,8 +29,8 @@ public: void rmDC(QString m, uint32_t d); DiveComputerNode matchDC(QString m, uint32_t d); DiveComputerNode matchModel(QString m); - QMultiMap<QString, struct DiveComputerNode> dcMap; - QMultiMap<QString, struct DiveComputerNode> dcWorkingMap; + QMultiMap<QString, class DiveComputerNode> dcMap; + QMultiMap<QString, class DiveComputerNode> dcWorkingMap; }; QString weight_string(int weight_in_grams); diff --git a/webservice.c b/webservice.c index f4f8baeb4..e713e1282 100644 --- a/webservice.c +++ b/webservice.c @@ -1,4 +1,3 @@ -#include <libintl.h> #include <glib/gi18n.h> #include <libsoup/soup.h> #include <libxml/tree.h> @@ -60,7 +60,7 @@ void subsurface_set_conf_int(const char *name, int value) RegSetValueEx(hkey, (LPCTSTR)name, 0, REG_DWORD, (const BYTE *)&value, 4); } -void subsurface_set_conf_bool(const char *name, int value) +void subsurface_set_conf_bool(const char *name, bool value) { subsurface_set_conf_int(name, value); } @@ -305,7 +305,7 @@ void subsurface_command_line_exit(gint *argc, gchar ***argv) g_free(*argv); } -gboolean subsurface_launch_for_uri(const char* uri) +bool subsurface_launch_for_uri(const char* uri) { gboolean ret = FALSE; wchar_t *wuri = (wchar_t *)g_utf8_to_utf16(uri, -1, NULL, NULL, NULL); @@ -320,7 +320,7 @@ gboolean subsurface_launch_for_uri(const char* uri) } /* check if we are running a newer OS version */ -gboolean subsurface_os_feature_available(os_feature_t f) +bool subsurface_os_feature_available(os_feature_t f) { switch (f) { case UTF8_FONT_WITH_STARS: |