diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/NameMatchOptionHandler.h | 4 | ||||
| -rw-r--r-- | src/OptionHandler.h | 4 | ||||
| -rw-r--r-- | src/OptionHandlerFactory.cc | 10 | ||||
| -rw-r--r-- | src/OptionHandlerImpl.cc | 8 | ||||
| -rw-r--r-- | src/OptionHandlerImpl.h | 4 | ||||
| -rw-r--r-- | src/RpcMethod.cc | 2 |
6 files changed, 16 insertions, 16 deletions
diff --git a/src/NameMatchOptionHandler.h b/src/NameMatchOptionHandler.h index aa941d92..2426484b 100644 --- a/src/NameMatchOptionHandler.h +++ b/src/NameMatchOptionHandler.h @@ -168,12 +168,12 @@ public: changeOption_ = f; } - virtual bool getGlobalChangeOption() const + virtual bool getChangeGlobalOption() const { return globalChangeOption_; } - virtual void setGlobalChangeOption(bool f) + virtual void setChangeGlobalOption(bool f) { globalChangeOption_ = f; } diff --git a/src/OptionHandler.h b/src/OptionHandler.h index 63b12c49..f9302a28 100644 --- a/src/OptionHandler.h +++ b/src/OptionHandler.h @@ -109,8 +109,8 @@ public: virtual void setInitialOption(bool f) = 0; virtual bool getChangeOption() const = 0; virtual void setChangeOption(bool f) = 0; - virtual bool getGlobalChangeOption() const = 0; - virtual void setGlobalChangeOption(bool f) = 0; + virtual bool getChangeGlobalOption() const = 0; + virtual void setChangeGlobalOption(bool f) = 0; virtual bool getCumulative() const = 0; virtual void setCumulative(bool f) = 0; }; diff --git a/src/OptionHandlerFactory.cc b/src/OptionHandlerFactory.cc index 5903e172..f77bd50e 100644 --- a/src/OptionHandlerFactory.cc +++ b/src/OptionHandlerFactory.cc @@ -373,7 +373,7 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers() OptionHandler::REQ_ARG, 'l')); op->addTag(TAG_BASIC); - op->setGlobalChangeOption(true); + op->setChangeGlobalOption(true); handlers.push_back(op); } { @@ -385,7 +385,7 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers() std::vector<std::string> (vbegin(params), vend(params)))); op->addTag(TAG_ADVANCED); - op->setGlobalChangeOption(true); + op->setChangeGlobalOption(true); handlers.push_back(op); } { @@ -396,7 +396,7 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers() 1, -1, 'j')); op->addTag(TAG_BASIC); - op->setGlobalChangeOption(true); + op->setChangeGlobalOption(true); handlers.push_back(op); } { @@ -443,7 +443,7 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers() op->addTag(TAG_BITTORRENT); op->addTag(TAG_FTP); op->addTag(TAG_HTTP); - op->setGlobalChangeOption(true); + op->setChangeGlobalOption(true); handlers.push_back(op); } { @@ -1724,7 +1724,7 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers() 0)); op->addTag(TAG_BASIC); op->addTag(TAG_BITTORRENT); - op->setGlobalChangeOption(true); + op->setChangeGlobalOption(true); handlers.push_back(op); } { diff --git a/src/OptionHandlerImpl.cc b/src/OptionHandlerImpl.cc index 1bcdd6d1..e1c4b814 100644 --- a/src/OptionHandlerImpl.cc +++ b/src/OptionHandlerImpl.cc @@ -820,14 +820,14 @@ void DeprecatedOptionHandler::setChangeOption(bool f) depOptHandler_->setChangeOption(f); } -bool DeprecatedOptionHandler::getGlobalChangeOption() const +bool DeprecatedOptionHandler::getChangeGlobalOption() const { - return depOptHandler_->getGlobalChangeOption(); + return depOptHandler_->getChangeGlobalOption(); } -void DeprecatedOptionHandler::setGlobalChangeOption(bool f) +void DeprecatedOptionHandler::setChangeGlobalOption(bool f) { - depOptHandler_->setGlobalChangeOption(f); + depOptHandler_->setChangeGlobalOption(f); } bool DeprecatedOptionHandler::getCumulative() const diff --git a/src/OptionHandlerImpl.h b/src/OptionHandlerImpl.h index f624ce80..523419d2 100644 --- a/src/OptionHandlerImpl.h +++ b/src/OptionHandlerImpl.h @@ -316,8 +316,8 @@ public: virtual void setInitialOption(bool f); virtual bool getChangeOption() const; virtual void setChangeOption(bool f); - virtual bool getGlobalChangeOption() const; - virtual void setGlobalChangeOption(bool f); + virtual bool getChangeGlobalOption() const; + virtual void setChangeGlobalOption(bool f); virtual bool getCumulative() const; virtual void setCumulative(bool f); }; diff --git a/src/RpcMethod.cc b/src/RpcMethod.cc index 14a2df4e..d25107f9 100644 --- a/src/RpcMethod.cc +++ b/src/RpcMethod.cc @@ -142,7 +142,7 @@ void RpcMethod::gatherChangeableGlobalOption { if(optionsDict) { gatherOption(optionsDict->begin(), optionsDict->end(), - mem_fun_sh(&OptionHandler::getGlobalChangeOption), + mem_fun_sh(&OptionHandler::getChangeGlobalOption), option, optionParser_); } } |