diff --git a/kded/daemon.h b/kded/daemon.h --- a/kded/daemon.h +++ b/kded/daemon.h @@ -80,7 +80,7 @@ QTimer* m_buttonTimer; QTimer* m_saveTimer; QTimer* m_lidClosedTimer; - QElapsedTimer* m_changeBlockTimer; + QScopedPointer m_changeBlockTimer; }; #endif /*KSCREN_DAEMON_H*/ diff --git a/kded/daemon.cpp b/kded/daemon.cpp --- a/kded/daemon.cpp +++ b/kded/daemon.cpp @@ -49,10 +49,10 @@ , m_monitoredConfig(0) , m_iteration(Generator::None) , m_monitoring(false) - , m_changeCompressor(new QTimer()) - , m_buttonTimer(new QTimer()) - , m_saveTimer(new QTimer()) - , m_lidClosedTimer(new QTimer()) + , m_changeCompressor(new QTimer(this)) + , m_buttonTimer(new QTimer(this)) + , m_saveTimer(new QTimer(this)) + , m_lidClosedTimer(new QTimer(this)) , m_changeBlockTimer(new QElapsedTimer()) { @@ -80,12 +80,6 @@ KScreenDaemon::~KScreenDaemon() { - delete m_changeCompressor; - delete m_saveTimer; - delete m_buttonTimer; - delete m_lidClosedTimer; - delete m_changeBlockTimer; - Generator::destroy(); Device::destroy(); }