← Back to branch summary

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

« back to all changes in this revision

Viewing changes to service/HudServiceImpl.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:
service/HudServiceImpl.h
28
28
#include <QDBusVariant>
29
29
#include <QMap>
30
30
#include <QScopedPointer>
 
31
#include <QTimer>
31
32
 
32
33
class HudAdaptor;
33
34
 
73
74
 
74
75
        void CloseQuery(const QDBusVariant &querykey);
75
76
 
 
77
protected Q_SLOTS:
 
78
        void legacyTimeout();
 
79
 
76
80
protected:
77
81
        Query::Ptr createQuery(const QString &query, const QString &service,
78
82
                        Query::EmptyBehaviour emptyBehaviour);
85
89
 
86
90
        QMap<QDBusObjectPath, Query::Ptr> m_queries;
87
91
 
88
 
        QMap<QString, Query::Ptr> m_legacyQueries;
 
92
        QMap<QString, QPair<Query::Ptr, QSharedPointer<QTimer>>> m_legacyQueries;
89
93
 
90
94
        QSharedPointer<ApplicationList> m_applicationList;
91
95