summaryrefslogtreecommitdiff
path: root/Userland/Applications/PixelPaint
diff options
context:
space:
mode:
Diffstat (limited to 'Userland/Applications/PixelPaint')
-rw-r--r--Userland/Applications/PixelPaint/BucketTool.cpp2
-rw-r--r--Userland/Applications/PixelPaint/EllipseTool.cpp2
-rw-r--r--Userland/Applications/PixelPaint/Image.cpp12
-rw-r--r--Userland/Applications/PixelPaint/ImageEditor.cpp4
-rw-r--r--Userland/Applications/PixelPaint/LayerListWidget.cpp4
-rw-r--r--Userland/Applications/PixelPaint/RectangleTool.cpp2
-rw-r--r--Userland/Applications/PixelPaint/SprayTool.cpp2
-rw-r--r--Userland/Applications/PixelPaint/main.cpp6
8 files changed, 17 insertions, 17 deletions
diff --git a/Userland/Applications/PixelPaint/BucketTool.cpp b/Userland/Applications/PixelPaint/BucketTool.cpp
index 6cffddac20..da788f3c8c 100644
--- a/Userland/Applications/PixelPaint/BucketTool.cpp
+++ b/Userland/Applications/PixelPaint/BucketTool.cpp
@@ -55,7 +55,7 @@ static float color_distance_squared(const Gfx::Color& lhs, const Gfx::Color& rhs
static void flood_fill(Gfx::Bitmap& bitmap, const Gfx::IntPoint& start_position, Color target_color, Color fill_color, int threshold)
{
- ASSERT(bitmap.bpp() == 32);
+ VERIFY(bitmap.bpp() == 32);
if (target_color == fill_color)
return;
diff --git a/Userland/Applications/PixelPaint/EllipseTool.cpp b/Userland/Applications/PixelPaint/EllipseTool.cpp
index 0501e2fb96..ec7a5f54d4 100644
--- a/Userland/Applications/PixelPaint/EllipseTool.cpp
+++ b/Userland/Applications/PixelPaint/EllipseTool.cpp
@@ -50,7 +50,7 @@ void EllipseTool::draw_using(GUI::Painter& painter, const Gfx::IntRect& ellipse_
painter.draw_ellipse_intersecting(ellipse_intersecting_rect, m_editor->color_for(m_drawing_button), m_thickness);
break;
default:
- ASSERT_NOT_REACHED();
+ VERIFY_NOT_REACHED();
}
}
diff --git a/Userland/Applications/PixelPaint/Image.cpp b/Userland/Applications/PixelPaint/Image.cpp
index 78eebc2b2d..248ccc1bb0 100644
--- a/Userland/Applications/PixelPaint/Image.cpp
+++ b/Userland/Applications/PixelPaint/Image.cpp
@@ -168,7 +168,7 @@ void Image::export_png(const String& file_path)
void Image::add_layer(NonnullRefPtr<Layer> layer)
{
for (auto& existing_layer : m_layers) {
- ASSERT(&existing_layer != layer.ptr());
+ VERIFY(&existing_layer != layer.ptr());
}
m_layers.append(move(layer));
@@ -206,7 +206,7 @@ size_t Image::index_of(const Layer& layer) const
if (&m_layers.at(i) == &layer)
return i;
}
- ASSERT_NOT_REACHED();
+ VERIFY_NOT_REACHED();
}
void Image::move_layer_to_back(Layer& layer)
@@ -255,8 +255,8 @@ void Image::move_layer_up(Layer& layer)
void Image::change_layer_index(size_t old_index, size_t new_index)
{
- ASSERT(old_index < m_layers.size());
- ASSERT(new_index < m_layers.size());
+ VERIFY(old_index < m_layers.size());
+ VERIFY(new_index < m_layers.size());
auto layer = m_layers.take(old_index);
m_layers.insert(new_index, move(layer));
did_modify_layer_stack();
@@ -290,13 +290,13 @@ void Image::select_layer(Layer* layer)
void Image::add_client(ImageClient& client)
{
- ASSERT(!m_clients.contains(&client));
+ VERIFY(!m_clients.contains(&client));
m_clients.set(&client);
}
void Image::remove_client(ImageClient& client)
{
- ASSERT(m_clients.contains(&client));
+ VERIFY(m_clients.contains(&client));
m_clients.remove(&client);
}
diff --git a/Userland/Applications/PixelPaint/ImageEditor.cpp b/Userland/Applications/PixelPaint/ImageEditor.cpp
index f29551c050..829210e39c 100644
--- a/Userland/Applications/PixelPaint/ImageEditor.cpp
+++ b/Userland/Applications/PixelPaint/ImageEditor.cpp
@@ -341,7 +341,7 @@ Color ImageEditor::color_for(GUI::MouseButton button) const
return m_primary_color;
if (button == GUI::MouseButton::Right)
return m_secondary_color;
- ASSERT_NOT_REACHED();
+ VERIFY_NOT_REACHED();
}
Color ImageEditor::color_for(const GUI::MouseEvent& event) const
@@ -350,7 +350,7 @@ Color ImageEditor::color_for(const GUI::MouseEvent& event) const
return m_primary_color;
if (event.buttons() & GUI::MouseButton::Right)
return m_secondary_color;
- ASSERT_NOT_REACHED();
+ VERIFY_NOT_REACHED();
}
void ImageEditor::set_primary_color(Color color)
diff --git a/Userland/Applications/PixelPaint/LayerListWidget.cpp b/Userland/Applications/PixelPaint/LayerListWidget.cpp
index 756772bb87..e12ac673a7 100644
--- a/Userland/Applications/PixelPaint/LayerListWidget.cpp
+++ b/Userland/Applications/PixelPaint/LayerListWidget.cpp
@@ -161,7 +161,7 @@ void LayerListWidget::mousemove_event(GUI::MouseEvent& event)
auto delta = event.position() - m_moving_event_origin;
auto& gadget = m_gadgets[m_moving_gadget_index.value()];
- ASSERT(gadget.is_moving);
+ VERIFY(gadget.is_moving);
gadget.movement_delta = delta;
relayout_gadgets();
}
@@ -221,7 +221,7 @@ static constexpr int vertical_step = gadget_height + gadget_spacing;
size_t LayerListWidget::hole_index_during_move() const
{
- ASSERT(is_moving_gadget());
+ VERIFY(is_moving_gadget());
auto& moving_gadget = m_gadgets[m_moving_gadget_index.value()];
int center_y_of_moving_gadget = moving_gadget.rect.translated(0, moving_gadget.movement_delta.y()).center().y();
return center_y_of_moving_gadget / vertical_step;
diff --git a/Userland/Applications/PixelPaint/RectangleTool.cpp b/Userland/Applications/PixelPaint/RectangleTool.cpp
index a5b023f18b..3ac941ba72 100644
--- a/Userland/Applications/PixelPaint/RectangleTool.cpp
+++ b/Userland/Applications/PixelPaint/RectangleTool.cpp
@@ -56,7 +56,7 @@ void RectangleTool::draw_using(GUI::Painter& painter, const Gfx::IntRect& rect)
painter.fill_rect_with_gradient(rect, m_editor->primary_color(), m_editor->secondary_color());
break;
default:
- ASSERT_NOT_REACHED();
+ VERIFY_NOT_REACHED();
}
}
diff --git a/Userland/Applications/PixelPaint/SprayTool.cpp b/Userland/Applications/PixelPaint/SprayTool.cpp
index 9997c29674..a5d0a176d8 100644
--- a/Userland/Applications/PixelPaint/SprayTool.cpp
+++ b/Userland/Applications/PixelPaint/SprayTool.cpp
@@ -66,7 +66,7 @@ void SprayTool::paint_it()
auto& bitmap = layer->bitmap();
GUI::Painter painter(bitmap);
- ASSERT(bitmap.bpp() == 32);
+ VERIFY(bitmap.bpp() == 32);
m_editor->update();
const double minimal_radius = 2;
const double base_radius = minimal_radius * m_thickness;
diff --git a/Userland/Applications/PixelPaint/main.cpp b/Userland/Applications/PixelPaint/main.cpp
index 0680b05583..e7c88d3849 100644
--- a/Userland/Applications/PixelPaint/main.cpp
+++ b/Userland/Applications/PixelPaint/main.cpp
@@ -201,7 +201,7 @@ int main(int argc, char** argv)
auto& edit_menu = menubar->add_menu("Edit");
auto paste_action = GUI::CommonActions::make_paste_action([&](auto&) {
- ASSERT(image_editor.image());
+ VERIFY(image_editor.image());
auto bitmap = GUI::Clipboard::the().bitmap();
if (!bitmap)
return;
@@ -217,13 +217,13 @@ int main(int argc, char** argv)
edit_menu.add_action(paste_action);
auto undo_action = GUI::CommonActions::make_undo_action([&](auto&) {
- ASSERT(image_editor.image());
+ VERIFY(image_editor.image());
image_editor.undo();
});
edit_menu.add_action(undo_action);
auto redo_action = GUI::CommonActions::make_redo_action([&](auto&) {
- ASSERT(image_editor.image());
+ VERIFY(image_editor.image());
image_editor.redo();
});
edit_menu.add_action(redo_action);