~thomas-voss/location-service/enable-kml-reporting

« back to all changes in this revision

Viewing changes to src/location/cmds/status.h

Committer: Thomas Voß
Date: 2017-03-08 11:58:46 UTC
mfrom: (289.2.5 spike-on-gdbus)
Revision ID: thomas.voss@canonical.com-20170308115846-bx6e266x3e5mk6v6

Merge lp:~thomas-voss/location-service/rework-dbus-bits.

files added:
src/location/connectivity/w11t.xml

src/location/connectivity/w11t_manager.cpp

src/location/connectivity/w11t_manager.h

src/location/dbus/bus.cpp

src/location/dbus/bus.h

src/location/dbus/codec.cpp

src/location/dbus/codec.h

src/location/dbus/service.xml

src/location/dbus/session.xml

src/location/dbus/util.h

src/location/glib

src/location/glib/holder.h

src/location/glib/runtime.cpp

src/location/glib/runtime.h

src/location/glib/serializing_bus.cpp

src/location/glib/serializing_bus.h

src/location/glib/shared_object.h

src/location/glib/util.cpp

src/location/glib/util.h

src/location/providers/remote/provider.xml

src/location/result.h

files removed:
src/location/connectivity/cached_radio_cell.cpp

src/location/connectivity/cached_radio_cell.h

src/location/connectivity/cached_wireless_network.cpp

src/location/connectivity/cached_wireless_network.h

src/location/connectivity/nm.h

src/location/connectivity/ofono.h

src/location/connectivity/ofono_nm_connectivity_manager.cpp

src/location/connectivity/ofono_nm_connectivity_manager.h

src/location/dbus/codec.h

src/location/dbus/session.h

src/location/providers/remote/interface.h

src/location/providers/remote/skeleton.cpp

src/location/providers/remote/skeleton.h

src/location/providers/remote/stub.cpp

src/location/providers/remote/stub.h

src/location/trust_store_permission_manager.cpp

src/location/trust_store_permission_manager.h

src/location/util/well_known_bus.cpp

src/location/util/well_known_bus.h

tests/connectivity_manager_test.cpp

tests/trust_store_permission_manager_test.cpp

files modified:
CMakeLists.txt

debian/VERSION

debian/VERSION.vivid

debian/control

debian/control.in

include/location/connectivity/manager.h

include/location/connectivity/wireless_network.h

include/location/service.h

snapcraft.yaml

src/CMakeLists.txt

src/location/CMakeLists.txt

src/location/cmds/monitor.cpp

src/location/cmds/monitor.h

src/location/cmds/provider.cpp

src/location/cmds/provider.h

src/location/cmds/run.cpp

src/location/cmds/run.h

src/location/cmds/status.cpp

src/location/cmds/status.h

src/location/criteria.cpp

src/location/dbus/service.h

src/location/dbus/skeleton/service.cpp

src/location/dbus/skeleton/service.h

src/location/dbus/skeleton/session.cpp

src/location/dbus/skeleton/session.h

src/location/dbus/stub/service.cpp

src/location/dbus/stub/service.h

src/location/dbus/stub/session.cpp

src/location/dbus/stub/session.h

src/location/providers/CMakeLists.txt

src/location/providers/dummy/provider.cpp

src/location/providers/mls/provider.cpp

src/location/providers/remote/CMakeLists.txt

src/location/providers/remote/provider.cpp

src/location/providers/remote/provider.h

src/location/providers/ubx/_8/serial_port_receiver.cpp

src/location/providers/ubx/provider.cpp

src/location/serializing_bus.cpp

src/location/serializing_bus.h

src/location/service_with_engine.cpp

src/location/service_with_engine.h

src/location/session_with_provider.cpp

src/location/session_with_provider.h

src/location/system_configuration.cpp

src/location/system_configuration.h

tests/CMakeLists.txt

tests/position_test.cpp

tests/serializing_bus_test.cpp

Show diffs side-by-side

added added

removed removed

src/location/cmds/status.h

#include <location/optional.h>

#include <location/service.h>

#include <location/dbus/bus.h>

#include <location/util/cli.h>

#include <location/visibility.h>

#include <core/dbus/well_known_bus.h>

#include <boost/filesystem.hpp>

#include <iosfwd>

private:

std::shared_ptr<Delegate> delegate; // We dispatch summary information to this delegate implementation.

core::dbus::WellKnownBus bus; // The bus we should connect to.

dbus::Bus bus; // The bus we should connect to.

};

}

Older »