aboutsummaryrefslogtreecommitdiff
path: root/src/gmenuharness
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-10-22 23:07:30 +0000
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-10-22 23:07:30 +0000
commit13525d7b0451f0a9ca7b73e83e2f374fbfb7c1bc (patch)
tree91d4d03a4980df9a072a371578c7c1993742e838 /src/gmenuharness
parent007ee3b3b425a31e31260c62baf789407bc8b54a (diff)
downloadayatana-indicator-sound-13525d7b0451f0a9ca7b73e83e2f374fbfb7c1bc.tar.gz
ayatana-indicator-sound-13525d7b0451f0a9ca7b73e83e2f374fbfb7c1bc.tar.bz2
ayatana-indicator-sound-13525d7b0451f0a9ca7b73e83e2f374fbfb7c1bc.zip
Fork from Ubuntu's indicator-sound.
Diffstat (limited to 'src/gmenuharness')
-rw-r--r--src/gmenuharness/CMakeLists.txt1
-rw-r--r--src/gmenuharness/MatchResult.cpp2
-rw-r--r--src/gmenuharness/MatchUtils.cpp4
-rw-r--r--src/gmenuharness/MenuItemMatcher.cpp6
-rw-r--r--src/gmenuharness/MenuMatcher.cpp4
5 files changed, 8 insertions, 9 deletions
diff --git a/src/gmenuharness/CMakeLists.txt b/src/gmenuharness/CMakeLists.txt
index ca9d4dc..761949b 100644
--- a/src/gmenuharness/CMakeLists.txt
+++ b/src/gmenuharness/CMakeLists.txt
@@ -1,4 +1,3 @@
-pkg_check_modules(UNITY_API libunity-api>=0.1.3 REQUIRED)
include_directories(${UNITY_API_INCLUDE_DIRS})
include_directories("${CMAKE_SOURCE_DIR}/include")
diff --git a/src/gmenuharness/MatchResult.cpp b/src/gmenuharness/MatchResult.cpp
index 40629aa..158e1fd 100644
--- a/src/gmenuharness/MatchResult.cpp
+++ b/src/gmenuharness/MatchResult.cpp
@@ -16,7 +16,7 @@
* Authored by: Pete Woods <pete.woods@canonical.com>
*/
-#include <unity/gmenuharness/MatchResult.h>
+#include <desktop/gmenuharness/MatchResult.h>
#include <chrono>
#include <map>
diff --git a/src/gmenuharness/MatchUtils.cpp b/src/gmenuharness/MatchUtils.cpp
index 7b87a25..1eeaf52 100644
--- a/src/gmenuharness/MatchUtils.cpp
+++ b/src/gmenuharness/MatchUtils.cpp
@@ -16,9 +16,9 @@
* Authored by: Pete Woods <pete.woods@canonical.com>
*/
-#include <unity/gmenuharness/MatchUtils.h>
+#include <desktop/gmenuharness/MatchUtils.h>
-#include <unity/util/ResourcePtr.h>
+#include <desktop/util/ResourcePtr.h>
using namespace std;
namespace util = unity::util;
diff --git a/src/gmenuharness/MenuItemMatcher.cpp b/src/gmenuharness/MenuItemMatcher.cpp
index f39acef..4e9f98e 100644
--- a/src/gmenuharness/MenuItemMatcher.cpp
+++ b/src/gmenuharness/MenuItemMatcher.cpp
@@ -16,9 +16,9 @@
* Authored by: Pete Woods <pete.woods@canonical.com>
*/
-#include <unity/gmenuharness/MatchResult.h>
-#include <unity/gmenuharness/MatchUtils.h>
-#include <unity/gmenuharness/MenuItemMatcher.h>
+#include <desktop/gmenuharness/MatchResult.h>
+#include <desktop/gmenuharness/MatchUtils.h>
+#include <desktop/gmenuharness/MenuItemMatcher.h>
#include <iostream>
#include <vector>
diff --git a/src/gmenuharness/MenuMatcher.cpp b/src/gmenuharness/MenuMatcher.cpp
index 5bb4fbd..7b32068 100644
--- a/src/gmenuharness/MenuMatcher.cpp
+++ b/src/gmenuharness/MenuMatcher.cpp
@@ -16,8 +16,8 @@
* Authored by: Pete Woods <pete.woods@canonical.com>
*/
-#include <unity/gmenuharness/MenuMatcher.h>
-#include <unity/gmenuharness/MatchUtils.h>
+#include <desktop/gmenuharness/MenuMatcher.h>
+#include <desktop/gmenuharness/MatchUtils.h>
#include <iostream>