From 2bc44f9e74aaec69cd807fc3933bed15cfac3504 Mon Sep 17 00:00:00 2001
From: skyjake <skyjake@users.sf.net>
Date: Sat, 13 Apr 2013 18:21:13 +0300
Subject: [PATCH] Refactor|libshell: Derived shell::Action from de::Action

---
 doomsday/libshell/include/de/shell/action.h | 3 ++-
 doomsday/libshell/src/action.cpp            | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/doomsday/libshell/include/de/shell/action.h b/doomsday/libshell/include/de/shell/action.h
index ee83898df8..a7fdcf30f2 100644
--- a/doomsday/libshell/include/de/shell/action.h
+++ b/doomsday/libshell/include/de/shell/action.h
@@ -20,6 +20,7 @@
 #define LIBSHELL_ACTION_H
 
 #include "KeyEvent"
+#include <de/Action>
 #include <QObject>
 
 namespace de {
@@ -28,7 +29,7 @@ namespace shell {
 /**
  * Maps a key event to a signal.
  */
-class Action : public QObject
+class Action : public QObject, public de::Action
 {
     Q_OBJECT
 
diff --git a/doomsday/libshell/src/action.cpp b/doomsday/libshell/src/action.cpp
index 3b3534e9a4..eef3f692e6 100644
--- a/doomsday/libshell/src/action.cpp
+++ b/doomsday/libshell/src/action.cpp
@@ -76,6 +76,7 @@ bool Action::tryTrigger(KeyEvent const &ev)
 
 void Action::trigger()
 {
+    de::Action::trigger();
     emit triggered();
 }