diff options
author | Jason Barron <jason.barron@nokia.com> | 2010-08-04 14:09:04 (GMT) |
---|---|---|
committer | Jason Barron <jason.barron@nokia.com> | 2010-08-05 12:59:11 (GMT) |
commit | bd1aeaa50c60cffa3e195f3f6aed808f23a5c73c (patch) | |
tree | 1557f755f7817da48f11080bf2964838f9e688aa /src/gui/painting/qgraphicssystem_runtime_p.h | |
parent | e5071275f719ec36ff5e14b1e92258f270ef22b6 (diff) | |
download | Qt-bd1aeaa50c60cffa3e195f3f6aed808f23a5c73c.zip Qt-bd1aeaa50c60cffa3e195f3f6aed808f23a5c73c.tar.gz Qt-bd1aeaa50c60cffa3e195f3f6aed808f23a5c73c.tar.bz2 |
Remove the memory tracking attempt from the runtime graphics system.
It has been decided that this logic will not be used by anyone at the
moment so let's remove it. This removes an exported (although private)
virtual function so breaks binary compatiblity for plugins built with
previous versions.
Reviewed-by: Jani Hautakangas
Diffstat (limited to 'src/gui/painting/qgraphicssystem_runtime_p.h')
-rw-r--r-- | src/gui/painting/qgraphicssystem_runtime_p.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/gui/painting/qgraphicssystem_runtime_p.h b/src/gui/painting/qgraphicssystem_runtime_p.h index 7aab89c..d4c9152 100644 --- a/src/gui/painting/qgraphicssystem_runtime_p.h +++ b/src/gui/painting/qgraphicssystem_runtime_p.h @@ -104,8 +104,6 @@ public: virtual QPixmapData *runtimeData() const; - virtual uint memoryUsage() const; - private: const QRuntimeGraphicsSystem *m_graphicsSystem; @@ -131,8 +129,6 @@ public: virtual QPoint offset(const QWidget *widget) const; - virtual uint memoryUsage() const; - QWindowSurface *m_windowSurface; QWindowSurface *m_pendingWindowSurface; @@ -159,7 +155,6 @@ public: void removePixmapData(QRuntimePixmapData *pixmapData) const; void removeWindowSurface(QRuntimeWindowSurface *windowSurface) const; - void setGraphicsSystem(const QString &name, uint memoryUsageLimit); void setGraphicsSystem(const QString &name); QString graphicsSystemName() const { return m_graphicsSystemName; } @@ -170,22 +165,14 @@ public: int windowSurfaceDestroyPolicy() const { return m_windowSurfaceDestroyPolicy; } - uint memoryUsage() const { return m_memoryUsage; } - -private: - - void increaseMemoryUsage(uint amount) const; - void decreaseMemoryUsage(uint amount, bool persistent = false) const; private: - mutable uint m_memoryUsage; int m_windowSurfaceDestroyPolicy; QGraphicsSystem *m_graphicsSystem; mutable QList<QRuntimePixmapData *> m_pixmapDatas; mutable QList<QRuntimeWindowSurface *> m_windowSurfaces; QString m_graphicsSystemName; - uint m_graphicsSystemChangeMemoryLimit; QString m_pendingGraphicsSystemName; friend class QRuntimePixmapData; |