Merge lp:~alan-griffiths/mir/tidy-code into lp:mir

[Alan Griffiths]

Delete unused code

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:4109
https://mir-jenkins.ubuntu.com/job/mir-ci/3196/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4297
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4384
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4374
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4374
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4374
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4324
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4324/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4324
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4324/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4324
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4324/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4324
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4324/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4324
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4324/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4324
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4324/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3196/rebuild

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

sure

review: Approve

[Chris Halse Rogers (raof)]

Seems sensible.

review: Approve

[Daniel van Vugt (vanvugt)]

Yes

review: Approve

=== modified file 'src/client/CMakeLists.txt'
--- src/client/CMakeLists.txt	2017-03-17 16:43:10 +0000
+++ src/client/CMakeLists.txt	2017-03-20 12:15:49 +0000
@@ -82,7 +82,6 @@
   mir_buffer_stream_api.cpp
   error_stream.cpp
   error_render_surface.cpp
-  error_chain.cpp
   buffer.cpp
   error_buffer.cpp
   mir_render_surface_api.cpp
 
=== modified file 'src/client/buffer_stream.cpp'
--- src/client/buffer_stream.cpp	2017-03-10 19:47:57 +0000
+++ src/client/buffer_stream.cpp	2017-03-20 12:15:49 +0000
@@ -408,12 +408,6 @@
     return static_cast<EGLNativeWindowType>(egl_native_window_.get());
 }
 
-void mcl::BufferStream::release_cpu_region()
-{
-    std::unique_lock<decltype(mutex)> lock(mutex);
-    secured_region.reset();
-}
-
 std::shared_ptr<mcl::MemoryRegion> mcl::BufferStream::secure_for_cpu_write()
 {
     auto buffer = get_current_buffer();
 
=== modified file 'src/client/buffer_stream.h'
--- src/client/buffer_stream.h	2017-03-10 19:47:57 +0000
+++ src/client/buffer_stream.h	2017-03-20 12:15:49 +0000
@@ -141,10 +141,7 @@
 private:
     void process_buffer(protobuf::Buffer const& buffer);
     void process_buffer(protobuf::Buffer const& buffer, std::unique_lock<std::mutex>&);
-    void on_scale_set(float scale);
-    void release_cpu_region();
     MirWaitHandle* set_server_swap_interval(int i);
-    void init_swap_interval();
     void wait_for_vsync();
 
     mutable std::mutex mutex; // Protects all members of *this
 
=== removed file 'src/client/error_chain.cpp'
--- src/client/error_chain.cpp	2017-01-18 02:29:37 +0000
+++ src/client/error_chain.cpp	1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
-/*
- * Copyright © 2016 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 published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Kevin DuBois <[e-mail]>
- */
-
-#include "error_chain.h"
-#include <boost/throw_exception.hpp>
-
-namespace mcl = mir::client;
-namespace geom = mir::geometry;
-
-mcl::ErrorChain::ErrorChain(
-    MirConnection* connection,
-    int id,
-    std::string const& error_msg) :
-    connection_(connection),
-    stream_id(id),
-    error(error_msg)
-{
-}
-
-char const* mcl::ErrorChain::error_msg() const
-{
-    return error.c_str();
-}
-
-MirConnection* mcl::ErrorChain::connection() const
-{
-    return connection_;
-}
-
-int mcl::ErrorChain::rpc_id() const
-{
-    return stream_id;
-}
-
-void mcl::ErrorChain::submit_buffer(MirBuffer*)
-{
-    BOOST_THROW_EXCEPTION(std::logic_error("Cannot submit: invalid MirPresentationChain"));
-}
-
-void mcl::ErrorChain::set_queueing_mode()
-{
-    BOOST_THROW_EXCEPTION(std::logic_error("Cannot set mode: invalid MirPresentationChain"));
-}
-
-void mcl::ErrorChain::set_dropping_mode()
-{
-    BOOST_THROW_EXCEPTION(std::logic_error("Cannot set mode: invalid MirPresentationChain"));
-}
 
=== removed file 'src/client/error_chain.h'
--- src/client/error_chain.h	2017-01-18 02:29:37 +0000
+++ src/client/error_chain.h	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-/*
- * Copyright © 2016 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Kevin DuBois <[e-mail]>
- */
-
-#ifndef MIR_CLIENT_ERROR_CHAIN_H
-#define MIR_CLIENT_ERROR_CHAIN_H
-
-#include "mir_presentation_chain.h"
-#include <memory>
-
-namespace mir
-{
-namespace client
-{
-
-class ErrorChain : public MirPresentationChain
-{
-public:
-    ErrorChain(
-        MirConnection* connection,
-        int id,
-        std::string const& error_msg);
-    void submit_buffer(MirBuffer* buffer) override;
-    MirConnection* connection() const override;
-    int rpc_id() const override;
-    char const* error_msg() const override;
-    void set_dropping_mode() override;
-    void set_queueing_mode() override;
-private:
-    MirConnection* const connection_;
-    int const stream_id;
-    std::string const error;
-};
-
-}
-}
-#endif /* MIR_CLIENT_ERROR_CHAIN_H */
 
=== modified file 'src/client/input/input_event.cpp'
--- src/client/input/input_event.cpp	2017-02-17 08:46:05 +0000
+++ src/client/input/input_event.cpp	2017-03-20 12:15:49 +0000
@@ -73,13 +73,6 @@
     return ev->input_type();
 })
 
-int mir_input_event_get_window_id(MirInputEvent const* ev) MIR_HANDLE_EVENT_EXCEPTION(
-{
-    expect_event_type(ev, mir_event_type_input);
-
-    return ev->window_id();
-})
-
 MirInputDeviceId mir_input_event_get_device_id(MirInputEvent const* ev) MIR_HANDLE_EVENT_EXCEPTION(
 {
     expect_event_type(ev, mir_event_type_input);
 
=== modified file 'src/client/mir_connection.cpp'
--- src/client/mir_connection.cpp	2017-03-14 04:41:33 +0000
+++ src/client/mir_connection.cpp	2017-03-20 12:15:49 +0000
@@ -40,7 +40,6 @@
 #include "render_surface.h"
 #include "error_render_surface.h"
 #include "presentation_chain.h"
-#include "error_chain.h"
 #include "logging/perf_report.h"
 #include "lttng/perf_report.h"
 #include "buffer_factory.h"
 
=== modified file 'src/client/presentation_chain.h'
--- src/client/presentation_chain.h	2017-01-18 02:29:37 +0000
+++ src/client/presentation_chain.h	2017-03-20 12:15:49 +0000
@@ -25,7 +25,7 @@
 #include "mir_toolkit/mir_presentation_chain.h"
 #include "mir_protobuf.pb.h"
 #include "buffer.h"
-#include <mutex>
+
 #include <memory>
 
 namespace mir
@@ -65,9 +65,6 @@
     std::shared_ptr<AsyncBufferFactory> const mir_buffer_factory;
 
     BufferStreamConfiguration interval_config;
-
-    std::mutex mutex;
-    std::vector<std::unique_ptr<Buffer>> buffers;
 };
 }
 }
 
=== modified file 'src/client/symbols.map'
--- src/client/symbols.map	2017-03-20 12:15:49 +0000
+++ src/client/symbols.map	2017-03-20 12:15:49 +0000
@@ -302,19 +302,6 @@
     extern "C++" { 
       mir::events::make_event*;
       mir::events::add_touch*;
-      mir::input::android::Lexicon::translate*;
-      mir::input::android::android_modifiers_from_mir*;
-      mir::input::android::mir_modifiers_from_android*;
-      mir::input::android::mir_keyboard_action_from_android*;
-      mir::input::android::android_keyboard_action_from_mir*;
-      mir::input::android::mir_pointer_buttons_from_android*;
-      mir::input::android::android_pointer_buttons_from_mir*;
-      mir::input::android::mir_tool_type_from_android*;
-      mir::input::android::android_tool_type_from_mir*;
-      mir::input::android::mir_pointer_action_from_masked_android*;
-      mir::input::android::mir_touch_action_from_masked_android*;
-      mir::input::android::android_source_id_is_pointer_device*;
-      mir::input::android::extract_android_action_from*;
       mir::client::DefaultConnectionConfiguration::DefaultConnectionConfiguration*;
       mir::client::DefaultConnectionConfiguration::the_surface_map*;
       mir::client::DefaultConnectionConfiguration::the_rpc_channel*;
@@ -344,19 +331,12 @@
     };
 } MIR_CLIENT_DETAIL_9;
 
-MIR_CLIENT_DETAIL_9v19 {
-  global:
-    extern "C++" { 
-      mir::input::android::android_pointer_action_from_mir*;
-    };
-} MIR_CLIENT_DETAIL_9v18;
-
 MIR_CLIENT_DETAIL_0.21 {
   global:
     extern "C++" { 
       mir::client::DefaultConnectionConfiguration::the_buffer_factory*;
     };
-} MIR_CLIENT_DETAIL_9v19;
+} MIR_CLIENT_DETAIL_9v18;
 
 MIR_CLIENT_DETAIL_private_buffer_semantics {
   global:
@@ -385,7 +365,7 @@
     mir_presentation_chain_set_dropping_mode;
   local:
     *;
-} MIR_CLIENT_DETAIL_9v19;
+} MIR_CLIENT_DETAIL_9v18;
 
 MIR_CLIENT_DETAIL_0.24 {
   global:
 
=== removed file 'src/include/common/mir/input/android/event_conversion_helpers.h'
--- src/include/common/mir/input/android/event_conversion_helpers.h	2015-06-18 02:46:16 +0000
+++ src/include/common/mir/input/android/event_conversion_helpers.h	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-/*
- * Copyright © 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 published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#ifndef MIR_INPUT_EVENT_CONVERSION_HELPERS_H_
-#define MIR_INPUT_EVENT_CONVERSION_HELPERS_H_
-
-#include "mir_toolkit/event.h"
-
-namespace mir
-{
-namespace input
-{
-namespace android
-{
-MirInputEventModifiers mir_modifiers_from_android(int32_t android_modifiers);
-int32_t android_modifiers_from_mir(MirInputEventModifiers modifiers);
-
-MirKeyboardAction mir_keyboard_action_from_android(int32_t android_action, int32_t repeat_count);
-// Mir differentiates between mir_keyboard_action_down
-// and mir_keyboard_action_repeat whereas android encodes
-// keyrepeats as AKEY_EVENT_ACTION_DOWN and a repeatCount of > 0
-// Thus when converting from MirKeyboardAction to an android
-// action we must also fetch a repeat count for the android event.
-int32_t android_keyboard_action_from_mir(int32_t& repeat_count_out, MirKeyboardAction action);
-
-MirPointerButtons mir_pointer_buttons_from_android(int32_t android_state);
-int32_t android_pointer_buttons_from_mir(MirPointerButtons buttons);
-
-MirTouchTooltype mir_tool_type_from_android(int32_t android_tooltype);
-int32_t android_tool_type_from_mir(MirTouchTooltype mir_tooltype);
-
-MirPointerAction mir_pointer_action_from_masked_android(int32_t android_action);
-MirTouchAction mir_touch_action_from_masked_android(int32_t android_action);
-
-bool android_source_id_is_pointer_device(int32_t source_id);
-
-int32_t android_pointer_action_from_mir(MirPointerAction action, MirPointerButtons buttons_pressed);
-int32_t extract_masked_android_action_from(MirEvent const& ev);
-int32_t extract_android_action_from(MirEvent const& ev);
-
-}
-}
-}
-
-#endif // MIR_INPUT_EVENT_CONVERSION_HELPERS_H_
 
=== modified file 'src/platforms/android/client/buffer.h'
--- src/platforms/android/client/buffer.h	2017-01-18 02:29:37 +0000
+++ src/platforms/android/client/buffer.h	2017-03-20 12:15:49 +0000
@@ -56,10 +56,7 @@
     Buffer(const Buffer&) = delete;
     Buffer& operator=(const Buffer&) = delete;
 private:
-    void pack_native_window_buffer();
 
-    mir::Fd mutable api_user_fence;
- 
     std::shared_ptr<BufferRegistrar> const buffer_registrar;
     std::shared_ptr<graphics::android::NativeBuffer> const native_buffer;
     MirPixelFormat const buffer_pf;
 
=== modified file 'src/platforms/android/server/platform.h'
--- src/platforms/android/server/platform.h	2017-03-15 11:22:17 +0000
+++ src/platforms/android/server/platform.h	2017-03-20 12:15:49 +0000
@@ -64,7 +64,6 @@
     std::shared_ptr<graphics::GraphicBufferAllocator> const buffer_allocator;
     std::shared_ptr<DisplayComponentFactory> const display_buffer_builder;
     std::shared_ptr<DisplayReport> const display_report;
-    std::shared_ptr<PlatformIpcOperations> const ipc_operations;
     std::shared_ptr<DeviceQuirks> const quirks;
     std::shared_ptr<NativeWindowReport> const native_window_report;
     OverlayOptimization const overlay_option;
 
=== modified file 'src/platforms/evdev/libinput_device.h'
--- src/platforms/evdev/libinput_device.h	2017-03-14 02:26:28 +0000
+++ src/platforms/evdev/libinput_device.h	2017-03-20 12:15:49 +0000
@@ -82,9 +82,7 @@
     OutputInfo get_output_info() const;
 
     std::shared_ptr<InputReport> report;
-    std::shared_ptr<::libinput> lib;
     std::vector<LibInputDevicePtr> devices;
-    std::shared_ptr<dispatch::Dispatchable> dispatchable_fd;
 
     InputSink* sink{nullptr};
     EventBuilder* builder{nullptr};
 
=== modified file 'src/platforms/evdev/platform.h'
--- src/platforms/evdev/platform.h	2017-02-15 07:38:33 +0000
+++ src/platforms/evdev/platform.h	2017-03-20 12:15:49 +0000
@@ -64,13 +64,10 @@
     void continue_after_config() override;
 
 private:
-    void scan_for_devices();
     void device_added(libinput_device* dev);
     void device_removed(libinput_device* dev);
     void process_input_events();
 
-    std::shared_ptr<LibInputDevice> create_device(udev::Device const& dev) const;
-
     std::shared_ptr<InputReport> const report;
     std::shared_ptr<udev::Context> const udev_context;
     std::shared_ptr<InputDeviceRegistry> const input_device_registry;
 
=== modified file 'src/server/input/config_changer.cpp'
--- src/server/input/config_changer.cpp	2017-02-28 08:53:57 +0000
+++ src/server/input/config_changer.cpp	2017-03-20 12:15:49 +0000
@@ -136,7 +136,6 @@
     mi::ConfigChanger& config_changer;
     std::vector<std::shared_ptr<mi::Device>> added;
     std::vector<MirInputDeviceId> removed;
-    bool devices_changed;
 };
 
 }
 
=== modified file 'src/server/input/default_device.h'
--- src/server/input/default_device.h	2017-02-28 08:53:57 +0000
+++ src/server/input/default_device.h	2017-03-20 12:15:49 +0000
@@ -72,7 +72,6 @@
     optional_value<MirTouchscreenConfig> touchscreen_configuration() const override;
     void apply_touchscreen_configuration(MirTouchscreenConfig const&) override;
 private:
-    void wake_hub_for_device_change();
     MirInputDeviceId const device_id;
     InputDevice& device;
     InputDeviceInfo const info;
 
=== modified file 'src/server/input/default_input_device_hub.h'
--- src/server/input/default_input_device_hub.h	2017-03-14 02:26:28 +0000
+++ src/server/input/default_input_device_hub.h	2017-03-20 12:15:49 +0000
@@ -80,7 +80,6 @@
 
 
 private:
-    void update_spots();
     void add_device_handle(std::shared_ptr<DefaultDevice> const& handle);
     void remove_device_handle(MirInputDeviceId id);
     void device_changed(Device* dev);
 
=== modified file 'src/server/scene/surface_stack.h'
--- src/server/scene/surface_stack.h	2016-01-29 08:18:22 +0000
+++ src/server/scene/surface_stack.h	2017-03-20 12:15:49 +0000
@@ -45,7 +45,6 @@
 /// classes) and controller (SurfaceController) elements of an MVC design.
 namespace scene
 {
-class InputRegistrar;
 class BasicSurface;
 class SceneReport;
 class RenderingTracker;
@@ -110,7 +109,6 @@
 
     RecursiveReadWriteMutex mutable guard;
 
-    std::shared_ptr<InputRegistrar> const input_registrar;
     std::shared_ptr<SceneReport> const report;
 
     std::vector<std::shared_ptr<Surface>> surfaces;
 
=== modified file 'tests/unit-tests/frontend/stress_protobuf_communicator.cpp'
--- tests/unit-tests/frontend/stress_protobuf_communicator.cpp	2017-01-18 02:29:37 +0000
+++ tests/unit-tests/frontend/stress_protobuf_communicator.cpp	2017-03-20 12:15:49 +0000
@@ -65,7 +65,6 @@
     mir::protobuf::SurfaceParameters surface_parameters;
     mir::protobuf::Surface surface;
     mir::protobuf::Void ignored;
-    mir::protobuf::Connection connection;
 
     void create_surface_done();
     void submit_buffer_done();