Merge lp:~ricmm/hud/papi-v2 into lp:hud/14.10

[Ricardo Mendoza]

Drop support for Platform API (SF)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:392
http://jenkins.qa.ubuntu.com/job/hud-ci/287/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-utopic-amd64-ci/2
    FAILURE: http://jenkins.qa.ubuntu.com/job/hud-utopic-armhf-ci/2/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-utopic-i386-ci/2

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

review: Needs Fixing (continuous-integration)

[lp:~ricmm/hud/papi-v2]

393. By Ricardo Mendoza on 2014-05-29

Remove tests

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:393
http://jenkins.qa.ubuntu.com/job/hud-ci/288/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-utopic-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-utopic-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-utopic-i386-ci/3

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

review: Approve (continuous-integration)

[Pete Woods (pete-woods)]

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-03-05 12:06:48 +0000
+++ debian/control	2014-05-29 09:06:35 +0000
@@ -23,7 +23,6 @@
                libqt5sql5-sqlite,
                libqtdbustest1-dev (>= 0.2),
                libqtdbusmock1-dev (>= 0.2),
-               libubuntu-platform-api1-dev [armhf],
                libunityvoice1-dev,
                pkg-config,
                python-setuptools,

=== modified file 'tests/unit/window-stack-bridge/CMakeLists.txt'
--- tests/unit/window-stack-bridge/CMakeLists.txt	2013-12-13 18:31:07 +0000
+++ tests/unit/window-stack-bridge/CMakeLists.txt	2014-05-29 09:06:35 +0000
@@ -1,14 +1,9 @@
-
-if(${ENABLE_BAMF} OR ${ENABLE_PLATFORM_API})
+if(${ENABLE_BAMF})
 
 if(${ENABLE_BAMF})
 	list(APPEND UNIT_TESTS_SRC TestBamfWindowStack.cpp)
 endif()
 
-if(${ENABLE_PLATFORM_API})
-	list(APPEND UNIT_TESTS_SRC TestPlatformApiWindowStack.cpp)
-endif()
-
 add_executable(
 	test-window-stack-bridge-unit-tests
 	${UNIT_TESTS_SRC}

=== removed file 'tests/unit/window-stack-bridge/TestPlatformApiWindowStack.cpp'
--- tests/unit/window-stack-bridge/TestPlatformApiWindowStack.cpp	2013-11-27 14:28:43 +0000
+++ tests/unit/window-stack-bridge/TestPlatformApiWindowStack.cpp	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * 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 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/>.
- *
- * Author: Pete Woods <[e-mail]>
- */
-
-#include <common/DBusTypes.h>
-#include <common/WindowStackInterface.h>
-#include <window-stack-bridge/PlatformApiWindowStack.h>
-
-#include <libqtdbustest/DBusTestRunner.h>
-#include <libqtdbusmock/DBusMock.h>
-#include <QSignalSpy>
-#include <gtest/gtest.h>
-#include <gmock/gmock.h>
-
-using namespace std;
-using namespace testing;
-using namespace hud::common;
-using namespace QtDBusTest;
-using namespace QtDBusMock;
-
-namespace {
-
-class TestPlatformApiWindowStack: public Test {
-protected:
-	TestPlatformApiWindowStack() :
-			mock(dbus) {
-	}
-
-	virtual ~TestPlatformApiWindowStack() {
-	}
-
-	DBusTestRunner dbus;
-
-	DBusMock mock;
-};
-
-TEST_F(TestPlatformApiWindowStack, ExportsDBusInterface) {
-}
-
-} // namespace

=== modified file 'window-stack-bridge/CMakeLists.txt'
--- window-stack-bridge/CMakeLists.txt	2013-10-31 13:41:01 +0000
+++ window-stack-bridge/CMakeLists.txt	2014-05-29 09:06:35 +0000
@@ -1,12 +1,9 @@
 
 if(${ENABLE_BAMF})
 	add_definitions( -DENABLE_BAMF=1 )
-elseif(${ENABLE_PLATFORM_API})
-	add_definitions( -DENABLE_PLATFORM_API=1 )
-	set(PLATFORM_API_LIBRARIES "-lubuntu_application_api")
 endif()
 
-if(${ENABLE_BAMF} OR ${ENABLE_PLATFORM_API})
+if(${ENABLE_BAMF})
 
 set(
 	WINDOW_STACK_BRIDGE_SOURCES
@@ -29,10 +26,6 @@
 	)
 endif()
 
-if(${ENABLE_PLATFORM_API})
-	list(APPEND WINDOW_STACK_BRIDGE_SOURCES PlatformApiWindowStack.cpp)
-endif()
-
 qt5_add_dbus_adaptor(
 	WINDOW_STACK_BRIDGE_SOURCES
 	${WINDOW_STACK_XML}
@@ -62,7 +55,6 @@
 target_link_libraries(
 	window-stack-bridge
 	hud-common
-	${PLATFORM_API_LIBRARIES}
 )
 
 add_executable(
@@ -91,4 +83,4 @@
 	RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}/hud"
 )
 
-endif()
\ No newline at end of file
+endif()

=== removed file 'window-stack-bridge/PlatformApiWindowStack.cpp'
--- window-stack-bridge/PlatformApiWindowStack.cpp	2013-10-31 13:41:01 +0000
+++ window-stack-bridge/PlatformApiWindowStack.cpp	1970-01-01 00:00:00 +0000
@@ -1,127 +0,0 @@
-/*
- * Copyright (C) 2013 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
- * 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/>.
- *
- * Author: Pete Woods <[e-mail]>
- */
-
-#include <window-stack-bridge/PlatformApiWindowStack.h>
-#include <common/Localisation.h>
-
-#include <QDebug>
-#include <stdexcept>
-#include <ubuntu/application/ui/stage.h>
-
-using namespace hud::common;
-
-PlatformApiWindowStack::PlatformApiWindowStack(
-		const QDBusConnection &connection, QObject *parent) :
-		AbstractWindowStack(connection, parent) {
-
-	if (qgetenv("QT_QPA_PLATFORM") != "ubuntu") {
-		throw std::logic_error(
-				_("Incorrect QPA environment for Ubuntu platform API"));
-	}
-
-	registerOnBus();
-
-	m_observer_definition.on_session_requested = on_session_requested_cb;
-	m_observer_definition.on_session_born = on_session_born_cb;
-	m_observer_definition.on_session_unfocused = on_session_unfocused_cb;
-	m_observer_definition.on_session_focused = on_session_focused_cb;
-	m_observer_definition.on_session_died = on_session_died_cb;
-	m_observer_definition.on_keyboard_geometry_changed = 0;
-	m_observer_definition.on_session_requested_fullscreen = 0;
-	m_observer_definition.context = reinterpret_cast<void *>(this);
-
-	ubuntu_ui_session_install_session_lifecycle_observer(
-			&m_observer_definition);
-}
-
-PlatformApiWindowStack::~PlatformApiWindowStack() {
-}
-
-QString PlatformApiWindowStack::GetAppIdFromPid(uint pid) {
-	// FIXME Not implemented
-	qDebug() << "GetAppIdFromPid";
-	return QString();
-}
-
-QList<WindowInfo> PlatformApiWindowStack::GetWindowStack() {
-	// FIXME Not implemented
-	qDebug() << "GetWindowStack";
-	return QList<WindowInfo>();
-}
-
-QStringList PlatformApiWindowStack::GetWindowProperties(uint windowId,
-		const QString &appId, const QStringList &names) {
-	// FIXME Not implemented
-	qDebug() << "GetWindowProperties:" << windowId << appId << names;
-	return QStringList();
-}
-
-void PlatformApiWindowStack::onSessionRequested(
-		ubuntu_ui_well_known_application app) {
-	// FIXME Not implemented
-	qDebug() << "onSessionRequested";
-}
-
-void PlatformApiWindowStack::onSessionBorn(ubuntu_ui_session_properties props) {
-	// FIXME Not implemented
-	qDebug() << "onSessionBorn";
-	//session_properties_get_window_id
-}
-
-void PlatformApiWindowStack::onSessionUnfocused(
-		ubuntu_ui_session_properties props) {
-	// FIXME Not implemented
-	qDebug() << "onSessionUnfocused";
-}
-
-void PlatformApiWindowStack::onSessionFocused(
-		ubuntu_ui_session_properties props) {
-	// FIXME Not implemented
-	qDebug() << "onSessionFocused";
-}
-
-void PlatformApiWindowStack::onSessionDied(ubuntu_ui_session_properties props) {
-	// FIXME Not implemented
-	qDebug() << "onSessionDied";
-}
-
-void PlatformApiWindowStack::on_session_requested_cb(
-		ubuntu_ui_well_known_application app, void* context) {
-	reinterpret_cast<PlatformApiWindowStack *>(context)->onSessionRequested(
-			app);
-}
-
-void PlatformApiWindowStack::on_session_born_cb(
-		ubuntu_ui_session_properties props, void* context) {
-	reinterpret_cast<PlatformApiWindowStack *>(context)->onSessionBorn(props);
-}
-void PlatformApiWindowStack::on_session_unfocused_cb(
-		ubuntu_ui_session_properties props, void* context) {
-	reinterpret_cast<PlatformApiWindowStack *>(context)->onSessionUnfocused(
-			props);
-}
-void PlatformApiWindowStack::on_session_focused_cb(
-		ubuntu_ui_session_properties props, void* context) {
-	reinterpret_cast<PlatformApiWindowStack *>(context)->onSessionFocused(
-			props);
-}
-
-void PlatformApiWindowStack::on_session_died_cb(
-		ubuntu_ui_session_properties props, void* context) {
-	reinterpret_cast<PlatformApiWindowStack *>(context)->onSessionDied(props);
-}

=== removed file 'window-stack-bridge/PlatformApiWindowStack.h'
--- window-stack-bridge/PlatformApiWindowStack.h	2013-10-31 13:41:01 +0000
+++ window-stack-bridge/PlatformApiWindowStack.h	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2013 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
- * 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/>.
- *
- * Author: Pete Woods <[e-mail]>
- */
-
-#ifndef PLATFORMAPIWINDOWSTACK_H_
-#define PLATFORMAPIWINDOWSTACK_H_
-
-#include <window-stack-bridge/AbstractWindowStack.h>
-
-#include <ubuntu/ui/ubuntu_ui_session_service.h>
-
-class Q_DECL_EXPORT PlatformApiWindowStack: public AbstractWindowStack {
-Q_OBJECT
-
-public:
-	explicit PlatformApiWindowStack(const QDBusConnection &connection,
-			QObject *parent = 0);
-
-	virtual ~PlatformApiWindowStack();
-
-public Q_SLOTS:
-	virtual QString GetAppIdFromPid(uint pid);
-
-	virtual QList<hud::common::WindowInfo> GetWindowStack();
-
-	virtual QStringList GetWindowProperties(uint windowId, const QString &appId,
-			const QStringList &names);
-
-protected:
-	static void on_session_requested_cb(ubuntu_ui_well_known_application app,
-			void* context);
-
-	void onSessionRequested(ubuntu_ui_well_known_application app);
-
-	static void on_session_born_cb(ubuntu_ui_session_properties props,
-			void* context);
-
-	void onSessionBorn(ubuntu_ui_session_properties props);
-
-	static void on_session_unfocused_cb(ubuntu_ui_session_properties props,
-			void* context);
-
-	void onSessionUnfocused(ubuntu_ui_session_properties props);
-
-	static void on_session_focused_cb(ubuntu_ui_session_properties props,
-			void* context);
-
-	void onSessionFocused(ubuntu_ui_session_properties props);
-
-	static void on_session_died_cb(ubuntu_ui_session_properties props,
-			void* context);
-
-	void onSessionDied(ubuntu_ui_session_properties props);
-
-	ubuntu_ui_session_lifecycle_observer m_observer_definition;
-};
-
-#endif /* PLATFORMAPIWINDOWSTACK_H_ */