diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-03-15 20:16:16 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-03-15 20:16:16 +0300 |
| commit | 5c83a96b8ad85ad0562542b9720a0df6c5fb550c (patch) | |
| tree | 1759cd93802d506583c7030119f1115b0444e226 /src/gui/widgets/guitable.cpp | |
| parent | a260aeab234704ace8ba672b1d1ce57e18425e07 (diff) | |
| parent | 22cb237571e06395ec241377721c02716f0ea8a7 (diff) | |
| download | plus-5c83a96b8ad85ad0562542b9720a0df6c5fb550c.tar.gz plus-5c83a96b8ad85ad0562542b9720a0df6c5fb550c.tar.bz2 plus-5c83a96b8ad85ad0562542b9720a0df6c5fb550c.tar.xz plus-5c83a96b8ad85ad0562542b9720a0df6c5fb550c.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/gui/widgets/guitable.cpp')
| -rw-r--r-- | src/gui/widgets/guitable.cpp | 8 |
1 files changed, 4 insertions, 4 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)); } } |