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 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/gui/widgets/guitable.cpp')

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)
-- 
cgit v1.2.3-70-g09d2