c959e36 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Build without any warnings

c959e36Daniel d'Andrada12 years ago

plugins/Lights/Lights.cpp+1−2

compare with xenial

unifiedsplit

@@ -20,8 +20,7 @@

20#include <QtCore/QDebug>

22extern "C" {

23−#include <hardware/hardware.h>

24−#include <hardware/lights.h>

23+#include "android-hardware.h"

25#include <string.h>

24#include <string.h>

26}

25}

plugins/Lights/android-hardware.hnew file+23

@@ -0,0 +1,23 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ */

17+

18+// The purpose of this header wrapper is just to avoid having warnings being reported on

19+// code from external header files, as we can't do anything about them.

20+#pragma GCC system_header

21+

22+#include <hardware/hardware.h>

23+#include <hardware/lights.h>

plugins/Utils/windowkeysfilter.cpp+1

@@ -31,6 +31,7 @@ bool WindowKeysFilter::eventFilter(QObject *watched, QEvent *event)

31{

32 Q_ASSERT(!m_filteredWindow.isNull());

33 Q_ASSERT(watched == static_cast<QObject*>(m_filteredWindow.data()));

34+ Q_UNUSED(watched);

35 if (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) {

36 if (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) {

36 // Let QML see this event and decide if it does not want it

37 // Let QML see this event and decide if it does not want it

tests/mocks/HudClient/fake_libhud_client.cpp+8−1

@@ -63,6 +63,7 @@ HudClientQuery *hud_client_query_new(const gchar *query)

63DeeModel *hud_client_query_get_results_model(HudClientQuery *cquery)

64{

65 Q_ASSERT(cquery == HudClientStub::m_query);

66+ Q_UNUSED(cquery);

66 if (!resultsModel) {

67 if (!resultsModel) {

67 resultsModel = dee_sequence_model_new();

68 resultsModel = dee_sequence_model_new();

68 dee_model_set_schema_full(resultsModel, results_model_schema, G_N_ELEMENTS(results_model_schema));

69 dee_model_set_schema_full(resultsModel, results_model_schema, G_N_ELEMENTS(results_model_schema));

@@ -113,18 +114,21 @@ void hud_client_query_execute_toolbar_item(HudClientQuery *cquery, HudClientQuer

113{

114{

114 Q_ASSERT(cquery == HudClientStub::m_query);

115 Q_ASSERT(cquery == HudClientStub::m_query);

115 Q_UNUSED(timestamp);

116 Q_UNUSED(timestamp);

117+ Q_UNUSED(cquery);

116 HudClientStub::m_lastExecutedToolbarItem = item;

118 HudClientStub::m_lastExecutedToolbarItem = item;

117}

119}

118

120

119void hud_client_query_set_query(HudClientQuery *cquery, const char *query)

121void hud_client_query_set_query(HudClientQuery *cquery, const char *query)

120{

122{

121 Q_ASSERT(cquery == HudClientStub::m_query);

123 Q_ASSERT(cquery == HudClientStub::m_query);

124+ Q_UNUSED(cquery);

122 HudClientStub::m_lastSetQuery = QString::fromUtf8(query);

125 HudClientStub::m_lastSetQuery = QString::fromUtf8(query);

123}

126}

124

127

125void hud_client_query_execute_command(HudClientQuery *cquery, GVariant *command_key, guint timestamp)

128void hud_client_query_execute_command(HudClientQuery *cquery, GVariant *command_key, guint timestamp)

126{

129{

127 Q_ASSERT(cquery == HudClientStub::m_query);

130 Q_ASSERT(cquery == HudClientStub::m_query);

131+ Q_UNUSED(cquery);

128 Q_UNUSED(timestamp);

132 Q_UNUSED(timestamp);

129 for (uint i = 0; i < dee_model_get_n_rows(resultsModel); ++i) {

133 for (uint i = 0; i < dee_model_get_n_rows(resultsModel); ++i) {

130 DeeModelIter *iter = dee_model_get_iter_at_row(resultsModel, i);

134 DeeModelIter *iter = dee_model_get_iter_at_row(resultsModel, i);

@@ -144,6 +148,7 @@ void hud_client_query_execute_command(HudClientQuery *cquery, GVariant *command_

144HudClientParam *hud_client_query_execute_param_command(HudClientQuery *cquery, GVariant *command_key, guint timestamp)

148HudClientParam *hud_client_query_execute_param_command(HudClientQuery *cquery, GVariant *command_key, guint timestamp)

145{

149{

146 Q_ASSERT(cquery == HudClientStub::m_query);

150 Q_ASSERT(cquery == HudClientStub::m_query);

151+ Q_UNUSED(cquery);

147 Q_UNUSED(timestamp);

152 Q_UNUSED(timestamp);

148 for (uint i = 0; i < dee_model_get_n_rows(resultsModel); ++i) {

153 for (uint i = 0; i < dee_model_get_n_rows(resultsModel); ++i) {

149 DeeModelIter *iter = dee_model_get_iter_at_row(resultsModel, i);

154 DeeModelIter *iter = dee_model_get_iter_at_row(resultsModel, i);

@@ -165,12 +170,14 @@ HudClientParam *hud_client_query_execute_param_command(HudClientQuery *cquery, G

165void hud_client_query_voice_query(HudClientQuery *cquery)

170void hud_client_query_voice_query(HudClientQuery *cquery)

166{

171{

167 Q_ASSERT(cquery == HudClientStub::m_query);

172 Q_ASSERT(cquery == HudClientStub::m_query);

173+ Q_UNUSED(cquery);

168 // TODO We are not testing voice queries yet

174 // TODO We are not testing voice queries yet

169}

175}

170

176

171gboolean hud_client_query_toolbar_item_active(HudClientQuery *cquery, HudClientQueryToolbarItems item)

177gboolean hud_client_query_toolbar_item_active(HudClientQuery *cquery, HudClientQueryToolbarItems item)

172{

178{

173 Q_ASSERT(cquery == HudClientStub::m_query);

179 Q_ASSERT(cquery == HudClientStub::m_query);

180+ Q_UNUSED(cquery);

174 if (item == HUD_CLIENT_QUERY_TOOLBAR_HELP)

181 if (item == HUD_CLIENT_QUERY_TOOLBAR_HELP)

175 return HudClientStub::m_helpToolbarItemEnabled;

182 return HudClientStub::m_helpToolbarItemEnabled;

176

183

@@ -218,7 +225,7 @@ GActionGroup *hud_client_param_get_actions(HudClientParam *param)

218 if (!parametrizedActionGroup) {

225 if (!parametrizedActionGroup) {

219 GSimpleActionGroup *actionGroup = g_simple_action_group_new();

226 GSimpleActionGroup *actionGroup = g_simple_action_group_new();

220 GSimpleAction *action = g_simple_action_new("costAction", G_VARIANT_TYPE_DOUBLE);

227 GSimpleAction *action = g_simple_action_new("costAction", G_VARIANT_TYPE_DOUBLE);

221− g_simple_action_group_insert(actionGroup, G_ACTION(action));

228+ g_action_map_add_action(G_ACTION_MAP(actionGroup), G_ACTION(action));

222

229

223 g_signal_connect (action, "activate", G_CALLBACK (on_signal_activated), nullptr);

230 g_signal_connect (action, "activate", G_CALLBACK (on_signal_activated), nullptr);

224

231