041f34d · unity8 · git.iko.soy

Use QString here to eliminate JS conversion errors.

commit041f34d54acf9aad31ee310de2d14afb28621d5f authorRodney Dawes <dobey@ubports.com> dateTue 28 Jul 2020, 10:19 (6 years ago) parent4e9f67b

2 files changed+3−3

unifiedsplit

tests/mocks/Unity/ApplicationMenu/mockapplicationmenuregistry.cpp+2−2

@@ -41,7 +41,7 @@ void MockApplicationMenuRegistry::RegisterSurfaceMenu(const QString &surface,

4141 service);

4242}

4343

44−void MockApplicationMenuRegistry::UnregisterSurfaceMenu(const QString &surfaceId, const QDBusObjectPath &menuObjectPath)

44+void MockApplicationMenuRegistry::UnregisterSurfaceMenu(const QString &surfaceId, const QString &menuObjectPath)

4545{

46− ApplicationMenuRegistry::UnregisterSurfaceMenu(surfaceId, menuObjectPath);

46+ ApplicationMenuRegistry::UnregisterSurfaceMenu(surfaceId, QDBusObjectPath(menuObjectPath));

4747}

tests/mocks/Unity/ApplicationMenu/mockapplicationmenuregistry.h+1−1

@@ -32,7 +32,7 @@ public:

3232 const QString &service);

3333

3434 Q_INVOKABLE void UnregisterSurfaceMenu(const QString &surfaceId,

35− const QDBusObjectPath &menuObjectPath);

35+ const QString &menuObjectPath);

3636

3737private:

3838 MockApplicationMenuRegistry(QObject *parent = 0);