Differential D17342 Diff 46940 src/settings/setting.cpp

Changeset View

Standalone View

View Options

src/settings/setting.cpp

Context not available.
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)
Context not available.
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;
Context not available.
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;
Context not available.