summaryrefslogtreecommitdiff
path: root/cppe/src/IceE/DefaultsAndOverrides.cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2005-07-19 17:09:40 +0000
committerDwayne Boone <dwayne@zeroc.com>2005-07-19 17:09:40 +0000
commit49a3baf241e28c42be6e48c15378ca2a445477cd (patch)
tree8e2194212d4e5a1527b8bf8281192e3756f25f13 /cppe/src/IceE/DefaultsAndOverrides.cpp
parentFixed pe=roperty setting (diff)
downloadice-49a3baf241e28c42be6e48c15378ca2a445477cd.tar.bz2
ice-49a3baf241e28c42be6e48c15378ca2a445477cd.tar.xz
ice-49a3baf241e28c42be6e48c15378ca2a445477cd.zip
Renamed properties back to Ice.
Diffstat (limited to 'cppe/src/IceE/DefaultsAndOverrides.cpp')
-rw-r--r--cppe/src/IceE/DefaultsAndOverrides.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/cppe/src/IceE/DefaultsAndOverrides.cpp b/cppe/src/IceE/DefaultsAndOverrides.cpp
index b9b61e2b75c..65ee47b79fc 100644
--- a/cppe/src/IceE/DefaultsAndOverrides.cpp
+++ b/cppe/src/IceE/DefaultsAndOverrides.cpp
@@ -24,33 +24,33 @@ IceInternal::DefaultsAndOverrides::DefaultsAndOverrides(const PropertiesPtr& pro
overrideConnectTimeout(false),
overrideConnectTimeoutValue(-1)
{
- const_cast<string&>(defaultHost) = properties->getProperty("IceE.Default.Host");
+ const_cast<string&>(defaultHost) = properties->getProperty("Ice.Default.Host");
if(defaultHost.empty())
{
const_cast<string&>(defaultHost) = getLocalHost(true);
}
#ifdef ICEE_HAS_ROUTER
- const_cast<string&>(defaultRouter) = properties->getProperty("IceE.Default.Router");
+ const_cast<string&>(defaultRouter) = properties->getProperty("Ice.Default.Router");
#endif
string value;
- value = properties->getProperty("IceE.Override.Timeout");
+ value = properties->getProperty("Ice.Override.Timeout");
if(!value.empty())
{
const_cast<bool&>(overrideTimeout) = true;
- const_cast<Int&>(overrideTimeoutValue) = properties->getPropertyAsInt("IceE.Override.Timeout");
+ const_cast<Int&>(overrideTimeoutValue) = properties->getPropertyAsInt("Ice.Override.Timeout");
}
- value = properties->getProperty("IceE.Override.ConnectTimeout");
+ value = properties->getProperty("Ice.Override.ConnectTimeout");
if(!value.empty())
{
const_cast<bool&>(overrideConnectTimeout) = true;
- const_cast<Int&>(overrideConnectTimeoutValue) = properties->getPropertyAsInt("IceE.Override.ConnectTimeout");
+ const_cast<Int&>(overrideConnectTimeoutValue) = properties->getPropertyAsInt("Ice.Override.ConnectTimeout");
}
#ifdef ICEE_HAS_LOCATOR
- const_cast<string&>(defaultLocator) = properties->getProperty("IceE.Default.Locator");
+ const_cast<string&>(defaultLocator) = properties->getProperty("Ice.Default.Locator");
#endif
}