git.iko.soy/unity8
on xenial help sign in
Use QString here to eliminate JS conversion errors.
95ba0f6Rodney Dawes
tests/mocks/Unity/ApplicationMenu/mockapplicationmenuregistry.cpp+2−2
compare with xenial
unifiedsplit
@@ -41,7 +41,7 @@ void MockApplicationMenuRegistry::RegisterSurfaceMenu(const QString &surface,
41 service);
41 service);
42}
42}
43
43
44−void MockApplicationMenuRegistry::UnregisterSurfaceMenu(const QString &surfaceId, const QDBusObjectPath &menuObjectPath)
44+void MockApplicationMenuRegistry::UnregisterSurfaceMenu(const QString &surfaceId, const QString &menuObjectPath)
45{
45{
46− ApplicationMenuRegistry::UnregisterSurfaceMenu(surfaceId, menuObjectPath);
46+ ApplicationMenuRegistry::UnregisterSurfaceMenu(surfaceId, QDBusObjectPath(menuObjectPath));
47}
47}
tests/mocks/Unity/ApplicationMenu/mockapplicationmenuregistry.h+1−1
@@ -32,7 +32,7 @@ public:
32 const QString &service);
32 const QString &service);
33
33
34 Q_INVOKABLE void UnregisterSurfaceMenu(const QString &surfaceId,
34 Q_INVOKABLE void UnregisterSurfaceMenu(const QString &surfaceId,
35− const QDBusObjectPath &menuObjectPath);
35+ const QString &menuObjectPath);
36
36
37private:
37private:
38 MockApplicationMenuRegistry(QObject *parent = 0);
38 MockApplicationMenuRegistry(QObject *parent = 0);