Skip to content
This repository was archived by the owner on Apr 28, 2022. It is now read-only.

Commit e1f125e

Browse files
committed
[systemsettings] Update VpnModel to use libconnman-qt VPN API. Contributes 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.
1 parent 19a8d7e commit e1f125e

File tree

4 files changed

+411
-945
lines changed

4 files changed

+411
-945
lines changed

src/qdbusxml2cpp_dbus_types.h

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/src.pro

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ PKGCONFIG += profile mlite5 mce timed-qt5 libshadowutils blkid libcrypto nemomod
1010
PKGCONFIG += ssu-sysinfo nemodbus packagekitqt5
1111

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

1714
SOURCES += \
1815
languagemodel.cpp \
@@ -26,9 +23,6 @@ SOURCES += \
2623
aboutsettings.cpp \
2724
certificatemodel.cpp \
2825
vpnmodel.cpp \
29-
connmanserviceproxy.cpp \
30-
connmanvpnproxy.cpp \
31-
connmanvpnconnectionproxy.cpp \
3226
developermodesettings.cpp \
3327
batterystatus.cpp \
3428
diskusage.cpp \
@@ -54,9 +48,6 @@ PUBLIC_HEADERS = \
5448
aboutsettings.h \
5549
certificatemodel.h \
5650
vpnmodel.h \
57-
connmanserviceproxy.h \
58-
connmanvpnproxy.h \
59-
connmanvpnconnectionproxy.h \
6051
developermodesettings.h \
6152
batterystatus.h \
6253
udisks2block_p.h \
@@ -72,7 +63,6 @@ PUBLIC_HEADERS = \
7263

7364
HEADERS += \
7465
$$PUBLIC_HEADERS \
75-
qdbusxml2cpp_dbus_types.h \
7666
localeconfig.h \
7767
batterystatus_p.h \
7868
logging_p.h \

0 commit comments

Comments
 (0)