From 33afd58b8e463d3d17cf0f876e736fa93777b3aa Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Fri, 26 Dec 2008 18:58:29 +0000 Subject: [PATCH] Converted all ASSERTs to REQUIREs --- src/gui/dialogs/name-chooser.cpp | 2 +- src/gui/dialogs/render.cpp | 2 +- src/gui/output/gdkdisplayer.cpp | 8 ++++---- src/gui/output/xvdisplayer.cpp | 2 +- src/gui/panels/timeline-panel.cpp | 6 +++--- src/gui/widgets/timeline-widget.cpp | 8 ++++---- src/gui/widgets/timeline/timeline-body.cpp | 4 ++-- .../widgets/timeline/timeline-header-container.cpp | 12 ++++++------ src/gui/widgets/timeline/timeline-track.cpp | 4 ++-- src/gui/workspace/workspace-window.cpp | 4 ++-- 10 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/gui/dialogs/name-chooser.cpp b/src/gui/dialogs/name-chooser.cpp index 924361fe6..0017b8bb7 100644 --- a/src/gui/dialogs/name-chooser.cpp +++ b/src/gui/dialogs/name-chooser.cpp @@ -44,7 +44,7 @@ NameChooser::NameChooser(Window &parent, Glib::ustring title, hBox.set_spacing(BoxSpacing); VBox* const v_box = get_vbox(); - ASSERT(v_box != NULL); + REQUIRE(v_box != NULL); v_box->pack_start(hBox); // Configure the dialog diff --git a/src/gui/dialogs/render.cpp b/src/gui/dialogs/render.cpp index 5afa00f76..91bdbaf67 100644 --- a/src/gui/dialogs/render.cpp +++ b/src/gui/dialogs/render.cpp @@ -41,7 +41,7 @@ Render::Render(Window &parent) : videoFrame(_("Video")) { VBox *v_box = get_vbox(); - ASSERT(v_box != NULL); + REQUIRE(v_box != NULL); // The Output File Row outputFileHBox.pack_start(outputFileLabel, PACK_SHRINK); diff --git a/src/gui/output/gdkdisplayer.cpp b/src/gui/output/gdkdisplayer.cpp index ffe6b81e3..0f83ceac4 100644 --- a/src/gui/output/gdkdisplayer.cpp +++ b/src/gui/output/gdkdisplayer.cpp @@ -61,17 +61,17 @@ GdkDisplayer::put( void *image ) video_x, video_y, video_width, video_height ); GdkWindow *window = drawingArea->get_window()->gobj(); - ASSERT(window != NULL); + REQUIRE(window != NULL); GdkGC *gc = gdk_gc_new( window ); - ASSERT(gc != NULL); + REQUIRE(gc != NULL); GdkPixbuf *pixbuf = gdk_pixbuf_new_from_data( (const guchar*)image, GDK_COLORSPACE_RGB, FALSE, 8, preferredWidth(), preferredHeight(), preferredWidth() * 3, NULL, NULL ); - ASSERT(pixbuf != NULL); + REQUIRE(pixbuf != NULL); GdkPixbuf *scaled_image = gdk_pixbuf_scale_simple( pixbuf, video_width, video_height, GDK_INTERP_NEAREST ); - ASSERT(scaled_image != NULL); + REQUIRE(scaled_image != NULL); gdk_draw_pixbuf( window, gc, scaled_image, 0, 0, video_x, video_y, -1, -1, GDK_RGB_DITHER_NORMAL, 0, 0 ); diff --git a/src/gui/output/xvdisplayer.cpp b/src/gui/output/xvdisplayer.cpp index db3d2b25e..13a692a40 100644 --- a/src/gui/output/xvdisplayer.cpp +++ b/src/gui/output/xvdisplayer.cpp @@ -201,7 +201,7 @@ void XvDisplayer::put( void *image ) { REQUIRE(image != NULL); - ASSERT(drawingArea != NULL); + REQUIRE(drawingArea != NULL); if(xvImage != NULL) { diff --git a/src/gui/panels/timeline-panel.cpp b/src/gui/panels/timeline-panel.cpp index 9572ae8e6..03cdc8e2f 100644 --- a/src/gui/panels/timeline-panel.cpp +++ b/src/gui/panels/timeline-panel.cpp @@ -160,7 +160,7 @@ void TimelinePanel::on_zoom_in() { TimelineWidget *const widget = get_current_page(); - ASSERT(widget != NULL); + REQUIRE(widget != NULL); widget->get_view_window().zoom_view(ZoomToolSteps); update_zoom_buttons(); @@ -170,7 +170,7 @@ void TimelinePanel::on_zoom_out() { TimelineWidget *const widget = get_current_page(); - ASSERT(widget != NULL); + REQUIRE(widget != NULL); widget->get_view_window().zoom_view(-ZoomToolSteps); update_zoom_buttons(); @@ -201,7 +201,7 @@ TimelinePanel::on_playback_period_drag_released() // real backend TimelineWidget *const widget = get_current_page(); - ASSERT(widget != NULL); + REQUIRE(widget != NULL); widget->set_playback_point(widget->get_playback_period_start()); //----- END TEST CODE diff --git a/src/gui/widgets/timeline-widget.cpp b/src/gui/widgets/timeline-widget.cpp index 7798fba76..fa85d6a2d 100644 --- a/src/gui/widgets/timeline-widget.cpp +++ b/src/gui/widgets/timeline-widget.cpp @@ -296,7 +296,7 @@ TimelineWidget::update_tracks() create_timeline_tracks(); // Update the header container - ASSERT(headerContainer != NULL); + REQUIRE(headerContainer != NULL); headerContainer->show_all_children(); headerContainer->update_headers(); @@ -308,7 +308,7 @@ TimelineWidget::update_tracks() BOOST_FOREACH(shared_ptr track, sequence->get_child_tracks()) { - ASSERT(track); + REQUIRE(track); totalHeight += measure_branch_height(track); } } @@ -456,7 +456,7 @@ TimelineWidget::lookup_model_track( void TimelineWidget::update_scroll() { - ASSERT(body != NULL); + REQUIRE(body != NULL); const Allocation body_allocation = body->get_allocation(); //----- Horizontal Scroll ------// @@ -511,7 +511,7 @@ TimelineWidget::measure_branch_height( BOOST_FOREACH( shared_ptr child, model_track->get_child_tracks() ) { - ASSERT(child != NULL); + REQUIRE(child); height += measure_branch_height(child); } diff --git a/src/gui/widgets/timeline/timeline-body.cpp b/src/gui/widgets/timeline/timeline-body.cpp index b1d1eb6da..7e8125cac 100644 --- a/src/gui/widgets/timeline/timeline-body.cpp +++ b/src/gui/widgets/timeline/timeline-body.cpp @@ -303,7 +303,7 @@ TimelineBody::draw_track_recursive(Cairo::RefPtr cr, lookup_timeline_track(model_track); const int height = timeline_track->get_height(); - ASSERT(height >= 0); + REQUIRE(height >= 0); // Draw the track background cr->rectangle(0, 0, view_width, height); @@ -453,7 +453,7 @@ shared_ptr TimelineBody::track_from_branch( lookup_timeline_track(model_track); const int height = timeline_track->get_height(); - ASSERT(height >= 0); + REQUIRE(height >= 0); // Does the point fall in this track? if(offset <= y && y < offset + height) diff --git a/src/gui/widgets/timeline/timeline-header-container.cpp b/src/gui/widgets/timeline/timeline-header-container.cpp index 506eb0316..d9c15fc90 100644 --- a/src/gui/widgets/timeline/timeline-header-container.cpp +++ b/src/gui/widgets/timeline/timeline-header-container.cpp @@ -248,7 +248,7 @@ TimelineHeaderContainer::forall_vfunc(gboolean /* include_internals */, BOOST_FOREACH( shared_ptr track, get_tracks() ) { - ASSERT(track != NULL); + REQUIRE(track); forall_vfunc_recursive(track, callback, callback_data); } } @@ -275,7 +275,7 @@ TimelineHeaderContainer::on_expose_event(GdkEventExpose *event) BOOST_FOREACH( shared_ptr model_track, get_tracks() ) { - ASSERT(model_track != NULL); + REQUIRE(model_track); draw_header_decoration(model_track, Gdk::Rectangle(0, 0, @@ -354,7 +354,7 @@ TimelineHeaderContainer::layout_headers_recursive( offset, // y max( header_width - indent, 0 ), // width track_height); // height - ASSERT(header_box.get_height() >= 0); + REQUIRE(header_box.get_height() >= 0); // Cache the bounding box headerBoxes[timeline_track] = header_box; @@ -448,14 +448,14 @@ TimelineHeaderContainer::draw_header_decoration( REQUIRE(clip_rect.get_height() > 0); Glib::RefPtr