From 34fd0c17912bdc932fe66eb6334e2353e86398a5 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Wed, 18 Nov 2026 15:54:23 +0900
Subject: Replace use of TQKeyEvent::stateAfter()

`TQKeyEvent::stateAfter()` is unreliable, so use the current keyboard state via `tdeApp->keyboardMouseState()`.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 kolourpaint/kptool.cpp               | 32 +++++++-------------------------
 ksvg/plugin/ksvg_widget.cpp          |  5 ++++-
 ksvg/test/external/SVGTestWidget.cpp |  5 ++++-
 3 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/kolourpaint/kptool.cpp b/kolourpaint/kptool.cpp
index c7da848a..bfb57da9 100644
--- a/kolourpaint/kptool.cpp
+++ b/kolourpaint/kptool.cpp
@@ -1351,36 +1351,18 @@ void kpTool::keyUpdateModifierState (TQKeyEvent *e)
 #if DEBUG_KP_TOOL && 0
     kdDebug () << "kpTool::updateModifierState() e->key=" << e->key () << endl;
     kdDebug () << "\tshift="
-               << (e->stateAfter () & TQt::ShiftButton)
+               << (e->state () & TQt::ShiftButton)
                << " control="
-               << (e->stateAfter () & TQt::ControlButton)
+               << (e->state () & TQt::ControlButton)
                << " alt="
-               << (e->stateAfter () & TQt::AltButton)
+               << (e->state () & TQt::AltButton)
                << endl;
 #endif
-    if (e->key () & (TQt::Key_Alt | TQt::Key_Shift | TQt::Key_Control))
-    {
-    #if DEBUG_KP_TOOL && 0
-        kdDebug () << "\t\tmodifier changed - use e's claims" << endl;
-    #endif
-        setShiftPressed (e->stateAfter () & TQt::ShiftButton);
-        setControlPressed (e->stateAfter () & TQt::ControlButton);
-        setAltPressed (e->stateAfter () & TQt::AltButton);
-    }
-    else
-    {
-    #if DEBUG_KP_TOOL && 0
-        kdDebug () << "\t\tmodifiers not changed - figure out the truth" << endl;
-    #endif
-        uint keyState = TDEApplication::keyboardModifiers ();
-
-        setShiftPressed (keyState & TDEApplication::ShiftModifier);
-        setControlPressed (keyState & TDEApplication::ControlModifier);
 
-        // TODO: Can't do much about ALT - unless it's always TDEApplication::Modifier1?
-        //       Ditto for everywhere else where I set SHIFT & CTRL but not alt.
-        setAltPressed (e->stateAfter () & TQt::AltButton);
-    }
+    const TQt::ButtonState modState = TDEApplication::keyboardMouseState ();
+    setShiftPressed (modState & TQt::ShiftButton);
+    setControlPressed (modState & TQt::ControlButton);
+    setAltPressed (modState & TQt::AltButton);
 }
 
 
diff --git a/ksvg/plugin/ksvg_widget.cpp b/ksvg/plugin/ksvg_widget.cpp
index 0e799c47..c310df05 100644
--- a/ksvg/plugin/ksvg_widget.cpp
+++ b/ksvg/plugin/ksvg_widget.cpp
@@ -19,6 +19,7 @@
 */
 
 #include <kcursor.h>
+#include <tdeapplication.h>
 #include <tdepopupmenu.h>
 #include <kxmlguifactory.h>
 #include "ksvg_widget.moc"
@@ -234,7 +235,9 @@ void KSVGWidget::mouseReleaseEvent(TQMouseEvent *event)
 
 void KSVGWidget::keyPressEvent(TQKeyEvent *ke)
 {
-	if(ke->stateAfter() & TQt::ControlButton)
+	Q_UNUSED(ke);
+
+	if(TDEApplication::keyboardMouseState() & TQt::ControlButton)
 	{
 		setCursor(KCursor::sizeAllCursor());
 		return;
diff --git a/ksvg/test/external/SVGTestWidget.cpp b/ksvg/test/external/SVGTestWidget.cpp
index 64944736..7c2000ef 100644
--- a/ksvg/test/external/SVGTestWidget.cpp
+++ b/ksvg/test/external/SVGTestWidget.cpp
@@ -11,6 +11,7 @@
 #include "KSVGCanvas.h"
 #include "CanvasItem.h"
 #include <kcursor.h>
+#include <tdeapplication.h>
 
 using namespace KSVG;
 
@@ -169,7 +170,9 @@ void SVGTestWidget::mouseReleaseEvent(TQMouseEvent *event)
 
 void SVGTestWidget::keyPressEvent(TQKeyEvent *event)
 {
-	if(event->stateAfter() & TQMouseEvent::ControlButton)
+	Q_UNUSED(event);
+
+	if(TDEApplication::keyboardMouseState() & TQt::ControlButton)
 	{
 		setCursor(KCursor::sizeAllCursor());
 		return;
-- 
cgit v1.2.3

