~ricmm/platform-api/add-location-service-api-take-2

« back to all changes in this revision

Viewing changes to src/ubuntu/mircommon/application_options_mir_priv.h

Committer: Thomas Voß
Date: 2013-07-06 06:53:05 UTC
Revision ID: thomas.voss@canonical.com-20130706065305-88erq3gw3bf88rnr

* Refactored the src folder
* Added the location service API

files added:
include/ubuntu/application/location

include/ubuntu/application/location/CMakeLists.txt

include/ubuntu/application/location/heading_update.h

include/ubuntu/application/location/position_update.h

include/ubuntu/application/location/service.h

include/ubuntu/application/location/session.h

include/ubuntu/application/location/velocity_update.h

src/ubuntu

src/ubuntu/CMakeLists.txt

src/ubuntu/application

src/ubuntu/application/CMakeLists.txt

src/ubuntu/application/location

src/ubuntu/application/location/CMakeLists.txt

src/ubuntu/application/location/heading_update.cpp

src/ubuntu/application/location/position_update.cpp

src/ubuntu/application/location/service.cpp

src/ubuntu/application/location/session.cpp

src/ubuntu/application/location/velocity_update.cpp

src/ubuntu/hybris

src/ubuntu/hybris/CMakeLists.txt

src/ubuntu/hybris/bridge.h

src/ubuntu/hybris/tests

src/ubuntu/hybris/tests/CMakeLists.txt

src/ubuntu/hybris/tests/test_c_api.cpp

src/ubuntu/hybris/tests/test_gps_api.cpp

src/ubuntu/hybris/tests/test_multiple_surfaces_event_delivery.cpp

src/ubuntu/hybris/tests/test_sensors_api.cpp

src/ubuntu/hybris/tests/test_session_c_api.cpp

src/ubuntu/hybris/ubuntu_application_api_hybris.cpp

src/ubuntu/hybris/ubuntu_application_sensors_hybris.cpp

src/ubuntu/hybris/ubuntu_platform_hardware_api.cpp

src/ubuntu/mirclient

src/ubuntu/mirclient/CMakeLists.txt

src/ubuntu/mirclient/application_instance_mirclient.cpp

src/ubuntu/mirclient/application_instance_mirclient_priv.h

src/ubuntu/mirclient/ubuntu_application_api_mirclient.cpp

src/ubuntu/mirclient/window_mirclient.cpp

src/ubuntu/mirclient/window_mirclient_priv.h

src/ubuntu/mirclient/window_properties_mirclient.cpp

src/ubuntu/mirclient/window_properties_mirclient_priv.h

src/ubuntu/mircommon

src/ubuntu/mircommon/CMakeLists.txt

src/ubuntu/mircommon/application_description_mir.cpp

src/ubuntu/mircommon/application_description_mir_priv.h

src/ubuntu/mircommon/application_id_mir.cpp

src/ubuntu/mircommon/application_id_mir_priv.h

src/ubuntu/mircommon/application_options_mir.cpp

src/ubuntu/mircommon/application_options_mir_priv.h

src/ubuntu/mircommon/event_helpers_mir.cpp

src/ubuntu/mircommon/event_helpers_mir.h

src/ubuntu/mircommon/lifecycle_delegate_mir.cpp

src/ubuntu/mircommon/lifecycle_delegate_mir_priv.h

src/ubuntu/mircommon/session_mir.cpp

src/ubuntu/mircommon/ubuntu_application_sensors_desktop.cpp

src/ubuntu/mirserver

src/ubuntu/mirserver/CMakeLists.txt

src/ubuntu/mirserver/application_instance_mirserver.cpp

src/ubuntu/mirserver/application_instance_mirserver_priv.h

src/ubuntu/mirserver/ubuntu_application_api_mirserver.cpp

src/ubuntu/mirserver/ubuntu_application_api_mirserver_priv.h

src/ubuntu/mirserver/window_mirserver.cpp

src/ubuntu/mirserver/window_mirserver_priv.h

src/ubuntu/mirserver/window_properties_mirserver.cpp

src/ubuntu/mirserver/window_properties_mirserver_priv.h

files removed:
src/hybris

src/hybris/CMakeLists.txt

src/hybris/bridge.h

src/hybris/tests

src/hybris/tests/CMakeLists.txt

src/hybris/tests/test_c_api.cpp

src/hybris/tests/test_gps_api.cpp

src/hybris/tests/test_multiple_surfaces_event_delivery.cpp

src/hybris/tests/test_sensors_api.cpp

src/hybris/tests/test_session_c_api.cpp

src/hybris/ubuntu_application_api_hybris.cpp

src/hybris/ubuntu_application_sensors_hybris.cpp

src/hybris/ubuntu_platform_hardware_api.cpp

src/mirclient

src/mirclient/CMakeLists.txt

src/mirclient/application_instance_mirclient.cpp

src/mirclient/application_instance_mirclient_priv.h

src/mirclient/ubuntu_application_api_mirclient.cpp

src/mirclient/window_mirclient.cpp

src/mirclient/window_mirclient_priv.h

src/mirclient/window_properties_mirclient.cpp

src/mirclient/window_properties_mirclient_priv.h

src/mircommon

src/mircommon/CMakeLists.txt

src/mircommon/application_description_mir.cpp

src/mircommon/application_description_mir_priv.h

src/mircommon/application_id_mir.cpp

src/mircommon/application_id_mir_priv.h

src/mircommon/application_options_mir.cpp

src/mircommon/application_options_mir_priv.h

src/mircommon/event_helpers_mir.cpp

src/mircommon/event_helpers_mir.h

src/mircommon/lifecycle_delegate_mir.cpp

src/mircommon/lifecycle_delegate_mir_priv.h

src/mircommon/session_mir.cpp

src/mircommon/ubuntu_application_sensors_desktop.cpp

src/mirserver

src/mirserver/CMakeLists.txt

src/mirserver/application_instance_mirserver.cpp

src/mirserver/application_instance_mirserver_priv.h

src/mirserver/ubuntu_application_api_mirserver.cpp

src/mirserver/ubuntu_application_api_mirserver_priv.h

src/mirserver/window_mirserver.cpp

src/mirserver/window_mirserver_priv.h

src/mirserver/window_properties_mirserver.cpp

src/mirserver/window_properties_mirserver_priv.h

files modified:
debian/libplatform-api1-hybris.symbols

include/ubuntu/application/CMakeLists.txt

src/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

src/ubuntu/mircommon/application_options_mir_priv.h

* 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 <robert.carr@canonical.com>

#ifndef UBUNTU_APPLICATION_OPTIONS_MIR_PRIV_H_

#define UBUNTU_APPLICATION_OPTIONS_MIR_PRIV_H_

#include <ubuntu/application/options.h>

#include <ubuntu/application/ui/options.h>

#include <string>

namespace ubuntu

{

namespace application

{

namespace mir

{

class Options

{

public:

Options() = default;

~Options() = default;

UApplicationOptions* as_u_application_options();

static Options* from_u_application_options(UApplicationOptions* u_options);

UApplicationOperationMode operation_mode = U_APPLICATION_FOREGROUND_APP;

UAUiFormFactor form_factor = U_DESKTOP;

UAUiStage stage = U_MAIN_STAGE;

std::string desktop_file;

protected:

Options(Options const&) = delete;

Options& operator=(Options const&) = delete;

};

}

} // namespace ubuntu

#endif // UBUNTU_APPLICATION_OPTIONS_MIR_PRIV_H_

Older »