Cleaned up the code:

- Now (mostly string) arguments are passed as constant references.
- Removed some useless pure virtual method overrides.

diff --git a/chit.cpp b/chit.cpp
index 8ef60eb73c87d3cfadac566f0bba33afba95b273..2322d12ec8d8d1d221650f9e3bd59d61c92beeb6 100644 (file)
--- a/chit.cpp
+++ b/chit.cpp
@@ -10,7 +10,8 @@ using std::cerr;
 using std::endl;
 #endif
 
-CHIT::CHIT(string root, string postfix, string group): GHIT(root, postfix, group) {
+CHIT::CHIT(const string& root, const string& postfix, const string& group):
+        GHIT(root, postfix, group) {
 #ifdef DEBUG
     cerr << "In CHIT::CHIT(root = '" << root << "', postfix = '" << postfix
         << "', group = '" << group << "');" << endl;
@@ -23,7 +24,7 @@ CHIT::~CHIT(void) {
 #endif
 }
 
-string CHIT::getFileContent(string filename) {
+string CHIT::getFileContent(const string& filename) {
     Hash::iterator c = cache.find(filename);
     if (c == cache.end()) {
         cache[filename] = GHIT::getFileContent(filename);

diff --git a/chit.h b/chit.h
index 434e64e6942d9ae419fdba507d2da1fbd45f4b4c..4043d29728b01b265b136e24d196b05a7ce1c0e6 100644 (file)
--- a/chit.h
+++ b/chit.h
@@ -35,7 +35,7 @@ namespace bife {
              * @param  filename Name of the file to get the content.
              * @return File content.
              */
-            virtual string getFileContent(string);
+            virtual string getFileContent(const string&);
 
         public:
             /**
@@ -45,7 +45,8 @@ namespace bife {
              * @param postfix Postfix of the template files.
              * @param group   Starting group.
              */
-            CHIT(string = string("."), string = string(".tpl"), string = string(""));
+            CHIT(const string& = string("."), const string& = string(".tpl"),
+                    const string& = string(""));
 
             /**
              * Destructor.

diff --git a/container.cpp b/container.cpp
index 5375cb10e7792a8751c74de02cd6408c0847293f..85d12425a6acd0bc6aed2663027b706d17934a16 100644 (file)
--- a/container.cpp
+++ b/container.cpp
@@ -18,13 +18,13 @@ Container::Container(void) {
 #endif
 }
 
-Container::Container(Hash attrs): Widget(attrs) {
+Container::Container(const Hash& attrs): Widget(attrs) {
 #ifdef DEBUG
     cerr << "In Container::Container(attrs = {" /* TODO << attrs */ << "});" << endl;
 #endif
 }
 
-Container::Container(Hash attrs, Widget& content): Widget(attrs) {
+Container::Container(const Hash& attrs, Widget& content): Widget(attrs) {
     // FIXME - this->content.push_back(content);
 #ifdef DEBUG
     cerr << "In Container::Container(attrs = {" /* TODO << attrs */
@@ -32,7 +32,7 @@ Container::Container(Hash attrs, Widget& content): Widget(attrs) {
 #endif
 }
 
-Container::Container(Widget& content, Hash attrs): Widget(attrs) {
+Container::Container(Widget& content, const Hash& attrs): Widget(attrs) {
     // FIXME - this->content.push_back(content);
 #ifdef DEBUG
     cerr << "In Container::Container(content = {" /* TODO << content */

diff --git a/container.h b/container.h
index 9029c8ade9f24b674065de31e0d8c7f852a52663..f01dcac53a29a9d7f983713e334f2365ff856a30 100644 (file)
--- a/container.h
+++ b/container.h
@@ -40,7 +40,7 @@ namespace bife {
              *
              * @param attrs Widget attributes.
              */
-            Container(Hash);
+            Container(const Hash&);
 
             /**
              * Constructor.
@@ -48,7 +48,7 @@ namespace bife {
              * @param attrs   Widget attributes.
              * @param content Content of the widget.
              */
-            Container(Hash, Widget&);
+            Container(const Hash&, Widget&);
 
             /**
              * Constructor.
@@ -56,7 +56,7 @@ namespace bife {
              * @param content Content of the widget.
              * @param attrs   Widget attributes.
              */
-            Container(Widget&, Hash);
+            Container(Widget&, const Hash&);
 
             /**
              * Destructor.
@@ -69,15 +69,7 @@ namespace bife {
              * @param  hit HIT template to use to render de widget.
              * @return Rendered widget.
              */
-            virtual string render(HIT&) = 0;
-
-            /**
-             * Renders the widget using a HIT template.
-             *
-             * @param  hit HIT template to use to render de widget.
-             * @return Rendered widget.
-             */
-            string renderContent(HIT&);
+            virtual string renderContent(HIT&);
     };
 
 }

diff --git a/fallback.cpp b/fallback.cpp
index e8ed815398d2dd2314f1c50df251c3548480d66b..6179706b9a30330c748ee13d76a2545bc47b95b6 100644 (file)
--- a/fallback.cpp
+++ b/fallback.cpp
@@ -12,21 +12,22 @@ using std::cerr;
 using std::endl;
 #endif
 
-Fallback::Fallback(string name) {
-    root = NULL;
+Fallback::Fallback(const string& name): name(name) {
 #ifdef DEBUG
     cerr << "In Fallback::Fallback(name = '" << name << "');" << endl;
 #endif
 }
 
-Fallback::Fallback(string name, Hash attrs): Container(attrs) {
+Fallback::Fallback(const string& name, const Hash& attrs):
+        Container(attrs), name(name) {
 #ifdef DEBUG
     cerr << "In Fallback::Fallback(name = '" << name
         << "', attrs = {" /* TODO << attrs */ << "});" << endl;
 #endif
 }
 
-Fallback::Fallback(string name, Hash attrs, Widget& content): Container(attrs) {
+Fallback::Fallback(const string& name, const Hash& attrs, Widget& content):
+        Container(attrs, content), name(name) {
     // FIXME - this->content.push_back(content);
 #ifdef DEBUG
     cerr << "In Fallback::Fallback(name = '" << name
@@ -35,7 +36,8 @@ Fallback::Fallback(string name, Hash attrs, Widget& content): Container(attrs) {
 #endif
 }
 
-Fallback::Fallback(string name, Widget& content, Hash attrs): Container(attrs) {
+Fallback::Fallback(const string& name, Widget& content, const Hash& attrs):
+        Container(content, attrs), name(name) {
     // FIXME - this->content.push_back(content);
 #ifdef DEBUG
     cerr << "In Fallback::Fallback(name = '" << name

diff --git a/fallback.h b/fallback.h
index 58f5cd34e5704a24494a30695fac066aba0cfb38..ade02b888f9b0583c15bcbe2a91a2d3ff95cbdaf 100644 (file)
--- a/fallback.h
+++ b/fallback.h
@@ -21,9 +21,9 @@ namespace bife {
      */
     class Fallback: public Container {
         // Attributes.
-        protected:
+        public:
             /// Root widget.
-            Widget* root;
+            string name;
 
         // Methods.
         public:
@@ -32,7 +32,7 @@ namespace bife {
              *
              * @param name    Name of the widget.
              */
-            Fallback(string);
+            Fallback(const string&);
 
             /**
              * Constructor.
@@ -40,7 +40,7 @@ namespace bife {
              * @param name    Name of the widget.
              * @param attrs   Widget attributes.
              */
-            Fallback(string, Hash);
+            Fallback(const string&, const Hash&);
 
             /**
              * Constructor.
@@ -49,7 +49,7 @@ namespace bife {
              * @param attrs   Widget attributes.
              * @param content Content of the widget.
              */
-            Fallback(string, Hash, Widget&);
+            Fallback(const string&, const Hash&, Widget&);
 
             /**
              * Constructor.
@@ -57,7 +57,7 @@ namespace bife {
              * @param name    Name of the widget.
              * @param content Content of the widget.
              */
-            Fallback(string, Widget&);
+            Fallback(const string&, Widget&);
 
             /**
              * Constructor.
@@ -66,20 +66,12 @@ namespace bife {
              * @param content Content of the widget.
              * @param attrs   Widget attributes.
              */
-            Fallback(string, Widget&, Hash);
+            Fallback(const string&, Widget&, const Hash&);
 
             /**
              * Destructor.
              */
             virtual ~Fallback(void);
-
-            /**
-             * Renders the widget using a HIT template.
-             *
-             * @param  hit HIT template to use to render de widget.
-             * @return Rendered widget.
-             */
-            virtual string render(HIT&) = 0;
     };
 
 }

diff --git a/ghit.cpp b/ghit.cpp
index 5243932b5d74d70f8872db975eb1009617fb82b0..5d453bd22c062a57fb580f6f9cbe9a7c534fddd0 100644 (file)
--- a/ghit.cpp
+++ b/ghit.cpp
@@ -10,7 +10,8 @@ using std::cerr;
 using std::endl;
 #endif
 
-GHIT::GHIT(string root, string postfix, string group): HIT(root, postfix) {
+GHIT::GHIT(const string& root, const string& postfix, const string& group):
+        HIT(root, postfix) {
 #ifdef DEBUG
     cerr << "In GHIT::GHIT(root = '" << root << "', postfix = '" << postfix
         << "', group = '" << group << "');" << endl;
@@ -24,11 +25,11 @@ GHIT::~GHIT(void) {
 #endif
 }
 
-string GHIT::getFileName(string blockname) {
+string GHIT::getFileName(const string& blockname) {
     return string(root + '/' + group.top() + '/' + blockname + postfix);
 }
 
-void GHIT::pushGroup(string group) {
+void GHIT::pushGroup(const string& group) {
     this->group.push(group);
 }
 

diff --git a/ghit.h b/ghit.h
index e362728488ea8e644c1e7aa8a87a213ecd19a249..1cfc00bbfb492fa42ab7498dfed7015b80b4e465 100644 (file)
--- a/ghit.h
+++ b/ghit.h
@@ -38,7 +38,7 @@ namespace bife {
              * @param  blockname Name of the block to get the filename.
              * @return Block's filename.
              */
-            virtual string getFileName(string);
+            virtual string getFileName(const string&);
 
         public:
             /**
@@ -48,7 +48,8 @@ namespace bife {
              * @param postfix Postfix of the template files.
              * @param group   Starting group.
              */
-            GHIT(string = string("."), string = string(".tpl"), string = string(""));
+            GHIT(const string& = string("."), const string& = string(".tpl"),
+                    const string& = string(""));
 
             /**
              * Destructor.
@@ -60,7 +61,7 @@ namespace bife {
              *
              * @param group Group of templates to work with.
              */
-            virtual void pushGroup(string);
+            virtual void pushGroup(const string&);
 
             /**
              * Stops working with a group of templates.

diff --git a/hit.cpp b/hit.cpp
index ad99316f60c89d3f2b498f7bb85ef86f45526a26..54bd6c1b925e93fe2c0b28c143d0eba4c33b5209 100644 (file)
--- a/hit.cpp
+++ b/hit.cpp
@@ -14,7 +14,7 @@ using std::cerr;
 using std::endl;
 #endif
 
-HIT::HIT(string root, string postfix): root(root), postfix(postfix) {
+HIT::HIT(const string& root, const string& postfix): root(root), postfix(postfix) {
 #ifdef DEBUG
     cerr << "In HIT::HIT(root = '" << root << "', postfix = '" << postfix << "')" << endl;
 #endif
@@ -26,11 +26,11 @@ HIT::~HIT(void) {
 #endif
 }
 
-string HIT::getFileName(string blockname) {
+string HIT::getFileName(const string& blockname) {
     return string(root + '/' + blockname + postfix);
 }
 
-string HIT::getFileContent(string filename) {
+string HIT::getFileContent(const string& filename) {
     stringbuf buff;
     ifstream in(filename.c_str());
     // FIXME - Verificar apertura.
@@ -47,7 +47,7 @@ string HIT::getFileContent(string filename) {
     return buff.str();
 }
 
-string HIT::parse(string blockname, Hash& vars) {
+string HIT::parse(const string& blockname, Hash& vars) {
     int pos;
     string key;
     string content = getFileContent(getFileName(blockname));

diff --git a/hit.h b/hit.h
index 9162460404b4090e8de9e3659d071ccbcc254ad7..ad6424f086e8e689d33fa54a85e8c2f6a6af3776 100644 (file)
--- a/hit.h
+++ b/hit.h
@@ -37,7 +37,7 @@ namespace bife {
              * @param  blockname Name of the block to get the filename.
              * @return Block's filename.
              */
-            virtual string getFileName(string);
+            virtual string getFileName(const string&);
 
             /**
              * Gets file content.
@@ -45,7 +45,7 @@ namespace bife {
              * @param  filename Name of the file to get the content.
              * @return File content.
              */
-            virtual string getFileContent(string);
+            virtual string getFileContent(const string&);
 
         public:
             /**
@@ -54,7 +54,7 @@ namespace bife {
              * @param root    Root directory from where to get the templates.
              * @param postfix Postfix of the template files.
              */
-            HIT(string = string("."), string = string(".tpl"));
+            HIT(const string& = string("."), const string& = string(".tpl"));
 
             /**
              * Destructor.
@@ -68,7 +68,7 @@ namespace bife {
              * @param  vars      Hash containing the variable names and their values.
              * @return Parsed block with variables replaced.
              */
-            string parse(string, Hash&);
+            string parse(const string&, Hash&);
     };
 
 }

diff --git a/widget.cpp b/widget.cpp
index 46e3d2b66ff3b9f197971ee2ea11d447be130011..cd95d5f785bf83a948cdc415756f4b6b63ffcc49 100644 (file)
--- a/widget.cpp
+++ b/widget.cpp
@@ -18,7 +18,7 @@ Widget::Widget(void) {
 #endif
 }
 
-Widget::Widget(Hash attrs): attrs(attrs) {
+Widget::Widget(const Hash& attrs): attrs(attrs) {
 #ifdef DEBUG
     cerr << "In Widget::Widget(attrs = {" /* TODO << attrs */ << "});" << endl;
 #endif

diff --git a/widget.h b/widget.h
index a054e20050415f64459d3ca6f3bdee0ca2c15ac7..de9f47bb31104e9f3d2a1e27fdfbb30dbbc581af 100644 (file)
--- a/widget.h
+++ b/widget.h
@@ -34,7 +34,7 @@ namespace bife {
              *
              * @param attrs Widget attributes.
              */
-            Widget(Hash);
+            Widget(const Hash&);
 
             /**
              * Destructor.