Differential D17381 Diff 46975 src/settings/setting.cpp

Changeset View

Standalone View

src/settings/setting.cpp

Context not available.
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, 12, 0)
			jgrulichUnsubmitted Done Again not true. jgrulich: Again not true.
		35		#define NM_SETTING_MACSEC_SETTING_NAME "macsec"
		36		#endif
		37
34	#if !NM_CHECK_VERSION(1, 10, 0)	38		#if !NM_CHECK_VERSION(1, 10, 0)
35	#define NM_SETTING_OVS_BRIDGE_SETTING_NAME "ovs-bridge"	39		#define NM_SETTING_OVS_BRIDGE_SETTING_NAME "ovs-bridge"
36	#define NM_SETTING_OVS_INTERFACE_SETTING_NAME "ovs-interface"	40		#define NM_SETTING_OVS_INTERFACE_SETTING_NAME "ovs-interface"
Context not available.
169	case TeamPort:	173		case TeamPort:
170	typeString = QLatin1String(NM_SETTING_TEAM_PORT_SETTING_NAME);	174		typeString = QLatin1String(NM_SETTING_TEAM_PORT_SETTING_NAME);
171	break;	175		break;
		176		case Macsec:
		177		typeString = QLatin1String(NM_SETTING_MACSEC_SETTING_NAME);
		178		break;
172	case NetworkManager::Setting::Generic:	179		case NetworkManager::Setting::Generic:
173	typeString = QLatin1String(NM_SETTING_GENERIC_SETTING_NAME);	180		typeString = QLatin1String(NM_SETTING_GENERIC_SETTING_NAME);
174	break;	181		break;
Context not available.
245	type = Tc;	252		type = Tc;
246	} else if (typeString == QLatin1String(NM_SETTING_TEAM_PORT_SETTING_NAME)) {	253		} else if (typeString == QLatin1String(NM_SETTING_TEAM_PORT_SETTING_NAME)) {
247	type = TeamPort;	254		type = TeamPort;
		255		} else if (typeString == QLatin1String(NM_SETTING_MACSEC_SETTING_NAME)) {
		256		type = Macsec;
248	}	257		}
249		258
250	return type;	259		return type;
Context not available.