[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [libnm-qt/settings] settings: Use QFlags instead of enum
From:       Jan Grulich <jgrulich () redhat ! com>
Date:       2013-03-18 14:00:30
Message-ID: 20130318140030.979B7A604F () git ! kde ! org
[Download RAW message or body]

Git commit 3a40d695c3648a48337d1f7e1d675b574848bd02 by Jan Grulich.
Committed on 18/03/2013 at 15:00.
Pushed by grulich into branch 'settings'.

Use QFlags instead of enum

M  +3    -3    settings/vlan.cpp
M  +4    -2    settings/vlan.h
M  +1    -1    settings/vlan_p.h

http://commits.kde.org/libnm-qt/3a40d695c3648a48337d1f7e1d675b574848bd02

diff --git a/settings/vlan.cpp b/settings/vlan.cpp
index 12be42e..bf0cad7 100644
--- a/settings/vlan.cpp
+++ b/settings/vlan.cpp
@@ -106,14 +106,14 @@ quint32 NetworkManager::Settings::VlanSetting::id() const
     return d->id;
 }
 
-void NetworkManager::Settings::VlanSetting::setFlags(NetworkManager::Settings::VlanSetting::Flag flags)
+void NetworkManager::Settings::VlanSetting::setFlags(NetworkManager::Settings::VlanSetting::Flags flags)
 {
     Q_D(VlanSetting);
 
     d->flags = flags;
 }
 
-NetworkManager::Settings::VlanSetting::Flag NetworkManager::Settings::VlanSetting::flags() const
+NetworkManager::Settings::VlanSetting::Flags NetworkManager::Settings::VlanSetting::flags() const
 {
     Q_D(const VlanSetting);
 
@@ -192,7 +192,7 @@ QVariantMap NetworkManager::Settings::VlanSetting::toMap() const
     }
 
     if (flags() != None) {
-        setting.insert(QLatin1String(NM_SETTING_VLAN_FLAGS), flags());
+        setting.insert(QLatin1String(NM_SETTING_VLAN_FLAGS), (int)flags());
     }
 
     if (!ingressPriorityMap().isEmpty()) {
diff --git a/settings/vlan.h b/settings/vlan.h
index cbfb918..e94a873 100644
--- a/settings/vlan.h
+++ b/settings/vlan.h
@@ -37,6 +37,7 @@ class NMQT_EXPORT VlanSetting : public Setting
     Q_DECLARE_PRIVATE(VlanSetting)
 public:
     enum Flag {None = 0, ReorderHeaders = 0x1, Gvrp = 0x2, LooseBinding = 0x4};
+    Q_DECLARE_FLAGS(Flags, Flag);
 
     VlanSetting();
     VlanSetting(VlanSetting *);
@@ -53,8 +54,8 @@ public:
     void setId(quint32 id);
     quint32 id() const;
 
-    void setFlags(Flag flags);
-    Flag flags() const;
+    void setFlags(Flags flags);
+    Flags flags() const;
 
     void setIngressPriorityMap(const QStringList & map);
     QStringList ingressPriorityMap() const;
@@ -72,6 +73,7 @@ public:
 private:
     VlanSettingPrivate * d_ptr;
 };
+Q_DECLARE_OPERATORS_FOR_FLAGS(VlanSetting::Flags)
 }
 }
 
diff --git a/settings/vlan_p.h b/settings/vlan_p.h
index 6966fc4..debc611 100644
--- a/settings/vlan_p.h
+++ b/settings/vlan_p.h
@@ -36,7 +36,7 @@ namespace Settings
         QString interfaceName;
         QString parent;
         quint32 id;
-        NetworkManager::Settings::VlanSetting::Flag flags;
+        NetworkManager::Settings::VlanSetting::Flags flags;
         QStringList ingressPriorityMap;
         QStringList egressPriorityMap;
     };
[prev in list] [next in list] [prev in thread] [next in thread]