Refactor|libshell: Derived shell::Action from de::Action

skyjake · Apr 13, 2013 · 2bc44f9 · 2bc44f9
1 parent 27f9a3f
commit 2bc44f9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -76,6 +76,7 @@ bool Action::tryTrigger(KeyEvent const &ev)
 
 void Action::trigger()
 {
+    de::Action::trigger();
     emit triggered();
 }