Add m_ to member variables.

src/Screen.cpp

@@ -1,44 +1,44 @@
 #include "Screen.h"
 #include "Helper.h"
 
-uint32_t Screen::id_counter = 0;
+uint32_t Screen::s_idCounter = 0;
 
-Screen::Screen(const std::string &name, std::vector<Widget *> widgets, Framebuffer *framebuffer,
+Screen::Screen(const std::string &name, std::vector<Widget *> widgets, FrameBuffer *framebuffer,
                ShaderProgram *shaderProgram)
-    : unique_name(name), framebuffer(framebuffer), shaderProgram(shaderProgram), widgets(widgets)
+    : m_uniqueName(name), m_frameBuffer(framebuffer), m_shaderProgram(shaderProgram), m_widgets(widgets)
 {
-    id = id_counter++;
+    m_id = s_idCounter++;
 }
 
 Screen::~Screen()
 {
     // Iterate over Widgets and Textures to delete all of them
-    for (auto it = widgets.begin(); it != widgets.end(); it++) {
+    for (auto it = m_widgets.begin(); it != m_widgets.end(); it++) {
         delete *it;
     }
-    for (auto it = textures.begin(); it != textures.end(); it++) {
+    for (auto it = m_textures.begin(); it != m_textures.end(); it++) {
         delete *it;
     }
 }
 
 const std::string &Screen::getUniqueName() const
 {
-    return unique_name;
+    return m_uniqueName;
 }
 
 std::vector<Widget *> Screen::getWidgets() const
 {
-    return widgets;
+    return m_widgets;
 }
 
 Widget *Screen::getWidgetByName(const std::string &name) const
 {
-    if (m_widget_name_cache.find(name) != m_widget_name_cache.end())
-        return m_widget_name_cache[name];
+    if (m_widgetNameCache.find(name) != m_widgetNameCache.end())
+        return m_widgetNameCache[name];
 
-    for (auto it : widgets) {
+    for (auto it : m_widgets) {
         if (it->getUniqueName() == name) {
-            m_widget_name_cache[name] = it;
+            m_widgetNameCache[name] = it;
             return it;
         }
     }
@@ -47,19 +47,19 @@ Widget *Screen::getWidgetByName(const std::string &name) const
 
 void Screen::addWidget(Widget *widget)
 {
-    widgets.push_back(widget);
+    m_widgets.push_back(widget);
 }
 
 void Screen::draw() const
 {
-    framebuffer->setExposureCorrection(false);
-    framebuffer->bind();
+    m_frameBuffer->setExposureCorrection(false);
+    m_frameBuffer->bind();
 
-    for (auto it = widgets.begin(); it != widgets.end(); it++) {
-        (*it)->draw(shaderProgram);
+    for (auto it = m_widgets.begin(); it != m_widgets.end(); it++) {
+        (*it)->draw(m_shaderProgram);
     }
 
-    framebuffer->unbind();
-    framebuffer->render();
-    framebuffer->setExposureCorrection(true);
+    m_frameBuffer->unbind();
+    m_frameBuffer->render();
+    m_frameBuffer->setExposureCorrection(true);
 }