X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/bf21ddd450e9e7b223e89623c6e31c806eb6374c..2d7f4e102ee3231bdb600b0ac7e2d8f898034b78:/lib/gui/ewidgetdesktop.cpp

diff --git a/lib/gui/ewidgetdesktop.cpp b/lib/gui/ewidgetdesktop.cpp
index 9f40a3db..05b4ec4d 100644
--- a/lib/gui/ewidgetdesktop.cpp
+++ b/lib/gui/ewidgetdesktop.cpp
@@ -7,7 +7,7 @@ extern void dumpRegion(const gRegion &region);
 
 void eWidgetDesktop::addRootWidget(eWidget *root)
 {
-	assert(!root->m_desktop);
+	ASSERT(!root->m_desktop);
 	
 	int invert_sense = 0;
 		/* buffered mode paints back-to-front, while immediate mode is front-to-back. */
@@ -343,12 +343,11 @@ void eWidgetDesktop::setRedrawTask(eMainloop &ml)
 {
 	if (m_mainloop)
 	{
-		delete m_timer;
 		m_timer = 0;
 		m_mainloop = 0;
 	}
 	m_mainloop = &ml;
-	m_timer = new eTimer(m_mainloop);
+	m_timer = eTimer::create(m_mainloop);
 	CONNECT(m_timer->timeout, eWidgetDesktop::paint);
 	
 	if (m_require_redraw)
@@ -375,7 +374,7 @@ void eWidgetDesktop::makeCompatiblePixmap(gPixmap &pm)
 	ePtr<gPixmap> target_pixmap;
 	m_screen.m_dc->getPixmap(target_pixmap);
 	
-	assert(target_pixmap);
+	ASSERT(target_pixmap);
 	
 	if (target_pixmap->surface && target_pixmap->surface->bpp > 8)
 		return;
@@ -399,7 +398,7 @@ void eWidgetDesktop::setCompositionMode(int mode)
 				removeBufferForWidget(*i, l);
 }
 
-eWidgetDesktop::eWidgetDesktop(eSize size): m_mainloop(0), m_timer(0)
+eWidgetDesktop::eWidgetDesktop(eSize size): m_mainloop(0)
 {
 	m_screen.m_dirty_region = gRegion(eRect(ePoint(0, 0), size));
 	m_screen.m_screen_size = size;
@@ -463,7 +462,7 @@ void eWidgetDesktop::redrawComposition(int notified)
 	if (m_comp_mode != cmBuffered)
 		return;
 	
-	assert(m_screen.m_dc);
+	ASSERT(m_screen.m_dc);
 	
 	gPainter p(m_screen.m_dc);
 	p.resetClip(eRect(ePoint(0, 0), m_screen.m_screen_size));