Change INetProtocol enumerators to CamelCase

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

Change-Id: I444e8b958f029201b228937e088efabc4b6d3050

3 files changed, 18 insertions, 18 deletions

diff --git a/svl/source/misc/filenotation.cxx b/svl/source/misc/filenotation.cxx
index c10dd60d65b2..536818d4e261 100644
--- a/svl/source/misc/filenotation.cxx
+++ b/svl/source/misc/filenotation.cxx
@@ -35,7 +35,7 @@ namespace svt
         if ( _eInputNotation == N_URL )
         {
             INetURLObject aParser( _rUrlOrPath );
-            if ( aParser.GetProtocol() == INetProtocol::FILE )
+            if ( aParser.GetProtocol() == INetProtocol::File )
                 implInitWithURLNotation( _rUrlOrPath );
             else
                 m_sSystem = m_sFileURL = _rUrlOrPath;
@@ -56,7 +56,7 @@ namespace svt
             if ( !_rSystemPath.isEmpty() )
             {
                 INetURLObject aSmartParser;
-                aSmartParser.SetSmartProtocol( INetProtocol::FILE );
+                aSmartParser.SetSmartProtocol( INetProtocol::File );
                 if ( aSmartParser.SetSmartURL( _rSystemPath ) )
                 {
                     m_sFileURL = aSmartParser.GetMainURL( INetURLObject::NO_DECODE );
@@ -84,12 +84,12 @@ namespace svt
         INetURLObject aParser( _rUrlOrPath );
         switch ( aParser.GetProtocol() )
         {
-            case INetProtocol::FILE:
+            case INetProtocol::File:
                 // file URL
                 bSuccess = implInitWithURLNotation( _rUrlOrPath );
                 break;
 
-            case INetProtocol::NOT_VALID:
+            case INetProtocol::NotValid:
                 // assume system notation
                 bSuccess = implInitWithSystemNotation( _rUrlOrPath );
                 break;
diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx
index 5c3f1a9ada6f..98a3009b215f 100644
--- a/svl/source/misc/inethist.cxx
+++ b/svl/source/misc/inethist.cxx
@@ -335,7 +335,7 @@ void INetURLHistory::NormalizeUrl_Impl (INetURLObject &rUrl)
 {
     switch (rUrl.GetProtocol())
     {
-        case INetProtocol::FILE:
+        case INetProtocol::File:
             if (!INetURLObject::IsCaseSensitive())
             {
                 OUString aPath (rUrl.GetURLPath(INetURLObject::NO_DECODE).toAsciiLowerCase());
@@ -343,19 +343,19 @@ void INetURLHistory::NormalizeUrl_Impl (INetURLObject &rUrl)
             }
             break;
 
-        case INetProtocol::FTP:
+        case INetProtocol::Ftp:
             if (!rUrl.HasPort())
                 rUrl.SetPort (INETHIST_DEF_FTP_PORT);
             break;
 
-        case INetProtocol::HTTP:
+        case INetProtocol::Http:
             if (!rUrl.HasPort())
                 rUrl.SetPort (INETHIST_DEF_HTTP_PORT);
             if (!rUrl.HasURLPath())
                 rUrl.SetURLPath("/");
             break;
 
-        case INetProtocol::HTTPS:
+        case INetProtocol::Https:
             if (!rUrl.HasPort())
                 rUrl.SetPort (INETHIST_DEF_HTTPS_PORT);
             if (!rUrl.HasURLPath())
diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx
index 5e53645b7916..362b6273c3e4 100644
--- a/svl/source/misc/urihelper.cxx
+++ b/svl/source/misc/urihelper.cxx
@@ -76,7 +76,7 @@ OUString URIHelper::SmartRel2Abs(INetURLObject const & rTheBaseURIRef,
                                                  eStyle);
         if (bCheckFileExists
             && !bWasAbsolute
-            && (aAbsURIRef.GetProtocol() == INetProtocol::FILE))
+            && (aAbsURIRef.GetProtocol() == INetProtocol::File))
         {
             INetURLObject aNonFileURIRef;
             aNonFileURIRef.SetSmartURL(rTheRelURIRef,
@@ -84,7 +84,7 @@ OUString URIHelper::SmartRel2Abs(INetURLObject const & rTheBaseURIRef,
                                        eCharset,
                                        eStyle);
             if (!aNonFileURIRef.HasError()
-                && aNonFileURIRef.GetProtocol() != INetProtocol::FILE)
+                && aNonFileURIRef.GetProtocol() != INetProtocol::File)
             {
                 bool bMaybeFile = false;
                 if (rMaybeFileHdl.IsSet())
@@ -507,7 +507,7 @@ OUString URIHelper::FindFirstURLInText(OUString const & rText,
             {
                 sal_Int32 i = nPos;
                 INetProtocol eScheme = INetURLObject::CompareProtocolScheme(rText.copy(i, rEnd - i));
-                if (eScheme == INetProtocol::FILE) // 2nd
+                if (eScheme == INetProtocol::File) // 2nd
                 {
                     while (rText[i++] != ':') ;
                     sal_Int32 nPrefixEnd = i;
@@ -525,7 +525,7 @@ OUString URIHelper::FindFirstURLInText(OUString const & rText,
                         && isBoundary1(rCharClass, rText, nUriEnd, rEnd))
                     {
                         INetURLObject aUri(rText.copy(nPos, nUriEnd - nPos),
-                                           INetProtocol::FILE, eMechanism, eCharset,
+                                           INetProtocol::File, eMechanism, eCharset,
                                            eStyle);
                         if (!aUri.HasError())
                         {
@@ -536,7 +536,7 @@ OUString URIHelper::FindFirstURLInText(OUString const & rText,
                         }
                     }
                 }
-                else if (eScheme != INetProtocol::NOT_VALID) // 1st
+                else if (eScheme != INetProtocol::NotValid) // 1st
                 {
                     while (rText[i++] != ':') ;
                     sal_Int32 nPrefixEnd = i;
@@ -554,7 +554,7 @@ OUString URIHelper::FindFirstURLInText(OUString const & rText,
                             || rText[nUriEnd] == '\\'))
                     {
                         INetURLObject aUri(rText.copy(nPos, nUriEnd - nPos),
-                                           INetProtocol::HTTP, eMechanism,
+                                           INetProtocol::Http, eMechanism,
                                            eCharset);
                         if (!aUri.HasError())
                         {
@@ -603,7 +603,7 @@ OUString URIHelper::FindFirstURLInText(OUString const & rText,
                         || rText[nUriEnd] == '\\')
                     {
                         INetURLObject aUri(rText.copy(nPos, nUriEnd - nPos),
-                                           INetProtocol::HTTP, eMechanism,
+                                           INetProtocol::Http, eMechanism,
                                            eCharset);
                         if (!aUri.HasError())
                         {
@@ -627,7 +627,7 @@ OUString URIHelper::FindFirstURLInText(OUString const & rText,
                     if (isBoundary1(rCharClass, rText, nUriEnd, rEnd))
                     {
                         INetURLObject aUri(rText.copy(nPos, nUriEnd - nPos),
-                                           INetProtocol::FILE,
+                                           INetProtocol::File,
                                            INetURLObject::ENCODE_ALL,
                                            RTL_TEXTENCODING_UTF8,
                                            INetURLObject::FSYS_DOS);
@@ -656,7 +656,7 @@ OUString URIHelper::FindFirstURLInText(OUString const & rText,
                     if (isBoundary1(rCharClass, rText, nUriEnd, rEnd))
                     {
                         INetURLObject aUri(rText.copy(nPos, nUriEnd - nPos),
-                                           INetProtocol::FILE,
+                                           INetProtocol::File,
                                            INetURLObject::ENCODE_ALL,
                                            RTL_TEXTENCODING_UTF8,
                                            INetURLObject::FSYS_DOS);
@@ -693,7 +693,7 @@ OUString URIHelper::FindFirstURLInText(OUString const & rText,
                             && isBoundary1(rCharClass, rText, i, rEnd))
                         {
                             INetURLObject aUri(rText.copy(nPos, i - nPos),
-                                               INetProtocol::MAILTO,
+                                               INetProtocol::Mailto,
                                                INetURLObject::ENCODE_ALL);
                             if (!aUri.HasError())
                             {