merge

Sun, 27 Apr 2025 16:13:28 +0200

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Sun, 27 Apr 2025 16:13:28 +0200
changeset 586
a05b0245b074
parent 585
e71867b33bfd (diff)
parent 584
12cca226c1eb (current diff)
child 587
61813a91c84d

merge

--- a/application/main.c	Sun Apr 27 15:17:17 2025 +0200
+++ b/application/main.c	Sun Apr 27 16:13:28 2025 +0200
@@ -925,7 +925,7 @@
     if(col == 0) {
         return s;
     } else {
-        return "0";
+        return (void*)(intptr_t)12;
     }
 }
 
--- a/ui/qt/model.cpp	Sun Apr 27 15:17:17 2025 +0200
+++ b/ui/qt/model.cpp	Sun Apr 27 16:13:28 2025 +0200
@@ -159,8 +159,8 @@
                         return s;
                     }
                     case UI_INTEGER: {
-                        int *i = (int*)value;
-                        return QString::number(*i);
+                        intptr_t i = (intptr_t)value;
+                        return QString::number(i);
                     }
                     case UI_ICON: {
                         break;

mercurial