Merge pull request #5 from Daxx/master

Adjust nativeEventFilter install method
user-none · Apr 14, 2015 · adac615 · adac615
2 parents 51bf347 + 63e1da3
commit adac615
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 11 deletions.
diff --git a/src/application.cpp b/src/application.cpp
@@ -22,19 +22,15 @@
 
 Application::Application(const QString &appId, int &argc, char **argv) : QtSingleApplication(appId, argc, argv) {
     m_kdocker = 0;
-    m_filter  = 0;
 }
 
 void Application::setKDockerInstance(KDocker *kdocker) {
     m_kdocker = kdocker;
-    m_filter  = m_kdocker-> getTrayItemManager();
-    installNativeEventFilter(m_filter);
 }
 
 void Application::close() {
     if (m_kdocker) {
         m_kdocker->undockAll();
     }
-    removeNativeEventFilter(m_filter);
     quit();
 }
diff --git a/src/application.h b/src/application.h
@@ -36,7 +36,6 @@ class Application : public QtSingleApplication {
 
 private:
     KDocker *m_kdocker;
-    TrayItemManager *m_filter;
 };
 
 #endif	/* _APPLICATION_H */
diff --git a/src/kdocker.cpp b/src/kdocker.cpp
@@ -46,10 +46,6 @@ KDocker::~KDocker() {
     }
 }
 
-TrayItemManager *KDocker::getTrayItemManager() {
-    return m_trayItemManager;
-}
-
 void KDocker::undockAll() {
     if (m_trayItemManager) {
         m_trayItemManager->undockAll();

diff --git a/src/kdocker.h b/src/kdocker.h
@@ -36,8 +36,6 @@ class KDocker : public QObject {
     KDocker();
     ~KDocker();
 
-    TrayItemManager *getTrayItemManager();
-
     void undockAll();
 
     void preProcessCommand(int argc, char **argv);

diff --git a/src/trayitemmanager.cpp b/src/trayitemmanager.cpp
@@ -56,6 +56,7 @@ TrayItemManager::TrayItemManager() {
     // The isValidWindowId function in util.cpp will generate errors if the
     // window is not valid while it is checking.
     XSetErrorHandler(ignoreXErrors);
+    qApp-> installNativeEventFilter(this);
 }
 
 TrayItemManager::~TrayItemManager() {
@@ -66,6 +67,7 @@ TrayItemManager::~TrayItemManager() {
     delete m_grabInfo.qtimer;
     delete m_grabInfo.qloop;
     delete m_scanner;
+    qApp-> removeNativeEventFilter(this);
 }
 
 /* The X11 Event Filter. Pass on events to the TrayItems that we created. */