~ubuntu-branches/ubuntu/trusty/hud/trusty-proposed

Viewing changes to service/DBusMenuCollector.h

Committer: Package Import Robot
Author(s): Ubuntu daily release, Pete Woods, Marcus Tomlinson
Date: 2014-02-06 11:58:43 UTC
mfrom: (1.1.27)
Revision ID: package-import@ubuntu.com-20140206115843-etuvqtn04ei6xb1h

Tags: 13.10.1+14.04.20140206-0ubuntu1

[ Pete Woods ]
* Re-enable quit action in HUD client library. (LP: #1269409)
* Extra checks for null DBusMenuCollector

[ Marcus Tomlinson ]
* Cache size of QtGActionGroup in m_size rather and re-calculating it
on every Size() call. (LP: #1276225)

files modified:
debian/changelog

libhud-client/HudToolbarModel.cpp

libhud-client/toolbar-items.h

libqtgmenu/internal/QtGActionGroup.cpp

libqtgmenu/internal/QtGActionGroup.h

service/DBusMenuCollector.cpp

service/DBusMenuCollector.h

service/WindowImpl.cpp

tests/integration/TestHud.cpp

Show diffs side-by-side

added added

removed removed

service/DBusMenuCollector.h

const QDBusObjectPath &menuObjectPath);

protected:

void openMenu(QMenu *menu);

void hideMenu(QMenu *menu);

unsigned int m_windowId;

QSharedPointer<ComCanonicalAppMenuRegistrarInterface> m_registrar;

QWeakPointer<CollectorToken> m_collectorToken;

QScopedPointer<DBusMenuImporter> m_menuImporter;

QSharedPointer<DBusMenuImporter> m_menuImporter;

QString m_service;

Older »