Differential D17342 Diff 46949 src/settings/setting.cpp

Changeset View

Standalone View

View Options

src/settings/setting.cpp

Show All 25 Lines
26#define signals Q_SIGNALS 26​#define signals Q_SIGNALS
27 27​
28#include <QDebug> 28​#include <QDebug>
29 29​
30#if !NM_CHECK_VERSION(1, 14, 0) 30​#if !NM_CHECK_VERSION(1, 14, 0)
31#define NM_SETTING_MATCH_SETTING_NAME "match" 31​#define NM_SETTING_MATCH_SETTING_NAME "match"
32#endif 32​#endif
33 33​
34#if !NM_CHECK_VERSION(1, 10, 0) 34​#if !NM_CHECK_VERSION(1, 10, 0)
jgrulichUnsubmitted
Done

NM 1.10.0

jgrulich: NM 1.10.0
35#define NM_SETTING_TC_CONFIG_SETTING_NAME "tc" ​
36#define NM_SETTING_OVS_BRIDGE_SETTING_NAME "ovs-bridge" 35​#define NM_SETTING_OVS_BRIDGE_SETTING_NAME "ovs-bridge"
37#define NM_SETTING_OVS_INTERFACE_SETTING_NAME "ovs-interface" 36​#define NM_SETTING_OVS_INTERFACE_SETTING_NAME "ovs-interface"
38#define NM_SETTING_OVS_PATCH_SETTING_NAME "ovs-patch" 37​#define NM_SETTING_OVS_PATCH_SETTING_NAME "ovs-patch"
39#define NM_SETTING_OVS_PORT_SETTING_NAME "ovs-port" 38​#define NM_SETTING_OVS_PORT_SETTING_NAME "ovs-port"
39​#define NM_SETTING_TC_CONFIG_SETTING_NAME "tc"
40​#define NM_SETTING_TEAM_PORT_SETTING_NAME "team-port"
40#endif 41​#endif
41 42​
42#if !NM_CHECK_VERSION(1, 8, 0) 43​#if !NM_CHECK_VERSION(1, 8, 0)
43#define NM_SETTING_USER_SETTING_NAME "user" 44​#define NM_SETTING_USER_SETTING_NAME "user"
44#endif 45​#endif
45 46​
46#if !NM_CHECK_VERSION(1, 6, 0) 47​#if !NM_CHECK_VERSION(1, 6, 0)
47#define NM_SETTING_PROXY_SETTING_NAME "proxy" 48​#define NM_SETTING_PROXY_SETTING_NAME "proxy"
▲ Show 20 Lines • Show All 112 Lines • ▼ Show 20 Line(s)160 case OvsPort:
160 typeString = QLatin1String(NM_SETTING_OVS_PORT_SETTING_NAME); 161​ typeString = QLatin1String(NM_SETTING_OVS_PORT_SETTING_NAME);
161 break; 162​ break;
162 case Match: 163​ case Match:
163 typeString = QLatin1String(NM_SETTING_MATCH_SETTING_NAME); 164​ typeString = QLatin1String(NM_SETTING_MATCH_SETTING_NAME);
164 break; 165​ break;
165 case Tc: 166​ case Tc:
166 typeString = QLatin1String(NM_SETTING_TC_CONFIG_SETTING_NAME); 167​ typeString = QLatin1String(NM_SETTING_TC_CONFIG_SETTING_NAME);
167 break; 168​ break;
169​ case TeamPort:
170​ typeString = QLatin1String(NM_SETTING_TEAM_PORT_SETTING_NAME);
171​ break;
168 case NetworkManager::Setting::Generic: 172​ case NetworkManager::Setting::Generic:
169 typeString = QLatin1String(NM_SETTING_GENERIC_SETTING_NAME); 173​ typeString = QLatin1String(NM_SETTING_GENERIC_SETTING_NAME);
170 break; 174​ break;
171 default: 175​ default:
172 break; 176​ break;
173 } 177​ }
174 178​
175 return typeString; 179​ return typeString;
▲ Show 20 Lines • Show All 58 Lines • ▼ Show 20 Line(s)183{
234 } else if (typeString == QLatin1String(NM_SETTING_OVS_PATCH_SETTING_NAME)) { 238​ } else if (typeString == QLatin1String(NM_SETTING_OVS_PATCH_SETTING_NAME)) {
235 type = OvsPatch; 239​ type = OvsPatch;
236 } else if (typeString == QLatin1String(NM_SETTING_OVS_PORT_SETTING_NAME)) { 240​ } else if (typeString == QLatin1String(NM_SETTING_OVS_PORT_SETTING_NAME)) {
237 type = OvsPort; 241​ type = OvsPort;
238 } else if (typeString == QLatin1String(NM_SETTING_MATCH_SETTING_NAME)) { 242​ } else if (typeString == QLatin1String(NM_SETTING_MATCH_SETTING_NAME)) {
239 type = Match; 243​ type = Match;
240 } else if (typeString == QLatin1String(NM_SETTING_TC_CONFIG_SETTING_NAME)) { 244​ } else if (typeString == QLatin1String(NM_SETTING_TC_CONFIG_SETTING_NAME)) {
241 type = Tc; 245​ type = Tc;
246​ } else if (typeString == QLatin1String(NM_SETTING_TEAM_PORT_SETTING_NAME)) {
247​ type = TeamPort;
242 } 248​ }
243 249​
244 return type; 250​ return type;
245} 251​}
246 252​
247NetworkManager::Setting::Setting(SettingType type) 253​NetworkManager::Setting::Setting(SettingType type)
248 : d_ptr(new SettingPrivate()) 254​ : d_ptr(new SettingPrivate())
249{ 255​{
▲ Show 20 Lines • Show All 97 Lines • Show Last 20 Lines