From 6f496c4919a62edbb73e9adbc3ddd84484afc756 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 28 Oct 2016 20:26:31 +0300
Subject: Fix conflict for variable mSelectable between two classes.

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

(limited to 'src/gui')

diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index 9009b914c..4447904ae 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -54,7 +54,7 @@ GuiTable::GuiTable(const Widget2 *const widget,
     mLinewiseMode(false),
     mWrappingEnabled(false),
     mOpaque(opacity),
-    mSelectable(true)
+    mSelectableGui(true)
 {
     mAllowLogic = false;
     mBackgroundColor = getThemeColor(ThemeColorId::BACKGROUND);
@@ -104,7 +104,7 @@ void GuiTable::recomputeDimensions()
     const int columns_nr = mModel->getColumns();
     int width = 0;
 
-    if (mSelectable)
+    if (mSelectableGui)
     {
         if (mSelectedRow >= rows_nr)
             mSelectedRow = rows_nr - 1;
@@ -148,7 +148,7 @@ int GuiTable::getColumnWidth(const int i) const
 
 void GuiTable::setSelectedRow(const int selected)
 {
-    if (!mSelectable)
+    if (!mSelectableGui)
     {
         mSelectedRow = -1;
     }
@@ -523,7 +523,7 @@ void GuiTable::keyPressed(KeyEvent& event)
 // -- MouseListener notifications
 void GuiTable::mousePressed(MouseEvent& event)
 {
-    if (!mSelectable)
+    if (!mSelectableGui)
         return;
 
     if (event.getButton() == MouseButton::LEFT)
diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h
index b411eff79..c42ac7ff5 100644
--- a/src/gui/widgets/guitable.h
+++ b/src/gui/widgets/guitable.h
@@ -159,8 +159,8 @@ class GuiTable final : public Widget,
 
         void requestFocus() override;
 
-        void setSelectable(bool b)
-        { mSelectable = b; }
+        void setSelectableGui(bool b)
+        { mSelectableGui = b; }
 
     protected:
         /** Frees all action listeners on inner widgets. */
@@ -201,7 +201,7 @@ class GuiTable final : public Widget,
         bool mLinewiseMode;
         bool mWrappingEnabled;
         Opaque mOpaque;
-        bool mSelectable;
+        bool mSelectableGui;
 };
 
 #endif  // GUI_WIDGETS_GUITABLE_H
diff --git a/src/gui/widgets/tabs/setup_relations.cpp b/src/gui/widgets/tabs/setup_relations.cpp
index bccea1d86..819f46e79 100644
--- a/src/gui/widgets/tabs/setup_relations.cpp
+++ b/src/gui/widgets/tabs/setup_relations.cpp
@@ -89,7 +89,7 @@ Setup_Relations::Setup_Relations(const Widget2 *const widget) :
                                            RELATION_CHOICE_COLUMN_WIDTH);
     mPlayerTitleTable->setBackgroundColor(getThemeColor(
         ThemeColorId::TABLE_BACKGROUND));
-    mPlayerTitleTable->setSelectable(false);
+    mPlayerTitleTable->setSelectableGui(false);
 
     for (int i = 0; i < COLUMNS_NR; i++)
     {
-- 
cgit v1.2.3-70-g09d2