Change INetProtocol enumerators to CamelCase

...to avoid clashes with macros and poor warnings about hiding global FILE

Change-Id: I444e8b958f029201b228937e088efabc4b6d3050

4 files changed, 49 insertions, 49 deletions

diff --git a/include/svl/inethist.hxx b/include/svl/inethist.hxx
index 6b4f9755011b..0cd3801c5985 100644
--- a/include/svl/inethist.hxx
+++ b/include/svl/inethist.hxx
@@ -63,10 +63,10 @@ public:
     */
     bool QueryProtocol (INetProtocol eProto) const
     {
-        return ((eProto == INetProtocol::FILE ) ||
-                (eProto == INetProtocol::FTP  ) ||
-                (eProto == INetProtocol::HTTP ) ||
-                (eProto == INetProtocol::HTTPS)    );
+        return ((eProto == INetProtocol::File ) ||
+                (eProto == INetProtocol::Ftp  ) ||
+                (eProto == INetProtocol::Http ) ||
+                (eProto == INetProtocol::Https)    );
     }
 
     /** QueryUrl.
diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx
index 92a07661c6cb..7d2d4f5ccbee 100644
--- a/include/svtools/inettbc.hxx
+++ b/include/svtools/inettbc.hxx
@@ -59,9 +59,9 @@ protected:
     virtual bool                    PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
 
 public:
-                                    SvtURLBox( vcl::Window* pParent, INetProtocol eSmart = INetProtocol::NOT_VALID, bool bSetDefaultHelpID = true );
-                                    SvtURLBox( vcl::Window* pParent, WinBits _nStyle, INetProtocol eSmart = INetProtocol::NOT_VALID, bool bSetDefaultHelpID = true );
-                                    SvtURLBox( vcl::Window* pParent, const ResId& _rResId, INetProtocol eSmart = INetProtocol::NOT_VALID, bool bSetDefaultHelpID = true );
+                                    SvtURLBox( vcl::Window* pParent, INetProtocol eSmart = INetProtocol::NotValid, bool bSetDefaultHelpID = true );
+                                    SvtURLBox( vcl::Window* pParent, WinBits _nStyle, INetProtocol eSmart = INetProtocol::NotValid, bool bSetDefaultHelpID = true );
+                                    SvtURLBox( vcl::Window* pParent, const ResId& _rResId, INetProtocol eSmart = INetProtocol::NotValid, bool bSetDefaultHelpID = true );
                                     virtual ~SvtURLBox();
 
     void                            SetBaseURL( const OUString& rURL );
diff --git a/include/svtools/place.hxx b/include/svtools/place.hxx
index 0933f998a1a5..db70cf96c163 100644
--- a/include/svtools/place.hxx
+++ b/include/svtools/place.hxx
@@ -33,7 +33,7 @@ public:
     OUString& GetName( ) { return msName; }
     OUString GetUrl( ) { return maUrl.GetMainURL( INetURLObject::NO_DECODE ); }
     INetURLObject& GetUrlObject( ) { return maUrl; }
-    bool  IsLocal( ) { return maUrl.GetProtocol() == INetProtocol::FILE; }
+    bool  IsLocal( ) { return maUrl.GetProtocol() == INetProtocol::File; }
     bool  IsEditable( ) { return mbEditable; }
 };
 
diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx
index 50c5b5109b40..fd7dc2d76a88 100644
--- a/include/tools/urlobj.hxx
+++ b/include/tools/urlobj.hxx
@@ -66,41 +66,41 @@ enum
 // Schemes:
 enum class INetProtocol
 {
-    NOT_VALID,
-    FTP,
-    HTTP,
-    FILE,
-    MAILTO,
-    VND_SUN_STAR_WEBDAV,
-    NEWS,
-    PRIV_SOFFICE,
-    VND_SUN_STAR_HELP,
-    HTTPS,
-    SLOT,
-    MACRO,
-    JAVASCRIPT,
-    IMAP,
-    POP3,
-    DATA,
-    CID,
-    OUT,
-    VND_SUN_STAR_HIER,
-    VIM,
-    UNO,
-    COMPONENT,
-    VND_SUN_STAR_PKG,
-    LDAP,
-    DB,
-    VND_SUN_STAR_CMD,
-    TELNET,
-    VND_SUN_STAR_EXPAND,
-    VND_SUN_STAR_TDOC,
-    GENERIC,
-    SMB,
-    HID,
-    SFTP,
-    CMIS,
-    LAST = CMIS
+    NotValid,
+    Ftp,
+    Http,
+    File,
+    Mailto,
+    VndSunStarWebdav,
+    News,
+    PrivSoffice,
+    VndSunStarHelp,
+    Https,
+    Slot,
+    Macro,
+    Javascript,
+    Imap,
+    Pop3,
+    Data,
+    Cid,
+    Out,
+    VndSunStarHier,
+    Vim,
+    Uno,
+    Component,
+    VndSunStarPkg,
+    Ldap,
+    Db,
+    VndSunStarCmd,
+    Telnet,
+    VndSunStarExpand,
+    VndSunStarTdoc,
+    Generic,
+    Smb,
+    Hid,
+    Sftp,
+    Cmis,
+    LAST = Cmis
 };
 
 class TOOLS_DLLPUBLIC SAL_WARN_UNUSED INetURLObject
@@ -182,9 +182,9 @@ public:
     // General Structure:
 
     inline INetURLObject():
-        m_eScheme(INetProtocol::NOT_VALID), m_eSmartScheme(INetProtocol::HTTP) {}
+        m_eScheme(INetProtocol::NotValid), m_eSmartScheme(INetProtocol::Http) {}
 
-    inline bool HasError() const { return m_eScheme == INetProtocol::NOT_VALID; }
+    inline bool HasError() const { return m_eScheme == INetProtocol::NotValid; }
 
     inline OUString GetMainURL(DecodeMechanism eMechanism,
                                 rtl_TextEncoding eCharset
@@ -1234,7 +1234,7 @@ private:
     // Coding:
 
     static inline sal_Char getEscapePrefix(INetProtocol eTheScheme)
-    { return eTheScheme == INetProtocol::VIM ? '=' : '%'; }
+    { return eTheScheme == INetProtocol::Vim ? '=' : '%'; }
 
     inline sal_Char getEscapePrefix() const
     { return getEscapePrefix(m_eScheme); }
@@ -1299,7 +1299,7 @@ inline OUString INetURLObject::decode(SubString const & rSubString,
 inline INetURLObject::INetURLObject(OUString const & rTheAbsURIRef,
                                     EncodeMechanism eMechanism,
                                     rtl_TextEncoding eCharset):
-    m_eScheme(INetProtocol::NOT_VALID), m_eSmartScheme(INetProtocol::HTTP)
+    m_eScheme(INetProtocol::NotValid), m_eSmartScheme(INetProtocol::Http)
 {
     setAbsURIRef(rTheAbsURIRef, false, eMechanism, eCharset, false,
                  FSysStyle(0));
@@ -1318,7 +1318,7 @@ inline INetURLObject::INetURLObject(OUString const & rTheAbsURIRef,
                                     EncodeMechanism eMechanism,
                                     rtl_TextEncoding eCharset,
                                     FSysStyle eStyle):
-    m_eScheme(INetProtocol::NOT_VALID), m_eSmartScheme(eTheSmartScheme)
+    m_eScheme(INetProtocol::NotValid), m_eSmartScheme(eTheSmartScheme)
 {
     setAbsURIRef(rTheAbsURIRef, false, eMechanism, eCharset, true, eStyle);
 }
@@ -1456,7 +1456,7 @@ inline bool INetURLObject::SetMark(OUString const & rTheFragment,
 
 inline INetURLObject::INetURLObject(OUString const & rFSysPath,
                                     FSysStyle eStyle):
-    m_eScheme(INetProtocol::NOT_VALID), m_eSmartScheme(INetProtocol::HTTP)
+    m_eScheme(INetProtocol::NotValid), m_eSmartScheme(INetProtocol::Http)
 {
     setFSysPath(rFSysPath, eStyle);
 }