AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent a leak of QXcbXSettingsPrivate

Browse Source 
The private was not deleted. Adding the dtor in turn
causes a warning about not having a virtual dtor
in the base class, so add that as well.

Change-Id: I24a90caf2cf6192a6f17cf5af96b8f77010d9127
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
This commit is contained in:
Giuseppe D'Angelo 2014-10-30 10:22:36 +01:00
parent cca4eb45c5
commit dce4453485
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/platforms/xcb/qxcbconnection.h
View File

@ -324,6 +324,7 @@ private:
class QXcbWindowEventListener class QXcbWindowEventListener
{ {
public: public:
virtual ~QXcbWindowEventListener() {}
virtual bool handleGenericEvent(xcb_generic_event_t *, long *) { return false; } virtual bool handleGenericEvent(xcb_generic_event_t *, long *) { return false; }
virtual void handleExposeEvent(const xcb_expose_event_t *) {} virtual void handleExposeEvent(const xcb_expose_event_t *) {}

6
src/plugins/platforms/xcb/qxcbxsettings.cpp
View File

@ -262,6 +262,12 @@ QXcbXSettings::QXcbXSettings(QXcbScreen *screen)
d_ptr->initialized = true; d_ptr->initialized = true;
} }
QXcbXSettings::~QXcbXSettings()
{
delete d_ptr;
d_ptr = 0;
}
bool QXcbXSettings::initialized() const bool QXcbXSettings::initialized() const
{ {
Q_D(const QXcbXSettings); Q_D(const QXcbXSettings);

1
src/plugins/platforms/xcb/qxcbxsettings.h
View File

@ -45,6 +45,7 @@ class QXcbXSettings : public QXcbWindowEventListener
Q_DECLARE_PRIVATE(QXcbXSettings) Q_DECLARE_PRIVATE(QXcbXSettings)
public: public:
QXcbXSettings(QXcbScreen *screen); QXcbXSettings(QXcbScreen *screen);
~QXcbXSettings();
bool initialized() const; bool initialized() const;
QVariant setting(const QByteArray &property) const; QVariant setting(const QByteArray &property) const;