Change INetProtocol enumerators to CamelCase

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

Change-Id: I444e8b958f029201b228937e088efabc4b6d3050

12 files changed, 15 insertions, 15 deletions

diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 30967d8e1369..6d800cbe10f7 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -1245,7 +1245,7 @@ void ODatabaseModelImpl::impl_switchToLogicalURL( const OUString& i_rDocumentURL
         )
     {
         INetURLObject aURL( i_rDocumentURL );
-        if ( aURL.GetProtocol() != INetProtocol::NOT_VALID )
+        if ( aURL.GetProtocol() != INetProtocol::NotValid )
         {
             m_sName = i_rDocumentURL;
             // TODO: our data source must broadcast the change of the Name property
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 98a305059a80..dc91e952a711 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -313,7 +313,7 @@ Reference< XInterface >  ODatabaseContext::getRegisteredObject(const OUString& _
 Reference< XInterface > ODatabaseContext::loadObjectFromURL(const OUString& _rName,const OUString& _sURL)
 {
     INetURLObject aURL( _sURL );
-    if ( aURL.GetProtocol() == INetProtocol::NOT_VALID )
+    if ( aURL.GetProtocol() == INetProtocol::NotValid )
         throw NoSuchElementException( _rName, *this );
 
     try
diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
index 9d2d9b7f6c0d..b5f3682d9308 100644
--- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx
+++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
@@ -239,7 +239,7 @@ namespace dbaccess
             throw IllegalArgumentException( OUString(), *this, 2 );
 
         INetURLObject aURL( _rLocation );
-        if ( aURL.GetProtocol() == INetProtocol::NOT_VALID )
+        if ( aURL.GetProtocol() == INetProtocol::NotValid )
             throw IllegalArgumentException( OUString(), *this, 2 );
     }
 
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index 021e9736bd98..c83049d5e991 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -1091,7 +1091,7 @@ Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const
         // the name which should be referred in the login dialog
         OUString sServerName( m_pImpl->m_sName );
         INetURLObject aURLCheck( sServerName );
-        if ( aURLCheck.GetProtocol() != INetProtocol::NOT_VALID )
+        if ( aURLCheck.GetProtocol() != INetProtocol::NotValid )
             sServerName = aURLCheck.getBase( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_UNAMBIGUOUS );
 
         // the request
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
index 658a14a32bce..c4ccd03e6353 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
@@ -119,7 +119,7 @@ namespace dbmm
             // get the document's current URL
             Reference< XModel > xDocument( getDialog().getDocument(), UNO_QUERY_THROW );
             INetURLObject aURLParser( xDocument->getURL() );
-            OSL_ENSURE( aURLParser.GetProtocol() != INetProtocol::NOT_VALID, "SaveDBDocPage::initializePage: illegal document URL!" );
+            OSL_ENSURE( aURLParser.GetProtocol() != INetProtocol::NotValid, "SaveDBDocPage::initializePage: illegal document URL!" );
 
             OUStringBuffer aBaseName( aURLParser.getBase() );
             aBaseName.appendAscii( ".backup" );
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 53759bc083be..632da15e494e 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -404,7 +404,7 @@ void SAL_CALL OApplicationController::disposing()
                             OUString());
 
                     // add to recent document list
-                    if ( aURL.GetProtocol() == INetProtocol::FILE )
+                    if ( aURL.GetProtocol() == INetProtocol::File )
                         Application::AddToRecentDocumentList( aURL.GetURLNoPass( INetURLObject::NO_DECODE ),
                                                               (pFilter) ? pFilter->GetMimeType() : OUString(),
                                                               (pFilter) ? pFilter->GetServiceName() : OUString() );
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 11614688dfd1..429bd4335396 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -1089,7 +1089,7 @@ namespace
     bool getDataSourceDisplayName_isURL( const OUString& _rDS, OUString& _rDisplayName, OUString& _rUniqueId )
     {
         INetURLObject aURL( _rDS );
-        if ( aURL.GetProtocol() != INetProtocol::NOT_VALID )
+        if ( aURL.GetProtocol() != INetProtocol::NotValid )
         {
             _rDisplayName = aURL.getBase(INetURLObject::LAST_SEGMENT,true,INetURLObject::DECODE_WITH_CHARSET);
             _rUniqueId = aURL.GetMainURL( INetURLObject::NO_DECODE );
@@ -3653,7 +3653,7 @@ OUString SbaTableQueryBrowser::getPrivateTitle() const
         OUString sName = m_pTreeView->getListBox().GetEntryText(m_pCurrentlyDisplayed);
         sTitle = GetEntryText( pConnection );
         INetURLObject aURL(sTitle);
-        if ( aURL.GetProtocol() != INetProtocol::NOT_VALID )
+        if ( aURL.GetProtocol() != INetProtocol::NotValid )
             sTitle = aURL.getBase(INetURLObject::LAST_SEGMENT,true,INetURLObject::DECODE_WITH_CHARSET);
         if ( !sName.isEmpty() )
         {
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 3f914c73f706..5d8f1e255b35 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -612,7 +612,7 @@ namespace dbaui
             ::ucbhelper::Content aParent(aParser.GetMainURL(INetURLObject::NO_DECODE), xEmptyEnv, comphelper::getProcessComponentContext());
 
             OUString sContentType;
-            if ( INetProtocol::FILE == eProtocol )
+            if ( INetProtocol::File == eProtocol )
             {
                 sContentType = "application/vnd.sun.staroffice.fsys-folder";
                 // the file UCP currently does not support the ContentType property
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 847f69f2946f..1493734256b1 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -268,7 +268,7 @@ void ODbaseIndexDialog::Init()
 
     // if the string does not contain a path, cut the string
     INetURLObject aURL;
-    aURL.SetSmartProtocol(INetProtocol::FILE);
+    aURL.SetSmartProtocol(INetProtocol::File);
     {
         SvtPathOptions aPathOptions;
         m_aDSN = aPathOptions.SubstituteVariable(m_aDSN);
@@ -300,7 +300,7 @@ void ODbaseIndexDialog::Init()
 
     const OUString *pBegin = aFolderContent.getConstArray();
     const OUString *pEnd   = pBegin + aFolderContent.getLength();
-    aURL.SetSmartProtocol(INetProtocol::FILE);
+    aURL.SetSmartProtocol(INetProtocol::File);
     for(;pBegin != pEnd;++pBegin)
     {
         OUString aName;
@@ -408,7 +408,7 @@ void OTableInfo::WriteInfFile( const OUString& rDSN ) const
 {
     // open INF file
     INetURLObject aURL;
-    aURL.SetSmartProtocol(INetProtocol::FILE);
+    aURL.SetSmartProtocol(INetProtocol::File);
     OUString aDsn = rDSN;
     {
         SvtPathOptions aPathOptions;
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 725f79c99653..30240f286c08 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -815,7 +815,7 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
         {
             m_aDocURL = INetURLObject(aFileDlg.GetPath());
 
-            if( m_aDocURL.GetProtocol() != INetProtocol::NOT_VALID )
+            if( m_aDocURL.GetProtocol() != INetProtocol::NotValid )
             {
                 OUString sFileName = m_aDocURL.GetMainURL( INetURLObject::NO_DECODE );
                 if ( ::utl::UCBContentHelper::IsDocument(sFileName) )
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 951e41f7e933..9d7cacc9512a 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -595,7 +595,7 @@ void OSQLMessageBox::impl_createStandardButtons( WinBits _nStyle )
 
         OUString aTmp;
         INetURLObject aHID( m_sHelpURL );
-        if ( aHID.GetProtocol() == INetProtocol::HID )
+        if ( aHID.GetProtocol() == INetProtocol::Hid )
               aTmp = aHID.GetURLPath();
         else
             aTmp = m_sHelpURL;
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 9dca902eaeea..5c661d5d8191 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -1081,7 +1081,7 @@ OUString getStrippedDatabaseName(const Reference<XPropertySet>& _xDataSource,OUS
     }
     OUString sName = _rsDatabaseName;
     INetURLObject aURL(sName);
-    if ( aURL.GetProtocol() != INetProtocol::NOT_VALID )
+    if ( aURL.GetProtocol() != INetProtocol::NotValid )
         sName = aURL.getBase(INetURLObject::LAST_SEGMENT,true,INetURLObject::DECODE_UNAMBIGUOUS);
     return sName;
 }