Reimplement disabled Delete key features

include/editor.h

@@ -96,7 +96,6 @@ public:
     void renderDivingConnections();
     void addConnection(MapConnection* connection);
     void removeConnection(MapConnection* connection);
-    void removeSelectedConnection();
     void addNewWildMonGroup(QWidget *window);
     void deleteWildMonGroup();
     void configureEncounterJSON(QWidget *);
@@ -187,6 +186,7 @@ public:
 
     bool selectingEvent = false;
 
+    void deleteSelectedEvents();
     void shouldReselectEvents();
     void scaleMapView(int);
     static void openInTextEditor(const QString &path, int lineNum = 0);

include/mainwindow.h

@@ -224,9 +224,6 @@ private slots:
     void on_actionMove_triggered();
     void on_actionMap_Shift_triggered();
 
-    void onDeleteKeyPressed();
-    void on_toolButton_deleteObject_clicked();
-
     void addNewEvent(Event::Type type);
     void tryAddEventTab(QWidget * tab);
     void displayEventTabs();

include/ui/connectionpixmapitem.h

@@ -5,6 +5,7 @@
 #include <QGraphicsPixmapItem>
 #include <QPainter>
 #include <QPointer>
+#include <QKeyEvent>
 
 class ConnectionPixmapItem : public QObject, public QGraphicsPixmapItem {
     Q_OBJECT
@@ -36,14 +37,17 @@ private:
     static const int mHeight = 16;
 
 protected:
-    QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
-    void mousePressEvent(QGraphicsSceneMouseEvent*) override;
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent*) override;
-    void mouseDoubleClickEvent(QGraphicsSceneMouseEvent*) override;
+    virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
+    virtual void mousePressEvent(QGraphicsSceneMouseEvent*) override;
+    virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent*) override;
+    virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent*) override;
+    virtual void keyPressEvent(QKeyEvent*) override;
+    virtual void focusInEvent(QFocusEvent*) override;
 
 signals:
     void connectionItemDoubleClicked(MapConnection*);
     void selectionChanged(bool selected);
+    void deleteRequested(MapConnection*);
 };
 
 #endif // CONNECTIONPIXMAPITEM_H

include/ui/connectionslistitem.h

@@ -34,11 +34,12 @@ private:
     unsigned actionId = 0;
 
 protected:
-    void mousePressEvent(QMouseEvent*) override;
+    virtual void mousePressEvent(QMouseEvent*) override;
+    virtual void focusInEvent(QFocusEvent*) override;
+    virtual void keyPressEvent(QKeyEvent*) override;
 
 signals:
     void selected();
-    void removed(MapConnection*);
     void openMapClicked(MapConnection*);
 
 private slots:

include/ui/graphicsview.h

@@ -34,6 +34,7 @@ signals:
 
 class Editor;
 
+// TODO: This should just be MapView. It makes map-based assumptions, and no other class inherits GraphicsView.
 class GraphicsView : public QGraphicsView
 {
 public:
@@ -44,10 +45,10 @@ public:
 //    GraphicsView_Object object;
     Editor *editor;
 protected:
-    void mousePressEvent(QMouseEvent *event);
-    void mouseMoveEvent(QMouseEvent *event);
-    void mouseReleaseEvent(QMouseEvent *event);
-    void moveEvent(QMoveEvent *event);
+    virtual void mousePressEvent(QMouseEvent *event) override;
+    virtual void mouseMoveEvent(QMouseEvent *event) override;
+    virtual void mouseReleaseEvent(QMouseEvent *event) override;
+    virtual void moveEvent(QMoveEvent *event) override;
 };
 
 //Q_DECLARE_METATYPE(GraphicsView)

include/ui/mapview.h

@@ -73,7 +73,8 @@ public:
 private:
     QMap<int, Overlay*> overlayMap;
 protected:
-    void drawForeground(QPainter *painter, const QRectF &rect);
+    virtual void drawForeground(QPainter *painter, const QRectF &rect) override;
+    virtual void keyPressEvent(QKeyEvent*) override;
 };
 
 #endif // GRAPHICSVIEW_H