~indicator-applet-developers/hud/trunk.14.04

« back to all changes in this revision

Viewing changes to libqtgmenu/QtGMenuImporter.h

  • Committer: CI bot
  • Author(s): Pete Woods, Marcus Tomlinson
  • Date: 2014-06-04 14:04:03 UTC
  • mfrom: (390.1.44 trunk)
  • Revision ID: ps-jenkins@lists.canonical.com-20140604140403-a70c33snru5b6k4x
Harden HUD against misbehaving applications

Report the offending applications using Apport's recoverable problem tool.
Switch to using shared pointers where possible for managing memory. Fixes: 1298656, 1316473, 1322050, 1325538

Show diffs side-by-side

added added

removed removed

Lines of Context:
47
47
                   const QMap<QString, QDBusObjectPath>& action_paths, QObject* parent = 0 );
48
48
  virtual ~QtGMenuImporter();
49
49
 
50
 
  GMenuModel* GetGMenuModel() const;
51
 
  GActionGroup* GetGActionGroup( int index = 0 ) const;
 
50
  QSharedPointer<GMenuModel> GetGMenuModel() const;
 
51
  QSharedPointer<GActionGroup> GetGActionGroup( int index = 0 ) const;
52
52
 
53
53
  std::shared_ptr< QMenu > GetQMenu() const;
54
54