From 6a2462e30864406bba5ebe9627b44f960bdfa7cf Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 8 Sep 2012 13:30:57 -0500 Subject: Make Invalid a flag --- .../network-manager/network-manager.cpp | 2 +- tdecore/tdenetworkconnections.h | 35 +++++++++++----------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/tdecore/networkbackends/network-manager/network-manager.cpp b/tdecore/networkbackends/network-manager/network-manager.cpp index 74d96e7ec..db7e8c30d 100644 --- a/tdecore/networkbackends/network-manager/network-manager.cpp +++ b/tdecore/networkbackends/network-manager/network-manager.cpp @@ -119,7 +119,7 @@ TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags nmGlobalStateToTDEGlo } TDENetworkConnectionStatus::TDENetworkConnectionStatus nmDeviceStateToTDEDeviceState(TQ_UINT32 nmType) { - TDENetworkConnectionStatus::TDENetworkConnectionStatus ret = TDENetworkConnectionStatus::Invalid; + TDENetworkConnectionStatus::TDENetworkConnectionStatus ret = TDENetworkConnectionStatus::None; if (nmType == NM_DEVICE_STATE_UNKNOWN) { ret |= TDENetworkConnectionStatus::Invalid; diff --git a/tdecore/tdenetworkconnections.h b/tdecore/tdenetworkconnections.h index 93bab1d73..8af12158e 100644 --- a/tdecore/tdenetworkconnections.h +++ b/tdecore/tdenetworkconnections.h @@ -390,23 +390,24 @@ namespace TDENetworkPasswordHandlingFlags { namespace TDENetworkConnectionStatus { enum TDENetworkConnectionStatus { - Invalid = 0x00000000, - Disconnected = 0x00000001, - Connected = 0x00000002, - LinkUnavailable = 0x00000004, - EstablishingLink = 0x00000008, - DeactivatingLink = 0x00000010, - ConfiguringProtocols = 0x00000020, - Reconnecting = 0x00000040, - LinkLost = 0x00000080, - LinkLocalAccess = 0x00000100, - SiteLocalAccess = 0x00000200, - GlobalAccess = 0x00000400, - UnManaged = 0x00000800, - NeedAuthorization = 0x00001000, - Failed = 0x00002000, - VerifyingProtocols = 0x00004000, - DependencyWait = 0x00008000 + None = 0x00000000, + Invalid = 0x00000001, + Disconnected = 0x00000002, + Connected = 0x00000004, + LinkUnavailable = 0x00000008, + EstablishingLink = 0x00000010, + DeactivatingLink = 0x00000020, + ConfiguringProtocols = 0x00000040, + Reconnecting = 0x00000080, + LinkLost = 0x00000100, + LinkLocalAccess = 0x00000200, + SiteLocalAccess = 0x00000400, + GlobalAccess = 0x00000800, + UnManaged = 0x00001000, + NeedAuthorization = 0x00002000, + Failed = 0x00004000, + VerifyingProtocols = 0x00008000, + DependencyWait = 0x00010000 }; CREATE_FLAG_BITWISE_MANIPULATION_FUNCTIONS(TDENetworkConnectionStatus) -- cgit v1.2.1