Change INetProtocol to scoped enumeration

...and fix o3tl::enumarray::operator [] const overload

Change-Id: I749b1b9d68686b03a97074253478d9d2d9d32b0b

3 files changed, 6 insertions, 6 deletions

diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 62f184505a94..87ef52e2347b 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, INET_PROT_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, INET_PROT_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 0c9ed6369f74..7c69eaf6d66a 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, INET_PROT_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, INET_PROT_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 ebadb962888c..0443eda76340 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 (INET_PROT_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 (INET_PROT_FILE == aURL.GetProtocol())
+    if (INetProtocol::FILE == aURL.GetProtocol())
     {
         OUString aNewURL = uri::ExternalUriReferenceTranslator::create( m_xContext )->translateToInternal(rURL);