Browse Source

LibGUI: Remove G prefix from macros

Tibor Nagy 5 years ago
parent
commit
9e6e731a78
3 changed files with 13 additions and 13 deletions
  1. 2 2
      Libraries/LibGUI/TextEditor.cpp
  2. 10 10
      Libraries/LibGUI/Widget.cpp
  3. 1 1
      Libraries/LibGUI/Widget.h

+ 2 - 2
Libraries/LibGUI/TextEditor.cpp

@@ -45,7 +45,7 @@
 #include <stdio.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <unistd.h>
 
 
-//#define DEBUG_GTEXTEDITOR
+//#define DEBUG_TEXTEDITOR
 
 
 namespace GUI {
 namespace GUI {
 
 
@@ -411,7 +411,7 @@ void TextEditor::paint_event(PaintEvent& event)
         for_each_visual_line(line_index, [&](const Gfx::Rect& visual_line_rect, const StringView& visual_line_text, size_t start_of_visual_line) {
         for_each_visual_line(line_index, [&](const Gfx::Rect& visual_line_rect, const StringView& visual_line_text, size_t start_of_visual_line) {
             if (is_multi_line() && line_index == m_cursor.line())
             if (is_multi_line() && line_index == m_cursor.line())
                 painter.fill_rect(visual_line_rect, widget_background_color.darkened(0.9f));
                 painter.fill_rect(visual_line_rect, widget_background_color.darkened(0.9f));
-#ifdef DEBUG_GTEXTEDITOR
+#ifdef DEBUG_TEXTEDITOR
             painter.draw_rect(visual_line_rect, Color::Cyan);
             painter.draw_rect(visual_line_rect, Color::Cyan);
 #endif
 #endif
             if (!document().has_spans()) {
             if (!document().has_spans()) {

+ 10 - 10
Libraries/LibGUI/Widget.cpp

@@ -51,16 +51,16 @@
 
 
 namespace GUI {
 namespace GUI {
 
 
-REGISTER_GWIDGET(Button)
-REGISTER_GWIDGET(CheckBox)
-REGISTER_GWIDGET(GroupBox)
-REGISTER_GWIDGET(Label)
-REGISTER_GWIDGET(RadioButton)
-REGISTER_GWIDGET(ScrollBar)
-REGISTER_GWIDGET(Slider)
-REGISTER_GWIDGET(SpinBox)
-REGISTER_GWIDGET(TextBox)
-REGISTER_GWIDGET(Widget)
+REGISTER_WIDGET(Button)
+REGISTER_WIDGET(CheckBox)
+REGISTER_WIDGET(GroupBox)
+REGISTER_WIDGET(Label)
+REGISTER_WIDGET(RadioButton)
+REGISTER_WIDGET(ScrollBar)
+REGISTER_WIDGET(Slider)
+REGISTER_WIDGET(SpinBox)
+REGISTER_WIDGET(TextBox)
+REGISTER_WIDGET(Widget)
 
 
 static HashMap<String, WidgetClassRegistration*>& widget_classes()
 static HashMap<String, WidgetClassRegistration*>& widget_classes()
 {
 {

+ 1 - 1
Libraries/LibGUI/Widget.h

@@ -35,7 +35,7 @@
 #include <LibGfx/Orientation.h>
 #include <LibGfx/Orientation.h>
 #include <LibGfx/Rect.h>
 #include <LibGfx/Rect.h>
 
 
-#define REGISTER_GWIDGET(class_name)                          \
+#define REGISTER_WIDGET(class_name)                           \
     extern WidgetClassRegistration registration_##class_name; \
     extern WidgetClassRegistration registration_##class_name; \
     WidgetClassRegistration registration_##class_name(#class_name, []() { return class_name::construct(); });
     WidgetClassRegistration registration_##class_name(#class_name, []() { return class_name::construct(); });