Move all monitor related classes to the monitor-lib

* Created new monitor-lib
* Removed dependencies from window and other libs
towards monitor classes. Monitor classes should
depend on manager and window lib.

Change-Id: Ie6f7a82b3a22808eb7414251c996072e47fd2687
Reviewed-by: Bernd Weimer <bernd.weimer@pelagicore.com>

1 files changed, 9 insertions, 21 deletions

diff --git a/src/manager-lib/manager-lib.pro b/src/manager-lib/manager-lib.pro
index eac015c6..1ff00427 100644
--- a/src/manager-lib/manager-lib.pro
+++ b/src/manager-lib/manager-lib.pro
@@ -34,14 +34,11 @@ HEADERS += \
     applicationipcmanager.h \
     applicationipcinterface.h \
     applicationipcinterface_p.h \
-    systemmonitor.h \
-    systemmonitor_p.h \
-    processmonitor.h \
-    processmonitor_p.h \
-    xprocessmonitor.h \
-    memorymonitor.h \
-    fpsmonitor.h \
-    applicationmanager_p.h
+    applicationmanager_p.h \
+    systemreader.h \
+
+linux:HEADERS += \
+    sysfsreader.h \
 
 !headless:HEADERS += \
     fakeapplicationmanagerwindow.h \
@@ -50,9 +47,6 @@ multi-process:HEADERS += \
     nativeruntime.h \
     nativeruntime_p.h \
 
-linux:HEADERS += \
-    sysfsreader.h \
-
 qtHaveModule(qml):HEADERS += \
     qmlinprocessruntime.h \
     qmlinprocessapplicationinterface.h \
@@ -70,13 +64,10 @@ SOURCES += \
     quicklauncher.cpp \
     applicationipcmanager.cpp \
     applicationipcinterface.cpp \
-    systemmonitor.cpp \
-    systemmonitor_p.cpp \
-    processmonitor.cpp \
-    processmonitor_p.cpp \
-    xprocessmonitor.cpp \
-    memorymonitor.cpp \
-    fpsmonitor.cpp \
+    systemreader.cpp \
+
+linux:SOURCES += \
+    sysfsreader.cpp \
 
 !headless:SOURCES += \
     fakeapplicationmanagerwindow.cpp \
@@ -84,9 +75,6 @@ SOURCES += \
 multi-process:SOURCES += \
     nativeruntime.cpp \
 
-linux:SOURCES += \
-    sysfsreader.cpp \
-
 qtHaveModule(qml):SOURCES += \
     qmlinprocessruntime.cpp \
     qmlinprocessapplicationinterface.cpp \