2010-06-11 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Made protected member variable private. Added accessor funcs.
	* src/AbstractAuthResolver.h
	* src/DefaultAuthResolver.cc
	* src/DefaultAuthResolver.h
	* src/NetrcAuthResolver.cc
	* src/NetrcAuthResolver.h

ChangeLog

@@ -1,3 +1,12 @@
+2010-06-11  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Made protected member variable private. Added accessor funcs.
+	* src/AbstractAuthResolver.h
+	* src/DefaultAuthResolver.cc
+	* src/DefaultAuthResolver.h
+	* src/NetrcAuthResolver.cc
+	* src/NetrcAuthResolver.h
+
 2010-06-11  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Made protected member variable private. Added accessor funcs.

src/AbstractAuthResolver.h

@@ -40,12 +40,10 @@
 namespace aria2 {
 
 class AbstractAuthResolver : public AuthResolver {
-protected:
-
+private:
   SharedHandle<AuthConfig> _userDefinedAuthConfig;
 
   SharedHandle<AuthConfig> _defaultAuthConfig;
-
 public:
   AbstractAuthResolver();
 

src/DefaultAuthResolver.cc

@@ -37,14 +37,13 @@
 
 namespace aria2 {
 
-DefaultAuthResolver::~DefaultAuthResolver() {}
-
-AuthConfigHandle DefaultAuthResolver::resolveAuthConfig(const std::string& hostname)
+AuthConfigHandle DefaultAuthResolver::resolveAuthConfig
+(const std::string& hostname)
 {
-  if(_userDefinedAuthConfig.isNull()) {
-    return _defaultAuthConfig;
+  if(getUserDefinedAuthConfig().isNull()) {
+    return getDefaultAuthConfig();
   } else {
-    return _userDefinedAuthConfig;
+    return getUserDefinedAuthConfig();
   }
 }
 

src/DefaultAuthResolver.h

@@ -41,9 +41,8 @@ namespace aria2 {
 
 class DefaultAuthResolver : public AbstractAuthResolver {
 public:
-  virtual ~DefaultAuthResolver();
-
-  virtual SharedHandle<AuthConfig> resolveAuthConfig(const std::string& hostname);
+  virtual SharedHandle<AuthConfig> resolveAuthConfig
+  (const std::string& hostname);
 };
 
 typedef SharedHandle<DefaultAuthResolver> DefaultAuthResolverHandle;

src/NetrcAuthResolver.cc

@@ -43,10 +43,10 @@ NetrcAuthResolver::NetrcAuthResolver():_ignoreDefault(false) {}
 SharedHandle<AuthConfig>
 NetrcAuthResolver::resolveAuthConfig(const std::string& hostname)
 {
-  if(_userDefinedAuthConfig.isNull()) {
+  if(getUserDefinedAuthConfig().isNull()) {
     return findNetrcAuthenticator(hostname);
   } else {
-    return _userDefinedAuthConfig;
+    return getUserDefinedAuthConfig();
   }
 }
 
@@ -54,14 +54,14 @@ SharedHandle<AuthConfig>
 NetrcAuthResolver::findNetrcAuthenticator(const std::string& hostname) const
 {
   if(_netrc.isNull()) {
-    return _defaultAuthConfig;
+    return getDefaultAuthConfig();
   } else {
     SharedHandle<Authenticator> auth = _netrc->findAuthenticator(hostname);
     if(auth.isNull()) {
-      return _defaultAuthConfig;
+      return getDefaultAuthConfig();
     } else {
-      if(_ignoreDefault && auth->getMachine() == "") {
-        return _defaultAuthConfig;
+      if(_ignoreDefault && auth->getMachine().empty()) {
+        return getDefaultAuthConfig();
       } else {
         return SharedHandle<AuthConfig>
           (new AuthConfig(auth->getLogin(), auth->getPassword()));

src/NetrcAuthResolver.h

@@ -47,13 +47,13 @@ private:
 
   bool _ignoreDefault;
 
-  SharedHandle<AuthConfig> findNetrcAuthenticator(const std::string& hostname) const;
+  SharedHandle<AuthConfig> findNetrcAuthenticator
+  (const std::string& hostname) const;
 public:
   NetrcAuthResolver();
 
-  virtual ~NetrcAuthResolver() {}
-
-  virtual SharedHandle<AuthConfig> resolveAuthConfig(const std::string& hostname);
+  virtual SharedHandle<AuthConfig> resolveAuthConfig
+  (const std::string& hostname);
 
   void setNetrc(const SharedHandle<Netrc>& netrc);