← Back to branch summary

~mir-team/qtmir/trunk

~mir-team/qtmir/trunk

« back to all changes in this revision

Viewing changes to src/platforms/mirserver/mirserverintegration.h

Committer: Bileto Bot
Author(s): Albert Astals Cid, Gerry Boland
Date: 2017-03-20 21:15:13 UTC
mfrom: (606.4.12 make_sure_surface_not_null)
Revision ID: ci-train-bot@canonical.com-20170320211513-z7v3z0ldes3gtcc0

Check for find() result not being null before using it

We do it in onWindowReady, onWindowMoved, onWindowFocusChanged, etc so no reason to not do it in onWindowRemoved

Approved by: Lukáš Tinkl, Unity8 CI Bot

files added:
cmake/modules/FindQt5PlatformSupport.cmake

debian/bileto_convert_to_gles

debian/gles-patches

debian/gles-patches/convert-to-gles.patch

debian/gles-patches/series

demos/qml-demo-shell/Button.qml

demos/qml-demo-shell/WindowModelDebugView.qml

demos/qml-demo-shell/pointerposition.cpp

demos/qml-demo-shell/pointerposition.h

demos/qml-demo-shell/windowModel.qml

src/common/appnotifier.h

src/common/mirqtconversion.h

src/common/windowcontrollerinterface.h

src/common/windowmodelnotifier.h

src/modules/Unity/Application/applicationinfo.h

src/modules/Unity/Application/cgmanager.cpp

src/modules/Unity/Application/cgmanager.h

src/modules/Unity/Application/dbusfocusinfo.cpp

src/modules/Unity/Application/dbusfocusinfo.h

src/modules/Unity/Application/mirsurfacelistmodel.cpp

src/modules/Unity/Application/mirsurfacelistmodel.h

src/modules/Unity/Application/sessionmap_interface.h

src/modules/Unity/Application/surfacemanager.cpp

src/modules/Unity/Application/surfacemanager.h

src/modules/Unity/Application/taskcontroller.cpp

src/modules/Unity/Application/upstart/applicationinfo.cpp

src/modules/Unity/Application/upstart/applicationinfo.h

src/modules/Unity/Application/windowmodel.cpp

src/modules/Unity/Application/windowmodel.h

src/modules/Unity/Screens/qquickscreenwindow.cpp

src/modules/Unity/Screens/qquickscreenwindow.h

src/platforms/mirserver/customscreenconfiguration.h

src/platforms/mirserver/eventbuilder.cpp

src/platforms/mirserver/eventbuilder.h

src/platforms/mirserver/eventdispatch.cpp

src/platforms/mirserver/eventdispatch.h

src/platforms/mirserver/initialsurfacesizes.cpp

src/platforms/mirserver/initialsurfacesizes.h

src/platforms/mirserver/inputdeviceobserver.cpp

src/platforms/mirserver/inputdeviceobserver.h

src/platforms/mirserver/logging.cpp

src/platforms/mirserver/miral

src/platforms/mirserver/miral/CMakeLists.txt

src/platforms/mirserver/miral/edid.cpp

src/platforms/mirserver/miral/edid.h

src/platforms/mirserver/miral/mirbuffer.cpp

src/platforms/mirserver/miral/mirbuffer.h

src/platforms/mirserver/miral/persist_display_config.cpp

src/platforms/mirserver/miral/persist_display_config.h

src/platforms/mirserver/mirserverhooks.cpp

src/platforms/mirserver/mirserverhooks.h

src/platforms/mirserver/openglcontextfactory.cpp

src/platforms/mirserver/openglcontextfactory.h

src/platforms/mirserver/promptsession.h

src/platforms/mirserver/promptsessionmanager.cpp

src/platforms/mirserver/promptsessionmanager.h

src/platforms/mirserver/screenscontroller.cpp

src/platforms/mirserver/screenscontroller.h

src/platforms/mirserver/screentypes.h

src/platforms/mirserver/setqtcompositor.cpp

src/platforms/mirserver/setqtcompositor.h

src/platforms/mirserver/shelluuid.cpp

src/platforms/mirserver/shelluuid.h

src/platforms/mirserver/windowcontroller.cpp

src/platforms/mirserver/windowcontroller.h

src/platforms/mirserver/windowmanagementpolicy.cpp

src/platforms/mirserver/windowmanagementpolicy.h

tests/check-requires-provides.sh

tests/convert-to-gles.sh

tests/framework/mock_persistent_surface_store.cpp

tests/framework/mock_persistent_surface_store.h

tests/framework/mock_sessionmap.h

tests/framework/mock_shell.h

tests/framework/mock_window_controller.h

tests/framework/stub_buffer.h

tests/framework/stub_scene_surface.h

tests/framework/stub_windowcontroller.h

tests/mirserver/EventBuilder

tests/mirserver/EventBuilder/CMakeLists.txt

tests/mirserver/EventBuilder/eventbuilder_test.cpp

tests/mirserver/ScreensModel/stub_displayconfigurationcontroller.h

tests/mirserver/miral

tests/mirserver/miral/CMakeLists.txt

tests/mirserver/miral/edid_test.cpp

tests/modules/SurfaceManager

tests/modules/SurfaceManager/CMakeLists.txt

tests/modules/SurfaceManager/surface_manager_test.cpp

tests/modules/WindowManager/windowmodel_test.cpp

files removed:
debian/tests

debian/tests/control

debian/tests/run-tests

src/modules/Unity/Application/applicationscreenshotprovider.cpp

src/modules/Unity/Application/applicationscreenshotprovider.h

src/modules/Unity/Application/dbuswindowstack.cpp

src/modules/Unity/Application/dbuswindowstack.h

src/modules/Unity/Application/desktopfilereader.cpp

src/modules/Unity/Application/desktopfilereader.h

src/modules/Unity/Application/mirsurfacemanager.cpp

src/modules/Unity/Application/mirsurfacemanager.h

src/modules/Unity/Application/sessionmanager.cpp

src/modules/Unity/Application/sessionmanager.h

src/modules/Unity/Application/ubuntukeyboardinfo.cpp

src/modules/Unity/Application/ubuntukeyboardinfo.h

src/platforms/mirserver/mirserver.cpp

src/platforms/mirserver/mirserver.h

src/platforms/mirserver/mirserverstatuslistener.cpp

src/platforms/mirserver/mirserverstatuslistener.h

src/platforms/mirserver/mirwindowmanager.cpp

src/platforms/mirserver/mirwindowmanager.h

src/platforms/mirserver/sessionlistener.cpp

src/platforms/mirserver/sessionlistener.h

tests/framework/mock_display.cpp

tests/framework/mock_display.h

tests/framework/mock_display_configuration.cpp

tests/framework/mock_display_configuration.h

tests/framework/mock_gl_display_buffer.cpp

tests/framework/stub_scene_surface.cpp

tests/mirserver/Clipboard

tests/mirserver/Clipboard/CMakeLists.txt

tests/mirserver/Clipboard/clipboard_test.cpp

tests/mirserver/WindowManager

tests/mirserver/WindowManager/CMakeLists.txt

tests/mirserver/WindowManager/stub_session.cpp

tests/mirserver/WindowManager/stub_session.h

tests/mirserver/WindowManager/stub_surface.cpp

tests/mirserver/WindowManager/stub_surface.h

tests/mirserver/WindowManager/window_manager.cpp

tests/modules/DesktopFileReader

tests/modules/DesktopFileReader/CMakeLists.txt

tests/modules/DesktopFileReader/calculator.desktop

tests/modules/DesktopFileReader/desktopfilereader_test.cpp

files renamed:
src/platforms/mirserver/tileddisplayconfigurationpolicy.cpp => src/platforms/mirserver/mirdisplayconfigurationpolicy.cpp

src/platforms/mirserver/tileddisplayconfigurationpolicy.h => src/platforms/mirserver/mirdisplayconfigurationpolicy.h

src/platforms/mirserver/screencontroller.cpp => src/platforms/mirserver/screensmodel.cpp

src/platforms/mirserver/screencontroller.h => src/platforms/mirserver/screensmodel.h

tests/framework/fake_desktopfilereader.cpp => tests/framework/fake_application_info.cpp

tests/framework/fake_desktopfilereader.h => tests/framework/fake_application_info.h

tests/framework/stub_scene_surface.h => tests/framework/fake_surface.h

tests/framework/mock_desktop_file_reader.cpp => tests/framework/mock_application_info.cpp

tests/framework/mock_desktop_file_reader.h => tests/framework/mock_application_info.h

tests/mirserver/ScreenController/ => tests/mirserver/ScreensModel/

tests/mirserver/ScreenController/screencontroller_test.cpp => tests/mirserver/ScreensModel/screensmodel_test.cpp

tests/mirserver/ScreenController/testable_screencontroller.h => tests/mirserver/ScreensModel/testable_screensmodel.h

tests/modules/SessionManager/ => tests/modules/Session/

tests/modules/SessionManager/session_manager_test.cpp => tests/modules/Session/taskcontroller_test.cpp

tests/modules/SurfaceManager/ => tests/modules/WindowManager/

files modified:
CMakeLists.txt

README

debian/changelog

debian/control

debian/copyright

debian/rules

demos/paths.h.in

demos/qml-demo-client/CMakeLists.txt

demos/qml-demo-shell/CMakeLists.txt

demos/qml-demo-shell/main.cpp

demos/qml-demo-shell/qml-demo-shell.qml

src/common/abstractdbusservicemonitor.cpp

src/common/debughelpers.cpp

src/common/debughelpers.h

src/common/timestamp_impl.h

src/modules/Unity/Application/CMakeLists.txt

src/modules/Unity/Application/application.cpp

src/modules/Unity/Application/application.h

src/modules/Unity/Application/application_manager.cpp

src/modules/Unity/Application/application_manager.h

src/modules/Unity/Application/mirbuffersgtexture.cpp

src/modules/Unity/Application/mirbuffersgtexture.h

src/modules/Unity/Application/mirsurface.cpp

src/modules/Unity/Application/mirsurface.h

src/modules/Unity/Application/mirsurfaceinterface.h

src/modules/Unity/Application/mirsurfaceitem.cpp

src/modules/Unity/Application/mirsurfaceitem.h

src/modules/Unity/Application/plugin.cpp

src/modules/Unity/Application/proc_info.cpp

src/modules/Unity/Application/session.cpp

src/modules/Unity/Application/session.h

src/modules/Unity/Application/session_interface.h

src/modules/Unity/Application/sharedwakelock.cpp

src/modules/Unity/Application/taskcontroller.h

src/modules/Unity/Application/upstart/taskcontroller.cpp

src/modules/Unity/Application/upstart/taskcontroller.h

src/modules/Unity/Screens/CMakeLists.txt

src/modules/Unity/Screens/plugin.cpp

src/modules/Unity/Screens/screens.cpp

src/modules/Unity/Screens/screens.h

src/platforms/mirserver/CMakeLists.txt

src/platforms/mirserver/clipboard.cpp

src/platforms/mirserver/clipboard.h

src/platforms/mirserver/cursor.cpp

src/platforms/mirserver/cursor.h

src/platforms/mirserver/logging.h

src/platforms/mirserver/mircursorimages.cpp

src/platforms/mirserver/miropenglcontext.cpp

src/platforms/mirserver/miropenglcontext.h

src/platforms/mirserver/mirserverintegration.cpp

src/platforms/mirserver/mirserverintegration.h

src/platforms/mirserver/mirsingleton.cpp

src/platforms/mirserver/mirsingleton.h

src/platforms/mirserver/nativeinterface.cpp

src/platforms/mirserver/nativeinterface.h

src/platforms/mirserver/offscreensurface.cpp

src/platforms/mirserver/plugin.cpp

src/platforms/mirserver/plugin.h

src/platforms/mirserver/promptsessionlistener.cpp

src/platforms/mirserver/promptsessionlistener.h

src/platforms/mirserver/qmirserver.cpp

src/platforms/mirserver/qmirserver.h

src/platforms/mirserver/qmirserver_p.cpp

src/platforms/mirserver/qmirserver_p.h

src/platforms/mirserver/qtcompositor.cpp

src/platforms/mirserver/qtcompositor.h

src/platforms/mirserver/qteventfeeder.cpp

src/platforms/mirserver/qteventfeeder.h

src/platforms/mirserver/screen.cpp

src/platforms/mirserver/screen.h

src/platforms/mirserver/screenwindow.cpp

src/platforms/mirserver/screenwindow.h

src/platforms/mirserver/sessionauthorizer.cpp

src/platforms/mirserver/sessionauthorizer.h

src/platforms/mirserver/surfaceobserver.cpp

src/platforms/mirserver/surfaceobserver.h

src/platforms/mirserver/tracepoints.tp

tests/CMakeLists.txt

tests/framework/CMakeLists.txt

tests/framework/fake_displayconfigurationoutput.h

tests/framework/fake_mirsurface.cpp

tests/framework/fake_mirsurface.h

tests/framework/fake_session.cpp

tests/framework/fake_session.h

tests/framework/gmock_fixes.h

tests/framework/mock_gl_display_buffer.h

tests/framework/mock_main_loop.cpp

tests/framework/mock_main_loop.h

tests/framework/mock_mir_session.cpp

tests/framework/mock_mir_session.h

tests/framework/mock_proc_info.cpp

tests/framework/mock_renderable.h

tests/framework/mock_session.cpp

tests/framework/mock_session.h

tests/framework/mock_surface.h

tests/framework/mock_task_controller.cpp

tests/framework/mock_task_controller.h

tests/framework/qtmir_test.cpp

tests/framework/qtmir_test.h

tests/mirserver/CMakeLists.txt

tests/mirserver/QtEventFeeder/CMakeLists.txt

tests/mirserver/QtEventFeeder/mock_qtwindowsystem.h

tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp

tests/mirserver/Screen/CMakeLists.txt

tests/mirserver/Screen/screen_test.cpp

tests/mirserver/ScreensModel/CMakeLists.txt

tests/mirserver/ScreensModel/stub_display.h

tests/modules/Application/CMakeLists.txt

tests/modules/Application/application_test.cpp

tests/modules/ApplicationManager/CMakeLists.txt

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/CMakeLists.txt

tests/modules/General/timestamp_test.cpp

tests/modules/Session/CMakeLists.txt

tests/modules/Session/session_test.cpp

tests/modules/SharedWakelock/CMakeLists.txt

tests/modules/WindowManager/CMakeLists.txt

tests/modules/WindowManager/mirsurface_test.cpp

tests/modules/WindowManager/mirsurfaceitem_test.cpp

Show diffs side-by-side

added added

removed removed

src/platforms/mirserver/mirserverintegration.h

1

1

/*

2

* Copyright (C) 2013-2015 Canonical, Ltd.

2

* Copyright (C) 2013-2017 Canonical, Ltd.

3

3

*

4

4

* This program is free software: you can redistribute it and/or modify it under

5

5

* the terms of the GNU Lesser General Public License version 3, as published by

24

24

class NativeInterface;

25

25

class QMirServer;

26

26

27

namespace qtmir {

28

class Clipboard;

29

}

30

31

27

class MirServerIntegration : public QPlatformIntegration

32

28

{

33

29

public:

67

63

68

64

NativeInterface *m_nativeInterface;

69

65

QPlatformInputContext* m_inputContext;

70

QScopedPointer<qtmir::Clipboard> m_clipboard;

71

66

};

72

67

73

68

#endif // MIRSERVERINTEGRATION_H

Older »