5 files changed, 6 insertions, 5 deletions
diff --git a/unity-shared/CMakeLists.txt b/unity-shared/CMakeLists.txt
index 28dcc84e8..576d89482 100644
--- a/unity-shared/CMakeLists.txt
+++ b/unity-shared/CMakeLists.txt
@@ -32,6 +32,7 @@ set (UNITY_SHARED_SOURCES
 CoverArt.cpp
 BackgroundEffectHelper.cpp
 DashStyle.cpp
+ DebugDBusInterface.cpp
 DefaultThumbnailProvider.cpp
 FontSettings.cpp
 IMTextEntry.cpp
@@ -64,6 +65,7 @@ set (UNITY_SHARED_SOURCES
 UnityWindowView.cpp
 UserThumbnailProvider.cpp
 WindowManager.cpp
+ XPathQueryPart.cpp
 )
 
 if(UNITY_ENABLE_X_ORG_SUPPORT)
diff --git a/plugins/unityshell/src/DebugDBusInterface.cpp b/unity-shared/DebugDBusInterface.cpp
index 42e55de39..f086eac4a 100644
--- a/plugins/unityshell/src/DebugDBusInterface.cpp
+++ b/unity-shared/DebugDBusInterface.cpp
@@ -24,7 +24,6 @@
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/bind.hpp>
-#include <core/core.h>
 #include <NuxCore/Logger.h>
 #include <NuxCore/LoggingWriter.h>
 
@@ -303,7 +302,7 @@ std::list<Introspectable*> GetIntrospectableNodesFromQuery(std::string const& qu
 query_strings.end(),
 boost::bind( &std::string::empty, _1 ) ),
 query_strings.end());
- foreach(std::string part, query_strings)
+ for (auto part : query_strings)
 {
 query_parts.push_back(XPathQueryPart(part));
 }
@@ -343,7 +342,7 @@ std::list<Introspectable*> GetIntrospectableNodesFromQuery(std::string const& qu
 start_points.push_back(node);
 }
 // Add all children of current node to queue.
- foreach(Introspectable* child, node->GetIntrospectableChildren())
+ for (Introspectable* child : node->GetIntrospectableChildren())
 {
 queue.push(child);
 }
@@ -355,7 +354,7 @@ std::list<Introspectable*> GetIntrospectableNodesFromQuery(std::string const& qu
 typedef std::pair<Introspectable*, std::list<XPathQueryPart>::iterator> node_match_pair;
 
 std::queue<node_match_pair> traverse_queue;
- foreach(Introspectable *node, start_points)
+ for (Introspectable *node : start_points)
 {
 traverse_queue.push(node_match_pair(node, query_parts.begin()));
 }
@@ -377,7 +376,7 @@ std::list<Introspectable*> GetIntrospectableNodesFromQuery(std::string const& qu
 else
 {
 // push all children of current node to start of queue, advance search iterator, and loop again.
- foreach (Introspectable *child, node->GetIntrospectableChildren())
+ for (Introspectable* child : node->GetIntrospectableChildren())
 {
 if (query_it->Matches(child))
 {
diff --git a/plugins/unityshell/src/DebugDBusInterface.h b/unity-shared/DebugDBusInterface.h
index 3c11a5a0b..3c11a5a0b 100644
--- a/plugins/unityshell/src/DebugDBusInterface.h
+++ b/unity-shared/DebugDBusInterface.h
diff --git a/plugins/unityshell/src/XPathQueryPart.cpp b/unity-shared/XPathQueryPart.cpp
index a42a65c34..a42a65c34 100644
--- a/plugins/unityshell/src/XPathQueryPart.cpp
+++ b/unity-shared/XPathQueryPart.cpp
diff --git a/plugins/unityshell/src/XPathQueryPart.h b/unity-shared/XPathQueryPart.h
index b5beb3f4f..b5beb3f4f 100644
--- a/plugins/unityshell/src/XPathQueryPart.h
+++ b/unity-shared/XPathQueryPart.h