Merge lp:~ken-vandine/ubuntu-system-settings/mouse_no_dynamic_vis into lp:ubuntu-system-settings

[Ken VanDine]

Removed unnecessary mouse-plugin, it was intended for use with dynamic visibility, which is no longer needed.

Removed unnecessary mouse-plugin, it was intended for use with dynamic visibility, which is no longer needed.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1587
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2593/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6227
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/367
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/776
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4799
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6238
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6238/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27087

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2593/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ken-vandine/ubuntu-system-settings/mouse_no_dynamic_vis]

1588. By Ken VanDine on 2016-03-23

merged trunk

[Michael Sheldon (michael-sheldon)]

Looks good

review: Approve

=== modified file 'plugins/mouse/CMakeLists.txt'
--- plugins/mouse/CMakeLists.txt	2016-03-07 16:29:15 +0000
+++ plugins/mouse/CMakeLists.txt	2016-03-23 15:05:32 +0000
@@ -1,5 +1,3 @@
-add_subdirectory(plugin)
-
 set(QML_SOURCES
     PageComponent.qml
     None.qml

=== removed directory 'plugins/mouse/plugin'
=== removed file 'plugins/mouse/plugin/CMakeLists.txt'
--- plugins/mouse/plugin/CMakeLists.txt	2015-07-30 18:51:21 +0000
+++ plugins/mouse/plugin/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-add_definitions(-DQT_NO_KEYWORDS)
-
-add_library(mouse-plugin SHARED mouse-plugin.h mouse-plugin.cpp)
-qt5_use_modules(mouse-plugin Core Qml DBus)
-target_link_libraries(mouse-plugin SystemSettings)
-install(TARGETS mouse-plugin DESTINATION ${PLUGIN_MODULE_DIR})

=== removed file 'plugins/mouse/plugin/mouse-plugin.cpp'
--- plugins/mouse/plugin/mouse-plugin.cpp	2015-07-30 18:51:21 +0000
+++ plugins/mouse/plugin/mouse-plugin.cpp	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-/*
- * This file is part of system-settings
- *
- * Copyright (C) 2015 Canonical Ltd
- *
- * Contact: Ken VanDine <[e-mail]>
- *
- * 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
- * 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 warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mouse-plugin.h"
-
-#include <QDebug>
-#include <QDBusInterface>
-#include <QStringList>
-#include <SystemSettings/ItemBase>
-
-using namespace SystemSettings;
-
-class MouseItem: public ItemBase
-{
-    Q_OBJECT
-
-public:
-    explicit MouseItem(const QVariantMap &staticData, QObject *parent = 0);
-    void setVisibility(bool visible);
-
-};
-
-
-MouseItem::MouseItem(const QVariantMap &staticData, QObject *parent):
-    ItemBase(staticData, parent)
-{
-    QDBusConnection m_systemBusConnection (QDBusConnection::systemBus());
-    QDBusInterface m_unityInterface ("com.canonical.unity",
-                                     "/com/canonical/unity",
-                                     "com.canonical.unity",
-                                     m_systemBusConnection);
-
-    /* FIXME: Determine visibility based on connection of mouse or touchpad */
-    setVisibility(true);
-}
-
-void MouseItem::setVisibility(bool visible)
-{
-    setVisible(visible);
-}
-
-ItemBase *MousePlugin::createItem(const QVariantMap &staticData,
-                                 QObject *parent)
-{
-    return new MouseItem(staticData, parent);
-}
-
-#include "mouse-plugin.moc"

=== removed file 'plugins/mouse/plugin/mouse-plugin.h'
--- plugins/mouse/plugin/mouse-plugin.h	2015-07-30 18:51:21 +0000
+++ plugins/mouse/plugin/mouse-plugin.h	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-/*
- * This file is part of system-settings
- *
- * Copyright (C) 2015 Canonical Ltd
- *
- * Contact: Ken VanDine <[e-mail]>
- *
- * 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
- * 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 warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef SYSTEM_SETTINGS_MOUSE_PLUGIN_H
-#define SYSTEM_SETTINGS_MOUSE_PLUGIN_H
-
-#include <QObject>
-#include <SystemSettings/PluginInterface>
-
-class MousePlugin: public QObject, public SystemSettings::PluginInterface2
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "com.ubuntu.SystemSettings.PluginInterface/2.0")
-    Q_INTERFACES(SystemSettings::PluginInterface2)
-
-public:
-    SystemSettings::ItemBase *createItem(const QVariantMap &staticData,
-                                         QObject *parent = 0);
-};
-
-#endif // SYSTEM_SETTINGS_MOUSE_PLUGIN_H