mockpp-commits

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/chaining
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23474/mockpp/chaining

Modified Files:
	ChainableMockMethod.h 
Log Message:
simplified a bit

Index: ChainableMockMethod.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ChainableMockMethod.h	3 Oct 2005 09:54:39 -0000	1.3
+++ ChainableMockMethod.h	16 Oct 2005 12:26:46 -0000	1.4
@@ -50,13 +50,23 @@
     */
     ChainableMockMethodBase(const String &name, ChainableMockObject *parent = 0)
       : MockObject(name, parent)
+      , chainable(parent)
     {}
 
+    ChainableMockObject *getChainableMockObject() const
+    {
+      return chainable;
+    }
+
     String getMethodName() const
     {
 //       static CppString method_name = getVerifiableName() + MOCKPP_PCHAR(".") + m_name;
       return getVerifiableName();
     }
+
+  private:
+
+    ChainableMockObject   *chainable;
 };
 
 
@@ -92,8 +102,8 @@
     {
       public:
 
-        ChainerFor(ChainableMockObject &obj, ChainableMockMethod1Base &method)
-          : Builder(&method.getCoreMock(), &obj, method.getMethodName())
+        ChainerFor(ChainableMockMethod1Base &method)
+          : Builder(&method.getCoreMock(), method.getChainableMockObject(), method.getMethodName())
         {}
     };
 
@@ -181,8 +191,8 @@
     {
       public:
 
-        ChainerFor(ChainableMockObject &obj, ChainableMockMethod2Base &method)
-          : Builder(&method.getCoreMock(), &obj, method.getMethodName())
+        ChainerFor(ChainableMockMethod2Base &method)
+          : Builder(&method.getCoreMock(), method.getChainableMockObject(), method.getMethodName())
         {}
     };