diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-13 04:09:29 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-13 04:09:29 +0000 |
| commit | 4f2f95ce18dc6290c3581b40ea4f20d05bd78d55 (patch) | |
| tree | dfe5142295b450df7d9838ed6ade1d1332377d22 /kdesktop/bgmanager.h | |
| parent | bee265d85549eed053dfc1e6308f4b5dbd3f2536 (diff) | |
| download | tdebase-4f2f95ce18dc6290c3581b40ea4f20d05bd78d55.tar.gz tdebase-4f2f95ce18dc6290c3581b40ea4f20d05bd78d55.zip | |
Fix a second cause of the ever-ubiquitous Bug #456
This one is related to the MOC having a different idea of the data structure than the C compiler does in bgmanager.xx,
thereby causing memory corruption when the bgmanager object attempts to access data members that the MOC did not add to the objects memory structure.
Also apply the fix in r1420474 to KDesktopIface and KScreenSaverIface
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1241406 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdesktop/bgmanager.h')
| -rw-r--r-- | kdesktop/bgmanager.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/kdesktop/bgmanager.h b/kdesktop/bgmanager.h index 4e15b8df5..080c5a614 100644 --- a/kdesktop/bgmanager.h +++ b/kdesktop/bgmanager.h @@ -19,10 +19,6 @@ #define COMPOSITE #endif -#ifdef Q_MOC_RUN -#define COMPOSITE -#endif - class KConfig; class TQTimer; class TQPixmap; @@ -93,11 +89,8 @@ private slots: void desktopResized(); void clearRoot(); void saveImages(); - -#ifdef COMPOSITE void slotCmBackgroundChanged(bool); -#endif - + private: void applyCommon(bool common); void applyExport(bool _export); @@ -129,9 +122,7 @@ private: TQWidget *m_pDesktop; TQTimer *m_pTimer; -#ifdef COMPOSITE - KPixmap *m_tPixmap; -#endif + KPixmap *m_tPixmap; TQPtrVector<KVirtualBGRenderer> m_Renderer; TQPtrVector<KBackgroundCacheEntry> m_Cache; |