From: Guilherme Maciel Ferreira Date: Thu, 2 Feb 2012 23:14:54 +0000 (-0200) Subject: Fix: misspelled class name. X-Git-Tag: v1.3~11^2~19 X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=5596767bb17476abb53255d6ed804ee6893e9bd3;p=pingcheck Fix: misspelled class name. - The correct is HostsDownLimitOption instead of HostDownLimitOption. --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d578b39..793414f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -46,7 +46,7 @@ set(SOURCES config/option/hostpingprotocoloption.cpp config/option/hostportoption.cpp config/option/hostnameoption.cpp - config/option/hostdownlimitoption.cpp + config/option/hostsdownlimitoption.cpp config/option/linkdownintervaloption.cpp config/option/linkupintervaloption.cpp config/option/nameserveroption.cpp diff --git a/src/config/configurationoptions.cpp b/src/config/configurationoptions.cpp index 8e5f8b9..dd98445 100644 --- a/src/config/configurationoptions.cpp +++ b/src/config/configurationoptions.cpp @@ -29,7 +29,7 @@ #include "config/option/configfileoption.h" #include "config/option/daemonoption.h" -#include "config/option/hostdownlimitoption.h" +#include "config/option/hostsdownlimitoption.h" #include "config/option/hostnameoption.h" #include "config/option/hostportoption.h" #include "config/option/hostpingprotocoloption.h" @@ -73,8 +73,8 @@ ConfigurationOptions::ConfigurationOptions() : ConfigurationOptionItem version( new VersionOption ); GenericOptions.push_back( version ); - ConfigurationOptionItem host_down_limit( new HostDownLimitOption ); - ConfigOptions.push_back( host_down_limit ); + ConfigurationOptionItem hosts_down_limit( new HostsDownLimitOption ); + ConfigOptions.push_back( hosts_down_limit ); ConfigurationOptionItem link_down_interval( new LinkDownIntervalOption ); ConfigOptions.push_back( link_down_interval ); diff --git a/src/config/option/hostdownlimitoption.cpp b/src/config/option/hostsdownlimitoption.cpp similarity index 77% rename from src/config/option/hostdownlimitoption.cpp rename to src/config/option/hostsdownlimitoption.cpp index 33c9bc2..121af1d 100644 --- a/src/config/option/hostdownlimitoption.cpp +++ b/src/config/option/hostsdownlimitoption.cpp @@ -18,7 +18,7 @@ on this file might be covered by the GNU General Public License. */ -#include "config/option/hostdownlimitoption.h" +#include "config/option/hostsdownlimitoption.h" #include @@ -28,23 +28,23 @@ using boost::program_options::variables_map; using I2n::Logger::GlobalLogger; //----------------------------------------------------------------------------- -// HostDownLimitOption +// HostsDownLimitOption //----------------------------------------------------------------------------- -HostDownLimitOption::HostDownLimitOption() : +HostsDownLimitOption::HostsDownLimitOption() : ConfigurationOption( "hosts-down-limit", value()->default_value( 0 ), // no host down - "Limit of host that have to be down in order to notify." + "Limit of hosts that have to be down in order to notify." ) { } -HostDownLimitOption::~HostDownLimitOption() +HostsDownLimitOption::~HostsDownLimitOption() { } -bool HostDownLimitOption::parse( +bool HostsDownLimitOption::parse( const variables_map& vm, Configuration *configuration ) @@ -52,11 +52,11 @@ bool HostDownLimitOption::parse( // hosts-down-limit if ( 1 <= vm.count( get_command_string() ) ) { - int host_down_limit = vm[ get_command_string() ].as (); - configuration->set_hosts_down_limit( host_down_limit ); + int hosts_down_limit = vm[ get_command_string() ].as (); + configuration->set_hosts_down_limit( hosts_down_limit ); GlobalLogger.info() << get_command_string() << "=" - << host_down_limit << endl; + << hosts_down_limit << endl; return true; } diff --git a/src/config/option/hostdownlimitoption.h b/src/config/option/hostsdownlimitoption.h similarity index 84% rename from src/config/option/hostdownlimitoption.h rename to src/config/option/hostsdownlimitoption.h index 358962c..b1b5a6e 100644 --- a/src/config/option/hostdownlimitoption.h +++ b/src/config/option/hostsdownlimitoption.h @@ -18,25 +18,25 @@ on this file might be covered by the GNU General Public License. */ -#ifndef HOST_DOWN_LIMIT_OPTION_H -#define HOST_DOWN_LIMIT_OPTION_H +#ifndef HOSTS_DOWN_LIMIT_OPTION_H +#define HOSTS_DOWN_LIMIT_OPTION_H #include #include "config/option/configurationoption.h" //----------------------------------------------------------------------------- -// HostDownLimitOption +// HostsDownLimitOption //----------------------------------------------------------------------------- /** * @brief This class represents the "hosts-down-limit" configuration option. */ -class HostDownLimitOption : public ConfigurationOption +class HostsDownLimitOption : public ConfigurationOption { public: - HostDownLimitOption(); - virtual ~HostDownLimitOption(); + HostsDownLimitOption(); + virtual ~HostsDownLimitOption(); virtual bool parse( const boost::program_options::variables_map &vm, @@ -45,4 +45,4 @@ public: }; -#endif // HOST_DOWN_LIMIT_OPTION_H +#endif // HOSTS_DOWN_LIMIT_OPTION_H diff --git a/test/CMakeLists.test_configurationcommandline.txt b/test/CMakeLists.test_configurationcommandline.txt index bbbaf00..9bf66b0 100644 --- a/test/CMakeLists.test_configurationcommandline.txt +++ b/test/CMakeLists.test_configurationcommandline.txt @@ -14,7 +14,7 @@ add_executable(test_configurationcommandline ${CMAKE_SOURCE_DIR}/src/config/option/hostpingprotocoloption.cpp ${CMAKE_SOURCE_DIR}/src/config/option/hostportoption.cpp ${CMAKE_SOURCE_DIR}/src/config/option/hostnameoption.cpp - ${CMAKE_SOURCE_DIR}/src/config/option/hostdownlimitoption.cpp + ${CMAKE_SOURCE_DIR}/src/config/option/hostsdownlimitoption.cpp ${CMAKE_SOURCE_DIR}/src/config/option/linkdownintervaloption.cpp ${CMAKE_SOURCE_DIR}/src/config/option/linkupintervaloption.cpp ${CMAKE_SOURCE_DIR}/src/config/option/nameserveroption.cpp diff --git a/test/CMakeLists.test_configurationfile.txt b/test/CMakeLists.test_configurationfile.txt index d042739..1c7e19b 100644 --- a/test/CMakeLists.test_configurationfile.txt +++ b/test/CMakeLists.test_configurationfile.txt @@ -14,7 +14,7 @@ add_executable(test_configurationfile ${CMAKE_SOURCE_DIR}/src/config/option/hostpingprotocoloption.cpp ${CMAKE_SOURCE_DIR}/src/config/option/hostportoption.cpp ${CMAKE_SOURCE_DIR}/src/config/option/hostnameoption.cpp - ${CMAKE_SOURCE_DIR}/src/config/option/hostdownlimitoption.cpp + ${CMAKE_SOURCE_DIR}/src/config/option/hostsdownlimitoption.cpp ${CMAKE_SOURCE_DIR}/src/config/option/linkdownintervaloption.cpp ${CMAKE_SOURCE_DIR}/src/config/option/linkupintervaloption.cpp ${CMAKE_SOURCE_DIR}/src/config/option/nameserveroption.cpp