From 068d7924ff6e10b457d7b686ed8df1f93e970656 Mon Sep 17 00:00:00 2001
From: Nick Gasson <nick@nickg.me.uk>
Date: Sat, 31 Oct 2009 23:27:14 +0000
Subject: [PATCH] OK, I like camelCase

---
 include/gui2/ContainerWidget.hpp | 12 ++++++------
 include/gui2/ILayout.hpp         |  4 ++--
 include/gui2/Label.hpp           |  9 ++++-----
 include/gui2/Widget.hpp          |  8 ++++----
 layouts/demo.xml                 |  2 +-
 src/UIDemo.cpp                   | 12 ++++++------
 src/gui2/ContainerWidget.cpp     | 24 ++++++++++++------------
 src/gui2/Label.cpp               | 10 +++++-----
 src/gui2/Layout.cpp              |  8 ++++----
 src/gui2/Widget.cpp              | 10 +++++-----
 10 files changed, 49 insertions(+), 50 deletions(-)

diff --git a/include/gui2/ContainerWidget.hpp b/include/gui2/ContainerWidget.hpp
index b633600..c0b793c 100644
--- a/include/gui2/ContainerWidget.hpp
+++ b/include/gui2/ContainerWidget.hpp
@@ -31,23 +31,23 @@ namespace gui {
       ContainerWidget(const AttributeSet& attrs);
 
       virtual void render(RenderContext& rc) const;
-      virtual void adjust_for_theme(Theme& theme);
+      virtual void adjustForTheme(Theme& theme);
 
-      void add_child(Widget* w);
+      void addChild(Widget* w);
       
-      virtual void handle_click(int x, int y);
+      virtual void handleClick(int x, int y);
       
    protected:
-      virtual void child_added(Widget* w) {};
+      virtual void childAdded(Widget* w) {};
 
       typedef vector<Widget*> ChildList;
       
       ChildList::iterator begin() { return children.begin(); }
       ChildList::iterator end() { return children.end(); }
 
-      ChildList::const_iterator const_begin() const
+      ChildList::const_iterator constBegin() const
       { return children.begin(); }
-      ChildList::const_iterator const_end() const
+      ChildList::const_iterator constEnd() const
       { return children.end(); }
       
    private:
diff --git a/include/gui2/ILayout.hpp b/include/gui2/ILayout.hpp
index ee751d2..d6739d0 100644
--- a/include/gui2/ILayout.hpp
+++ b/include/gui2/ILayout.hpp
@@ -32,7 +32,7 @@ namespace gui {
       virtual ~ILayout() {}
 
       template <class T>
-      T& get_cast(const string& path) const
+      T& cast(const string& path) const
       {
          return dynamic_cast<T&>(get(path));
       }
@@ -45,7 +45,7 @@ namespace gui {
 
    typedef shared_ptr<ILayout> ILayoutPtr;
 
-   ILayoutPtr make_layout(const string& file_name);
+   ILayoutPtr makeLayout(const string& file_name);
 
 }
 
diff --git a/include/gui2/Label.hpp b/include/gui2/Label.hpp
index 43cec8a..c3c1b14 100644
--- a/include/gui2/Label.hpp
+++ b/include/gui2/Label.hpp
@@ -29,17 +29,16 @@ namespace gui {
    public:
       Label(const AttributeSet& attrs);
 
-      const string& text() const { return text_; }
-      void text(const string& t) { text_ = t; }
+      const string& text() const { return _text; }
+      void text(const string& t) { _text = t; }
 
       void format(const char* fmt, ...);
 
       void render(RenderContext& rc) const;
-      void adjust_for_theme(Theme& theme);
+      void adjustForTheme(Theme& theme);
    private:
-      string text_;
+      string _text;
    };
-   
 }
 
 #endif
diff --git a/include/gui2/Widget.hpp b/include/gui2/Widget.hpp
index 210cce8..9b5507c 100644
--- a/include/gui2/Widget.hpp
+++ b/include/gui2/Widget.hpp
@@ -51,22 +51,22 @@ namespace gui {
       void connect(Signal sig, SignalHandler handler);
 
       virtual void render(RenderContext& rc) const = 0;
-      virtual void adjust_for_theme(Theme& theme) {}
+      virtual void adjustForTheme(Theme& theme) {}
       
-      virtual void handle_click(int x, int y);
+      virtual void handleClick(int x, int y);
       
    protected:
       void raise(Signal sig);
 
    private:
-      static string unique_name();
+      static string uniqueName();
       
       string name_;
       int x_, y_, width_, height_;
 
       map<Signal, SignalHandler> handlers;
             
-      static int unique_id;
+      static int ourUniqueId;
    };
  
 }
diff --git a/layouts/demo.xml b/layouts/demo.xml
index 6bfe784..d397c44 100644
--- a/layouts/demo.xml
+++ b/layouts/demo.xml
@@ -8,7 +8,7 @@
             x="5" y="35" width="80" height="25" />
     <label text="abcdefghijklmnopqrstuvwxyz"
            name="cntlabel"
-           x="5" y="60"/>
+           x="5" y="65"/>
   </window>
 
   <window x="300" y="100" width="200" height="250"
diff --git a/src/UIDemo.cpp b/src/UIDemo.cpp
index 3e88e8b..4eead87 100644
--- a/src/UIDemo.cpp
+++ b/src/UIDemo.cpp
@@ -40,7 +40,7 @@ public:
       MouseButton button) {}
    
 private:
-   void btn1_click(gui::Widget& w);
+   void btn1Click(gui::Widget& w);
    
    gui::ILayoutPtr layout;
 };
@@ -49,18 +49,18 @@ UIDemo::UIDemo()
 {
    using namespace placeholders;
    
-   layout = gui::make_layout("layouts/demo.xml");
+   layout = gui::makeLayout("layouts/demo.xml");
 
    layout->get("/wnd1/btn1").connect(gui::Widget::SIG_CLICK,
-      bind(&UIDemo::btn1_click, this, _1));
+      bind(&UIDemo::btn1Click, this, _1));
 }
 
-void UIDemo::btn1_click(gui::Widget& w)
+void UIDemo::btn1Click(gui::Widget& w)
 {
    static int cnt = 0;
    debug() << "Clicked button 1!";
 
-   layout->get_cast<gui::Label>("/wnd1/cntlabel").text(
+   layout->cast<gui::Label>("/wnd1/cntlabel").text(
       boost::lexical_cast<string>(++cnt));
 }
 
@@ -75,7 +75,7 @@ void UIDemo::onMouseClick(IPickBufferPtr pick_buffer, int x, int y,
    layout->click(x, y);
 }
 
-IScreenPtr make_ui_demo()
+IScreenPtr makeUIDemo()
 {
    return IScreenPtr(new UIDemo);
 }
diff --git a/src/gui2/ContainerWidget.cpp b/src/gui2/ContainerWidget.cpp
index 540b750..ca9fa18 100644
--- a/src/gui2/ContainerWidget.cpp
+++ b/src/gui2/ContainerWidget.cpp
@@ -28,34 +28,34 @@ ContainerWidget::ContainerWidget(const AttributeSet& attrs)
 
 void ContainerWidget::render(RenderContext& rc) const
 {
-   for (ChildList::const_iterator it = const_begin();
-        it != const_end(); ++it) {
+   for (ChildList::const_iterator it = constBegin();
+        it != constEnd(); ++it) {
       rc.scissor(*it);
       (*it)->render(rc);
    }
 }
 
-void ContainerWidget::add_child(Widget* w)
+void ContainerWidget::addChild(Widget* w)
 {
    children.push_back(w);
-   child_added(w);
+   childAdded(w);
 }
 
-void ContainerWidget::adjust_for_theme(Theme& theme)
+void ContainerWidget::adjustForTheme(Theme& theme)
 {
-   for (ChildList::const_iterator it = const_begin();
-        it != const_end(); ++it)
-      (*it)->adjust_for_theme(theme);
+   for (ChildList::const_iterator it = constBegin();
+        it != constEnd(); ++it)
+      (*it)->adjustForTheme(theme);
 }
 
-void ContainerWidget::handle_click(int x, int y)
+void ContainerWidget::handleClick(int x, int y)
 {
-   for (ChildList::const_iterator it = const_begin();
-        it != const_end(); ++it) {
+   for (ChildList::const_iterator it = constBegin();
+        it != constEnd(); ++it) {
       Widget& w = **it;
 
       if (w.x() <= x && x < w.x() + w.width()
          && w.y() <= y && y < w.y() + w.height())
-         w.handle_click(x - w.x(), y - w.y());
+         w.handleClick(x - w.x(), y - w.y());
    }
 }
diff --git a/src/gui2/Label.cpp b/src/gui2/Label.cpp
index c1a98d2..d02d4a8 100644
--- a/src/gui2/Label.cpp
+++ b/src/gui2/Label.cpp
@@ -25,19 +25,19 @@ using namespace gui;
 
 Label::Label(const AttributeSet& attrs)
    : Widget(attrs),
-     text_(attrs.get<string>("text"))
+     _text(attrs.get<string>("text"))
 {
-   
+   _text = "foo";
 }
 
 void Label::render(RenderContext& rc) const
 {
-   rc.print(rc.theme().normal_font(), x(), y(), text_);
+   rc.print(rc.theme().normal_font(), x(), y(), _text);
 }
 
-void Label::adjust_for_theme(Theme& theme)
+void Label::adjustForTheme(Theme& theme)
 {
-   width(theme.normal_font()->text_width(text_));
+   width(theme.normal_font()->text_width(_text));
    height(theme.normal_font()->height());
 }
 
diff --git a/src/gui2/Layout.cpp b/src/gui2/Layout.cpp
index c078a9e..7825282 100644
--- a/src/gui2/Layout.cpp
+++ b/src/gui2/Layout.cpp
@@ -109,7 +109,7 @@ void Layout::startElement(const string& local_name,
 
    Widget* parent = parse_path.top();
    if (ContainerWidget* c = dynamic_cast<ContainerWidget*>(parent)) {
-      c->add_child(w);
+      c->addChild(w);
    }
    else {
       throw runtime_error("Widget " + parse_path.str()
@@ -133,7 +133,7 @@ void Layout::render() const
 {
    assert(root);
    Theme dummy;
-   root->adjust_for_theme(dummy);
+   root->adjustForTheme(dummy);
    
    RenderContext rc;
    root->render(rc);
@@ -150,7 +150,7 @@ Widget& Layout::get(const string& path) const
 
 void Layout::click(int x, int y)
 {
-   root->handle_click(x, y);
+   root->handleClick(x, y);
 }
 
 string Layout::PathStack::str() const
@@ -176,7 +176,7 @@ Widget* Layout::PathStack::top() const
    return path_comps.back();
 }
 
-ILayoutPtr gui::make_layout(const string& file_name)
+ILayoutPtr gui::makeLayout(const string& file_name)
 {
    return ILayoutPtr(new Layout(file_name));
 }
diff --git a/src/gui2/Widget.cpp b/src/gui2/Widget.cpp
index b84f14b..1f87ed2 100644
--- a/src/gui2/Widget.cpp
+++ b/src/gui2/Widget.cpp
@@ -22,10 +22,10 @@
 
 using namespace gui;
 
-int Widget::unique_id(0);
+int Widget::ourUniqueId(0);
 
 Widget::Widget(const AttributeSet& attrs)
-   : name_(attrs.get<string>("name", unique_name())),
+   : name_(attrs.get<string>("name", uniqueName())),
      x_(attrs.get<int>("x", 0)),
      y_(attrs.get<int>("y", 0)),
      width_(attrs.get<int>("width", 0)),
@@ -34,9 +34,9 @@ Widget::Widget(const AttributeSet& attrs)
    
 }
 
-string Widget::unique_name()
+string Widget::uniqueName()
 {
-   return "widget" + boost::lexical_cast<string>(unique_id++);
+   return "widget" + boost::lexical_cast<string>(ourUniqueId++);
 }
 
 void Widget::raise(Signal sig)
@@ -51,7 +51,7 @@ void Widget::connect(Signal sig, SignalHandler handler)
    handlers[sig] = handler;
 }
 
-void Widget::handle_click(int x, int y)
+void Widget::handleClick(int x, int y)
 {
    raise(SIG_CLICK);
 }
-- 
2.39.2