Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[systemsettings] Update VpnModel to use libconnman-qt VPN API. Contri…
…butes to JB#45378

Functionality from VpnModel has now been moved into libconnman-qt
VpnCoreModel. This updates VpnModel to use this libconnman-qt VPN API,
by extending VpnCoreModel, rather than interacting with connman directly
through its dbus interface.
  • Loading branch information
llewelld committed Oct 9, 2019
1 parent 19a8d7e commit e1f125e
Show file tree
Hide file tree
Showing 4 changed files with 411 additions and 945 deletions.
14 changes: 0 additions & 14 deletions src/qdbusxml2cpp_dbus_types.h

This file was deleted.

10 changes: 0 additions & 10 deletions src/src.pro
Expand Up @@ -10,9 +10,6 @@ PKGCONFIG += profile mlite5 mce timed-qt5 libshadowutils blkid libcrypto nemomod
PKGCONFIG += ssu-sysinfo nemodbus packagekitqt5

system(qdbusxml2cpp -p mceiface.h:mceiface.cpp mce.xml)
system(qdbusxml2cpp -c ConnmanVpnProxy -p connmanvpnproxy ../dbus/net.connman.vpn.xml -i qdbusxml2cpp_dbus_types.h)
system(qdbusxml2cpp -c ConnmanVpnConnectionProxy -p connmanvpnconnectionproxy ../dbus/net.connman.vpn.Connection.xml -i qdbusxml2cpp_dbus_types.h)
system(qdbusxml2cpp -c ConnmanServiceProxy -p connmanserviceproxy ../dbus/net.connman.service.xml -i qdbusxml2cpp_dbus_types.h)

SOURCES += \
languagemodel.cpp \
Expand All @@ -26,9 +23,6 @@ SOURCES += \
aboutsettings.cpp \
certificatemodel.cpp \
vpnmodel.cpp \
connmanserviceproxy.cpp \
connmanvpnproxy.cpp \
connmanvpnconnectionproxy.cpp \
developermodesettings.cpp \
batterystatus.cpp \
diskusage.cpp \
Expand All @@ -54,9 +48,6 @@ PUBLIC_HEADERS = \
aboutsettings.h \
certificatemodel.h \
vpnmodel.h \
connmanserviceproxy.h \
connmanvpnproxy.h \
connmanvpnconnectionproxy.h \
developermodesettings.h \
batterystatus.h \
udisks2block_p.h \
Expand All @@ -72,7 +63,6 @@ PUBLIC_HEADERS = \

HEADERS += \
$$PUBLIC_HEADERS \
qdbusxml2cpp_dbus_types.h \
localeconfig.h \
batterystatus_p.h \
logging_p.h \
Expand Down

0 comments on commit e1f125e

Please sign in to comment.