Mercurial > hg > toolkit / file diff

--- a/ui/qt/menu.cpp	Fri Apr 24 12:54:28 2026 +0200
+++ b/ui/qt/menu.cpp	Fri Apr 24 12:56:06 2026 +0200
@@ -71,7 +71,7 @@
     add_menu_items(menu, i, m, obj);
 }
 
-static UiAction* create_action(
+static UiQAction* create_action(
         UiObject *obj,
         const char *icon,
         const char *label,
@@ -80,7 +80,7 @@
         int *states)
 {
     QString str = QString::fromUtf8(label);
-    UiAction *action = new UiAction(obj, str, callback, userdata);
+    UiQAction *action = new UiQAction(obj, str, callback, userdata);
     if(icon) {
         action->setIcon(QIcon::fromTheme(icon));
         action->setIconVisibleInMenu(true);
@@ -97,7 +97,7 @@
 
 void add_menuitem_widget(QMenu *parent, int i, UiMenuItemI *item, UiObject *obj) {
     UiMenuItem *it = (UiMenuItem*)item;
-    UiAction *action = create_action(obj, it->icon, it->label, it->callback, it->userdata, it->states);
+    UiQAction *action = create_action(obj, it->icon, it->label, it->callback, it->userdata, it->states);
     parent->addAction(action);
     QObject::connect(action, SIGNAL(triggered()), action, SLOT(trigger()));
 }
@@ -109,7 +109,7 @@
 void add_checkitem_widget(QMenu *parent, int i, UiMenuItemI *item, UiObject *obj) {
     UiMenuCheckItem *it = (UiMenuCheckItem*)item;
     
-    UiAction *action = create_action(obj, it->icon, it->label, it->callback, it->userdata, it->states);
+    UiQAction *action = create_action(obj, it->icon, it->label, it->callback, it->userdata, it->states);
     parent->addAction(action);
     action->setCheckable(true);
     action->prepare_event = ui_checkableaction_prepare_event;
@@ -129,7 +129,7 @@
 void add_radioitem_widget(QMenu *parent, int index, UiMenuItemI *item, UiObject *obj) {
     UiMenuRadioItem *it = (UiMenuRadioItem*)item;
     
-    UiAction *action = create_action(obj, it->icon, it->label, it->callback, it->userdata, it->states);
+    UiQAction *action = create_action(obj, it->icon, it->label, it->callback, it->userdata, it->states);
     parent->addAction(action);
     action->setCheckable(true);
     action->prepare_event = ui_actiongroup_prepare_event;
@@ -152,7 +152,7 @@
     action->var;
 }
 
-void ui_actiongroup_prepare_event(UiEvent *event, UiAction *action) {
+void ui_actiongroup_prepare_event(UiEvent *event, UiQAction *action) {
     if(action->var) {
         UiInteger *value = (UiInteger*)action->var->value;
         event->eventdata = value;
@@ -214,7 +214,7 @@
     }
 }
 
-void ui_checkableaction_prepare_event(UiEvent *event, UiAction *action) {
+void ui_checkableaction_prepare_event(UiEvent *event, UiQAction *action) {
     if(action->var) {
         event->eventdata = action->var->value;
         event->eventdatatype = UI_EVENT_DATA_INTEGER_VALUE;
@@ -223,13 +223,13 @@
 }
 
 int64_t ui_checkableaction_get(UiInteger *value) {
-    UiAction *action= (UiAction*)value->obj;
+    UiQAction *action= (UiQAction*)value->obj;
     value->value = action->isChecked();
     return value->value;
 }
 
 void ui_checkableaction_set(UiInteger *value, int64_t i) {
-    UiAction *action = (UiAction*)value->obj;
+    UiQAction *action = (UiQAction*)value->obj;
     value->value = i;
     if(i != 0) {
         action->setChecked((bool)i);