diff options
author | Andreas Kling <awesomekling@gmail.com> | 2019-09-30 17:20:53 +0200 |
---|---|---|
committer | Andreas Kling <awesomekling@gmail.com> | 2019-09-30 17:20:53 +0200 |
commit | 1a279c5b2aba17b0a22cfff0624124ebc3dbebc7 (patch) | |
tree | 93ffbe6e3b8ab2027304fa58fd7a49cef12a4ca2 | |
parent | c5e057438c63a18c94251f0f350885152234f258 (diff) | |
download | serenity-1a279c5b2aba17b0a22cfff0624124ebc3dbebc7.zip |
GMessageBox: Hide the constructor and fix broken usages
We no longer support creating CObjects on the stack. Use construct().
-rw-r--r-- | Applications/PaintBrush/main.cpp | 3 | ||||
-rw-r--r-- | Applications/TextEditor/TextEditorWidget.cpp | 4 | ||||
-rw-r--r-- | Libraries/LibGUI/GMessageBox.h | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Applications/PaintBrush/main.cpp b/Applications/PaintBrush/main.cpp index d7f87f8a80..aba425b811 100644 --- a/Applications/PaintBrush/main.cpp +++ b/Applications/PaintBrush/main.cpp @@ -50,8 +50,7 @@ int main(int argc, char** argv) auto filename = picker.selected_file().string(); auto bitmap = load_png(filename); if (!bitmap) { - GMessageBox msgbox(String::format("Failed to load '%s'", filename.characters()), "Open failed", GMessageBox::Type::Error, GMessageBox::InputType::OK, window); - msgbox.exec(); + GMessageBox::show(String::format("Failed to load '%s'", filename.characters()), "Open failed", GMessageBox::Type::Error, GMessageBox::InputType::OK, window); return; } paintable_widget->set_bitmap(*bitmap); diff --git a/Applications/TextEditor/TextEditorWidget.cpp b/Applications/TextEditor/TextEditorWidget.cpp index 50ba9b5b4c..49e047bf75 100644 --- a/Applications/TextEditor/TextEditorWidget.cpp +++ b/Applications/TextEditor/TextEditorWidget.cpp @@ -118,8 +118,8 @@ TextEditorWidget::TextEditorWidget() m_new_action = GAction::create("New", { Mod_Ctrl, Key_N }, GraphicsBitmap::load_from_file("/res/icons/16x16/new.png"), [this](const GAction&) { if (m_document_dirty) { - GMessageBox save_document_first_box("Save Document First?", "Warning", GMessageBox::Type::Warning, GMessageBox::InputType::OKCancel, window()); - auto save_document_first_result = save_document_first_box.exec(); + auto save_document_first_box = GMessageBox::construct("Save Document First?", "Warning", GMessageBox::Type::Warning, GMessageBox::InputType::OKCancel, window()); + auto save_document_first_result = save_document_first_box->exec(); if (save_document_first_result != GDialog::ExecResult::ExecOK) return; diff --git a/Libraries/LibGUI/GMessageBox.h b/Libraries/LibGUI/GMessageBox.h index efaf9fab01..6fe2a0655b 100644 --- a/Libraries/LibGUI/GMessageBox.h +++ b/Libraries/LibGUI/GMessageBox.h @@ -17,12 +17,13 @@ public: OKCancel, }; - explicit GMessageBox(const StringView& text, const StringView& title, Type type = Type::None, InputType = InputType::OK, CObject* parent = nullptr); virtual ~GMessageBox() override; static int show(const StringView& text, const StringView& title, Type type = Type::None, InputType = InputType::OK, CObject* parent = nullptr); private: + explicit GMessageBox(const StringView& text, const StringView& title, Type type = Type::None, InputType = InputType::OK, CObject* parent = nullptr); + bool should_include_ok_button() const; bool should_include_cancel_button() const; void build(); |