TableItemDelegate: add default paintItem() implementation

so MultiLineEditDelegate doesn't have to implement it just for calling the base class implementation QStyledItemDelegate::paint() (which raised a clazy error)
mixxxdj · Jul 18, 2023 · ccaa3b1 · ccaa3b1
1 parent 8a25d40
commit ccaa3b1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 17 deletions.
diff --git a/src/library/bpmdelegate.h b/src/library/bpmdelegate.h
@@ -13,8 +13,9 @@ class BPMDelegate : public TableItemDelegate {
     explicit BPMDelegate(QTableView* pTableView);
     virtual ~BPMDelegate();
 
-    void paintItem(QPainter* painter, const QStyleOptionViewItem& option,
-               const QModelIndex& index) const;
+    void paintItem(QPainter* painter,
+            const QStyleOptionViewItem& option,
+            const QModelIndex& index) const override;
 
   private:
     QTableView* m_pTableView;

diff --git a/src/library/multilineeditdelegate.cpp b/src/library/multilineeditdelegate.cpp
@@ -119,12 +119,3 @@ void MultiLineEditDelegate::commitAndCloseEditor() {
     emit commitData(pEditor);
     emit closeEditor(pEditor);
 }
-
-void MultiLineEditDelegate::paintItem(
-        QPainter* pPainter,
-        const QStyleOptionViewItem& option,
-        const QModelIndex& index) const {
-    // Paint the item the default way, i.e. ellipsis after horizontal overflow
-    // and first linebreak
-    QStyledItemDelegate::paint(pPainter, option, index);
-}
diff --git a/src/library/multilineeditdelegate.h b/src/library/multilineeditdelegate.h
@@ -34,11 +34,6 @@ class MultiLineEditDelegate : public TableItemDelegate {
             const QStyleOptionViewItem& option,
             const QModelIndex& index) const override;
 
-    void paintItem(
-            QPainter* painter,
-            const QStyleOptionViewItem& option,
-            const QModelIndex& index) const override;
-
   private slots:
     void commitAndCloseEditor();
 

diff --git a/src/library/tableitemdelegate.cpp b/src/library/tableitemdelegate.cpp
@@ -73,3 +73,10 @@ void TableItemDelegate::paintItemBackground(
     const auto bgBrush = qvariant_cast<QBrush>(bgValue);
     painter->fillRect(option.rect, bgBrush);
 }
+
+void TableItemDelegate::paintItem(
+        QPainter* painter,
+        const QStyleOptionViewItem& option,
+        const QModelIndex& index) const {
+    QStyledItemDelegate::paint(painter, option, index);
+}
diff --git a/src/library/tableitemdelegate.h b/src/library/tableitemdelegate.h
@@ -18,7 +18,7 @@ class TableItemDelegate : public QStyledItemDelegate {
     virtual void paintItem(
             QPainter* painter,
             const QStyleOptionViewItem& option,
-            const QModelIndex& index) const = 0;
+            const QModelIndex& index) const;
 
   protected:
     static void paintItemBackground(