Merge lp:~bregma/unity/lp-1430784 into lp:unity

[Stephen M. Webb]

silenced GCC 5 warnings

Tweaks to the code to silence new warnings from GCC 5 (which with -Werror cause FTBFS).

Most of the problems are from code generated by Google Test macros resulting in -Wunused-variable warnings. I fixed these by adding #pragma push/pop around the offending macro instantiations in the test code.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3930
http://jenkins.qa.ubuntu.com/job/unity-ci/1165/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/52

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1165/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

Code looks fine. I'll trust that it compiles now with gcc5 since you would not have proposed this unless it compiled in your pbuilder:)

review: Approve

=== modified file 'hud/HudController.cpp'
--- hud/HudController.cpp	2014-07-11 01:45:49 +0000
+++ hud/HudController.cpp	2015-03-13 14:15:34 +0000
@@ -157,7 +157,7 @@
   view_->search_activated.connect(sigc::mem_fun(this, &Controller::OnSearchActivated));
   view_->query_activated.connect(sigc::mem_fun(this, &Controller::OnQueryActivated));
   view_->query_selected.connect(sigc::mem_fun(this, &Controller::OnQuerySelected));
-  view_->layout_changed.connect(sigc::bind(sigc::mem_fun(this, &Controller::Relayout), nullptr));
+  view_->layout_changed.connect(sigc::bind(sigc::mem_fun(this, &Controller::Relayout), false));
   // Add to the debug introspection.
   AddChild(view_);
 }
 
=== modified file 'tests/test_application_launcher_icon.cpp'
--- tests/test_application_launcher_icon.cpp	2014-03-12 23:44:57 +0000
+++ tests/test_application_launcher_icon.cpp	2015-03-13 14:15:34 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * Copyright 2012,2015 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -1012,6 +1012,9 @@
   virtual ~QuitLabel() {}
 };
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-variable"
+
 INSTANTIATE_TEST_CASE_P(TestApplicationLauncherIcon, QuitLabel, testing::Values("Quit", "Exit", "Close"));
 
 TEST_P(/*TestApplicationLauncherIcon*/QuitLabel, QuicklistMenuItemRemoteOverridesQuitByLabelNotRunning)
@@ -1059,6 +1062,8 @@
   EXPECT_TRUE(cb_called);
 }
 
+#pragma GCC diagnostic pop
+
 TEST_F(TestApplicationLauncherIcon, QuicklistMenuItemRemoteOverridesQuitByPropertyNotRunning)
 {
   mock_app->SetRunState(false);
 
=== modified file 'tests/test_desktop_application_subject.cpp'
--- tests/test_desktop_application_subject.cpp	2013-09-05 17:50:54 +0000
+++ tests/test_desktop_application_subject.cpp	2015-03-13 14:15:34 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013,2015 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -32,6 +32,9 @@
   ApplicationSubject subject;
 };
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-variable"
+
 struct Property : TestDestkopApplicationSubject, testing::WithParamInterface<std::string> {};
 INSTANTIATE_TEST_CASE_P(TestDestkopApplicationSubject, Property, testing::Values("Fooo", "Bar", "Unity"));
 
@@ -275,4 +278,6 @@
   EXPECT_EQ(mock_subject, copy_subject);
 }
 
+#pragma GCC diagnostic pop
+
 } // anonymous namespace
 
=== modified file 'tests/test_glib_dbus_server.cpp'
--- tests/test_glib_dbus_server.cpp	2013-03-25 14:48:16 +0000
+++ tests/test_glib_dbus_server.cpp	2015-03-13 14:15:34 +0000
@@ -433,6 +433,9 @@
   EXPECT_TRUE(signal_got);
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-variable"
+
 struct ReadableProperties : TestGLibDBusServerInteractions, testing::WithParamInterface<std::string> {};
 INSTANTIATE_TEST_CASE_P(TestGLibDBusServerInteractions, ReadableProperties, testing::Values("ReadOnlyProperty", "ReadWriteProperty"));
 
@@ -510,4 +513,6 @@
   EXPECT_EQ(value, new_value);
 }
 
+#pragma GCC diagnostic pop
+
 } // Namespace
 
=== modified file 'tests/test_gnome_session_manager.cpp'
--- tests/test_gnome_session_manager.cpp	2014-04-06 10:10:41 +0000
+++ tests/test_gnome_session_manager.cpp	2015-03-13 14:15:34 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
 /*
- * Copyright (C) 2013 Canonical Ltd
+ * Copyright (C) 2013,2015 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -709,6 +709,9 @@
   EXPECT_TRUE(cancelled);
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-variable"
+
 struct InteractiveMode : TestGnomeSessionManager, testing::WithParamInterface<bool> {};
 INSTANTIATE_TEST_CASE_P(TestGnomeSessionManager, InteractiveMode, testing::Bool());
 
@@ -921,6 +924,8 @@
   EXPECT_FALSE(cancelled);
 }
 
+#pragma GCC diagnostic pop
+
 TEST_F(TestGnomeSessionManager, ImmediateReboot)
 {
   EnableInteractiveShutdown(false);
 
=== modified file 'tests/test_im_text_entry.cpp'
--- tests/test_im_text_entry.cpp	2013-11-06 11:21:43 +0000
+++ tests/test_im_text_entry.cpp	2015-03-13 14:15:34 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 Canonical Ltd.
+ * Copyright 2012,2013,2015 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License version 3, as
@@ -156,6 +156,9 @@
   EXPECT_EQ(EventNativelyHandled(), text_entry.InspectKeyEvent(selectall));
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-variable"
+
 struct CtrlKeybindings : TestIMTextEntry, testing::WithParamInterface<unsigned long> {};
 INSTANTIATE_TEST_CASE_P(TestIMTextEntry, CtrlKeybindings, testing::Values(NUX_VK_a, NUX_VK_BACKSPACE,
                                                                           NUX_VK_LEFT, NUX_VK_RIGHT,
@@ -168,6 +171,8 @@
   EXPECT_EQ(EventNativelyHandled(), text_entry.InspectKeyEvent(event));
 }
 
+#pragma GCC diagnostic pop
+
 TEST_F(TestIMTextEntry, AltKeybindings)
 {
   for (unsigned long keysym = 0; keysym < XK_umacron; ++keysym)
 
=== modified file 'tests/test_launcher_hide_machine.cpp'
--- tests/test_launcher_hide_machine.cpp	2013-10-18 18:48:25 +0000
+++ tests/test_launcher_hide_machine.cpp	2015-03-13 14:15:34 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
 /*
- * Copyright (C) 2012 Canonical Ltd
+ * Copyright (C) 2012,2015 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -48,6 +48,9 @@
   ul::LauncherHideMachine machine;
 };
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-variable"
+
 TEST_P(HideModeNever, Bool2Bool) {
   auto quirk = std::tr1::get<0>(GetParam());
   bool initial_value = std::tr1::get<1>(GetParam());
@@ -70,6 +73,8 @@
 INSTANTIATE_TEST_CASE_P(TestLauncherHideMachine, HideModeNever,
     Combine(ValuesIn(QUIRKS), Bool(), Bool()));
 
+#pragma GCC diagnostic pop
+
 // TODO: write tests for HideModeAutohide.
 
 }
 
=== modified file 'tests/test_launcher_hover_machine.cpp'
--- tests/test_launcher_hover_machine.cpp	2013-10-14 16:59:44 +0000
+++ tests/test_launcher_hover_machine.cpp	2015-03-13 14:15:34 +0000
@@ -32,6 +32,9 @@
   unity::LauncherHoverMachine::KEY_NAV_ACTIVE,
   unity::LauncherHoverMachine::LAUNCHER_IN_ACTION };
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-variable"
+
 struct SingleQuirk : public TestWithParam<std::tuple<unity::LauncherHoverMachine::HoverQuirk, bool, bool>> {
   unity::LauncherHoverMachine machine;
 };
@@ -113,3 +116,5 @@
     Combine(ValuesIn(QUIRKS), Bool(), Bool(), ValuesIn(QUIRKS), Bool(), Bool()));
 
 }
+
+#pragma GCC diagnostic pop
 
=== modified file 'tests/test_launcher_icon.cpp'
--- tests/test_launcher_icon.cpp	2014-03-21 04:40:12 +0000
+++ tests/test_launcher_icon.cpp	2015-03-13 14:15:34 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 Canonical Ltd.
+ * Copyright 2012,2013,2015 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -96,6 +96,9 @@
   return quirks;
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-variable"
+
 struct Quirks : TestLauncherIcon, WithParamInterface<AbstractLauncherIcon::Quirk> {};
 INSTANTIATE_TEST_CASE_P(TestLauncherIcon, Quirks, ValuesIn(GetQuirks()));
 
@@ -285,6 +288,8 @@
   }
 }
 
+#pragma GCC diagnostic pop
+
 TEST_F(TestLauncherIcon, NeedRedrawInvisibleAllMonitors)
 {
   AbstractLauncherIcon::Ptr icon_ptr(new NiceMock<MockLauncherIcon>());
 
=== modified file 'tests/test_panel_menu_view.cpp'
--- tests/test_panel_menu_view.cpp	2015-02-04 10:00:04 +0000
+++ tests/test_panel_menu_view.cpp	2015-03-13 14:15:34 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * Copyright 2012,2015 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -145,6 +145,9 @@
   EXPECT_FALSE(menu_view.ShouldDrawMenus());
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-variable"
+
 struct ProgressTester : TestPanelMenuView, WithParamInterface<double> {};
 INSTANTIATE_TEST_CASE_P(TestPanelMenuView, ProgressTester, Range(0.0, 1.0, 0.1));
 
@@ -185,5 +188,7 @@
   EXPECT_EQ(max_window->geo(), expected_geo);
 }
 
+#pragma GCC diagnostic pop
+
 } // panel namespace
 } // unity namespace
 
=== modified file 'tests/test_session_button.cpp'
--- tests/test_session_button.cpp	2013-03-19 14:54:43 +0000
+++ tests/test_session_button.cpp	2015-03-13 14:15:34 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
 /*
- * Copyright (C) 2013 Canonical Ltd
+ * Copyright (C) 2013,2015 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -151,6 +151,9 @@
   Button button;
 };
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-variable"
+
 INSTANTIATE_TEST_CASE_P(TestSessionButtonTypes, ActionButton,
   testing::Values(Button::Action::LOCK, Button::Action::LOGOUT, Button::Action::SUSPEND,
                   Button::Action::HIBERNATE, Button::Action::SHUTDOWN, Button::Action::REBOOT));
@@ -165,5 +168,7 @@
   EXPECT_EQ(button.action(), GetParam());
 }
 
+#pragma GCC diagnostic pop
+
 } // session
-} // unity
 \ No newline at end of file
+} // unity
 
=== modified file 'tests/test_session_controller.cpp'
--- tests/test_session_controller.cpp	2014-05-16 03:05:20 +0000
+++ tests/test_session_controller.cpp	2015-03-13 14:15:34 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
 /*
- * Copyright (C) 2013 Canonical Ltd
+ * Copyright (C) 2013,2015 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -73,6 +73,9 @@
   color_property.changed.emit(nux::color::RandomColor());
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-variable"
+
 struct ShowMode : TestSessionController, testing::WithParamInterface<View::Mode> {};
 INSTANTIATE_TEST_CASE_P(TestSessionController, ShowMode,
   testing::Values(View::Mode::SHUTDOWN, View::Mode::LOGOUT, View::Mode::FULL));
@@ -137,6 +140,8 @@
   EXPECT_EQ(controller.view_->have_inhibitors(), GetParam());
 }
 
+#pragma GCC diagnostic pop
+
 TEST_F(TestSessionController, CancelRequested)
 {
   controller.Show(View::Mode::FULL);
@@ -182,4 +187,4 @@
 }
 
 } // session
-} // unity
 \ No newline at end of file
+} // unity
 
=== modified file 'tests/test_software_center_launcher_icon.cpp'
--- tests/test_software_center_launcher_icon.cpp	2014-02-18 01:20:01 +0000
+++ tests/test_software_center_launcher_icon.cpp	2015-03-13 14:15:34 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * Copyright 2012,2015 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -243,6 +243,9 @@
   EXPECT_EQ(PRE_INSTALL_ICON, icon.icon_name());
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-variable"
+
 struct MultiMonitor : TestSoftwareCenterLauncherIcon, WithParamInterface<unsigned> {};
 INSTANTIATE_TEST_CASE_P(TestSoftwareCenterLauncherIcon, MultiMonitor, Range<unsigned>(0, monitors::MAX, 1));
 
@@ -292,6 +295,8 @@
   g_variant_unref(params);
 }
 
+#pragma GCC diagnostic pop
+
 }
 
 }
 
=== modified file 'tests/test_switcher_view.cpp'
--- tests/test_switcher_view.cpp	2014-05-08 04:22:31 +0000
+++ tests/test_switcher_view.cpp	2015-03-13 14:15:34 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013,2015 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -150,6 +150,8 @@
   EXPECT_DOUBLE_EQ(switcher.GetCurrentProgress(), 1.0f);
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-variable"
 
 struct AnimationProgress : TestSwitcherView, testing::WithParamInterface<float> {};
 INSTANTIATE_TEST_CASE_P(TestSwitcherView, AnimationProgress, testing::Range<float>(0.0, 1.0, 0.1));
@@ -216,5 +218,7 @@
   }
 }
 
+#pragma GCC diagnostic pop
+
 }
 }