From 54f1b48226c5aaa20926a93fbfdc8a54712e78f1 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 1 Mar 2014 20:50:14 +0300
Subject: In guitable rename conflicting mActionListeners into
 mActionListeners2.

---
 src/gui/widgets/guitable.cpp | 8 ++++----
 src/gui/widgets/guitable.h   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index 70ebb77d6..128281fe9 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -101,7 +101,7 @@ GuiTable::GuiTable(const Widget2 *const widget,
     KeyListener(),
     mModel(nullptr),
     mTopWidget(nullptr),
-    mActionListeners(),
+    mActionListeners2(),
     mHighlightColor(getThemeColor(Theme::HIGHLIGHT)),
     mSelectedRow(-1),
     mSelectedColumn(-1),
@@ -266,8 +266,8 @@ void GuiTable::setSelectedColumn(const int selected)
 
 void GuiTable::uninstallActionListeners()
 {
-    delete_all(mActionListeners);
-    mActionListeners.clear();
+    delete_all(mActionListeners2);
+    mActionListeners2.clear();
 }
 
 void GuiTable::installActionListeners()
@@ -285,7 +285,7 @@ void GuiTable::installActionListeners()
             Widget *const widget = mModel->getElementAt(row, column);
             if (widget)
             {
-                mActionListeners.push_back(new GuiTableActionListener(
+                mActionListeners2.push_back(new GuiTableActionListener(
                     this, widget, row, column));
             }
         }
diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h
index fb0c34784..7cec854a8 100644
--- a/src/gui/widgets/guitable.h
+++ b/src/gui/widgets/guitable.h
@@ -183,7 +183,7 @@ private:
     Widget *mTopWidget;
 
     /** Vector for compactness; used as a list in practice. */
-    std::vector<GuiTableActionListener *> mActionListeners;
+    std::vector<GuiTableActionListener *> mActionListeners2;
 
     /**
      * Holds the background color of the table.
-- 
cgit v1.2.3-60-g2f50