From c545fadd87319f03c2cc151462e01d8cf00dd941 Mon Sep 17 00:00:00 2001
From: Tomaz Canabrava <tomaz.canabrava@gmail.com>
Date: Sun, 6 Mar 2016 21:39:19 -0300
Subject: [PATCH 06/10] Clean some unused variables

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com>
---
 subsurface-core/isocialnetworkintegration.cpp | 2 +-
 subsurface-core/macos.c                       | 6 +++---
 subsurface-core/metrics.cpp                   | 7 ++++++-
 subsurface-core/metrics.h                     | 1 +
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/subsurface-core/isocialnetworkintegration.cpp b/subsurface-core/isocialnetworkintegration.cpp
index 4a2ccdf..eb1e82a 100644
--- a/subsurface-core/isocialnetworkintegration.cpp
+++ b/subsurface-core/isocialnetworkintegration.cpp
@@ -1,6 +1,6 @@
 #include "isocialnetworkintegration.h"
 
 //Hack for moc.
-ISocialNetworkIntegration::ISocialNetworkIntegration(QObject* parent)
+ISocialNetworkIntegration::ISocialNetworkIntegration(QObject* parent) : QObject(parent)
 {
 }
diff --git a/subsurface-core/macos.c b/subsurface-core/macos.c
index fdfcebb..9209c65 100644
--- a/subsurface-core/macos.c
+++ b/subsurface-core/macos.c
@@ -15,7 +15,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-void subsurface_user_info(struct user_info *info)
+void subsurface_user_info(struct user_info *)
 { /* Nothing, let's use libgit2-20 on MacOS */ }
 
 /* macos defines CFSTR to create a CFString object from a constant,
@@ -39,7 +39,7 @@ void subsurface_OS_pref_setup(void)
 	// nothing
 }
 
-bool subsurface_ignore_font(const char *font)
+bool subsurface_ignore_font(const char *)
 {
 	// there are no old default fonts to ignore
 	return false;
@@ -197,7 +197,7 @@ int subsurface_zip_close(struct zip *zip)
 }
 
 /* win32 console */
-void subsurface_console_init(bool dedicated)
+void subsurface_console_init(bool)
 {
 	/* NOP */
 }
diff --git a/subsurface-core/metrics.cpp b/subsurface-core/metrics.cpp
index 203c2e5..e9adc2d 100644
--- a/subsurface-core/metrics.cpp
+++ b/subsurface-core/metrics.cpp
@@ -8,7 +8,12 @@
 
 #include "metrics.h"
 
-static IconMetrics dfltIconMetrics = { -1 };
+static IconMetrics dfltIconMetrics;
+
+IconMetrics::IconMetrics()
+	:sz_small(-1), sz_med(-1), sz_big(-1), sz_pic(-1), spacing(-1)
+{
+}
 
 QFont defaultModelFont()
 {
diff --git a/subsurface-core/metrics.h b/subsurface-core/metrics.h
index 30295a3..03d6b22 100644
--- a/subsurface-core/metrics.h
+++ b/subsurface-core/metrics.h
@@ -25,6 +25,7 @@ struct IconMetrics {
 	int sz_pic; // ex 128px
 	// icon spacing
 	int spacing; // ex 2px
+	IconMetrics();
 };
 
 const IconMetrics & defaultIconMetrics();
-- 
2.5.4 (Apple Git-61)