Differential D17317 Diff 46792 src/settings/setting.cpp

Changeset View

Standalone View

View Options

src/settings/setting.cpp

Context not available.
27 27​
28#include <QDebug> 28​#include <QDebug>
29 29​
30​#if !NM_CHECK_VERSION(1, 10, 0)
31​#define NM_SETTING_TC_CONFIG_SETTING_NAME "tc"
32​#endif
33​#if !NM_CHECK_VERSION(1, 14, 0)
jgrulichUnsubmitted
Done

Same here, should be NM 1.14.0.

jgrulich: Same here, should be NM 1.14.0.
jgrulichUnsubmitted
Done

NM 1.14.0 is needed for NM_SETTING_MATCH_SETTING_NAME

jgrulich: NM 1.14.0 is needed for NM_SETTING_MATCH_SETTING_NAME
34​#define NM_SETTING_MATCH_SETTING_NAME "match"
35​#endif
36​
30namespace NetworkManager 37​namespace NetworkManager
31{ 38​{
32 39​
Context not available.
139 case OvsPort: 146​ case OvsPort:
140 typeString = QLatin1String(NM_SETTING_OVS_PORT_SETTING_NAME); 147​ typeString = QLatin1String(NM_SETTING_OVS_PORT_SETTING_NAME);
141 break; 148​ break;
149​ case Match:
150​ typeString = QLatin1String(NM_SETTING_MATCH_SETTING_NAME);
151​ break;
152​ case Tc:
153​ typeString = QLatin1String(NM_SETTING_TC_CONFIG_SETTING_NAME);
154​ break;
142 case NetworkManager::Setting::Generic: 155​ case NetworkManager::Setting::Generic:
143 typeString = QLatin1String(NM_SETTING_GENERIC_SETTING_NAME); 156​ typeString = QLatin1String(NM_SETTING_GENERIC_SETTING_NAME);
144 break; 157​ break;
Context not available.
209 type = OvsPatch; 222​ type = OvsPatch;
210 } else if (typeString == QLatin1String(NM_SETTING_OVS_PORT_SETTING_NAME)) { 223​ } else if (typeString == QLatin1String(NM_SETTING_OVS_PORT_SETTING_NAME)) {
211 type = OvsPort; 224​ type = OvsPort;
225​ } else if (typeString == QLatin1String(NM_SETTING_MATCH_SETTING_NAME)) {
226​ type = Match;
227​ } else if (typeString == QLatin1String(NM_SETTING_TC_CONFIG_SETTING_NAME)) {
228​ type = Tc;
212 } 229​ }
213 230​
214 return type; 231​ return type;
Context not available.