Merge lp:~unity-api-team/connectivity-api/connectivity-service-source-package-shuffle into lp:connectivity-api/14.10

[Antti Kaijanmäki]

* Move out connectivity-cpp to lp:indicator-network
* Move in libconnectivity-qt and qtdeclarative5-connectivity-plugin
  from lp:indicator-network
* removes binary packages
  - libconnectivity-cpp0
  - libconnectivity-cpp-dev
  - libconnectivity-cpp-doc
* adds binary packages:
  - libconnectivity-qt1
  - libconnectivity-qt1-dev
  - qml-module-ubuntu-connectivity
  - connectivity-doc

needs: https://code.launchpad.net/~unity-api-team/indicator-network/connectivity-service-source-package-shuffle/+merge/231432

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:20
http://jenkins.qa.ubuntu.com/job/connectivity-api-ci/56/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/connectivity-api-utopic-amd64-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/connectivity-api-utopic-armhf-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/connectivity-api-utopic-i386-ci/9/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/connectivity-api-ci/56/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-api-team/connectivity-api/connectivity-service-source-package-shuffle]

21. By Antti Kaijanmäki on 2014-08-19

fix coverage target.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:21
http://jenkins.qa.ubuntu.com/job/connectivity-api-ci/57/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/connectivity-api-utopic-amd64-ci/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/connectivity-api-utopic-armhf-ci/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/connectivity-api-utopic-i386-ci/10/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/connectivity-api-ci/57/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-api-team/connectivity-api/connectivity-service-source-package-shuffle]

22. By Antti Kaijanmäki on 2014-08-19

add missing dbus-test-runner builddep

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:22
http://jenkins.qa.ubuntu.com/job/connectivity-api-ci/58/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/connectivity-api-utopic-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/connectivity-api-utopic-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/connectivity-api-utopic-armhf-ci/11/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/connectivity-api-utopic-i386-ci/11

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/connectivity-api-ci/58/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

[Timo Jyrinki (timo-jyrinki)]

Antti asked to check the debian/ changes. Nothing wrong otherwise, but please use the qml-module-foo naming instead, so that it won't need to be renamed later again.

See bug #1342031.

So, it'd be qml-module-connectivity and referred to as module, not a plugin. Please also change the dependencies to point to the correct packages instead of the transtional ones:

qml-module-qtquick2,
qml-module-qttest,

review: Needs Fixing

[Timo Jyrinki (timo-jyrinki)]

For the connectivity QML module, the precise naming depends on which name you install it with.

For example, the "test" in qtdeclarative5 naming became "qttest" in the new naming since it's installed under /usr/lib/*/qt5/qml/QtTest/

qml-module-qtquick-xmllistmodel has path /usr/lib/*/qt5/qml/QtQuick/XmlListModel, as an example if you have more than one subdir.

[lp:~unity-api-team/connectivity-api/connectivity-service-source-package-shuffle]

23. By Antti Kaijanmäki on 2014-08-21

change qml package name.

24. By Antti Kaijanmäki on 2014-08-21

rename qml module

[Robert Bruce Park (robru)]

lgtm

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2014-04-11 13:58:10 +0000
+++ .bzrignore	2014-08-21 18:21:03 +0000
@@ -2,3 +2,5 @@
 .cproject
 .settings
 build
+*~
+*.user

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-05-28 15:29:04 +0000
+++ CMakeLists.txt	2014-08-21 18:21:03 +0000
@@ -1,31 +1,22 @@
-# Copyright © 2013 Canonical Ltd.
-#
-# 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/>.
-#
-# Authors:
-#     Antti Kaijanmäki <[e-mail]>
-
 cmake_minimum_required(VERSION 2.8)
 project(connectivity-cpp)
 
+string(TOLOWER "${CMAKE_BUILD_TYPE}" build_type_lower)
+
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
 
 include(EnableCoverageReport)
 include(GNUInstallDirs)
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pedantic -Wextra -fPIC -fvisibility=hidden -pthread")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -fno-strict-aliasing -fvisibility=hidden -fvisibility-inlines-hidden -pedantic -Wextra -fPIC -pthread")
-#set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
+set(COMMON_FLAGS "-Wall -Wextra -Wpedantic -fno-permissive -fPIC -fvisibility=hidden -pthread")
+if(NOT build_type_lower MATCHES debug)
+    set(COMMON_FLAGS "${COMMON_FLAGS} -Werror")
+endif()
+
+# "nice bug" in cmake... http://www.cmake.org/Bug/view.php?id=15058
+# let's not set C_FLAGS as it will break pthreads detection \o/
+#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_FLAGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${COMMON_FLAGS} -fno-strict-aliasing -fvisibility-inlines-hidden")
 
 #####################################################################
 # Enable code coverage calculation with gcov/gcovr/lcov
@@ -35,78 +26,25 @@
 #  * Find html report in subdir coveragereport
 #  * Find xml report feasible for jenkins in coverage.xml
 #####################################################################
-IF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
+IF(build_type_lower MATCHES coverage)
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs" )
   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ftest-coverage -fprofile-arcs" )
   SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -ftest-coverage -fprofile-arcs" )
   SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -ftest-coverage -fprofile-arcs" )
-ENDIF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
-
-set(CONNECTIVITY_CPP_VERSION_MAJOR 0)
-set(CONNECTIVITY_CPP_VERSION_MINOR 0)
-set(CONNECTIVITY_CPP_VERSION_PATCH 1)
+ENDIF()
 
 include(CTest)
 
 find_package(PkgConfig REQUIRED)
 
-include_directories(include)
-include_directories(dbus-cpp)
-
-pkg_check_modules(
-    PROPERTIESCPP REQUIRED
-    properties-cpp
-)
-include_directories(${PROPERTIESCPP_INCLUDE_DIRS})
-
-pkg_check_modules(
-    DBUSCPP REQUIRED
-    dbus-cpp
-)
-include_directories(${DBUSCPP_INCLUDE_DIRS})
-
-pkg_check_modules(
-    NETWORKMANAGER REQUIRED
-    NetworkManager
-)
-include_directories(${NETWORKMANAGER_NCLUDE_DIRS})
-
-# list these here to have them visible in Qt Creator
-set(CONNECTIVITY_INTERFACES
-    include/connectivity/networking/link.h
-    include/connectivity/networking/manager.h
-    include/connectivity/networking/service.h
-
-    include/connectivity/networking/service/tethering/service.h
-    include/connectivity/networking/service/tor/service.h
-    include/connectivity/networking/service/vpn/service.h
-
-    include/connectivity/networking/wifi/access-point.h
-    include/connectivity/networking/wifi/link.h
-
-    include/connectivity/networking/wwan/link.h
-)
-add_custom_target(QtCreatorHeaderHack SOURCES ${CONNECTIVITY_INTERFACES})
-
-# list these here to have them visible in Qt Creator
-set(DBUS_INTERFACES
-    dbus-cpp/services/nm.h
-    dbus-cpp/services/ofono.h
-    dbus-cpp/services/urfkill.h
-)
-add_custom_target(QtCreatorHeaderHack2 SOURCES ${DBUS_INTERFACES})
-
-add_subdirectory(data)
+set(CONNECTIVITY_QT_VERSION_MAJOR 1)
+set(CONNECTIVITY_QT_VERSION_MINOR 0)
+set(CONNECTIVITY_QT_LIB_TARGET connectivity-qt${CONNECTIVITY_QT_VERSION_MAJOR})
+
 add_subdirectory(doc)
-add_subdirectory(examples)
 enable_testing()
 add_subdirectory(tests)
 add_subdirectory(src)
 
-install(
-    DIRECTORY include/
-    DESTINATION include/connectivity-cpp-${CONNECTIVITY_CPP_VERSION_MAJOR}
-)
-
-enable_coverage_report(TARGETS connectivity-cpp
+enable_coverage_report(TARGETS connectivity-qt1
                        FILTER ${CMAKE_SOURCE_DIR}/tests/* ${CMAKE_BINARY_DIR}/*)

=== removed directory 'data'
=== removed file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2014-01-23 22:09:36 +0000
+++ data/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-# Copyright © 2013 Canonical Ltd.
-#
-# 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/>.
-#
-# Authors:
-#     Antti Kaijanmäki <[e-mail]>
-
-configure_file(
-	connectivity-cpp.pc.in connectivity-cpp.pc @ONLY
-)
-
-install(
-	FILES ${CMAKE_CURRENT_BINARY_DIR}/connectivity-cpp.pc
-	DESTINATION lib/pkgconfig
-)
-

=== removed file 'data/connectivity-cpp.pc.in'
--- data/connectivity-cpp.pc.in	2014-04-23 14:18:33 +0000
+++ data/connectivity-cpp.pc.in	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-includedir=${exec_prefix}/include
- 
-Name: @CMAKE_PROJECT_NAME@
-Description: 
-Version: @CONNECTIVITY_CPP_VERSION_MAJOR@.@CONNECTIVITY_CPP_VERSION_MINOR@.@CONNECTIVITY_CPP_VERSION_PATCH@
-Cflags: -I${includedir}/connectivity-cpp-@CONNECTIVITY_CPP_VERSION_MAJOR@
-Libs: -L${libdir} -lconnectivity-cpp
-Requires: dbus-cpp properties-cpp

=== removed file 'data/session.conf'
--- data/session.conf	2014-01-23 22:09:36 +0000
+++ data/session.conf	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-  <!-- If we fork, keep the user's original umask to avoid affecting
-       the behavior of child processes. -->
-  <keep_umask/>
-
-  <type>session</type>
-
-  <listen>unix:tmpdir=/tmp</listen>
-
-  <standard_session_servicedirs />
-
-  <policy context="default">
-    <!-- Allow everything to be sent -->
-    <allow send_destination="*" eavesdrop="true"/>
-    <!-- Allow everything to be received -->
-    <allow eavesdrop="true"/>
-    <!-- Allow anyone to own anything -->
-    <allow own="*"/>
-  </policy>
-
-  <!-- raise the service start timeout to 40 seconds as it can timeout
-       on the live cd on slow machines -->
-  <limit name="service_start_timeout">60000</limit>
-
-  <!-- the memory limits are 1G instead of say 4G because they can't exceed 32-bit signed int max -->
-  <limit name="max_incoming_bytes">1000000000</limit>
-  <limit name="max_outgoing_bytes">1000000000</limit>
-  <limit name="max_message_size">1000000000</limit>
-  <limit name="service_start_timeout">120000</limit>  
-  <limit name="auth_timeout">240000</limit>
-  <limit name="max_completed_connections">100000</limit>  
-  <limit name="max_incomplete_connections">10000</limit>
-  <limit name="max_connections_per_user">100000</limit>
-  <limit name="max_pending_service_starts">10000</limit>
-  <limit name="max_names_per_connection">50000</limit>
-  <limit name="max_match_rules_per_connection">50000</limit>
-  <limit name="max_replies_per_connection">50000</limit>
-  <limit name="reply_timeout">300000</limit>
-
-</busconfig>

=== removed file 'data/system.conf'
--- data/system.conf	2014-01-23 22:09:36 +0000
+++ data/system.conf	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-  <!-- If we fork, keep the user's original umask to avoid affecting
-       the behavior of child processes. -->
-  <keep_umask/>
-
-  <type>system</type>
-
-  <listen>unix:tmpdir=/tmp</listen>
-
-  <standard_system_servicedirs/>
-
-  <policy context="default">
-    <!-- Allow everything to be sent -->
-    <allow send_destination="*" eavesdrop="true"/>
-    <!-- Allow everything to be received -->
-    <allow eavesdrop="true"/>
-    <!-- Allow anyone to own anything -->
-    <allow own="*"/>
-  </policy>
-
-</busconfig>

=== removed directory 'dbus-cpp'
=== removed directory 'dbus-cpp/services'
=== removed file 'dbus-cpp/services/nm.h'
--- dbus-cpp/services/nm.h	2014-04-30 12:06:30 +0000
+++ dbus-cpp/services/nm.h	1970-01-01 00:00:00 +0000
@@ -1,986 +0,0 @@
-/*
- * Copyright © 2012-2013 Canonical Ltd.
- *
- * 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: Antti Kaijanmäki <[e-mail]>
- */
-#ifndef PLATFORM_MANAGER_NMOFONO_NM_H
-#define PLATFORM_MANAGER_NMOFONO_NM_H
-
-#include <core/dbus/bus.h>
-#include <core/dbus/object.h>
-#include <core/dbus/property.h>
-#include <core/dbus/service.h>
-#include <core/dbus/types/object_path.h>
-#include <core/dbus/types/any.h>
-#include <core/dbus/types/struct.h>
-#include <core/dbus/types/stl/map.h>
-#include <core/dbus/types/stl/string.h>
-#include <core/dbus/types/stl/tuple.h>
-#include <core/dbus/types/stl/vector.h>
-#include <NetworkManager/NetworkManager.h>
-#include "util.h"
-
-namespace org
-{
-namespace freedesktop
-{
-namespace NetworkManager
-{
-    struct Interface {
-
-        struct AccessPoint
-        {
-            static const std::string& name()
-            {
-                static const std::string s{NM_DBUS_INTERFACE_ACCESS_POINT};
-                return s;
-            }
-
-            struct Property {
-                struct Frequency
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"Frequency"};
-                        return s;
-                    }
-
-                    typedef AccessPoint Interface;
-                    typedef std::uint32_t ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-
-                struct Flags
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"Flags"};
-                        return s;
-                    }
-
-                    typedef AccessPoint Interface;
-                    typedef std::uint32_t ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-
-                struct WpaFlags
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"WpaFlags"};
-                        return s;
-                    }
-
-                    typedef AccessPoint Interface;
-                    typedef std::uint32_t ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-
-                struct RsnFlags
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"RsnFlags"};
-                        return s;
-                    }
-
-                    typedef AccessPoint Interface;
-                    typedef std::uint32_t ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-
-                struct Mode
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"Mode"};
-                        return s;
-                    }
-
-                    typedef AccessPoint Interface;
-                    typedef std::uint32_t ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-
-                struct Ssid
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"Ssid"};
-                        return s;
-                    }
-
-                    typedef AccessPoint Interface;
-                    /// @todo bug tvoss.. D-Bus BYTE(y) should be unsigned
-                    typedef std::vector<std::int8_t> ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-
-                struct HwAddress
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"HwAddress"};
-                        return s;
-                    }
-
-                    typedef AccessPoint Interface;
-                    typedef std::string ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-
-                struct Strength
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"Strength"};
-                        return s;
-                    }
-
-                    typedef AccessPoint Interface;
-                    typedef std::int8_t ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-            };
-
-            struct Signal {
-                struct PropertiesChanged
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"PropertiesChanged"};
-                        return s;
-                    }
-
-                    typedef AccessPoint Interface;
-                    typedef std::map<std::string, core::dbus::types::Variant> ArgumentType;
-                };
-            };
-
-            AccessPoint(const std::shared_ptr<core::dbus::Object>& object)
-                : object(object),
-                  frequency(object->get_property<Property::Frequency>()),
-                  hw_address(object->get_property<Property::HwAddress>()),
-                  strength(object->get_property<Property::Strength>()),
-                  flags(object->get_property<Property::Flags>()),
-                  wpa_flags(object->get_property<Property::WpaFlags>()),
-                  rsn_flags(object->get_property<Property::RsnFlags>()),
-                  mode(object->get_property<Property::Mode>()),
-                  ssid(object->get_property<Property::Ssid>()),
-                  properties_changed(object->get_signal<Signal::PropertiesChanged>())
-
-            {}
-
-            std::shared_ptr<core::dbus::Object> object;
-            std::shared_ptr<core::dbus::Property<Property::Frequency>> frequency;
-            std::shared_ptr<core::dbus::Property<Property::HwAddress>> hw_address;
-            std::shared_ptr<core::dbus::Property<Property::Strength>> strength;
-            std::shared_ptr<core::dbus::Property<Property::Flags>> flags;
-            std::shared_ptr<core::dbus::Property<Property::WpaFlags>> wpa_flags;
-            std::shared_ptr<core::dbus::Property<Property::RsnFlags>> rsn_flags;
-            std::shared_ptr<core::dbus::Property<Property::Mode>> mode;
-            std::shared_ptr<core::dbus::Property<Property::Ssid>> ssid;
-            std::shared_ptr<core::dbus::Signal<Signal::PropertiesChanged, Signal::PropertiesChanged::ArgumentType>> properties_changed;
-        }; // Interface::AccessPoint
-
-
-        struct ActiveConnection
-        {
-            static const std::string& name()
-            {
-                static const std::string s{NM_DBUS_INTERFACE_ACTIVE_CONNECTION};
-                return s;
-            }
-
-            struct Property {
-                struct Connection
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"Connection"};
-                        return s;
-                    }
-
-                    typedef ActiveConnection Interface;
-                    typedef core::dbus::types::ObjectPath ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-                struct SpecificObject
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"SpecificObject"};
-                        return s;
-                    }
-
-                    typedef ActiveConnection Interface;
-                    typedef core::dbus::types::ObjectPath ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-                struct Uuid
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"Uuid"};
-                        return s;
-                    }
-
-                    typedef ActiveConnection Interface;
-                    typedef std::string ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-                struct Devices
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"Devices"};
-                        return s;
-                    }
-
-                    typedef ActiveConnection Interface;
-                    typedef std::vector<core::dbus::types::ObjectPath> ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-                struct State
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"State"};
-                        return s;
-                    }
-
-                    typedef ActiveConnection Interface;
-                    typedef std::uint32_t ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-                struct Default
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"Default"};
-                        return s;
-                    }
-
-                    typedef ActiveConnection Interface;
-                    typedef bool ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-                struct Default6
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"Default6"};
-                        return s;
-                    }
-
-                    typedef ActiveConnection Interface;
-                    typedef bool ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-                struct Vpn
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"Vpn"};
-                        return s;
-                    }
-
-                    typedef ActiveConnection Interface;
-                    typedef bool ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-                struct Master
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"Master"};
-                        return s;
-                    }
-
-                    typedef ActiveConnection Interface;
-                    typedef bool ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-            }; // struct Property
-
-            struct Signal {
-                struct PropertiesChanged
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"PropertiesChanged"};
-                        return s;
-                    }
-
-                    typedef ActiveConnection Interface;
-                    typedef std::map<std::string, core::dbus::types::Variant> ArgumentType;
-                };
-            };
-
-            enum class State
-            {
-                unknown      = NM_ACTIVE_CONNECTION_STATE_UNKNOWN,
-                activating   = NM_ACTIVE_CONNECTION_STATE_ACTIVATING,
-                activated    = NM_ACTIVE_CONNECTION_STATE_ACTIVATED,
-                deactivating = NM_ACTIVE_CONNECTION_STATE_DEACTIVATING,
-                deactivated  = NM_ACTIVE_CONNECTION_STATE_DEACTIVATED
-            };
-
-            ActiveConnection(const std::shared_ptr<core::dbus::Object>& object)
-                : object(object),
-                  connection(object->get_property<Property::Connection>()),
-                  specific_object(object->get_property<Property::SpecificObject>()),
-                  uuid(object->get_property<Property::Uuid>()),
-                  devices(object->get_property<Property::Devices>()),
-                  state(object->get_property<Property::State>()),
-                  default_ipv4(object->get_property<Property::Default>()),
-                  default_ipv6(object->get_property<Property::Default6>()),
-                  vpn(object->get_property<Property::Vpn>()),
-                  master(object->get_property<Property::Master>()),
-                  properties_changed(object->get_signal<Signal::PropertiesChanged>())
-            {
-                token = properties_changed->connect([this](const Signal::PropertiesChanged::ArgumentType &map){
-                    for (auto entry: map) {
-                        if (entry.first == "State") {
-#if 0
-                            std::uint32_t new_value = entry.second.as<std::uint32_t>();
-                            state->update([&new_value](std::uint32_t &current_value){
-                                if (new_value == current_value)
-                                    return false;
-                                current_value = new_value;
-                                return true;
-                            });
-#endif
-                            continue;
-                        }
-                        else {
-                            std::cout << "Unexpected Connection.Active update: " << entry.first << std::endl;
-                        }
-                    }
-                });
-            }
-            ~ActiveConnection()
-            {
-                /// @todo fix dbus-cpp...
-                //properties_changed->disconnect(token);
-            }
-
-            State get_state() { return static_cast<State>(state->get()); }
-
-            std::shared_ptr<core::dbus::Object> object;
-            std::shared_ptr<core::dbus::Property<Property::Connection>> connection;
-            std::shared_ptr<core::dbus::Property<Property::SpecificObject>> specific_object;
-            std::shared_ptr<core::dbus::Property<Property::Uuid>> uuid;
-            std::shared_ptr<core::dbus::Property<Property::Devices>> devices;
-            std::shared_ptr<core::dbus::Property<Property::State>> state;
-            std::shared_ptr<core::dbus::Property<Property::Default>> default_ipv4;
-            std::shared_ptr<core::dbus::Property<Property::Default6>> default_ipv6;
-            std::shared_ptr<core::dbus::Property<Property::Vpn>> vpn;
-            std::shared_ptr<core::dbus::Property<Property::Master>> master;
-
-        private:
-            std::shared_ptr<core::dbus::Signal<Signal::PropertiesChanged, Signal::PropertiesChanged::ArgumentType>> properties_changed;
-            core::dbus::Signal<Signal::PropertiesChanged, Signal::PropertiesChanged::ArgumentType>::SubscriptionToken token;
-        };  // Interface::ActiveConnection
-
-        struct Connection
-        {
-            std::shared_ptr<core::dbus::Object> object;
-
-            Connection(const std::shared_ptr<core::dbus::Object>& object)
-                : object(object)
-            {}
-
-            static const std::string& name()
-            {
-                static const std::string s{NM_DBUS_IFACE_SETTINGS_CONNECTION};
-                return s;
-            }
-
-            struct Method {
-                struct GetSettings
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"GetSettings"};
-                        return s;
-                    }
-
-                    typedef Connection Interface;
-                    typedef std::map<std::string, std::map<std::string, core::dbus::types::Variant>> ResultType;
-
-                    static std::chrono::milliseconds default_timeout()
-                    {
-                        return std::chrono::seconds{1};
-                    }
-                };
-            };
-
-            Method::GetSettings::ResultType
-            get_settings()
-            {
-
-                auto result = object->invoke_method_synchronously<Method::GetSettings, Method::GetSettings::ResultType>();
-
-                if (result.is_error())
-                    connectivity::throw_dbus_exception(result.error());
-
-                return result.value();
-            }
-        }; // Interface::Connection
-
-        struct Device
-        {
-            static const std::string& name()
-            {
-                static const std::string s{NM_DBUS_INTERFACE_DEVICE};
-                return s;
-            }
-
-            enum class Type
-            {
-                unknown     = NM_DEVICE_TYPE_UNKNOWN,
-                ethernet    = NM_DEVICE_TYPE_ETHERNET,
-                wifi        = NM_DEVICE_TYPE_WIFI,
-                unused_1    = NM_DEVICE_TYPE_UNUSED1,
-                unused_2    = NM_DEVICE_TYPE_UNUSED2,
-                bluetooth   = NM_DEVICE_TYPE_BT,
-                olpc_mesh   = NM_DEVICE_TYPE_OLPC_MESH,
-                wimax       = NM_DEVICE_TYPE_WIMAX,
-                modem       = NM_DEVICE_TYPE_MODEM,
-                infiniband  = NM_DEVICE_TYPE_INFINIBAND,
-                bond        = NM_DEVICE_TYPE_BOND,
-                vlan        = NM_DEVICE_TYPE_VLAN,
-                adsl        = NM_DEVICE_TYPE_ADSL,
-                bridge      = NM_DEVICE_TYPE_BRIDGE
-            };
-
-            struct Wireless
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{NM_DBUS_INTERFACE_DEVICE_WIRELESS};
-                    return s;
-                }
-
-                struct Method {
-                    struct GetAccessPoints
-                    {
-                        static const std::string& name()
-                        {
-                            static const std::string s{"GetAccessPoints"};
-                            return s;
-                        }
-
-                        typedef Wireless Interface;
-                        typedef std::vector<core::dbus::types::ObjectPath> ResultType;
-
-                        static std::chrono::milliseconds default_timeout()
-                        {
-                            return std::chrono::seconds{1};
-                        }
-                    };
-                };
-
-                struct Signal {
-                    struct AccessPointAdded
-                    {
-                        static const std::string& name()
-                        {
-                            static const std::string s{"AccessPointAdded"};
-                            return s;
-                        }
-
-                        typedef Wireless Interface;
-                        typedef core::dbus::types::ObjectPath ArgumentType;
-                    };
-
-                    struct AccessPointRemoved
-                    {
-                        static const std::string& name()
-                        {
-                            static const std::string s{"AccessPointRemoved"};
-                            return s;
-                        }
-
-                        typedef Wireless Interface;
-                        typedef core::dbus::types::ObjectPath ArgumentType;
-                    };
-                };
-
-                Wireless(std::shared_ptr<core::dbus::Object> &base)
-                    : access_point_added(base->get_signal<Signal::AccessPointAdded>()),
-                      access_point_removed(base->get_signal<Signal::AccessPointRemoved>())
-                {}
-
-                std::shared_ptr<core::dbus::Signal<Signal::AccessPointAdded, Signal::AccessPointAdded::ArgumentType>> access_point_added;
-                std::shared_ptr<core::dbus::Signal<Signal::AccessPointRemoved, Signal::AccessPointRemoved::ArgumentType>> access_point_removed;
-
-            }; // Interface::Device::Wireless
-
-            struct Property {
-                struct DeviceType
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"DeviceType"};
-                        return s;
-                    }
-
-                    typedef Device Interface;
-                    typedef std::uint32_t ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-
-                struct DeviceInterface {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"Interface"};
-                        return s;
-                    }
-
-                    typedef Device Interface;
-                    typedef std::string ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-
-                struct Autoconnect
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"Autoconnect"};
-                        return s;
-                    }
-
-                    typedef Device Interface;
-                    typedef bool ValueType;
-                    static const bool readable = true;
-                    static const bool writable = true;
-                };
-
-                struct State {
-                    static const std::string &name()
-                    {
-                        static const std::string s{"State"};
-                        return s;
-                    }
-
-                    typedef Device Interface;
-                    typedef std::uint32_t ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-
-                struct AvailableConnections {
-                    static const std::string &name()
-                    {
-                        static const std::string s{"AvailableConnections"};
-                        return s;
-                    }
-
-                    typedef Device Interface;
-                    typedef std::vector<core::dbus::types::ObjectPath> ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-
-                struct ActiveConnection {
-                    static const std::string &name()
-                    {
-                        static const std::string s{"ActiveConnection"};
-                        return s;
-                    }
-
-                    typedef Device Interface;
-                    typedef core::dbus::types::ObjectPath ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-            };
-
-            std::vector<Connection>
-            get_available_connections() {
-                std::vector<Connection> list;
-                for (auto c: available_connections->get()) {
-                    list.push_back(Connection(service->object_for_path(c)));
-                }
-                return list;
-            }
-
-            struct Method {
-
-                struct Disconnect
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"Disconnect"};
-                        return s;
-                    }
-
-                    typedef Device Interface;
-                    typedef void ResultType;
-
-                    static std::chrono::milliseconds default_timeout()
-                    {
-                        return std::chrono::seconds{1};
-                    }
-                };
-            };
-
-            void disconnect()
-            {
-                auto result =
-                        object->invoke_method_synchronously<
-                            Device::Method::Disconnect, Device::Method::Disconnect::ResultType>();
-
-                if (result.is_error())
-                    connectivity::throw_dbus_exception(result.error());
-            }
-
-            struct Signal {
-                struct StateChanged
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"StateChanged"};
-                        return s;
-                    }
-
-                    typedef Device Interface;
-                    typedef std::tuple<std::uint32_t, std::uint32_t, std::uint32_t> ArgumentType;
-                };
-            };
-
-
-            Type type() const
-            {
-                return static_cast<Type>(device_type->get());
-            }
-
-            std::string interface() const
-            {
-                return device_interface->get();
-            }
-
-            Wireless::Method::GetAccessPoints::ResultType get_access_points() const
-            {
-                auto result = object->invoke_method_synchronously<Wireless::Method::GetAccessPoints,
-                                                                  Wireless::Method::GetAccessPoints::ResultType>();
-
-                if (result.is_error())
-                    connectivity::throw_dbus_exception(result.error());
-
-                return result.value();
-            }
-
-            Device(const std::shared_ptr<core::dbus::Service>& service,
-                   const std::shared_ptr<core::dbus::Object>& object)
-                : service(service),
-                  object(object),
-                  device_type(object->get_property<Property::DeviceType>()),
-                  autoconnect(object->get_property<Property::Autoconnect>()),
-                  device_interface(object->get_property<Property::DeviceInterface>()),
-                  state(object->get_property<Property::State>()),
-                  state_changed(object->get_signal<Signal::StateChanged>()),
-                  available_connections(object->get_property<Property::AvailableConnections>()),
-                  active_connection(object->get_property<Property::ActiveConnection>())
-            {}
-
-            std::shared_ptr<core::dbus::Service> service;
-            std::shared_ptr<core::dbus::Object> object;
-            std::shared_ptr<core::dbus::Property<Property::DeviceType>> device_type;
-            std::shared_ptr<core::dbus::Property<Property::Autoconnect>> autoconnect;
-            std::shared_ptr<core::dbus::Property<Property::DeviceInterface>> device_interface;
-            std::shared_ptr<core::dbus::Property<Property::State>> state;
-            std::shared_ptr<core::dbus::Signal<Signal::StateChanged, Signal::StateChanged::ArgumentType>> state_changed;
-            std::shared_ptr<core::dbus::Property<Property::AvailableConnections>> available_connections;
-            std::shared_ptr<core::dbus::Property<Property::ActiveConnection>> active_connection;
-        }; // Interface::Device
-
-        struct NetworkManager
-        {
-            static const std::string& name()
-            {
-                static const std::string s{NM_DBUS_INTERFACE};
-                return s;
-            }
-
-            struct Method {
-                struct ActivateConnection
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"ActivateConnection"};
-                        return s;
-                    }
-
-                    typedef NetworkManager Interface;
-                    typedef core::dbus::types::ObjectPath ResultType;
-
-                    static std::chrono::milliseconds default_timeout()
-                    {
-                        return std::chrono::seconds{1};
-                    }
-                };
-
-                struct AddAndActivateConnection
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"AddAndActivateConnection"};
-                        return s;
-                    }
-
-                    typedef NetworkManager Interface;
-                    typedef std::tuple<core::dbus::types::ObjectPath, core::dbus::types::ObjectPath> ResultType;
-
-                    static std::chrono::milliseconds default_timeout()
-                    {
-                        return std::chrono::seconds{1};
-                    }
-                };
-
-                struct GetDevices
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"GetDevices"};
-                        return s;
-                    }
-
-                    typedef NetworkManager Interface;
-                    typedef std::vector<core::dbus::types::ObjectPath> ResultType;
-
-                    static std::chrono::milliseconds default_timeout()
-                    {
-                        return std::chrono::seconds{1};
-                    }
-                };
-
-            };
-
-
-            struct Property
-            {
-                struct WirelessEnabled {
-                    static const std::string &name()
-                    {
-                        static const std::string s{"WirelessEnabled"};
-                        return s;
-                    }
-
-                    typedef NetworkManager Interface;
-                    typedef bool ValueType;
-                    static const bool readable = true;
-                    static const bool writable = true;
-                };
-
-                struct State {
-                    static const std::string &name()
-                    {
-                        static const std::string s{"State"};
-                        return s;
-                    }
-
-                    typedef NetworkManager Interface;
-                    typedef std::uint32_t ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-
-                struct PrimaryConnection {
-                    static const std::string &name()
-                    {
-                        static const std::string s{"PrimaryConnection"};
-                        return s;
-                    }
-
-                    typedef NetworkManager Interface;
-                    typedef core::dbus::types::ObjectPath ValueType;
-                    static const bool readable = true;
-                    static const bool writable = false;
-                };
-
-            };
-
-            struct Signal {
-
-                struct PropertiesChanged
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"PropertiesChanged"};
-                        return s;
-                    }
-
-                    typedef NetworkManager Interface;
-                    typedef std::map<std::string, core::dbus::types::Variant> ArgumentType;
-                };
-
-                struct DeviceAdded
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"DeviceAdded"};
-                        return s;
-                    }
-
-                    typedef NetworkManager Interface;
-                    typedef core::dbus::types::ObjectPath ArgumentType;
-                };
-
-                struct DeviceRemoved
-                {
-                    static const std::string& name()
-                    {
-                        static const std::string s{"DeviceRemoved"};
-                        return s;
-                    }
-
-                    typedef NetworkManager Interface;
-                    typedef core::dbus::types::ObjectPath ArgumentType;
-                };
-            };
-
-            Method::ActivateConnection::ResultType
-            activate_connection(const core::dbus::types::ObjectPath &connection,
-                                const core::dbus::types::ObjectPath &device,
-                                const core::dbus::types::ObjectPath &specific_object)
-            {
-                auto result =
-                        object->invoke_method_synchronously<
-                            Method::ActivateConnection,
-                            Method::ActivateConnection::ResultType>
-                        (connection, device, specific_object);
-
-                if (result.is_error())
-                    connectivity::throw_dbus_exception(result.error());
-
-                return result.value();
-            }
-
-            Method::AddAndActivateConnection::ResultType
-            add_and_activate_connection(std::map<std::string, std::map<std::string, core::dbus::types::Variant>> &connection,
-                                        const core::dbus::types::ObjectPath &device,
-                                        const core::dbus::types::ObjectPath &specific_object)
-            {
-                auto result =
-                        object->invoke_method_synchronously<
-                            Method::AddAndActivateConnection,
-                            Method::AddAndActivateConnection::ResultType>
-                        (connection, device, specific_object);
-
-                if (result.is_error())
-                    connectivity::throw_dbus_exception(result.error());
-
-
-                /// @todo return the settings (std::get<0>) object at some point
-                return result.value();
-            }
-
-            std::vector<Device> get_devices()
-            {
-                auto result =
-                        object->invoke_method_synchronously<
-                            Method::GetDevices,
-                            Method::GetDevices::ResultType>();
-
-                if (result.is_error())
-                    connectivity::throw_dbus_exception(result.error());
-
-                std::vector<Device> devices;
-                for (const auto& path : result.value())
-                {
-                    devices.emplace_back(
-                                Device(
-                                    service,
-                                    service->object_for_path(path)));
-                }
-
-                return devices;
-            }
-
-            NetworkManager(std::shared_ptr<core::dbus::Service> &service,
-                           std::shared_ptr<core::dbus::Object> &object)
-                : service(service),
-                  object(object),
-                  wireless_enabled(object->get_property<Property::WirelessEnabled>()),
-                  state(object->get_property<Property::State>()),
-                  properties_changed(object->get_signal<Signal::PropertiesChanged>()),
-                  primary_connection(object->get_property<Property::PrimaryConnection>()),
-                  device_added(object->get_signal<Signal::DeviceAdded>()),
-                  device_removed(object->get_signal<Signal::DeviceRemoved>())
-            {
-            }
-
-            std::shared_ptr<core::dbus::Service> service;
-            std::shared_ptr<core::dbus::Object> object;
-
-            std::shared_ptr<core::dbus::Property<Property::WirelessEnabled>> wireless_enabled;
-            std::shared_ptr<core::dbus::Property<Property::State>> state;
-            std::shared_ptr<core::dbus::Signal<Signal::PropertiesChanged, Signal::PropertiesChanged::ArgumentType>> properties_changed;
-            std::shared_ptr<core::dbus::Property<Property::PrimaryConnection>> primary_connection;
-            std::shared_ptr<core::dbus::Signal<Signal::DeviceAdded, Signal::DeviceAdded::ArgumentType>> device_added;
-            std::shared_ptr<core::dbus::Signal<Signal::DeviceRemoved, Signal::DeviceRemoved::ArgumentType>> device_removed;
-        }; // Interface::NetworkManager
-    };
-
-    struct Service
-    {
-        std::shared_ptr<Interface::NetworkManager> nm;
-
-        Service(const core::dbus::Bus::Ptr& bus)
-        {
-            auto service = core::dbus::Service::use_service<Interface::NetworkManager>(bus);
-            auto object = service->object_for_path(core::dbus::types::ObjectPath(NM_DBUS_PATH));
-            nm = std::make_shared<Interface::NetworkManager>(service, object);
-        }
-
-        struct Mock
-        {
-            std::shared_ptr<Interface::NetworkManager> nm;
-
-            Mock(const core::dbus::Bus::Ptr& bus)
-            {
-                auto service = core::dbus::Service::add_service<Interface::NetworkManager>(bus);
-                auto object = service->add_object_for_path(core::dbus::types::ObjectPath(NM_DBUS_PATH));
-                nm = std::make_shared<Interface::NetworkManager>(service, object);
-            }
-        };
-    };
-}
-}
-}
-
-#endif // PLATFORM_MANAGER_NMOFONO_NM_H

=== removed file 'dbus-cpp/services/ofono.h'
--- dbus-cpp/services/ofono.h	2014-04-14 07:39:46 +0000
+++ dbus-cpp/services/ofono.h	1970-01-01 00:00:00 +0000
@@ -1,339 +0,0 @@
-/*
- * Copyright © 2012-2013 Canonical Ltd.
- *
- * 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: Thomas Voß <[e-mail]>
- */
-#ifndef LOCATION_SERVICE_LOCATION_CONNECTIVITY_OFONO_H
-#define LOCATION_SERVICE_LOCATION_CONNECTIVITY_OFONO_H
-
-#include <core/dbus/bus.h>
-#include <core/dbus/object.h>
-#include <core/dbus/property.h>
-#include <core/dbus/service.h>
-#include <core/dbus/types/object_path.h>
-#include <core/dbus/types/struct.h>
-#include <core/dbus/types/stl/map.h>
-#include <core/dbus/types/stl/string.h>
-#include <core/dbus/types/stl/tuple.h>
-#include <core/dbus/types/stl/vector.h>
-#include<com/ubuntu/connectivity/util.h>
-
-namespace org
-{
-struct Ofono
-{
-static const std::string& name()
-{
-    static const std::string s{"org.ofono"};
-    return s;
-}
-struct Manager
-{
-    static const std::string& name()
-    {
-        static const std::string s{"org.ofono.Manager"};
-        return s;
-    }
-
-    struct GetModems
-    {
-        static const std::string& name()
-        {
-            static const std::string s{"GetModems"};
-            return s;
-        }
-
-        typedef Manager Interface;
-        typedef std::vector<
-            core::dbus::types::Struct<
-                core::dbus::types::ObjectPath
-            >
-        > ResultType;
-
-        static std::chrono::milliseconds default_timeout()
-        {
-            return std::chrono::seconds{1};
-        }
-    };
-
-    struct ModemAdded
-    {
-        static const std::string& name()
-        {
-            static const std::string s{"ModemAdded"};
-            return s;
-        }
-
-        typedef Manager Interface;
-        typedef std::tuple<core::dbus::types::ObjectPath, std::map<std::string, std::string>> ArgumentType;
-    };
-
-    struct ModemRemoved
-    {
-        static const std::string& name()
-        {
-            static const std::string s{"ModemRemoved"};
-            return s;
-        }
-
-        typedef Manager Interface;
-        typedef core::dbus::types::ObjectPath ArgumentType;
-    };
-
-    struct Modem
-    {
-        struct NetworkRegistration
-        {
-            static const std::string& name()
-            {
-                static const std::string s{"org.ofono.NetworkRegistration"};
-                return s;
-            }
-
-            struct GetProperties
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"GetProperties"};
-                    return s;
-                }
-
-                typedef NetworkRegistration Interface;
-                typedef std::map<std::string, core::dbus::types::Variant<>> ValueType;
-
-                static std::chrono::milliseconds default_timeout()
-                {
-                    return std::chrono::seconds{1};
-                }
-            };
-
-            struct Mode
-            {
-                static const char* unregistered() { return "unregistered"; }
-                static const char* registered() { return "registered"; }
-                static const char* searching() { return "searching"; }
-                static const char* denied() { return "denied"; }
-                static const char* unknown() { return "unknown"; }
-                static const char* roaming() { return "roaming"; }
-
-                static const std::string& name()
-                {
-                    static const std::string s{"Mode"};
-                    return s;
-                }
-
-                typedef NetworkRegistration Interface;
-                typedef std::string ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct LocationAreaCode
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"LocationAreaCode"};
-                    return s;
-                }
-
-                typedef NetworkRegistration Interface;
-                typedef std::uint16_t ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct CellId
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"CellId"};
-                    return s;
-                }
-
-                typedef NetworkRegistration Interface;
-                typedef std::uint32_t ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct MobileCountryCode
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"MobileCountryCode"};
-                    return s;
-                }
-
-                typedef NetworkRegistration Interface;
-                typedef std::string ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct MobileNetworkCode
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"MobileNetworkCode"};
-                    return s;
-                }
-
-                typedef NetworkRegistration Interface;
-                typedef std::string ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct Technology
-            {
-                static const char* gsm() { return "gsm"; }
-                static const char* edge() { return "edge"; }
-                static const char* umts() { return "umts"; }
-                static const char* hspa() { return "hspa"; }
-                static const char* lte() { return "lte"; }
-
-                static const std::string& name()
-                {
-                    static const std::string s{"Technology"};
-                    return s;
-                }
-
-                typedef NetworkRegistration Interface;
-                typedef std::string ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            struct Strength
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"Strength"};
-                    return s;
-                }
-
-                typedef NetworkRegistration Interface;
-                typedef std::int8_t ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-
-            NetworkRegistration(const std::shared_ptr<core::dbus::Object>& object)
-                : object(object),
-                  properties{}
-            {
-                auto result = object->invoke_method_synchronously<GetProperties, GetProperties::ValueType>();
-                if (result.is_error())
-                    connectivity::throw_dbus_exception(result.error());
-
-                properties = result.value();
-            }
-
-            template<typename Property>
-            typename Property::ValueType get(
-                    const typename Property::ValueType& default_value = typename Property::ValueType{}) const
-            {
-                try
-                {
-                    core::dbus::types::Any value = properties.at(Property::name()).get();
-                    typename Property::ValueType result; value.reader() >> result;
-
-                    return result;
-                } catch(...)
-                {
-                }
-
-                return default_value;
-            }
-
-            std::shared_ptr<core::dbus::Object> object;
-            GetProperties::ValueType properties;
-        };
-
-        Modem(const std::shared_ptr<core::dbus::Service>& service,
-              const std::shared_ptr<core::dbus::Object>& object)
-            : service(service),
-              object(object),
-              network_registration{object}
-        {
-        }
-
-        std::shared_ptr<core::dbus::Service> service;
-        std::shared_ptr<core::dbus::Object> object;
-        NetworkRegistration network_registration;
-    };
-
-    Manager(const core::dbus::Bus::Ptr& bus)
-        : service(core::dbus::Service::use_service<org::Ofono>(bus)),
-          object(service->object_for_path(core::dbus::types::ObjectPath("/"))),
-          modem_added(object->get_signal<ModemAdded>()),
-          modem_removed(object->get_signal<ModemRemoved>())
-    {
-        auto result = object->invoke_method_synchronously<GetModems, GetModems::ResultType>();
-
-        if (result.is_error())
-            connectivity::throw_dbus_exception(result.error());
-
-        for (const auto& element : result.value())
-        {
-            modems.insert(
-                        std::make_pair(
-                            element.value,
-                            Modem
-                            {
-                                service,
-                                service->object_for_path(element.value)
-                            }));
-        }
-
-        modem_added->connect([this](const ModemAdded::ArgumentType& arg)
-        {
-            std::lock_guard<std::mutex> lg(guard);
-            modems.insert(
-                        std::make_pair(
-                            std::get<0>(arg),
-                            Modem{
-                                service,
-                                service->object_for_path(std::get<0>(arg))
-                            }));
-        });
-
-        modem_removed->connect([this](const ModemRemoved::ArgumentType& arg)
-        {
-            std::lock_guard<std::mutex> lg(guard);
-            modems.erase(arg);
-        });
-    }
-
-    void for_each_modem(const std::function<void(const Modem&)>& functor) const
-    {
-        std::lock_guard<std::mutex> lg(guard);
-        for (const auto& modem : modems)
-        {
-            functor(modem.second);
-        }
-    }
-
-    std::shared_ptr<core::dbus::Service> service;
-    std::shared_ptr<core::dbus::Object> object;
-    std::shared_ptr<core::dbus::Signal<ModemAdded, ModemAdded::ArgumentType>> modem_added;
-    std::shared_ptr<core::dbus::Signal<ModemRemoved, ModemRemoved::ArgumentType>> modem_removed;
-    mutable std::mutex guard;
-    std::map<core::dbus::types::ObjectPath, Modem> modems;
-};
-};
-}
-
-#endif // LOCATION_SERVICE_LOCATION_CONNECTIVITY_OFONO_H

=== removed file 'dbus-cpp/services/urfkill.h'
--- dbus-cpp/services/urfkill.h	2014-05-30 13:18:36 +0000
+++ dbus-cpp/services/urfkill.h	1970-01-01 00:00:00 +0000
@@ -1,338 +0,0 @@
-/*
- * Copyright © 2014 Canonical Ltd.
- *
- * 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: Antti Kaijanmäki <[e-mail]>
- */
-#ifndef PLATFORM_MANAGER_NMOFONO_URFKILL_H
-#define PLATFORM_MANAGER_NMOFONO_URFKILL_H
-
-#include <core/dbus/bus.h>
-#include <core/dbus/object.h>
-#include <core/dbus/property.h>
-#include <core/dbus/service.h>
-#include <core/dbus/types/object_path.h>
-#include <core/dbus/types/any.h>
-#include <core/dbus/types/struct.h>
-#include <core/dbus/types/stl/map.h>
-#include <core/dbus/types/stl/string.h>
-#include <core/dbus/types/stl/tuple.h>
-#include <core/dbus/types/stl/vector.h>
-#include "util.h"
-
-namespace org
-{
-namespace freedesktop
-{
-namespace URfkill
-{
-
-struct Interface
-{
-    struct Killswitch
-    {
-        static const std::string& name()
-        {
-            static const std::string s{"org.freedesktop.URfkill.Killswitch"};
-            return s;
-        }
-
-        struct Property
-        {
-            struct State
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"state"};
-                    return s;
-                }
-
-                typedef Killswitch Interface;
-                typedef std::int32_t ValueType;
-                static const bool readable = true;
-                static const bool writable = false;
-            };
-        };
-
-        enum class Type;
-        Killswitch(const std::shared_ptr<core::dbus::Object>& object,
-                   Type type)
-            : object(object),
-              type(type),
-              _state(object->get_property<Property::State>())
-        {
-            _state->changed().connect(std::bind(&Killswitch::_stateChanged, this, std::placeholders::_1));
-            _stateChanged(_state->get());
-        }
-
-        enum class State
-        {
-            not_available = -1,
-            unblocked = 0,
-            soft_blocked = 1,
-            hard_blocked = 2
-        };
-
-        enum class Type {
-            bluetooth,
-            fm,
-            gps,
-            nfc,
-            uwb,
-            wimax,
-            wlan,
-            wwan
-        };
-
-        static const std::string path(Type type)
-        {
-            switch(type) {
-            case Type::bluetooth:
-                return "/org/freedesktop/URfkill/BLUETOOTH";
-            case Type::fm:
-                return "/org/freedesktop/URfkill/FM";
-            case Type::gps:
-                return "/org/freedesktop/URfkill/GPS";
-            case Type::nfc:
-                return "/org/freedesktop/URfkill/NFC";
-            case Type::uwb:
-                return "/org/freedesktop/URfkill/UWB";
-            case Type::wimax:
-                return "/org/freedesktop/URfkill/WIMAX";
-            case Type::wlan:
-                return "/org/freedesktop/URfkill/WLAN";
-            case Type::wwan:
-                return "/org/freedesktop/URfkill/WWAN";
-            }
-
-            return "";
-        }
-
-        void _stateChanged(Property::State::ValueType val)
-        {
-            if (val == -1)
-                state.set(State::not_available);
-            else if (val == 0)
-                state.set(State::unblocked);
-            else if (val == 1)
-                state.set(State::soft_blocked);
-            else if (val == 2)
-                state.set(State::hard_blocked);
-            else
-                throw std::runtime_error("got unknown Killswitch state from urfkill: " + std::to_string(val));
-        }
-
-        std::shared_ptr<core::dbus::Object> object;
-        const Type type;
-        std::shared_ptr<core::dbus::Property<Property::State>> _state;
-        core::Property<State> state;
-    };
-
-    struct URfkill
-    {
-        static const std::string& name()
-        {
-            static const std::string s{"org.freedesktop.URfkill"};
-            return s;
-        }
-
-        struct Method
-        {
-            struct Block
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"Block"};
-                    return s;
-                }
-
-                typedef URfkill Interface;
-                typedef bool ResultType;
-
-                static std::chrono::milliseconds default_timeout()
-                {
-                    return std::chrono::seconds{5};
-                }
-            };
-
-            struct FlightMode
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"FlightMode"};
-                    return s;
-                }
-
-                typedef URfkill Interface;
-                typedef bool ResultType;
-
-                static std::chrono::milliseconds default_timeout()
-                {
-                    return std::chrono::seconds{5};
-                }
-            };
-
-            struct IsFlightMode
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"IsFlightMode"};
-                    return s;
-                }
-
-                typedef URfkill Interface;
-                typedef bool ResultType;
-
-                static std::chrono::milliseconds default_timeout()
-                {
-                    return std::chrono::seconds{1};
-                }
-            };
-        };
-
-        struct Signal
-        {
-            struct FlightModeChanged
-            {
-                static const std::string& name()
-                {
-                    static const std::string s{"FlightModeChanged"};
-                    return s;
-                }
-
-                typedef URfkill Interface;
-                typedef bool ArgumentType;
-            };
-        };
-
-        URfkill(std::shared_ptr<core::dbus::Service> &service,
-                std::shared_ptr<core::dbus::Object> &object)
-            : service{service},
-              object{object},
-              flightModeChanged{object->get_signal<Signal::FlightModeChanged>()}
-        {
-            switches[Killswitch::Type::bluetooth] = std::make_shared<Killswitch>(service->object_for_path(Killswitch::path(Killswitch::Type::bluetooth)), Killswitch::Type::bluetooth);
-            switches[Killswitch::Type::fm]        = std::make_shared<Killswitch>(service->object_for_path(Killswitch::path(Killswitch::Type::fm)),        Killswitch::Type::fm);
-            switches[Killswitch::Type::gps]       = std::make_shared<Killswitch>(service->object_for_path(Killswitch::path(Killswitch::Type::gps)),       Killswitch::Type::gps);
-            switches[Killswitch::Type::nfc]       = std::make_shared<Killswitch>(service->object_for_path(Killswitch::path(Killswitch::Type::nfc)),       Killswitch::Type::nfc);
-            switches[Killswitch::Type::uwb]       = std::make_shared<Killswitch>(service->object_for_path(Killswitch::path(Killswitch::Type::uwb)),       Killswitch::Type::uwb);
-            switches[Killswitch::Type::wimax]     = std::make_shared<Killswitch>(service->object_for_path(Killswitch::path(Killswitch::Type::wimax)),     Killswitch::Type::wimax);
-            switches[Killswitch::Type::wlan]      = std::make_shared<Killswitch>(service->object_for_path(Killswitch::path(Killswitch::Type::wlan)),      Killswitch::Type::wlan);
-            switches[Killswitch::Type::wwan]      = std::make_shared<Killswitch>(service->object_for_path(Killswitch::path(Killswitch::Type::wwan)),      Killswitch::Type::wwan);
-        }
-
-        bool block(Killswitch::Type type, bool block)
-        {
-            std::uint32_t utype;
-            switch (type) {
-            case Killswitch::Type::bluetooth:
-                utype = 2;
-                break;
-            case Killswitch::Type::fm:
-                utype = 7;
-                break;
-            case Killswitch::Type::gps:
-                utype = 6;
-                break;
-            case Killswitch::Type::nfc:
-                utype = 8; /// @todo verify me
-                break;
-            case Killswitch::Type::uwb:
-                utype = 3;
-                break;
-            case Killswitch::Type::wimax:
-                utype = 4;
-                break;
-            case Killswitch::Type::wlan:
-                utype = 1;
-                break;
-            case Killswitch::Type::wwan:
-                utype = 5;
-                break;
-            }
-            // we can't handle "all" (0) with this, but that's deprecated by FlightMode anyway
-
-            auto result =
-                    object->invoke_method_synchronously<
-                       Method::Block, Method::Block::ResultType>
-                    (utype, block);
-
-            if (result.is_error())
-                throw std::runtime_error(result.error().print());
-
-            return result.value();
-        }
-
-        bool flightMode(bool block)
-        {
-            auto result =
-                    object->invoke_method_synchronously<
-                       Method::FlightMode, Method::FlightMode::ResultType>
-                    (block);
-
-            if (result.is_error())
-                throw std::runtime_error(result.error().print());
-
-            return result.value();
-        }
-
-        bool isFlightMode()
-        {
-            auto result =
-                    object->invoke_method_synchronously<
-                       Method::IsFlightMode, Method::IsFlightMode::ResultType>
-                    ();
-
-            if (result.is_error())
-                throw std::runtime_error(result.error().print());
-
-            return result.value();
-        }
-
-        std::shared_ptr<core::dbus::Service> service;
-        std::shared_ptr<core::dbus::Object> object;
-        std::shared_ptr<core::dbus::Signal<Signal::FlightModeChanged, Signal::FlightModeChanged::ArgumentType>> flightModeChanged;
-
-        std::map<Killswitch::Type, std::shared_ptr<Killswitch>> switches;
-    };
-};
-
-struct Service
-{
-    std::shared_ptr<Interface::URfkill> urfkill;
-
-    Service(const core::dbus::Bus::Ptr& bus)
-    {
-        auto service = core::dbus::Service::use_service<Interface::URfkill>(bus);
-        auto object = service->object_for_path(core::dbus::types::ObjectPath("/org/freedesktop/URfkill"));
-        urfkill = std::make_shared<Interface::URfkill>(service, object);
-    }
-
-    struct Mock
-    {
-        std::shared_ptr<Interface::URfkill> urfkill;
-
-        Mock(const core::dbus::Bus::Ptr& bus)
-        {
-            auto service = core::dbus::Service::add_service<Interface::URfkill>(bus);
-            auto object = service->add_object_for_path(core::dbus::types::ObjectPath("/org/freedesktop/URfkill"));
-            urfkill = std::make_shared<Interface::URfkill>(service, object);
-        }
-    };
-};
-}
-}
-}
-
-#endif // PLATFORM_MANAGER_NMOFONO_URFKILL_H

=== removed file 'dbus-cpp/services/util.h'
--- dbus-cpp/services/util.h	2014-04-23 13:27:07 +0000
+++ dbus-cpp/services/util.h	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-/*
- * Copyright © 2013 Canonical Ltd.
- *
- * 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/>.
- *
- * Authors:
- *     Jussi Pakkanen <[e-mail]>
- */
-
-#ifndef CONNECTIVITY_UTIL_H
-#define CONNECTIVITY_UTIL_H
-
-namespace core {
-namespace dbus {
-class Error;
-}
-}
-
-namespace connectivity {
-
-void throw_dbus_exception(const core::dbus::Error &e);
-
-}
-
-
-#endif

=== added file 'debian/connectivity-doc.install'
--- debian/connectivity-doc.install	1970-01-01 00:00:00 +0000
+++ debian/connectivity-doc.install	2014-08-21 18:21:03 +0000
@@ -0,0 +1,1 @@
+usr/share/doc/connectivity-api/*

=== modified file 'debian/control'
--- debian/control	2014-07-22 19:54:24 +0000
+++ debian/control	2014-08-21 18:21:03 +0000
@@ -3,7 +3,7 @@
 Section: libs
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: cmake,
-               dbus,
+               dbus-test-runner,
                debhelper (>= 9),
                doxygen,
                google-mock,
@@ -13,44 +13,63 @@
 # version.
                g++-4.9,
                lcov,
-               libdbus-1-dev,
-               libdbus-cpp-dev (>= 4.0.0),
                libgtest-dev,
-               libprocess-cpp-dev,
-               libproperties-cpp-dev,
-               network-manager-dev,
                pkg-config,
+               qt5-default,
+               qtbase5-dev,
+               qtbase5-dev-tools,
+               qtdeclarative5-dev,
+               qtdeclarative5-dev-tools,
+               qml-module-qtquick2,
+               qml-module-qttest,
 Standards-Version: 3.9.5
 Homepage: https://launchpad.net/connectivity-api
 Vcs-Bzr: lp:connectivity-api
 Vcs-Browser: https://bazaar.launchpad.net/~unity-api-team/connectivity-api/trunk.14.04/files
 
-Package: libconnectivity-cpp0
+Package: libconnectivity-qt1
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         network-manager,
-#         urfkill,
-Description: C++11 library providing connectivity API.
- Connectivity API provides information on system networking.
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         indicator-network (>= 0.5.1+14.10.20140819),
+Description: Ubuntu Connectivity Qt API
+ Ubuntu Connectivity API - Qt bindings
 
-Package: libconnectivity-cpp-dev
+Package: libconnectivity-qt1-dev
 Section: libdevel
 Architecture: any
-Multi-Arch: same
-Depends: ${misc:Depends},
-         libconnectivity-cpp0 (= ${binary:Version}),
-         libdbus-cpp-dev,
-         libproperties-cpp-dev,
-Suggests: libconnectivity-cpp-doc
-Description: C++11 library providing connectivity API. - dev headers
- All the development headers and libraries for libconnectivity-cpp.
-
-Package: libconnectivity-cpp-doc
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libconnectivity-qt1 (= ${binary:Version}),
+         qtbase5-dev
+Suggests: connectivity-doc,
+Description: Ubuntu Connectivity Qt API - development files
+ Ubuntu Connectivity API - Qt bindings
+ .
+ This package contains development files to develop against the Qt library.
+
+Package: qml-module-ubuntu-connectivity
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libconnectivity-qt1 (= ${binary:Version}),
+Description: Ubuntu Connectivity API QML Components
+ Ubuntu Connectivity API - QML bindings
+ .
+ This package contains the qtdeclarative bindings for Ubuntu connectivity API.
+
+Package: connectivity-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends},
-Description: Documentation files for libconnectivity-cpp-dev
- Documentation files for the libconnectivity-cpp development.
+         ${shlibs:Depends},
+Description: Unity Action API - documentation
+ Ubuntu Connectivity API
+ .
+ This package contains developer documentation.

=== removed file 'debian/libconnectivity-cpp-dev.install'
--- debian/libconnectivity-cpp-dev.install	2014-01-23 22:09:36 +0000
+++ debian/libconnectivity-cpp-dev.install	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-usr/include/*
-usr/lib/*/*.so
-usr/lib/pkgconfig/*
\ No newline at end of file

=== removed file 'debian/libconnectivity-cpp-doc.install'
--- debian/libconnectivity-cpp-doc.install	2014-01-23 22:09:36 +0000
+++ debian/libconnectivity-cpp-doc.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/share/doc/connectivity-cpp/
\ No newline at end of file

=== removed file 'debian/libconnectivity-cpp0.install'
--- debian/libconnectivity-cpp0.install	2014-03-11 21:08:34 +0000
+++ debian/libconnectivity-cpp0.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/lib/*/*.so.*

=== added file 'debian/libconnectivity-qt1-dev.install'
--- debian/libconnectivity-qt1-dev.install	1970-01-01 00:00:00 +0000
+++ debian/libconnectivity-qt1-dev.install	2014-08-21 18:21:03 +0000
@@ -0,0 +1,3 @@
+usr/lib/*/libconnectivity-qt1.so
+usr/include/*
+usr/lib/*/pkgconfig/*

=== added file 'debian/libconnectivity-qt1.install'
--- debian/libconnectivity-qt1.install	1970-01-01 00:00:00 +0000
+++ debian/libconnectivity-qt1.install	2014-08-21 18:21:03 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/libconnectivity-qt1.so.*

=== added file 'debian/qml-module-ubuntu-connectivity.install'
--- debian/qml-module-ubuntu-connectivity.install	1970-01-01 00:00:00 +0000
+++ debian/qml-module-ubuntu-connectivity.install	2014-08-21 18:21:03 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/qt5/qml

=== added directory 'doc'
=== removed directory 'doc'
=== added file 'doc/CMakeLists.txt'
--- doc/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ doc/CMakeLists.txt	2014-08-21 18:21:03 +0000
@@ -0,0 +1,27 @@
+set(INSTALL_DOCDIR ${CMAKE_INSTALL_DATAROOTDIR}/doc/connectivity-api)
+
+if(build_type_lower MATCHES debug)
+    option(BUILD_DOC "Build documentation by default" FALSE)
+else()
+    option(BUILD_DOC "Build documentation by default" TRUE)
+endif()
+option(PRIVATE_DOCS "Build private documentation" FALSE)
+
+if(${BUILD_DOC})
+    set(IS_ALL ALL)
+endif()
+
+add_subdirectory(qt)
+set(DBUS_FILES
+    dbus/connectivity-api.txt
+)
+
+add_custom_target(doc ${IS_ALL}
+    SOURCES ${DBUS_FILES}
+)
+add_dependencies(doc cppdoc qmldoc)
+
+install(
+    DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dbus/
+    DESTINATION ${INSTALL_DOCDIR}/dbus/
+)

=== removed file 'doc/CMakeLists.txt'
--- doc/CMakeLists.txt	2014-03-13 15:33:18 +0000
+++ doc/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-# Copyright © 2013 Canonical Ltd.
-#
-# 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/>.
-#
-# Authors:
-#     Antti Kaijanmäki <[e-mail]>
-
-string(TOLOWER "${CMAKE_BUILD_TYPE}" typelower)
-set(EXTRACT_PRIVATE NO)
-set(INTERNAL_DOCS NO)
-set(SOURCE_DIRS "${CMAKE_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}")
-
-if("${typelower}" STREQUAL "debug")
-  option(BUILD_DOC "Build documentation by default" FALSE)
-else()
-  option(BUILD_DOC "Build documentation by default" TRUE)
-endif()
-
-option(PRIVATE_DOCS "Build private documentation" FALSE)
-
-find_package(Doxygen)
-
-if(${BUILD_DOC})
-  set(IS_ALL ALL)
-endif()
-if(${PRIVATE_DOCS})
-  set(EXTRACT_PRIVATE YES)
-  set(INTERNAL_DOCS YES)
-  set(SOURCE_DIRS "${SOURCE_DIRS} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/dbus")
-endif()
-
-if (DOXYGEN_FOUND)
-  configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in 
-    ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
-  add_custom_target(doc ${IS_ALL}
-    ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    COMMENT "Generating API documentation with Doxygen" VERBATIM)
-  install(
-    DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
-    DESTINATION ${CMAKE_INSTALL_DOCDIR})
-  install(
-    DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/xml
-    DESTINATION ${CMAKE_INSTALL_DOCDIR})
-
-endif (DOXYGEN_FOUND)
-
-# list these here to have them visible in Qt Creator
-set(DOC_PAGES
-    pages/mainpage.dox
-    pages/using.dox
-    pages/networking-status.dox
-)
-add_custom_target(QtCreatorDocsHack SOURCES ${DOC_PAGES})

=== removed file 'doc/Doxyfile.in'
--- doc/Doxyfile.in	2014-03-13 15:33:18 +0000
+++ doc/Doxyfile.in	1970-01-01 00:00:00 +0000
@@ -1,1869 +0,0 @@
-# Doxyfile 1.8.3.1
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a hash (#) is considered a comment and will be ignored.
-# The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ").
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or sequence of words) that should
-# identify the project. Note that if you do not use Doxywizard you need
-# to put quotes around the project name if it contains spaces.
-
-PROJECT_NAME           = @CMAKE_PROJECT_NAME@
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
-
-PROJECT_NUMBER         = @CONNECTIVITY_CPP_VERSION_MAJOR@.@CONNECTIVITY_CPP_VERSION_MINOR@.@CONNECTIVITY_CPP_VERSION_PATCH@
-
-# Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer
-# a quick idea about the purpose of the project. Keep the description short.
-
-PROJECT_BRIEF          =
-
-# With the PROJECT_LOGO tag one can specify an logo or icon that is
-# included in the documentation. The maximum height of the logo should not
-# exceed 55 pixels and the maximum width should not exceed 200 pixels.
-# Doxygen will copy the logo to the output directory.
-
-PROJECT_LOGO           =
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       =
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
-# otherwise cause performance problems for the file system.
-
-CREATE_SUBDIRS         = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
-# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
-# "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF       =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
-# description.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES        = No
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
-# path to strip. Note that you specify absolute paths here, but also
-# relative paths, which will be relative from the directory where doxygen is
-# started.
-
-STRIP_FROM_PATH        =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH    = @CMAKE_SOURCE_DIR@/include
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful if your file system
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
-# (thus requiring an explicit @brief command for a brief description.)
-
-JAVADOC_AUTOBRIEF      = NO
-
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
-# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
-# an explicit \brief command for a brief description.)
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
-# be part of the file/class/namespace that contains it.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE               = 4
-
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES                =
-
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding
-# "class=itcl::class" will allow you to use the command class in the
-# itcl::class meaning.
-
-TCL_SUBST              =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C  = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for
-# Java. For instance, namespaces will be presented as packages, qualified
-# scopes will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources only. Doxygen will then generate output that is more tailored for
-# Fortran.
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for
-# VHDL.
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given
-# extension. Doxygen has a built-in mapping, but you can override or extend it
-# using this tag. The format is ext=language, where ext is a file extension,
-# and language is one of the parsers supported by doxygen: IDL, Java,
-# Javascript, CSharp, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL, C,
-# C++. For instance to make doxygen treat .inc files as Fortran files (default
-# is PHP), and .f files as C (default is Fortran), use: inc=Fortran f=C. Note
-# that for custom extensions you also need to set FILE_PATTERNS otherwise the
-# files are not read by doxygen.
-
-EXTENSION_MAPPING      =
-
-# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
-# comments according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you
-# can mix doxygen, HTML, and XML commands with Markdown formatting.
-# Disable only in case of backward compatibilities issues.
-
-MARKDOWN_SUPPORT       = YES
-
-# When enabled doxygen tries to link words that correspond to documented classes,
-# or namespaces to their corresponding documentation. Such a link can be
-# prevented in individual cases by by putting a % sign in front of the word or
-# globally by setting AUTOLINK_SUPPORT to NO.
-
-AUTOLINK_SUPPORT       = YES
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also makes the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-
-BUILTIN_STL_SUPPORT    = YES
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-
-CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
-# Doxygen will parse them like normal C++ but will assume all classes use public
-# instead of private inheritance when no explicit protection keyword is present.
-
-SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate
-# getter and setter methods for a property. Setting this option to YES (the
-# default) will make doxygen replace the get and set methods by a property in
-# the documentation. This will only work if the methods are indeed getting or
-# setting a simple type. If this is not the case, or you want to show the
-# methods anyway, you should set this option to NO.
-
-IDL_PROPERTY_SUPPORT   = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
-
-SUBGROUPING            = YES
-
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
-# unions are shown inside the group in which they are included (e.g. using
-# @ingroup) instead of on a separate page (for HTML and Man pages) or
-# section (for LaTeX and RTF).
-
-INLINE_GROUPED_CLASSES = NO
-
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
-# unions with only public data fields will be shown inline in the documentation
-# of the scope in which they are defined (i.e. file, namespace, or group
-# documentation), provided this scope is documented. If set to NO (the default),
-# structs, classes, and unions are shown on a separate page (for HTML and Man
-# pages) or section (for LaTeX and RTF).
-
-INLINE_SIMPLE_STRUCTS  = NO
-
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
-# is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically
-# be useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-
-TYPEDEF_HIDES_STRUCT   = NO
-
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
-# determine which symbols to keep in memory and which to flush to disk.
-# When the cache is full, less often used symbols will be written to disk.
-# For small to medium size projects (<1000 input files) the default value is
-# probably good enough. For larger projects a too small cache size can cause
-# doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penalty.
-# If the system has enough physical memory increasing the cache will improve the
-# performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will roughly double the
-# memory usage. The cache size is given by this formula:
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols.
-
-SYMBOL_CACHE_SIZE      = 0
-
-# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be
-# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given
-# their name and scope. Since this can be an expensive process and often the
-# same symbol appear multiple times in the code, doxygen keeps a cache of
-# pre-resolved symbols. If the cache is too small doxygen will become slower.
-# If the cache is too large, memory is wasted. The cache size is given by this
-# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols.
-
-LOOKUP_CACHE_SIZE      = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL            = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
-
-EXTRACT_PRIVATE        = @EXTRACT_PRIVATE@
-
-# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
-# scope will be included in the documentation.
-
-EXTRACT_PACKAGE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
-
-EXTRACT_STATIC         = YES
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base
-# name of the file that contains the anonymous namespace. By default
-# anonymous namespaces are hidden.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS  = YES
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS          = @INTERNAL_DOCS@
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-
-CASE_SENSE_NAMES       = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
-# of that file.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
-# will list include files with double quotes in the documentation
-# rather than with sharp brackets.
-
-FORCE_LOCAL_INCLUDES   = NO
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
-# declaration order.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
-# declaration order.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
-# will sort the (brief and detailed) documentation of class members so that
-# constructors and destructors are listed first. If set to NO (the default)
-# the constructors will appear in the respective orders defined by
-# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
-# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
-# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
-# hierarchy of group names into alphabetical order. If set to NO (the default)
-# the group names will appear in their defined order.
-
-SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
-# do proper type resolution of all parameters of a function it will reject a
-# match between the prototype and the implementation of a member function even
-# if there is only one candidate or it is obvious which candidate to choose
-# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
-# will still accept a match between prototype and implementation in such cases.
-
-STRICT_PROTO_MATCHING  = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
-# commands in the documentation.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
-# commands in the documentation.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
-# commands in the documentation.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if section-label ... \endif
-# and \cond section-label ... \endcond blocks.
-
-ENABLED_SECTIONS       =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or macro consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and macros in the
-# documentation can be controlled using \showinitializer or \hideinitializer
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES        = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
-# This will remove the Files entry from the Quick Index and from the
-# Folder Tree View (if specified). The default is YES.
-
-SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
-# Namespaces page.
-# This will remove the Namespaces entry from the Quick Index
-# and from the Folder Tree View (if specified). The default is YES.
-
-SHOW_NAMESPACES        = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command <command> <input-file>, where <command> is the value of
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
-# provided by doxygen. Whatever the program writes to standard output
-# is used as the file version. See the manual for examples.
-
-FILE_VERSION_FILTER    =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option.
-# You can optionally specify a file name after the option, if omitted
-# DoxygenLayout.xml will be used as the name of the layout file.
-
-LAYOUT_FILE            =
-
-# The CITE_BIB_FILES tag can be used to specify one or more bib files
-# containing the references data. This must be a list of .bib files. The
-# .bib extension is automatically appended if omitted. Using this command
-# requires the bibtex tool to be installed. See also
-# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
-# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
-# feature you need bibtex and perl available in the search path. Do not use
-# file names with spaces, bibtex cannot handle them.
-
-CITE_BIB_FILES         =
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
-# NO is used.
-
-WARNINGS               = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR      = YES
-
-# The WARN_NO_PARAMDOC option can be enabled to get warnings for
-# functions that are documented, but have no documentation for their parameters
-# or return value. If set to NO (the default) doxygen will only warn about
-# wrong or incomplete parameter documentation, but not about the absence of
-# documentation.
-
-WARN_NO_PARAMDOC       = YES
-
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text. Optionally the format may contain
-# $version, which will be replaced by the version of the file (if it could
-# be obtained via FILE_VERSION_FILTER)
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
-# to stderr.
-
-WARN_LOGFILE           =
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
-# with spaces.
-
-INPUT                  = ${SOURCE_DIRS}
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-# also the default input encoding. Doxygen uses libiconv (or the iconv built
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
-# the list of possible encodings.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
-# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
-# *.f90 *.f *.for *.vhd *.vhdl
-
-FILE_PATTERNS          =
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
-# If left blank NO is used.
-
-RECURSIVE              = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should be
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-# Note that relative paths are relative to the directory from which doxygen is
-# run.
-
-EXCLUDE                =
-
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-# directories that are symbolic links (a Unix file system feature) are excluded
-# from the input.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories. Note that the wildcards are matched
-# against the file with absolute path, so to exclude all test directories
-# for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       =
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-
-EXCLUDE_SYMBOLS        =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
-
-EXAMPLE_PATH           = @CMAKE_SOURCE_DIR@/examples
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank all files are included.
-
-EXAMPLE_PATTERNS       =
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE      = YES
-
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
-# the \image command).
-
-IMAGE_PATH             =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output.
-# If FILTER_PATTERNS is specified, this tag will be
-# ignored.
-
-INPUT_FILTER           =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis.
-# Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match.
-# The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty or if
-# non of the patterns match the file name, INPUT_FILTER is applied.
-
-FILTER_PATTERNS        =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES    = NO
-
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
-# and it is also possible to disable source filtering for a specific pattern
-# using *.ext= (so without naming a filter). This option only has effect when
-# FILTER_SOURCE_FILES is enabled.
-
-FILTER_SOURCE_PATTERNS =
-
-# If the USE_MD_FILE_AS_MAINPAGE tag refers to the name of a markdown file that
-# is part of the input, its contents will be placed on the main page (index.html).
-# This can be useful if you have a project on for instance GitHub and want reuse
-# the introduction page also for the doxygen output.
-
-USE_MDFILE_AS_MAINPAGE =
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
-# VERBATIM_HEADERS is set to NO.
-
-SOURCE_BROWSER         = YES
-
-# Setting the INLINE_SOURCES tag to YES will include the body
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C, C++ and Fortran comments will always remain visible.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES
-# then for each documented function all documented
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = YES
-
-# If the REFERENCES_RELATION tag is set to YES
-# then for each documented function all documented entities
-# called/used by that function will be listed.
-
-REFERENCES_RELATION    = YES
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code.
-# Otherwise they will link to the documentation.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code
-# will point to the HTML generated by the htags(1) tool instead of doxygen
-# built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
-# will need version 4.8.6 or higher.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS       = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX     = YES
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-# in which this list will be split (can be a number in the range [1..20])
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard header. Note that when using a custom header you are responsible
-#  for the proper inclusion of any scripts and style sheets that doxygen
-# needs, which is dependent on the configuration options used.
-# It is advised to generate a default header using "doxygen -w html
-# header.html footer.html stylesheet.css YourConfigFile" and then modify
-# that header. Note that the header is subject to change so you typically
-# have to redo this when upgrading to a newer version of doxygen or when
-# changing the value of configuration settings such as GENERATE_TREEVIEW!
-
-HTML_HEADER            =
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard footer.
-
-HTML_FOOTER            =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If left blank doxygen will
-# generate a default style sheet. Note that it is recommended to use
-# HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this
-# tag will in the future become obsolete.
-
-HTML_STYLESHEET        =
-
-# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional
-# user-defined cascading style sheet that is included after the standard
-# style sheets created by doxygen. Using this option one can overrule
-# certain style aspects. This is preferred over using HTML_STYLESHEET
-# since it does not replace the standard style sheet and is therefor more
-# robust against future updates. Doxygen will copy the style sheet file to
-# the output directory.
-
-HTML_EXTRA_STYLESHEET  = @CMAKE_CURRENT_SOURCE_DIR@/extra.css
-
-# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the HTML output directory. Note
-# that these files will be copied to the base HTML output directory. Use the
-# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that
-# the files will be copied as-is; there are no commands or markers available.
-
-HTML_EXTRA_FILES       =
-
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
-# Doxygen will adjust the colors in the style sheet and background images
-# according to this color. Hue is specified as an angle on a colorwheel,
-# see http://en.wikipedia.org/wiki/Hue for more information.
-# For instance the value 0 represents red, 60 is yellow, 120 is green,
-# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
-# The allowed range is 0 to 359.
-
-HTML_COLORSTYLE_HUE    = 220
-
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
-# the colors in the HTML output. For a value of 0 the output will use
-# grayscales only. A value of 255 will produce the most vivid colors.
-
-HTML_COLORSTYLE_SAT    = 100
-
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
-# the luminance component of the colors in the HTML output. Values below
-# 100 gradually make the output lighter, whereas values above 100 make
-# the output darker. The value divided by 100 is the actual gamma applied,
-# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
-# and 100 does not change the gamma.
-
-HTML_COLORSTYLE_GAMMA  = 80
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting
-# this to NO can help when comparing the output of multiple runs.
-
-HTML_TIMESTAMP         = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded.
-
-HTML_DYNAMIC_SECTIONS  = YES
-
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
-# entries shown in the various tree structured indices initially; the user
-# can expand and collapse entries dynamically later on. Doxygen will expand
-# the tree to such a level that at most the specified number of entries are
-# visible (unless a fully collapsed tree already exceeds this amount).
-# So setting the number of entries 1 will produce a full collapsed tree by
-# default. 0 is a special value representing an infinite number of entries
-# and will result in a full expanded tree by default.
-
-HTML_INDEX_NUM_ENTRIES = 100
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files
-# will be generated that can be used as input for Apple's Xcode 3
-# integrated development environment, introduced with OSX 10.5 (Leopard).
-# To create a documentation set, doxygen will generate a Makefile in the
-# HTML output directory. Running make will produce the docset in that
-# directory and running "make install" will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
-# it at startup.
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
-
-GENERATE_DOCSET        = NO
-
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
-# feed. A documentation feed provides an umbrella under which multiple
-# documentation sets from a single provider (such as a company or product suite)
-# can be grouped.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
-# should uniquely identify the documentation set bundle. This should be a
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
-# will append .docset to the name.
-
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-
-# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely
-# identify the documentation publisher. This should be a reverse domain-name
-# style string, e.g. com.mycompany.MyDocSet.documentation.
-
-DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
-
-# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
-
-DOCSET_PUBLISHER_NAME  = Publisher
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP      = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
-# written to the html output directory.
-
-CHM_FILE               =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION           =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI           = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file
-# content.
-
-CHM_INDEX_ENCODING     =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND             = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
-# that can be used as input for Qt's qhelpgenerator to generate a
-# Qt Compressed Help (.qch) of the generated HTML documentation.
-
-GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
-# be used to specify the file name of the resulting .qch file.
-# The path specified is relative to the HTML output folder.
-
-QCH_FILE               =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#namespace
-
-QHP_NAMESPACE          = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
-
-QHP_VIRTUAL_FOLDER     = doc
-
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
-# add. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
-
-QHP_CUST_FILTER_NAME   =
-
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
-# Qt Help Project / Custom Filters</a>.
-
-QHP_CUST_FILTER_ATTRS  =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's
-# filter section matches.
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
-# Qt Help Project / Filter Attributes</a>.
-
-QHP_SECT_FILTER_ATTRS  =
-
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
-# be used to specify the location of Qt's qhelpgenerator.
-# If non-empty doxygen will try to run qhelpgenerator on the generated
-# .qhp file.
-
-QHG_LOCATION           =
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
-#  will be generated, which together with the HTML files, form an Eclipse help
-# plugin. To install this plugin and make it available under the help contents
-# menu in Eclipse, the contents of the directory containing the HTML and XML
-# files needs to be copied into the plugins directory of eclipse. The name of
-# the directory within the plugins directory should be the same as
-# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
-# the help appears.
-
-GENERATE_ECLIPSEHELP   = NO
-
-# A unique identifier for the eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have
-# this name.
-
-ECLIPSE_DOC_ID         = org.doxygen.Project
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
-# at top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it. Since the tabs have the same information as the
-# navigation tree you can set this option to NO if you already set
-# GENERATE_TREEVIEW to YES.
-
-DISABLE_INDEX          = YES
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information.
-# If the tag value is set to YES, a side panel will be generated
-# containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
-# Windows users are probably better off using the HTML help feature.
-# Since the tree basically has the same information as the tab index you
-# could consider to set DISABLE_INDEX to NO when enabling this option.
-
-GENERATE_TREEVIEW      = YES
-
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
-# (range [0,1..20]) that doxygen will group on one line in the generated HTML
-# documentation. Note that a value of 0 will completely suppress the enum
-# values from appearing in the overview section.
-
-ENUM_VALUES_PER_LINE   = 1
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
-# is shown.
-
-TREEVIEW_WIDTH         = 250
-
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
-# links to external symbols imported via tag files in a separate window.
-
-EXT_LINKS_IN_WINDOW    = NO
-
-# Use this tag to change the font size of Latex formulas included
-# as images in the HTML documentation. The default is 10. Note that
-# when you change the font size after a successful doxygen run you need
-# to manually remove any form_*.png images from the HTML output directory
-# to force them to be regenerated.
-
-FORMULA_FONTSIZE       = 10
-
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are
-# not supported properly for IE 6.0, but are supported on all modern browsers.
-# Note that when changing this option you need to delete any form_*.png files
-# in the HTML output before the changes have effect.
-
-FORMULA_TRANSPARENT    = YES
-
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
-# (see http://www.mathjax.org) which uses client side Javascript for the
-# rendering instead of using prerendered bitmaps. Use this if you do not
-# have LaTeX installed or if you want to formulas look prettier in the HTML
-# output. When enabled you may also need to install MathJax separately and
-# configure the path to it using the MATHJAX_RELPATH option.
-
-USE_MATHJAX            = NO
-
-# When MathJax is enabled you can set the default output format to be used for
-# thA MathJax output. Supported types are HTML-CSS, NativeMML (i.e. MathML) and
-# SVG. The default value is HTML-CSS, which is slower, but has the best
-# compatibility.
-
-MATHJAX_FORMAT         = HTML-CSS
-
-# When MathJax is enabled you need to specify the location relative to the
-# HTML output directory using the MATHJAX_RELPATH option. The destination
-# directory should contain the MathJax.js script. For instance, if the mathjax
-# directory is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to
-# the MathJax Content Delivery Network so you can quickly see the result without
-# installing MathJax.
-# However, it is strongly recommended to install a local
-# copy of MathJax from http://www.mathjax.org before deployment.
-
-MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
-
-# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
-# names that should be enabled during MathJax rendering.
-
-MATHJAX_EXTENSIONS     =
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box
-# for the HTML output. The underlying search engine uses javascript
-# and DHTML and should work on any modern browser. Note that when using
-# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
-# (GENERATE_DOCSET) there is already a search function so this one should
-# typically be disabled. For large projects the javascript based search engine
-# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
-
-SEARCHENGINE           = NO
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript.
-# There are two flavours of web server based search depending on the
-# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
-# searching and an index file used by the script. When EXTERNAL_SEARCH is
-# enabled the indexing and searching needs to be provided by external tools.
-# See the manual for details.
-
-SERVER_BASED_SEARCH    = NO
-
-# When EXTERNAL_SEARCH is enabled doxygen will no longer generate the PHP
-# script for searching. Instead the search results are written to an XML file
-# which needs to be processed by an external indexer. Doxygen will invoke an
-# external search engine pointed to by the SEARCHENGINE_URL option to obtain
-# the search results. Doxygen ships with an example indexer (doxyindexer) and
-# search engine (doxysearch.cgi) which are based on the open source search engine
-# library Xapian. See the manual for configuration details.
-
-EXTERNAL_SEARCH        = NO
-
-# The SEARCHENGINE_URL should point to a search engine hosted by a web server
-# which will returned the search results when EXTERNAL_SEARCH is enabled.
-# Doxygen ships with an example search engine (doxysearch) which is based on
-# the open source search engine library Xapian. See the manual for configuration
-# details.
-
-SEARCHENGINE_URL       =
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
-# search data is written to a file for indexing by an external tool. With the
-# SEARCHDATA_FILE tag the name of this file can be specified.
-
-SEARCHDATA_FILE        = searchdata.xml
-
-# When SERVER_BASED_SEARCH AND EXTERNAL_SEARCH are both enabled the
-# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
-# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
-# projects and redirect the results back to the right project.
-
-EXTERNAL_SEARCH_ID     =
-
-# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
-# projects other than the one defined by this configuration file, but that are
-# all added to the same external search index. Each project needs to have a
-# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id
-# of to a relative location where the documentation can be found.
-# The format is: EXTRA_SEARCH_MAPPINGS = id1=loc1 id2=loc2 ...
-
-EXTRA_SEARCH_MAPPINGS  =
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-# generate Latex output.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked. If left blank `latex' will be used as the default command name.
-# Note that when enabling USE_PDFLATEX this option is only used for
-# generating bitmaps for formulas in the HTML output, but not in the
-# Makefile that is written to the output directory.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
-# default command name.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_LATEX          = YES 
-
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, letter, legal and
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE             = a4
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER           =
-
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
-# the generated latex document. The footer should contain everything after
-# the last chapter. If it is left blank doxygen will generate a
-# standard footer. Notice: only use this tag if you know what you are doing!
-
-LATEX_FOOTER           =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS         = YES
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
-# higher quality PDF documentation.
-
-USE_PDFLATEX           = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE        = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
-# in the output.
-
-LATEX_HIDE_INDICES     = NO
-
-# If LATEX_SOURCE_CODE is set to YES then doxygen will include
-# source code with syntax highlighting in the LaTeX output.
-# Note that which sources are shown also depends on other settings
-# such as SOURCE_BROWSER.
-
-LATEX_SOURCE_CODE      = NO 
-
-# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
-# http://en.wikipedia.org/wiki/BibTeX for more info.
-
-LATEX_BIB_STYLE        = plain
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
-# other RTF readers or editors.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS         = NO
-
-# Load style sheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an rtf document.
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE    =
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-# generate man pages
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION          = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
-# the code including all documentation.
-
-GENERATE_XML           = YES
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `xml' will be used as the default path.
-
-XML_OUTPUT             = xml
-
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_SCHEMA             =
-
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_DTD                =
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-# dump the program listings (including syntax highlighting
-# and cross-referencing information) to the XML output. Note that
-# enabling this will significantly increase the size of the XML output.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
-# moment.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
-# to generate PDF and DVI output from the Perl module output.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader.
-# This is useful
-# if you want to understand what is going on.
-# On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
-# and Perl will parse it just the same.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
-# files.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION        = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
-# PREDEFINED and EXPAND_AS_DEFINED tags.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# pointed to by INCLUDE_PATH will be searched when a #include is found.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
-# the preprocessor.
-
-INCLUDE_PATH           =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
-# be used.
-
-INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed. To prevent a macro definition from being
-# undefined via #undef or recursively expanded use the := operator
-# instead of the = operator.
-
-PREDEFINED             =
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition that
-# overrules the definition found in the source code.
-
-EXPAND_AS_DEFINED      =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all references to function-like macros
-# that are alone on a line, have an all uppercase name, and do not end with a
-# semicolon, because these will confuse the parser if not removed.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles. For each
-# tag file the location of the external documentation should be added. The
-# format of a tag file without this location is as follows:
-#
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-#
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths
-# or URLs. Note that each tag file must have a unique name (where the name does
-# NOT include the path). If a tag file is not located in the directory in which
-# doxygen is run, you must also specify the path to the tagfile here.
-
-TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE       =
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
-# will be listed.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
-# be listed.
-
-EXTERNAL_GROUPS        = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of `which perl').
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
-# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option also works with HAVE_DOT disabled, but it is recommended to
-# install and use dot, since it yields more powerful graphs.
-
-CLASS_DIAGRAMS         = YES
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH            =
-
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS   = NO
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT               = YES
-
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
-# allowed to run in parallel. When set to 0 (the default) doxygen will
-# base this on the number of processors available in the system. You can set it
-# explicitly to a value larger than 0 to get control over the balance
-# between CPU load and processing speed.
-
-DOT_NUM_THREADS        = 0
-
-# By default doxygen will use the Helvetica font for all dot files that
-# doxygen generates. When you want a differently looking font you can specify
-# the font name using DOT_FONTNAME. You need to make sure dot is able to find
-# the font, which can be done by putting it in a standard location or by setting
-# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
-# directory containing the font.
-
-DOT_FONTNAME           = Helvetica
-
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
-# The default size is 10pt.
-
-DOT_FONTSIZE           = 10
-
-# By default doxygen will tell dot to use the Helvetica font.
-# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
-# set the path where dot can find it.
-
-DOT_FONTPATH           =
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
-# CLASS_DIAGRAMS tag to NO.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
-# class references variables) of the class with other documented classes.
-
-COLLABORATION_GRAPH    = YES
-
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for groups, showing the direct groups dependencies
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-
-UML_LOOK               = YES
-
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside
-# the class node. If there are many fields or methods and many nodes the
-# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
-# threshold limits the number of items for each type to make the size more
-# managable. Set this to 0 for no limit. Note that the threshold may be
-# exceeded by 50% before the limit is enforced.
-
-UML_LIMIT_NUM_FIELDS   = 10
-
-# If set to YES, the inheritance and collaboration graphs will show the
-# relations between templates and their instances.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
-# other documented files.
-
-INCLUDE_GRAPH          = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then
-# doxygen will generate a call dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable call graphs
-# for selected functions only using the \callgraph command.
-
-CALL_GRAPH             = YES
-
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
-# doxygen will generate a caller dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable caller
-# graphs for selected functions only using the \callergraph command.
-
-CALLER_GRAPH           = NO
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will generate a graphical hierarchy of all classes instead of a textual one.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES
-# then doxygen will show the dependencies a directory has on other directories
-# in a graphical way. The dependency relations are determined by the #include
-# relations between the files in the directories.
-
-DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are svg, png, jpg, or gif.
-# If left blank png will be used. If you choose svg you need to set
-# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
-# visible in IE 9+ (other browsers do not have this requirement).
-
-DOT_IMAGE_FORMAT       = png
-
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-# enable generation of interactive SVG images that allow zooming and panning.
-# Note that this requires a modern browser other than Internet Explorer.
-# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
-# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
-# visible. Older versions of IE do not have SVG support.
-
-INTERACTIVE_SVG        = YES
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-
-DOT_PATH               =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
-# \dotfile command).
-
-DOTFILE_DIRS           =
-
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the
-# \mscfile command).
-
-MSCFILE_DIRS           =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
-# nodes that will be shown in the graph. If the number of nodes in a graph
-# becomes larger than this value, doxygen will truncate the graph, which is
-# visualized by representing a node as a red box. Note that doxygen if the
-# number of direct children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-
-DOT_GRAPH_MAX_NODES    = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes
-# that lay further from the root node will be omitted. Note that setting this
-# option to 1 or 2 may greatly reduce the computation time needed for large
-# code bases. Also note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not
-# seem to support this out of the box. Warning: Depending on the platform used,
-# enabling this option may lead to badly anti-aliased labels on the edges of
-# a graph (i.e. they become hard to read).
-
-DOT_TRANSPARENT        = YES
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10)
-# support this, this feature is disabled by default.
-
-DOT_MULTI_TARGETS      = YES
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
-# arrows in the dot generated graphs.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
-# the various graphs.
-
-DOT_CLEANUP            = YES

=== added directory 'doc/dbus'
=== added file 'doc/dbus/connectivity-api.txt'
--- doc/dbus/connectivity-api.txt	1970-01-01 00:00:00 +0000
+++ doc/dbus/connectivity-api.txt	2014-08-21 18:21:03 +0000
@@ -0,0 +1,26 @@
+Service		com.ubuntu.connectivity1
+Interface	com.ubuntu.connectivity1.NetworkingStatus
+Object path	/com/ubuntu/connectivity1/NetworkingStatus
+Policy group	connectivity
+Supports	org.freedesktop.DBus.Introspectable
+		org.freedesktop.DBus.Properties
+
+Properties	array{string} Limitations [readonly]
+
+			String array representing the possible limitations
+			on networking.
+
+			Currently available limitations are:
+				"bandwith"
+
+			"bandwith" - indicates that the bandwith of the
+				Internet connection has limitations.
+				Applications should minimize their bandwith
+				usage if possible.
+
+		string Status [readonly]
+
+			Status of the Internet connectivity. 
+
+			Possible values:
+				"offline", "connecting", "online"

=== removed directory 'doc/pages'
=== removed file 'doc/pages/mainpage.dox'
--- doc/pages/mainpage.dox	2014-03-11 12:20:55 +0000
+++ doc/pages/mainpage.dox	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-/*!
-\mainpage Ubuntu Connectivity API
-
-\tableofcontents
-
-\section sec_introduction Introduction
-
-Ubuntu API offers a way to access the connectivity related information of the system.
-
-\subsection sec_thread_safety Note on thread safety
-
-The API implementation uses a worker thread. The property changes may be dispatched from this thread and thus the
-user of this API must make sure to handle necessary threading issues.
-
-\section sec_general General Topics
-
- - \ref using-cpp "Using this C++ API"
- - \ref networking-status "Getting the networking status."
-
-\section sec_bug_reports Reporting Bugs
-If you find any problems with the or this documentation,
-please file a bug in Connectivity API [Launchpad page](https://bugs.launchpad.net/connectivity-api).
-*/

=== removed file 'doc/pages/networking-status.dox'
--- doc/pages/networking-status.dox	2014-03-11 14:19:31 +0000
+++ doc/pages/networking-status.dox	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-/*!
-\page networking-status Networking Status
-
-Applications needing to access the overall system networking status can access the
-top level com::ubuntu::connectivity::networking::Manager class. The class has properties
-for the networking status and connection characteristics of the system networking.
-
-\section Setup
-
-Manager is accessed by including the appropriate header:
-\snippet example_networking_status.cpp include
-
-and then creating an instance of the manager:
-\snippet example_networking_status.cpp create manager
-
-\section sec_networking_status Networking Status
-
-The status of the system networking can be accessed through the Manager::status property:
-\snippet example_networking_status.cpp subscribe networking status changes
-
-\section sec_characteristics Networking Characteristics
-
-The characteristics can be accessed through the Manager::characteristics property
-as a bitfield:
-\snippet example_networking_status.cpp subscribe characteristics changes
-
----
-The complete example (found in <i>examples/example_networking_status.cpp</i>):
-\include example_networking_status.cpp
-
-*/

=== removed file 'doc/pages/using.dox'
--- doc/pages/using.dox	2014-03-11 12:20:55 +0000
+++ doc/pages/using.dox	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-/*!
-\page using-cpp Using the C++ API
-
-Install the development headers:
-
-\code{.txt}
-sudo apt-get install libconnectivity-cpp-dev
-\endcode
-
-Enable c++11 and use pkg-config to get the necessary compilation flags:
-
-\code{.txt}
-$ g++ myapp.cpp -std=c++11 `pkg-config --cflags --libs connectivity-cpp` -o myapp
-\endcode
-
-The headers can then be included as:
-
-\code{.cpp}
-// includes the com::ubuntu::networking::connectivity::Manager class
-#include <com/ubuntu/connectivity/networking/manager.h>
-\endcode
-
-*/

=== added directory 'doc/qt'
=== added file 'doc/qt/CMakeLists.txt'
--- doc/qt/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ doc/qt/CMakeLists.txt	2014-08-21 18:21:03 +0000
@@ -0,0 +1,3 @@
+add_subdirectory(cpp)
+add_subdirectory(qml)
+

=== added directory 'doc/qt/cpp'
=== added file 'doc/qt/cpp/CMakeLists.txt'
--- doc/qt/cpp/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ doc/qt/cpp/CMakeLists.txt	2014-08-21 18:21:03 +0000
@@ -0,0 +1,40 @@
+add_subdirectory(examples)
+
+set(EXTRACT_PRIVATE NO)
+set(INTERNAL_DOCS NO)
+set(SOURCE_DIRS "${CMAKE_SOURCE_DIR}/src/qt/include ${CMAKE_CURRENT_SOURCE_DIR}")
+
+if(${PRIVATE_DOCS})
+  set(EXTRACT_PRIVATE YES)
+  set(INTERNAL_DOCS YES)
+  set(SOURCE_DIRS "${SOURCE_DIRS} ${CMAKE_SOURCE_DIR}/src")
+endif()
+
+set(DOC_FILES
+    Doxyfile.in
+    pages/mainpage.dox
+    pages/using.dox
+    pages/networking-status.dox
+)
+
+find_package(Doxygen)
+if(DOXYGEN_FOUND)
+    configure_file(
+        ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in
+        ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY
+    )
+    add_custom_target(cppdoc
+        ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        COMMENT "Generating API documentation with Doxygen" VERBATIM
+        SOURCES ${DOC_FILES}
+    )
+    install(
+        DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
+        DESTINATION ${INSTALL_DOCDIR}/cpp/
+    )
+    install(
+        DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/xml
+        DESTINATION ${INSTALL_DOCDIR}/cpp/
+    )
+endif(DOXYGEN_FOUND)

=== added file 'doc/qt/cpp/Doxyfile.in'
--- doc/qt/cpp/Doxyfile.in	1970-01-01 00:00:00 +0000
+++ doc/qt/cpp/Doxyfile.in	2014-08-21 18:21:03 +0000
@@ -0,0 +1,2316 @@
+# Doxyfile 1.8.7
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = "Ubuntu Connectivity Qt API"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         = @CONNECTIVITY_QT_VERSION_MAJOR@.@CONNECTIVITY_QT_VERSION_MINOR@
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          =
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is included in
+# the documentation. The maximum height of the logo should not exceed 55 pixels
+# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
+# to the output directory.
+
+PROJECT_LOGO           =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       =
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
+CREATE_SUBDIRS         = NO
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES        = NO
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    = @CMAKE_SOURCE_DIR@/src/qt/include
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a
+# new page for each member. If set to NO, the documentation of a member will be
+# part of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
+
+ALIASES                = "accessors=\par Accessors:\n" \
+                         "initvalue=\par Initial Value:\n" \
+                         "notify=\par Notify:\n"
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+#
+# Note For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by by putting a % sign in front of the word
+# or globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = YES
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = @EXTRACT_PRIVATE@
+
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO these classes will be included in the various overviews. This option has
+# no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO these declarations will be
+# included in the documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = YES
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = @INTERNAL_DOCS@
+
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = YES
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = YES
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the
+# todo list. This list is created by putting \todo commands in the
+# documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the
+# test list. This list is created by putting \test commands in the
+# documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES the list
+# will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. Do not use file names with spaces, bibtex cannot handle them. See
+# also \cite for info how to create references.
+
+CITE_BIB_FILES         =
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET                  = NO
+