Change INetProtocol enumerators to CamelCase

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

Change-Id: I444e8b958f029201b228937e088efabc4b6d3050

8 files changed, 22 insertions, 22 deletions

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index f76633b3ea33..407a64947ce5 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -932,9 +932,9 @@ namespace
         INetURLObject aUrl( rLogicName );
         INetProtocol eProt = aUrl.GetProtocol();
 #if HAVE_FEATURE_MACOSX_SANDBOX
-        return eProt == INetProtocol::SFTP;
+        return eProt == INetProtocol::Sftp;
 #else
-        return eProt == INetProtocol::FILE || eProt == INetProtocol::SFTP;
+        return eProt == INetProtocol::File || eProt == INetProtocol::Sftp;
 #endif
     }
 }
@@ -2420,7 +2420,7 @@ void SfxMedium::Init_Impl()
     {
         INetURLObject aUrl( pImp->m_aLogicName );
         INetProtocol eProt = aUrl.GetProtocol();
-        if ( eProt == INetProtocol::NOT_VALID )
+        if ( eProt == INetProtocol::NotValid )
         {
             SAL_WARN( "sfx.doc", "Unknown protocol!" );
         }
@@ -2683,13 +2683,13 @@ void SfxMedium::SetIsRemote_Impl()
     INetURLObject aObj( GetName() );
     switch( aObj.GetProtocol() )
     {
-        case INetProtocol::FTP:
-        case INetProtocol::HTTP:
-        case INetProtocol::HTTPS:
-        case INetProtocol::POP3:
-        case INetProtocol::NEWS:
-        case INetProtocol::IMAP:
-        case INetProtocol::VIM:
+        case INetProtocol::Ftp:
+        case INetProtocol::Http:
+        case INetProtocol::Https:
+        case INetProtocol::Pop3:
+        case INetProtocol::News:
+        case INetProtocol::Imap:
+        case INetProtocol::Vim:
             pImp->m_bRemote = true;
         break;
         default:
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index def4e05ac0ac..140e62cd044c 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -1186,7 +1186,7 @@ bool SfxDocumentTemplates::GetLogicNames
 
     INetURLObject aFullPath;
 
-    aFullPath.SetSmartProtocol( INetProtocol::FILE );
+    aFullPath.SetSmartProtocol( INetProtocol::File );
     aFullPath.SetURL( rPath );
     OUString aPath( aFullPath.GetMainURL( INetURLObject::NO_DECODE ) );
 
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 15f175efefd3..346dd0d90607 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -570,7 +570,7 @@ void SfxDocTplService_Impl::getDirList()
 
     for (sal_Int32 i = 0; i < nCount; ++i)
     {
-        aURL.SetSmartProtocol( INetProtocol::FILE );
+        aURL.SetSmartProtocol( INetProtocol::File );
         aURL.SetURL( aDirs.getToken( i, C_DELIM ) );
         maTemplateDirs[i] = aURL.GetMainURL( INetURLObject::NO_DECODE );
 
@@ -2907,7 +2907,7 @@ void SfxURLRelocator_Impl::initOfficeInstDirs()
 void SfxURLRelocator_Impl::implExpandURL( OUString& io_url )
 {
     const INetURLObject aParser( io_url );
-    if ( aParser.GetProtocol() != INetProtocol::VND_SUN_STAR_EXPAND )
+    if ( aParser.GetProtocol() != INetProtocol::VndSunStarExpand )
         return;
 
     io_url = aParser.GetURLPath( INetURLObject::DECODE_WITH_CHARSET );
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index b1e580cba74c..c75786910d38 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -1280,7 +1280,7 @@ OUString ModelData_Impl::GetRecommendedName( const OUString& aSuggestedName, con
                 uno::UNO_QUERY );
             if ( xTypeDetection.is() )
             {
-                INetURLObject aObj( "c:/" + aRecommendedName, INetProtocol::FILE,
+                INetURLObject aObj( "c:/" + aRecommendedName, INetProtocol::File,
                         INetURLObject::ENCODE_ALL, RTL_TEXTENCODING_UTF8, INetURLObject::FSYS_DOS );
 
                 uno::Sequence< beans::PropertyValue > aTypeNameProps;
@@ -1618,7 +1618,7 @@ bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel,
         OUString aFileName;
         aFileNameIter->second >>= aFileName;
         aURL.SetURL( aFileName );
-        DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NOT_VALID, "Illegal URL!" );
+        DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NotValid, "Illegal URL!" );
 
         ::comphelper::SequenceAsHashMap::const_iterator aIter =
                                 aModelData.GetMediaDescr().find( sFilterNameString );
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index b30e6f1c1e07..8a718b99338f 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -191,7 +191,7 @@ IMPL_LINK_NOARG(SfxNewFileDialog_Impl, Update)
 
         OUString aFileName = aTemplates.GetPath( m_pRegionLb->GetSelectEntryPos(), nEntry-1);
         INetURLObject aTestObj( aFileName );
-        if( aTestObj.GetProtocol() == INetProtocol::NOT_VALID )
+        if( aTestObj.GetProtocol() == INetProtocol::NotValid )
         {
             // temp. fix until Templates are managed by UCB compatible service
             // does NOT work with locally cached components !
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 3f7b183e3ae5..8ec5d45a9d63 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -860,7 +860,7 @@ OUString SfxObjectShell::GetTitle
     if ( pMed && ( nMaxLength == SFX_TITLE_CAPTION || nMaxLength == SFX_TITLE_PICKLIST ) )
     {
         // If a specific title was given at open:
-        // important for URLs: use INetProtocol::FILE for which the set title is not
+        // important for URLs: use INetProtocol::File for which the set title is not
         // considered. (See below, analysis of aTitleMap_Impl)
         SFX_ITEMSET_ARG( pMed->GetItemSet(), pNameItem, SfxStringItem, SID_DOCINFO_TITLE, false );
         if ( pNameItem )
@@ -891,7 +891,7 @@ OUString SfxObjectShell::GetTitle
     if ( nMaxLength > SFX_TITLE_CAPTION && nMaxLength <= SFX_TITLE_HISTORY )
     {
         sal_uInt16 nRemote;
-        if( !pMed || aURL.GetProtocol() == INetProtocol::FILE )
+        if( !pMed || aURL.GetProtocol() == INetProtocol::File )
             nRemote = 0;
         else
             nRemote = 1;
@@ -899,7 +899,7 @@ OUString SfxObjectShell::GetTitle
     }
 
     // Local file?
-    if ( aURL.GetProtocol() == INetProtocol::FILE )
+    if ( aURL.GetProtocol() == INetProtocol::File )
     {
         OUString aName( aURL.HasMark() ? INetURLObject( aURL.GetURLNoMark() ).PathToFileName() : aURL.PathToFileName() );
         if ( nMaxLength == SFX_TITLE_FULLNAME )
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index cafa4b26ed3c..91c385548117 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2108,7 +2108,7 @@ void SfxObjectShell::AddToRecentlyUsedList()
 {
     INetURLObject aUrl( pMedium->GetOrigURL() );
 
-    if ( aUrl.GetProtocol() == INetProtocol::FILE )
+    if ( aUrl.GetProtocol() == INetProtocol::File )
     {
         const SfxFilter* pOrgFilter = pMedium->GetOrigFilter();
         Application::AddToRecentDocumentList( aUrl.GetURLNoPass( INetURLObject::NO_DECODE ),
@@ -2644,7 +2644,7 @@ bool SfxObjectShell::CommonSaveAs_Impl
         }
     }
 
-    DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NOT_VALID, "Illegal URL!" );
+    DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NotValid, "Illegal URL!" );
     DBG_ASSERT( aParams->Count() != 0, "Incorrect Parameter");
 
     SFX_ITEMSET_ARG( aParams, pSaveToItem, SfxBoolItem, SID_SAVETO, false );
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index c988ac704806..1d056eb69900 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -638,7 +638,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
             OUString      sPath        ;
             OUString      sURL  (sTemp);
             INetURLObject aCheck(sURL );
-            if (aCheck.GetProtocol()==INetProtocol::NOT_VALID)
+            if (aCheck.GetProtocol()==INetProtocol::NotValid)
             {
                 // OK - it's not a valid URL. But may it's a simple
                 // system path directly. It will be supported for historical