Port from Unity8 to Lomiri (URL Dispatcher and API).

3 files changed, 12 insertions, 12 deletions

diff --git a/tests/integration/indicator-sound-test-base.cpp b/tests/integration/indicator-sound-test-base.cpp
index b7a0a77..e8eeefc 100644
--- a/tests/integration/indicator-sound-test-base.cpp
+++ b/tests/integration/indicator-sound-test-base.cpp
@@ -36,7 +36,7 @@ using namespace QtDBusTest;
 using namespace QtDBusMock;
 using namespace std;
 using namespace testing;
-namespace mh = unity::gmenuharness;
+namespace mh = lomiri::gmenuharness;
 
 namespace
 {
@@ -410,7 +410,7 @@ mh::MenuMatcher::Parameters IndicatorSoundTestBase::phoneParameters()
             "/org/ayatana/indicator/sound/phone");
 }
 
-unity::gmenuharness::MenuItemMatcher IndicatorSoundTestBase::volumeSlider(double volume, QString const &label)
+lomiri::gmenuharness::MenuItemMatcher IndicatorSoundTestBase::volumeSlider(double volume, QString const &label)
 {
     return mh::MenuItemMatcher().radio()
             .label(label.toStdString())
@@ -425,7 +425,7 @@ unity::gmenuharness::MenuItemMatcher IndicatorSoundTestBase::volumeSlider(double
             .pass_through_double_attribute("action", volume);
 }
 
-unity::gmenuharness::MenuItemMatcher IndicatorSoundTestBase::micSlider(double volume, QString const &label)
+lomiri::gmenuharness::MenuItemMatcher IndicatorSoundTestBase::micSlider(double volume, QString const &label)
 {
     return mh::MenuItemMatcher()
             .label(label.toStdString())
@@ -439,7 +439,7 @@ unity::gmenuharness::MenuItemMatcher IndicatorSoundTestBase::micSlider(double vo
             .pass_through_double_attribute("action", volume);
 }
 
-unity::gmenuharness::MenuItemMatcher IndicatorSoundTestBase::silentModeSwitch(bool toggled)
+lomiri::gmenuharness::MenuItemMatcher IndicatorSoundTestBase::silentModeSwitch(bool toggled)
 {
     return mh::MenuItemMatcher::checkbox()
         .label("Silent Mode")
diff --git a/tests/integration/indicator-sound-test-base.h b/tests/integration/indicator-sound-test-base.h
index 7942bd5..4e0d2dd 100644
--- a/tests/integration/indicator-sound-test-base.h
+++ b/tests/integration/indicator-sound-test-base.h
@@ -22,8 +22,8 @@
 #include <libqtdbustest/QProcessDBusService.h>
 #include <libqtdbusmock/DBusMock.h>
 
-#include <unity/gmenuharness/MatchUtils.h>
-#include <unity/gmenuharness/MenuMatcher.h>
+#include <lomiri/gmenuharness/MatchUtils.h>
+#include <lomiri/gmenuharness/MenuMatcher.h>
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
@@ -96,15 +96,15 @@ protected:
 
     static std::shared_ptr<GVariant> volume_variant(double volume);
 
-    static unity::gmenuharness::MenuMatcher::Parameters desktopParameters();
+    static lomiri::gmenuharness::MenuMatcher::Parameters desktopParameters();
 
-    static unity::gmenuharness::MenuMatcher::Parameters phoneParameters();
+    static lomiri::gmenuharness::MenuMatcher::Parameters phoneParameters();
 
-    static unity::gmenuharness::MenuItemMatcher volumeSlider(double volume, QString const &label);
+    static lomiri::gmenuharness::MenuItemMatcher volumeSlider(double volume, QString const &label);
 
-    static unity::gmenuharness::MenuItemMatcher micSlider(double volume, QString const &label);
+    static lomiri::gmenuharness::MenuItemMatcher micSlider(double volume, QString const &label);
 
-    static unity::gmenuharness::MenuItemMatcher silentModeSwitch(bool toggled);
+    static lomiri::gmenuharness::MenuItemMatcher silentModeSwitch(bool toggled);
 
     bool waitMenuChange();
 
diff --git a/tests/integration/test-indicator.cpp b/tests/integration/test-indicator.cpp
index 36b299e..43ed2b9 100644
--- a/tests/integration/test-indicator.cpp
+++ b/tests/integration/test-indicator.cpp
@@ -24,7 +24,7 @@
 
 using namespace std;
 using namespace testing;
-namespace mh = unity::gmenuharness;
+namespace mh = lomiri::gmenuharness;
 namespace
 {