From: Alex Rousskov Date: Thu, 8 May 2008 21:02:24 +0000 (-0600) Subject: Renamed MessageTranslator to MessageRep for consistency and brivety. X-Git-Tag: SQUID_3_1_0_1~45^2~11^2~24^2~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7b67e5b6ebd044b9d4fa391388944cc3bfe3292a;p=thirdparty%2Fsquid.git Renamed MessageTranslator to MessageRep for consistency and brivety. --- diff --git a/src/eCAP/Makefile.am b/src/eCAP/Makefile.am index f7d2478e47..d52aac9b90 100644 --- a/src/eCAP/Makefile.am +++ b/src/eCAP/Makefile.am @@ -13,8 +13,8 @@ libeCAP_la_SOURCES = \ Config.cc \ Host.h \ Host.cc \ - MessageTranslator.h \ - MessageTranslator.cc \ + MessageRep.h \ + MessageRep.cc \ ServiceRep.h \ ServiceRep.cc \ XactionRep.h \ diff --git a/src/eCAP/MessageTranslator.cc b/src/eCAP/MessageRep.cc similarity index 69% rename from src/eCAP/MessageTranslator.cc rename to src/eCAP/MessageRep.cc index f7fabe2c86..e808c347f8 100644 --- a/src/eCAP/MessageTranslator.cc +++ b/src/eCAP/MessageRep.cc @@ -4,5 +4,5 @@ #include "squid.h" #include "adaptation/Message.h" -#include "eCAP/MessageTranslator.h" +#include "eCAP/MessageRep.h" diff --git a/src/eCAP/MessageTranslator.h b/src/eCAP/MessageRep.h similarity index 53% rename from src/eCAP/MessageTranslator.h rename to src/eCAP/MessageRep.h index 5abe8d7aa5..374c6d31b5 100644 --- a/src/eCAP/MessageTranslator.h +++ b/src/eCAP/MessageRep.h @@ -3,8 +3,8 @@ * $Id$ */ -#ifndef SQUID__ECAP__MESSAGE_TRANSLATOR_H -#define SQUID__ECAP__MESSAGE_TRANSLATOR_H +#ifndef SQUID__ECAP__MESSAGE_REP_H +#define SQUID__ECAP__MESSAGE_REP_H #include "adaptation/forward.h" #include @@ -12,11 +12,11 @@ namespace Ecap { // Translates Squid Adaptation::Message into libecap::Message. -class MessageTranslator: public libecap::Message +class MessageRep: public libecap::Message { public: - MessageTranslator(Adaptation::Message &aMessage): theMessage(aMessage) {} + MessageRep(Adaptation::Message &aMessage): theMessage(aMessage) {} private: Adaptation::Message &theMessage; // the message being translated to libecap @@ -24,4 +24,4 @@ private: } // namespace Ecap; -#endif /* SQUID__E_CAP__MESSAGE_TRANSLATOR_H */ +#endif /* SQUID__E_CAP__MESSAGE_REP_H */ diff --git a/src/eCAP/XactionRep.cc b/src/eCAP/XactionRep.cc index 46596d0c21..b45c622d48 100644 --- a/src/eCAP/XactionRep.cc +++ b/src/eCAP/XactionRep.cc @@ -17,8 +17,8 @@ Ecap::XactionRep::XactionRep(Adaptation::Initiator *anInitiator, AsyncJob("Ecap::XactionRep"), Adaptation::Initiate("Ecap::XactionRep", anInitiator, aService), theVirgin(virginHeader), theCause(virginCause), - theVirginTranslator(theVirgin), theCauseTranslator(theCause), - theAnswerTranslator(theAnswer) + theVirginRep(theVirgin), theCauseRep(theCause), + theAnswerRep(theAnswer) { } @@ -62,13 +62,13 @@ Ecap::XactionRep::terminateMaster() libecap::Message & Ecap::XactionRep::virginMessage() { - return theVirginTranslator; + return theVirginRep; } libecap::Message & Ecap::XactionRep::virginCause() { - return theCauseTranslator; + return theCauseRep; } void @@ -100,7 +100,7 @@ Ecap::XactionRep::makeAdaptedResponse() libecap::Message & Ecap::XactionRep::adaptedMessage() { - return theAnswerTranslator; + return theAnswerRep; } void diff --git a/src/eCAP/XactionRep.h b/src/eCAP/XactionRep.h index c1b9c0bc83..d01db0413f 100644 --- a/src/eCAP/XactionRep.h +++ b/src/eCAP/XactionRep.h @@ -10,7 +10,7 @@ #include "adaptation/Initiate.h" #include "adaptation/Service.h" #include "adaptation/Message.h" -#include "eCAP/MessageTranslator.h" +#include "eCAP/MessageRep.h" #include #include #include @@ -68,9 +68,9 @@ private: Adaptation::Message theVirgin; Adaptation::Message theCause; Adaptation::Message theAnswer; - MessageTranslator theVirginTranslator; - MessageTranslator theCauseTranslator; - MessageTranslator theAnswerTranslator; + MessageRep theVirginRep; + MessageRep theCauseRep; + MessageRep theAnswerRep; CBDATA_CLASS2(XactionRep); };