commit 81509f3bee7e43e7a8cf7c2b17c75eb6596d7108
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Mar 21 17:02:38 2016 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Mar 21 17:03:02 2016 -0700
tree 97b8b813e0e617ce77e1c09ef9590229d6b3480c
parent 7268d6bb7ea63cb584368265211a32c9cb4b2d7b

Add Face into TrayMenu class

Change-Id: Ib7767a4a577ba6a27bef732119fd67f5facd210b

src/main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 0dbbfd2..073a9c3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -39,7 +39,7 @@
     : m_isActive(true)
     , m_scheduler(m_face.getIoService())
     , m_fibModel(m_face)
-    , m_tray(m_engine.rootContext())
+    , m_tray(m_engine.rootContext(), m_face)
   {
     QQmlContext* context = m_engine.rootContext();
 

src/tray-menu.cpp

diff --git a/src/tray-menu.cpp b/src/tray-menu.cpp
index 9aa0d8b..01c1f60 100644
--- a/src/tray-menu.cpp
+++ b/src/tray-menu.cpp
@@ -42,7 +42,7 @@
 
 namespace ndn {
 
-TrayMenu::TrayMenu(QQmlContext* context)
+TrayMenu::TrayMenu(QQmlContext* context, Face& face)
   : m_context(context)
   , m_isNfdRunning(false)
   , m_menu(new QMenu(this))
@@ -53,6 +53,7 @@
 #endif
   , m_entryQuit(new QAction("Quit", m_menu))
   , m_keyViewerDialog(new ncc::KeyViewerDialog)
+  , m_face(face)
 {
   connect(m_entryPref, SIGNAL(triggered()), this, SIGNAL(showApp()));
   connect(m_entrySec, SIGNAL(triggered()), m_keyViewerDialog, SLOT(present()));

src/tray-menu.hpp

diff --git a/src/tray-menu.hpp b/src/tray-menu.hpp
index 0c09cb0..cda18b8 100644
--- a/src/tray-menu.hpp
+++ b/src/tray-menu.hpp
@@ -36,6 +36,8 @@
 
 namespace ndn {
 
+class Face;
+
 class TrayMenu : public QWidget
 {
   Q_OBJECT
@@ -49,7 +51,7 @@
 
 public:
   explicit
-  TrayMenu(QQmlContext* context);
+  TrayMenu(QQmlContext* context, Face& face);
 
   ~TrayMenu();
 
@@ -102,6 +104,7 @@
   QAction* m_entryQuit;
 
   ncc::KeyViewerDialog* m_keyViewerDialog;
+  Face& m_face;
 };
 
 } // namespace ndn