Change INetProtocol enumerators to CamelCase

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

Change-Id: I444e8b958f029201b228937e088efabc4b6d3050

5 files changed, 8 insertions, 8 deletions

diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx
index 6ed3e12d27c4..eb94e10ef6d8 100644
--- a/connectivity/source/drivers/calc/CConnection.cxx
+++ b/connectivity/source/drivers/calc/CConnection.cxx
@@ -72,13 +72,13 @@ void OCalcConnection::construct(const OUString& url,const Sequence< PropertyValu
 
     m_aFileName = aDSN;
     INetURLObject aURL;
-    aURL.SetSmartProtocol(INetProtocol::FILE);
+    aURL.SetSmartProtocol(INetProtocol::File);
     {
         SvtPathOptions aPathOptions;
         m_aFileName = aPathOptions.SubstituteVariable(m_aFileName);
     }
     aURL.SetSmartURL(m_aFileName);
-    if ( aURL.GetProtocol() == INetProtocol::NOT_VALID )
+    if ( aURL.GetProtocol() == INetProtocol::NotValid )
     {
         //  don't pass invalid URL to loadComponentFromURL
         throw SQLException();
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index b47a00f90983..d0c8d0205392 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -628,7 +628,7 @@ OUString ODbaseTable::getEntry(OConnection* _pConnection,const OUString& _sName
         while(xDir->next())
         {
             sName = xRow->getString(1);
-            aURL.SetSmartProtocol(INetProtocol::FILE);
+            aURL.SetSmartProtocol(INetProtocol::File);
             OUString sUrl = _pConnection->getURL() +  s_sSeparator + sName;
             aURL.SetSmartURL( sUrl );
 
@@ -1038,7 +1038,7 @@ bool ODbaseTable::CreateImpl()
     }
 
     INetURLObject aURL;
-    aURL.SetSmartProtocol(INetProtocol::FILE);
+    aURL.SetSmartProtocol(INetProtocol::File);
     OUString aName = getEntry(m_pConnection, m_Name);
     if(aName.isEmpty())
     {
@@ -2523,7 +2523,7 @@ OUString ODbaseTable::createTempFile()
         getConnection()->throwGenericSQLException(STR_COULD_NOT_ALTER_TABLE, *this);
 
     INetURLObject aURL;
-    aURL.SetSmartProtocol(INetProtocol::FILE);
+    aURL.SetSmartProtocol(INetProtocol::File);
     aURL.SetURL(aTempFile.GetURL());
 
     OUString sNewName(aURL.getName().copy(0, aURL.getName().getLength() - sExt.getLength()));
diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx
index ae5d244e214f..1d5fdfb3054d 100644
--- a/connectivity/source/drivers/file/FConnection.cxx
+++ b/connectivity/source/drivers/file/FConnection.cxx
@@ -136,7 +136,7 @@ void OConnection::construct(const OUString& url,const Sequence< PropertyValue >&
 
         OUString aFileName = aDSN;
         INetURLObject aURL;
-        aURL.SetSmartProtocol(INetProtocol::FILE);
+        aURL.SetSmartProtocol(INetProtocol::File);
         {
             SvtPathOptions aPathOptions;
             aFileName = aPathOptions.SubstituteVariable(aFileName);
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index eb9e750175db..cde05f7e5659 100644
--- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
@@ -220,7 +220,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
     while(xResultSet->next())
     {
         aName = xRow->getString(1);
-        aURL.SetSmartProtocol(INetProtocol::FILE);
+        aURL.SetSmartProtocol(INetProtocol::File);
         OUString sUrl = m_pConnection->getURL() + "/" + aName;
         aURL.SetSmartURL( sUrl );
         sThisContentExtension = aURL.getExtension();
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 26d6b22c93e0..1c124d87ec1e 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -468,7 +468,7 @@ OUString OFlatTable::getEntry()
         while(xDir->next())
         {
             sName = xRow->getString(1);
-            aURL.SetSmartProtocol(INetProtocol::FILE);
+            aURL.SetSmartProtocol(INetProtocol::File);
             OUString sUrl = m_pConnection->getURL() +  s_sSeparator + sName;
             aURL.SetSmartURL( sUrl );