From: Bjoern Sikora <bjoern.sikora@intra2net.com>
Date: Wed, 16 Sep 2009 09:59:58 +0000 (+0200)
Subject: Avoid typedefs in header files if not really necessary.
X-Git-Tag: v1.1~184
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=92beaba331d89197d8c8045e4f2ddd5ecc63c438;p=bpdyndnsd

Avoid typedefs in header files if not really necessary.
---

diff --git a/src/config.cpp b/src/config.cpp
index d1cee9f..870f1c7 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -33,6 +33,8 @@ namespace po = boost::program_options;
 namespace fs = boost::filesystem;
 namespace ba = boost::algorithm;
 
+typedef boost::shared_ptr<boost::program_options::options_description> Options_descriptionPtr;
+
 using namespace std;
 
 /**
@@ -536,7 +538,7 @@ int Config::load_config_from_files()
  * Getter method for member OptDescCmd.
  * @return options_description*.
  */
-Config::Options_descriptionPtr Config::get_opt_desc_cmd() const
+Options_descriptionPtr Config::get_opt_desc_cmd() const
 {
     return OptDescCmd;
 }
@@ -546,7 +548,7 @@ Config::Options_descriptionPtr Config::get_opt_desc_cmd() const
  * Getter method for member OptDescConfMain.
  * @return options_description*.
  */
-Config::Options_descriptionPtr Config::get_opt_desc_conf_main() const
+Options_descriptionPtr Config::get_opt_desc_conf_main() const
 {
     return OptDescConfMain;
 }
@@ -556,7 +558,7 @@ Config::Options_descriptionPtr Config::get_opt_desc_conf_main() const
  * Getter method for member OptDescConfService.
  * @return options_description*.
  */
-Config::Options_descriptionPtr Config::get_opt_desc_conf_service() const
+Options_descriptionPtr Config::get_opt_desc_conf_service() const
 {
     return OptDescConfService;
 }
diff --git a/src/config.h b/src/config.h
index 9365340..b5a54de 100644
--- a/src/config.h
+++ b/src/config.h
@@ -23,13 +23,12 @@
 
 class Config
 {
-private:
 
-    typedef boost::shared_ptr<boost::program_options::options_description> Options_descriptionPtr;
+private:
 
-    Options_descriptionPtr OptDescCmd;
-    Options_descriptionPtr OptDescConfMain;
-    Options_descriptionPtr OptDescConfService;
+    boost::shared_ptr<boost::program_options::options_description> OptDescCmd;
+    boost::shared_ptr<boost::program_options::options_description> OptDescConfMain;
+    boost::shared_ptr<boost::program_options::options_description> OptDescConfService;
     boost::program_options::variables_map VariablesMap;
 
     Logger::Ptr Log;
@@ -63,11 +62,11 @@ public:
 
     int load_config_from_files();
 
-    Options_descriptionPtr get_opt_desc_cmd() const;
+    boost::shared_ptr<boost::program_options::options_description> get_opt_desc_cmd() const;
 
-    Options_descriptionPtr get_opt_desc_conf_main() const;
+    boost::shared_ptr<boost::program_options::options_description> get_opt_desc_conf_main() const;
 
-    Options_descriptionPtr get_opt_desc_conf_service() const;
+    boost::shared_ptr<boost::program_options::options_description> get_opt_desc_conf_service() const;
 
     bool get_daemon_mode() const;
 
diff --git a/src/httphelper.h b/src/httphelper.h
index d8c982a..1f987dc 100644
--- a/src/httphelper.h
+++ b/src/httphelper.h
@@ -18,6 +18,7 @@
 
 class HTTPHelper
 {
+
 private:
 
     Logger::Ptr Log;
diff --git a/src/ip_addr_helper.h b/src/ip_addr_helper.h
index 5d7765b..9d50ccc 100644
--- a/src/ip_addr_helper.h
+++ b/src/ip_addr_helper.h
@@ -18,6 +18,7 @@
 
 class IPAddrHelper
 {
+
 private:
 
     Logger::Ptr Log;
diff --git a/src/ip_service.h b/src/ip_service.h
index 951f3bb..10eece3 100644
--- a/src/ip_service.h
+++ b/src/ip_service.h
@@ -17,6 +17,7 @@
 
 class IPService
 {
+
 public:
 
     typedef boost::shared_ptr<IPService> Ptr;
diff --git a/src/logger.cpp b/src/logger.cpp
index c8ca7d8..dc712e9 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -17,6 +17,8 @@
 
 namespace po = boost::program_options;
 
+typedef boost::shared_ptr<boost::program_options::options_description> Options_descriptionPtr;
+
 using namespace std;
 
 /**
diff --git a/src/logger.h b/src/logger.h
index 55cdfb3..d946d50 100644
--- a/src/logger.h
+++ b/src/logger.h
@@ -21,8 +21,6 @@ class Logger
 
 private:
 
-    typedef boost::shared_ptr<boost::program_options::options_description> Options_descriptionPtr;
-
     int Loglevel;
     bool Syslog;
     std::string ExternalWarningLog;
@@ -52,7 +50,7 @@ public:
 
     void set_log_facility(const int _loglevel, const bool _syslog, const std::string& _external_error_log, const int _external_error_level);
 
-    void print_usage(const Options_descriptionPtr opt_desc) const;
+    void print_usage(const boost::shared_ptr<boost::program_options::options_description> opt_desc) const;
 
     void print_version() const;
 
diff --git a/src/net_helper.h b/src/net_helper.h
index 7b3254b..b22ae55 100644
--- a/src/net_helper.h
+++ b/src/net_helper.h
@@ -18,6 +18,7 @@
 
 class NetHelper
 {
+
 private:
 
     Logger::Ptr Log;
diff --git a/src/service.h b/src/service.h
index 8af8c24..ca204d6 100644
--- a/src/service.h
+++ b/src/service.h
@@ -20,6 +20,7 @@
 
 class Service
 {
+
 private:
 
     std::string Protocol;
diff --git a/src/util.h b/src/util.h
index 870c346..cf8299b 100644
--- a/src/util.h
+++ b/src/util.h
@@ -14,7 +14,6 @@
 namespace Util
 {
     static std::string compute_md5_digest(std::string data) throw (std::invalid_argument);
-
     static std::string parse_status_code(std::string data);
 };