1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-16 13:57:35 +00:00

LibGUI: Put all classes in the GUI namespace and remove the leading G

This took me a moment. Welcome to the new world of GUI::Widget! :^)
This commit is contained in:
Andreas Kling 2020-02-02 15:07:41 +01:00
parent 2d39da5405
commit c5bd9d4ed1
337 changed files with 5400 additions and 4816 deletions

View file

@ -37,13 +37,15 @@
#include <LibGUI/GTextRange.h>
#include <LibGUI/GUndoStack.h>
class GTextEditor;
class GTextDocument;
class GTextDocumentLine;
class GTextDocumentUndoCommand;
namespace GUI {
struct GTextDocumentSpan {
GTextRange range;
class TextDocument;
class TextDocumentLine;
class TextDocumentUndoCommand;
class TextEditor;
struct TextDocumentSpan {
TextRange range;
Color color;
Optional<Color> background_color;
bool is_skippable { false };
@ -51,7 +53,7 @@ struct GTextDocumentSpan {
void* data { nullptr };
};
class GTextDocument : public RefCounted<GTextDocument> {
class TextDocument : public RefCounted<TextDocument> {
public:
enum class SearchShouldWrap {
No = 0,
@ -67,60 +69,60 @@ public:
virtual void document_did_remove_all_lines() = 0;
virtual void document_did_change() = 0;
virtual void document_did_set_text() = 0;
virtual void document_did_set_cursor(const GTextPosition&) = 0;
virtual void document_did_set_cursor(const TextPosition&) = 0;
virtual bool is_automatic_indentation_enabled() const = 0;
virtual int soft_tab_width() const = 0;
};
static NonnullRefPtr<GTextDocument> create(Client* client = nullptr)
static NonnullRefPtr<TextDocument> create(Client* client = nullptr)
{
return adopt(*new GTextDocument(client));
return adopt(*new TextDocument(client));
}
size_t line_count() const { return (size_t)m_lines.size(); }
const GTextDocumentLine& line(size_t line_index) const { return m_lines[(int)line_index]; }
GTextDocumentLine& line(size_t line_index) { return m_lines[(int)line_index]; }
const TextDocumentLine& line(size_t line_index) const { return m_lines[(int)line_index]; }
TextDocumentLine& line(size_t line_index) { return m_lines[(int)line_index]; }
void set_spans(const Vector<GTextDocumentSpan>& spans) { m_spans = spans; }
void set_spans(const Vector<TextDocumentSpan>& spans) { m_spans = spans; }
void set_text(const StringView&);
const NonnullOwnPtrVector<GTextDocumentLine>& lines() const { return m_lines; }
NonnullOwnPtrVector<GTextDocumentLine>& lines() { return m_lines; }
const NonnullOwnPtrVector<TextDocumentLine>& lines() const { return m_lines; }
NonnullOwnPtrVector<TextDocumentLine>& lines() { return m_lines; }
bool has_spans() const { return !m_spans.is_empty(); }
const Vector<GTextDocumentSpan>& spans() const { return m_spans; }
void set_span_at_index(size_t index, GTextDocumentSpan span) { m_spans[(int)index] = move(span); }
const Vector<TextDocumentSpan>& spans() const { return m_spans; }
void set_span_at_index(size_t index, TextDocumentSpan span) { m_spans[(int)index] = move(span); }
void append_line(NonnullOwnPtr<GTextDocumentLine>);
void append_line(NonnullOwnPtr<TextDocumentLine>);
void remove_line(size_t line_index);
void remove_all_lines();
void insert_line(size_t line_index, NonnullOwnPtr<GTextDocumentLine>);
void insert_line(size_t line_index, NonnullOwnPtr<TextDocumentLine>);
void register_client(Client&);
void unregister_client(Client&);
void update_views(Badge<GTextDocumentLine>);
void update_views(Badge<TextDocumentLine>);
String text_in_range(const GTextRange&) const;
String text_in_range(const TextRange&) const;
Vector<GTextRange> find_all(const StringView& needle) const;
Vector<TextRange> find_all(const StringView& needle) const;
GTextRange find_next(const StringView&, const GTextPosition& start = {}, SearchShouldWrap = SearchShouldWrap::Yes) const;
GTextRange find_previous(const StringView&, const GTextPosition& start = {}, SearchShouldWrap = SearchShouldWrap::Yes) const;
TextRange find_next(const StringView&, const TextPosition& start = {}, SearchShouldWrap = SearchShouldWrap::Yes) const;
TextRange find_previous(const StringView&, const TextPosition& start = {}, SearchShouldWrap = SearchShouldWrap::Yes) const;
GTextPosition next_position_after(const GTextPosition&, SearchShouldWrap = SearchShouldWrap::Yes) const;
GTextPosition previous_position_before(const GTextPosition&, SearchShouldWrap = SearchShouldWrap::Yes) const;
TextPosition next_position_after(const TextPosition&, SearchShouldWrap = SearchShouldWrap::Yes) const;
TextPosition previous_position_before(const TextPosition&, SearchShouldWrap = SearchShouldWrap::Yes) const;
char character_at(const GTextPosition&) const;
char character_at(const TextPosition&) const;
GTextRange range_for_entire_line(size_t line_index) const;
TextRange range_for_entire_line(size_t line_index) const;
Optional<GTextDocumentSpan> first_non_skippable_span_before(const GTextPosition&) const;
Optional<GTextDocumentSpan> first_non_skippable_span_after(const GTextPosition&) const;
Optional<TextDocumentSpan> first_non_skippable_span_before(const TextPosition&) const;
Optional<TextDocumentSpan> first_non_skippable_span_after(const TextPosition&) const;
void add_to_undo_stack(NonnullOwnPtr<GTextDocumentUndoCommand>);
void add_to_undo_stack(NonnullOwnPtr<TextDocumentUndoCommand>);
bool can_undo() const { return m_undo_stack.can_undo(); }
bool can_redo() const { return m_undo_stack.can_redo(); }
@ -128,46 +130,46 @@ public:
void redo();
void notify_did_change();
void set_all_cursors(const GTextPosition&);
void set_all_cursors(const TextPosition&);
GTextPosition insert_at(const GTextPosition&, char, const Client* = nullptr);
GTextPosition insert_at(const GTextPosition&, const StringView&, const Client* = nullptr);
void remove(const GTextRange&);
TextPosition insert_at(const TextPosition&, char, const Client* = nullptr);
TextPosition insert_at(const TextPosition&, const StringView&, const Client* = nullptr);
void remove(const TextRange&);
private:
explicit GTextDocument(Client* client);
explicit TextDocument(Client* client);
void update_undo_timer();
NonnullOwnPtrVector<GTextDocumentLine> m_lines;
Vector<GTextDocumentSpan> m_spans;
NonnullOwnPtrVector<TextDocumentLine> m_lines;
Vector<TextDocumentSpan> m_spans;
HashTable<Client*> m_clients;
bool m_client_notifications_enabled { true };
GUndoStack m_undo_stack;
UndoStack m_undo_stack;
RefPtr<Core::Timer> m_undo_timer;
};
class GTextDocumentLine {
class TextDocumentLine {
friend class GTextEditor;
friend class GTextDocument;
friend class TextDocument;
public:
explicit GTextDocumentLine(GTextDocument&);
explicit GTextDocumentLine(GTextDocument&, const StringView&);
explicit TextDocumentLine(TextDocument&);
explicit TextDocumentLine(TextDocument&, const StringView&);
StringView view() const { return { characters(), (size_t)length() }; }
const char* characters() const { return m_text.data(); }
size_t length() const { return (size_t)m_text.size() - 1; }
void set_text(GTextDocument&, const StringView&);
void append(GTextDocument&, char);
void prepend(GTextDocument&, char);
void insert(GTextDocument&, size_t index, char);
void remove(GTextDocument&, size_t index);
void append(GTextDocument&, const char*, size_t);
void truncate(GTextDocument&, size_t length);
void clear(GTextDocument&);
void set_text(TextDocument&, const StringView&);
void append(TextDocument&, char);
void prepend(TextDocument&, char);
void insert(TextDocument&, size_t index, char);
void remove(TextDocument&, size_t index);
void append(TextDocument&, const char*, size_t);
void truncate(TextDocument&, size_t length);
void clear(TextDocument&);
size_t first_non_whitespace_column() const;
private:
@ -175,12 +177,12 @@ private:
Vector<char> m_text;
};
class GTextDocumentUndoCommand : public GCommand {
class TextDocumentUndoCommand : public Command {
public:
GTextDocumentUndoCommand(GTextDocument&);
virtual ~GTextDocumentUndoCommand();
TextDocumentUndoCommand(TextDocument&);
virtual ~TextDocumentUndoCommand();
void execute_from(const GTextDocument::Client& client)
void execute_from(const TextDocument::Client& client)
{
m_client = &client;
redo();
@ -188,28 +190,30 @@ public:
}
protected:
GTextDocument& m_document;
const GTextDocument::Client* m_client { nullptr };
TextDocument& m_document;
const TextDocument::Client* m_client { nullptr };
};
class InsertTextCommand : public GTextDocumentUndoCommand {
class InsertTextCommand : public TextDocumentUndoCommand {
public:
InsertTextCommand(GTextDocument&, const String&, const GTextPosition&);
InsertTextCommand(TextDocument&, const String&, const TextPosition&);
virtual void undo() override;
virtual void redo() override;
private:
String m_text;
GTextRange m_range;
TextRange m_range;
};
class RemoveTextCommand : public GTextDocumentUndoCommand {
class RemoveTextCommand : public TextDocumentUndoCommand {
public:
RemoveTextCommand(GTextDocument&, const String&, const GTextRange&);
RemoveTextCommand(TextDocument&, const String&, const TextRange&);
virtual void undo() override;
virtual void redo() override;
private:
String m_text;
GTextRange m_range;
TextRange m_range;
};
}