diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2009-04-06 14:08:55 +0200 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2009-04-06 14:08:55 +0200 |
| commit | 84007236ce796615a8e74432aad110164b23b8ec (patch) | |
| tree | 5053dc936f63882afe3fec56342e9d5d1dc8fe76 /lib/gui | |
| parent | 3e45b153a93894c4c382d3ba5ded974c738e9589 (diff) | |
| download | enigma2-84007236ce796615a8e74432aad110164b23b8ec.tar.gz enigma2-84007236ce796615a8e74432aad110164b23b8ec.zip | |
replace assert by ASSERT, so a proper log message is generated
Diffstat (limited to 'lib/gui')
| -rw-r--r-- | lib/gui/einputnumber.cpp | 2 | ||||
| -rw-r--r-- | lib/gui/einputstring.cpp | 2 | ||||
| -rw-r--r-- | lib/gui/elistbox.cpp | 2 | ||||
| -rw-r--r-- | lib/gui/ewidget.cpp | 10 | ||||
| -rw-r--r-- | lib/gui/ewidgetdesktop.cpp | 6 |
5 files changed, 11 insertions, 11 deletions
diff --git a/lib/gui/einputnumber.cpp b/lib/gui/einputnumber.cpp index 29c78801..a71e161f 100644 --- a/lib/gui/einputnumber.cpp +++ b/lib/gui/einputnumber.cpp @@ -105,7 +105,7 @@ int eInputContentNumber::haveKey(int code, int overwrite) m_cursor++; - assert(m_cursor <= m_len); + ASSERT(m_cursor <= m_len); if (m_input) m_input->invalidate(); diff --git a/lib/gui/einputstring.cpp b/lib/gui/einputstring.cpp index 9ead4fa9..4562e633 100644 --- a/lib/gui/einputstring.cpp +++ b/lib/gui/einputstring.cpp @@ -65,7 +65,7 @@ int eInputContentString::haveKey(int code, int overwrite) m_cursor++; - assert(m_cursor <= m_len); + ASSERT(m_cursor <= m_len); if (m_input) m_input->invalidate(); diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp index e8a0dada..c13114e8 100644 --- a/lib/gui/elistbox.cpp +++ b/lib/gui/elistbox.cpp @@ -302,7 +302,7 @@ int eListbox::event(int event, void *data, void *data2) if (!m_content) return eWidget::event(event, data, data2); - assert(m_content); + ASSERT(m_content); getStyle(style); diff --git a/lib/gui/ewidget.cpp b/lib/gui/ewidget.cpp index a302cbc6..2320cd46 100644 --- a/lib/gui/ewidget.cpp +++ b/lib/gui/ewidget.cpp @@ -88,7 +88,7 @@ void eWidget::invalidate(const gRegion ®ion) while (root && !root->m_desktop) { root = root->m_parent; - assert(root); + ASSERT(root); if (root->m_layer != -1) target_layer = root->m_layer; abspos += root->position(); @@ -122,7 +122,7 @@ void eWidget::show() probably somebody already erased the root, but tries some operations on a child window. ignore them for now. */ - /* assert(root); */ + /* ASSERT(root); */ return; } if (root->m_layer != -1) @@ -162,7 +162,7 @@ void eWidget::hide() return; abspos += root->position(); } - assert(root->m_desktop); + ASSERT(root->m_desktop); gRegion abs = m_visible_with_childs; abs.moveBy(abspos); @@ -218,7 +218,7 @@ ePoint eWidget::getAbsolutePosition() while (root && !root->m_desktop) { root = root->m_parent; - assert(root); + ASSERT(root); abspos += root->position(); } @@ -303,7 +303,7 @@ void eWidget::recalcClipRegionsWhenVisible() break; } t = t->m_parent; - assert(t); + ASSERT(t); } while(1); } diff --git a/lib/gui/ewidgetdesktop.cpp b/lib/gui/ewidgetdesktop.cpp index 63aeaace..05b4ec4d 100644 --- a/lib/gui/ewidgetdesktop.cpp +++ b/lib/gui/ewidgetdesktop.cpp @@ -7,7 +7,7 @@ extern void dumpRegion(const gRegion ®ion); 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. */ @@ -374,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; @@ -462,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)); |
