Change INetProtocol enumerators to CamelCase

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

Change-Id: I444e8b958f029201b228937e088efabc4b6d3050

5 files changed, 14 insertions, 14 deletions

diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 69f566e5eb7b..147070e52810 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -1282,7 +1282,7 @@ sal_uInt16 GraphicFilter::CanImportGraphic( const INetURLObject& rPath,
                                         sal_uInt16 nFormat, sal_uInt16* pDeterminedFormat )
 {
     sal_uInt16  nRetValue = GRFILTER_FORMATERROR;
-    DBG_ASSERT( rPath.GetProtocol() != INetProtocol::NOT_VALID, "GraphicFilter::CanImportGraphic() : ProtType == INetProtocol::NOT_VALID" );
+    DBG_ASSERT( rPath.GetProtocol() != INetProtocol::NotValid, "GraphicFilter::CanImportGraphic() : ProtType == INetProtocol::NotValid" );
 
     OUString    aMainUrl( rPath.GetMainURL( INetURLObject::NO_DECODE ) );
     std::unique_ptr<SvStream> xStream(::utl::UcbStreamHelper::CreateStream( aMainUrl, StreamMode::READ | StreamMode::SHARE_DENYNONE ));
@@ -1312,7 +1312,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const INetURLObject&
                                      sal_uInt16 nFormat, sal_uInt16 * pDeterminedFormat, sal_uInt32 nImportFlags )
 {
     sal_uInt16 nRetValue = GRFILTER_FORMATERROR;
-    DBG_ASSERT( rPath.GetProtocol() != INetProtocol::NOT_VALID, "GraphicFilter::ImportGraphic() : ProtType == INetProtocol::NOT_VALID" );
+    DBG_ASSERT( rPath.GetProtocol() != INetProtocol::NotValid, "GraphicFilter::ImportGraphic() : ProtType == INetProtocol::NotValid" );
 
     OUString    aMainUrl( rPath.GetMainURL( INetURLObject::NO_DECODE ) );
     std::unique_ptr<SvStream> xStream(::utl::UcbStreamHelper::CreateStream( aMainUrl, StreamMode::READ | StreamMode::SHARE_DENYNONE ));
@@ -1804,7 +1804,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const INetURLO
 #else
     SAL_INFO( "vcl.filter", "GraphicFilter::ExportGraphic() (thb)" );
     sal_uInt16  nRetValue = GRFILTER_FORMATERROR;
-    DBG_ASSERT( rPath.GetProtocol() != INetProtocol::NOT_VALID, "GraphicFilter::ExportGraphic() : ProtType == INetProtocol::NOT_VALID" );
+    DBG_ASSERT( rPath.GetProtocol() != INetProtocol::NotValid, "GraphicFilter::ExportGraphic() : ProtType == INetProtocol::NotValid" );
     bool bAlreadyExists = DirEntryExists( rPath );
 
     OUString    aMainUrl( rPath.GetMainURL( INetURLObject::NO_DECODE ) );
@@ -2254,12 +2254,12 @@ int GraphicFilter::LoadGraphic( const OUString &rPath, const OUString &rFilterNa
     INetURLObject aURL( rPath );
     if ( aURL.HasError() )
     {
-        aURL.SetSmartProtocol( INetProtocol::FILE );
+        aURL.SetSmartProtocol( INetProtocol::File );
         aURL.SetSmartURL( rPath );
     }
 
     SvStream* pStream = NULL;
-    if ( INetProtocol::FILE != aURL.GetProtocol() )
+    if ( INetProtocol::File != aURL.GetProtocol() )
     {
         pStream = ::utl::UcbStreamHelper::CreateStream( rPath, StreamMode::READ );
     }
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index b6e1a65f63a0..2a4166f4b951 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -4504,7 +4504,7 @@ we check in the following sequence:
             // check if the protocol is a known one, or if there is no protocol at all (on target only)
             // if there is no protocol, make the target relative to the current document directory
             // getting the needed URL information from the current document path
-            if( eTargetProtocol == INetProtocol::NOT_VALID )
+            if( eTargetProtocol == INetProtocol::NotValid )
             {
                 if( rLink.m_aURL.getLength() > 4 && rLink.m_aURL.startsWith("\\\\\\\\"))
                 {
@@ -4571,7 +4571,7 @@ we check in the following sequence:
                 bool bSetRelative = false;
                 bool bFileSpec = false;
                 //check if relative file link is requested and if the protocol is 'file://'
-                if( m_aContext.RelFsys && eBaseProtocol == eTargetProtocol && eTargetProtocol == INetProtocol::FILE )
+                if( m_aContext.RelFsys && eBaseProtocol == eTargetProtocol && eTargetProtocol == INetProtocol::File )
                     bSetRelative = true;
 
                 OUString aFragment = aTargetURL.GetMark( INetURLObject::NO_DECODE /*DECODE_WITH_CHARSET*/ ); //fragment as is,
@@ -4593,7 +4593,7 @@ we check in the following sequence:
                         // the one that normally have fragments (but I may be wrong...)
                         // and will force the use of URI when the protocol is not file:
                         if( (!aFragment.isEmpty() && !bTargetHasPDFExtension) ||
-                                        eTargetProtocol != INetProtocol::FILE )
+                                        eTargetProtocol != INetProtocol::File )
                         {
                             aLine.append( "/URI/URI" );
                         }
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 87ef52e2347b..3c573ae00b43 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -458,7 +458,7 @@ void PPDParser::initPPDFiles(PPDCache &rPPDCache)
     psp::getPrinterPathList( aPathList, PRINTER_PPDDIR );
     for( std::list< OUString >::const_iterator ppd_it = aPathList.begin(); ppd_it != aPathList.end(); ++ppd_it )
     {
-        INetURLObject aPPDDir( *ppd_it, INetProtocol::FILE, INetURLObject::ENCODE_ALL );
+        INetURLObject aPPDDir( *ppd_it, INetProtocol::File, INetURLObject::ENCODE_ALL );
         scanPPDDir( aPPDDir.GetMainURL( INetURLObject::NO_DECODE ) );
     }
     if( rPPDCache.pAllPPDFiles->find( OUString( "SGENPRT" ) ) == rPPDCache.pAllPPDFiles->end() )
@@ -481,7 +481,7 @@ void PPDParser::initPPDFiles(PPDCache &rPPDCache)
 
 OUString PPDParser::getPPDFile( const OUString& rFile )
 {
-    INetURLObject aPPD( rFile, INetProtocol::FILE, INetURLObject::ENCODE_ALL );
+    INetURLObject aPPD( rFile, INetProtocol::File, INetURLObject::ENCODE_ALL );
     // someone might enter a full qualified name here
     PPDDecompressStream aStream( aPPD.PathToFileName() );
     if( ! aStream.IsOpen() )
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index 7c69eaf6d66a..8464f6f03333 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -210,7 +210,7 @@ void PrinterInfoManager::initialize()
     std::list< OUString >::const_iterator print_dir_it;
     for( print_dir_it = aDirList.begin(); print_dir_it != aDirList.end(); ++print_dir_it )
     {
-        INetURLObject aFile( *print_dir_it, INetProtocol::FILE, INetURLObject::ENCODE_ALL );
+        INetURLObject aFile( *print_dir_it, INetProtocol::File, INetURLObject::ENCODE_ALL );
         aFile.Append( OUString( PRINT_FILENAME ) );
         Config aConfig( aFile.PathToFileName() );
         if( aConfig.HasGroup( GLOBAL_DEFAULTS_GROUP ) )
@@ -277,7 +277,7 @@ void PrinterInfoManager::initialize()
     // now collect all available printers
     for( print_dir_it = aDirList.begin(); print_dir_it != aDirList.end(); ++print_dir_it )
     {
-        INetURLObject aDir( *print_dir_it, INetProtocol::FILE, INetURLObject::ENCODE_ALL );
+        INetURLObject aDir( *print_dir_it, INetProtocol::File, INetURLObject::ENCODE_ALL );
         INetURLObject aFile( aDir );
         aFile.Append( OUString( PRINT_FILENAME ) );
 
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
index 0443eda76340..4aaa69fabcd8 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
@@ -51,7 +51,7 @@ OUString SalGtkPicker::uritounicode(const gchar* pIn)
         RTL_TEXTENCODING_UTF8 );
 
     INetURLObject aURL(sURL);
-    if (INetProtocol::FILE == aURL.GetProtocol())
+    if (INetProtocol::File == aURL.GetProtocol())
     {
         // all the URLs are handled by office in UTF-8
         // so the Gnome FP related URLs should be converted accordingly
@@ -81,7 +81,7 @@ OString SalGtkPicker::unicodetouri(const OUString &rURL)
     // so the Gnome FP related URLs should be converted accordingly
     OString sURL = OUStringToOString(rURL, RTL_TEXTENCODING_UTF8);
     INetURLObject aURL(rURL);
-    if (INetProtocol::FILE == aURL.GetProtocol())
+    if (INetProtocol::File == aURL.GetProtocol())
     {
         OUString aNewURL = uri::ExternalUriReferenceTranslator::create( m_xContext )->translateToInternal(rURL);