Merge pull request #2639 from nikicc/table-model-mappings

TableModel: Add old style mappings as deprecated

Author: astaric

Orange/widgets/utils/itemmodels.py

@@ -26,6 +26,7 @@
 from Orange.widgets import gui
 from Orange.widgets.utils import datacaching
 from Orange.statistics import basic_stats
+from Orange.util import deprecated
 
 
 class _store(dict):
@@ -153,6 +154,14 @@ def mapFromSourceRows(self, rows):
             rows = new_rows
         return rows
 
+    @deprecated('Orange.widgets.utils.itemmodels.AbstractSortTableModel.mapFromSourceRows')
+    def mapFromTableRows(self, rows):
+        return self.mapFromSourceRows(rows)
+
+    @deprecated('Orange.widgets.utils.itemmodels.AbstractSortTableModel.mapToSourceRows')
+    def mapToTableRows(self, rows):
+        return self.mapToSourceRows(rows)
+
     def resetSorting(self):
         """Invalidates the current sorting"""
         return self.sort(-1)
@@ -1135,6 +1144,10 @@ def row_instance(index):
     def sortColumnData(self, column):
         return self._columnSortKeyData(column, TableModel.ValueRole)
 
+    @deprecated('Orange.widgets.utils.itemmodels.TableModel.sortColumnData')
+    def columnSortKeyData(self, column, role):
+        return self._columnSortKeyData(column, role)
+
     def _columnSortKeyData(self, column, role):
         """
         Return a sequence of source table objects which can be used as