code refactoring: fix memory leaks, code style, etc.

builder/Builder.cpp

@@ -14,18 +14,23 @@
  * Product
  * the final object that will be created using Builder
  */
-class Product {
+class Product
+{
 public:
-  void makeA(const std::string &part) {
+  void makeA( const std::string &part )
+  {
     partA = part;
   }
-  void makeB(const std::string &part) {
+  void makeB( const std::string &part )
+  {
     partB = part;
   }
-  void makeC(const std::string &part) {
+  void makeC( const std::string &part )
+  {
     partC = part;
   }
-  std::string get() {
+  std::string get()
+  {
     return (partA + " " + partB + " " + partC);
   }
   // ...
@@ -41,21 +46,21 @@ private:
  * Builder
  * abstract interface for creating products
  */
-class Builder {
+class Builder
+{
 public:
-  virtual ~Builder() {
-    // ...
-  }
-
-  Product get() {
+  virtual ~Builder() {}
+  
+  Product get()
+  {
     return product;
   }
-
+  
   virtual void buildPartA() = 0;
   virtual void buildPartB() = 0;
   virtual void buildPartC() = 0;
   // ...
-  
+
 protected:
   Product product;
 };
@@ -64,30 +69,38 @@ protected:
  * Concrete Builder X and Y
  * create real products and stores them in the composite structure
  */
-class ConcreteBuilderX : public Builder {
+class ConcreteBuilderX : public Builder
+{
 public:
-  void buildPartA() {
-    product.makeA("A-X");
+  void buildPartA()
+  {
+    product.makeA( "A-X" );
   }
-  void buildPartB() {
-    product.makeB("B-X");
+  void buildPartB()
+  {
+    product.makeB( "B-X" );
   }
-  void buildPartC() {
-    product.makeC("C-X");
+  void buildPartC()
+  {
+    product.makeC( "C-X" );
   }
   // ...
 };
 
-class ConcreteBuilderY : public Builder {
+class ConcreteBuilderY : public Builder
+{
 public:
-  void buildPartA() {
-    product.makeA("A-Y");
+  void buildPartA()
+  {
+    product.makeA( "A-Y" );
   }
-  void buildPartB() {
-    product.makeB("B-Y");
+  void buildPartB()
+  {
+    product.makeB( "B-Y" );
   }
-  void buildPartC() {
-    product.makeC("C-Y");
+  void buildPartC()
+  {
+    product.makeC( "C-Y" );
   }
   // ...
 };
@@ -98,26 +111,32 @@ public:
  */
 class Director {
 public:
-  Director() : builder(nullptr) {}
-
-  ~Director() {
-    if (builder) {
+  Director() : builder() {}
+  
+  ~Director()
+  {
+    if ( builder )
+    {
       delete builder;
     }
   }
-
-  void set(Builder *b) {
-    if (builder) {
+  
+  void set( Builder *b )
+  {
+    if ( builder )
+    {
       delete builder;
     }
     builder = b;
   }
-
-  Product get() {
+  
+  Product get()
+  {
     return builder->get();
   }
-
-  void construct() {
+  
+  void construct()
+  {
     builder->buildPartA();
     builder->buildPartB();
     builder->buildPartC();
@@ -133,17 +152,17 @@ private:
 int main()
 {
   Director director;
-  director.set(new ConcreteBuilderX);
+  director.set( new ConcreteBuilderX );
   director.construct();
-
+  
   Product product1 = director.get();
   std::cout << "1st product parts: " << product1.get() << std::endl;
-
-  director.set(new ConcreteBuilderY);
+  
+  director.set( new ConcreteBuilderY );
   director.construct();
-
+  
   Product product2 = director.get();
   std::cout << "2nd product parts: " << product2.get() << std::endl;
-
+  
   return 0;
 }