Merge branch 'fix_v0.9'

app/lattecorona.cpp

@@ -47,7 +47,7 @@
 #include "wm/xwindowinterface.h"
 #include "wm/tracker/lastactivewindow.h"
 #include "wm/tracker/schemes.h"
-#include "wm/tracker/trackerwindows.h"
+#include "wm/tracker/windowstracker.h"
 
 // Qt
 #include <QAction>

app/view/windowstracker/allscreenstracker.cpp

@@ -24,7 +24,7 @@
 #include "../../layout/genericlayout.h"
 #include "../../wm/schemecolors.h"
 #include "../../wm/tracker/lastactivewindow.h"
-#include "../../wm/tracker/trackerwindows.h"
+#include "../../wm/tracker/windowstracker.h"
 
 namespace Latte {
 namespace ViewPart {

app/view/windowstracker/currentscreentracker.cpp

@@ -23,7 +23,7 @@
 #include "../view.h"
 #include "../../wm/schemecolors.h"
 #include "../../wm/tracker/lastactivewindow.h"
-#include "../../wm/tracker/trackerwindows.h"
+#include "../../wm/tracker/windowstracker.h"
 
 namespace Latte {
 namespace ViewPart {

app/view/windowstracker/windowstracker.cpp

@@ -24,7 +24,7 @@
 #include "allscreenstracker.h"
 #include "../view.h"
 #include "../../lattecorona.h"
-#include "../../wm/tracker/trackerwindows.h"
+#include "../../wm/tracker/windowstracker.h"
 
 
 namespace Latte {

app/wm/abstractwindowinterface.cpp

@@ -22,7 +22,7 @@
 
 // local
 #include "tracker/schemes.h"
-#include "tracker/trackerwindows.h"
+#include "tracker/windowstracker.h"
 #include "../lattecorona.h"
 
 // Qt

app/wm/abstractwindowinterface.h

@@ -25,7 +25,7 @@
 #include "schemecolors.h"
 #include "tasktools.h"
 #include "windowinfowrap.h"
-#include "tracker/trackerwindows.h"
+#include "tracker/windowstracker.h"
 #include "../liblatte2/types.h"
 #include "../liblatte2/extras.h"
 

app/wm/tracker/CMakeLists.txt

@@ -5,6 +5,6 @@ set(lattedock-app_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/trackedgeneralinfo.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/trackedlayoutinfo.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/trackedviewinfo.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/trackerwindows.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/windowstracker.cpp
     PARENT_SCOPE
 )

app/wm/tracker/lastactivewindow.cpp

@@ -21,7 +21,7 @@
 
 // local
 #include "trackedgeneralinfo.h"
-#include "trackerwindows.h"
+#include "windowstracker.h"
 #include "../abstractwindowinterface.h"
 #include "../tasktools.h"
 #include "../../view/view.h"

app/wm/tracker/trackedgeneralinfo.cpp

@@ -20,7 +20,7 @@
 #include "trackedgeneralinfo.h"
 
 //local
-#include "trackerwindows.h"
+#include "windowstracker.h"
 #include "../abstractwindowinterface.h"
 #include "../schemecolors.h"
 

app/wm/tracker/trackedlayoutinfo.cpp

@@ -20,7 +20,7 @@
 #include "trackedlayoutinfo.h"
 
 //local
-#include "trackerwindows.h"
+#include "windowstracker.h"
 #include "../../layout/genericlayout.h"
 
 namespace Latte {

app/wm/tracker/trackedviewinfo.cpp

@@ -20,7 +20,7 @@
 #include "trackedviewinfo.h"
 
 //local
-#include "trackerwindows.h"
+#include "windowstracker.h"
 #include "../schemecolors.h"
 #include "../../view/view.h"
 

app/wm/tracker/windowstracker.cpp

@@ -17,7 +17,7 @@
 *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "trackerwindows.h"
+#include "windowstracker.h"
 
 // local
 #include "lastactivewindow.h"