mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 22:03:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Changes to make the glib-removal-hack branch build on MacOSX

Browse source 
Tested with the Homebrew packaging system

Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Henrik Brautaset Aronsen 2013-10-06 13:43:45 +02:00 • committed by Dirk Hohndel
parent 4d3e74a236
commit 4d0b6e698a
9 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Rules.mk
View file

@ -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)

2
download-dialog.c
View file

@ -1,5 +1,3 @@
#include <libintl.h>
#include <glib/gi18n.h>
#include "dive.h"
#include "divelist.h"
#include "display.h"

2
gtk-gui.c
View file

@ -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>

6
macos.c
View file

@ -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);

1
main.cpp
View file

@ -4,7 +4,6 @@
#include <string.h>
#include <stdlib.h>
#include <time.h>
#include <libintl.h>
#include "qt-gui.h"
#include "version.h"

1
planner-gtk.c
View file

@ -4,7 +4,6 @@
*
* (c) Dirk Hohndel 2013
*/
#include <libintl.h>
#include <glib/gi18n.h>
#include <unistd.h>
#include <ctype.h>

4
qthelper.h
View file

@ -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);

1
webservice.c
View file

@ -1,4 +1,3 @@
#include <libintl.h>
#include <glib/gi18n.h>
#include <libsoup/soup.h>
#include <libxml/tree.h>

6
windows.c
View file

@ -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: