From 73dba53e4a36a31d7c803806706cc8a17a245e5c Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Thu, 23 Nov 2023 10:54:32 +0900
Subject: Replaced time related '#define' with actual strings

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 tdecore/netwm.cpp          |  4 ++--
 tdecore/tdeapplication.cpp | 10 +++++-----
 tdecore/tdestartupinfo.cpp |  2 +-
 tdecore/twin.cpp           |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'tdecore')

diff --git a/tdecore/netwm.cpp b/tdecore/netwm.cpp
index c1e876eeb..37190bf51 100644
--- a/tdecore/netwm.cpp
+++ b/tdecore/netwm.cpp
@@ -1602,7 +1602,7 @@ void NETRootInfo::updateSupportedProperties( Atom atom )
 }
 
 void NETRootInfo::setActiveWindow(Window window) {
-    setActiveWindow( window, FromUnknown, GET_QT_X_USER_TIME(), None );
+    setActiveWindow( window, FromUnknown, get_tqt_x_user_time(), None );
 }
 
 void NETRootInfo::setActiveWindow(Window window, NET::RequestSource src,
@@ -1811,7 +1811,7 @@ void NETRootInfo::moveResizeWindowRequest(Window window, int flags, int x, int y
 
 void NETRootInfo::restackRequest(Window window, Window above, int detail)
 {
-    restackRequest( window, FromTool, above, detail, GET_QT_X_USER_TIME() );
+    restackRequest( window, FromTool, above, detail, get_tqt_x_user_time() );
 }
 
 void NETRootInfo::restackRequest(Window window, RequestSource src, Window above, int detail, Time timestamp )
diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp
index 396aef97a..c13297dc3 100644
--- a/tdecore/tdeapplication.cpp
+++ b/tdecore/tdeapplication.cpp
@@ -2281,16 +2281,16 @@ void TDEApplication::updateUserTimestamp( unsigned long time )
         time = ev.xproperty.time;
         XDestroyWindow( display, w );
     }
-    if( GET_QT_X_USER_TIME() == 0
-        || NET::timestampCompare( time, GET_QT_X_USER_TIME() ) > 0 ) // check time > tqt_x_user_time
-        SET_QT_X_USER_TIME(time);
+    if( get_tqt_x_user_time() == 0
+        || NET::timestampCompare( time, get_tqt_x_user_time() ) > 0 ) // check time > tqt_x_user_time
+        set_tqt_x_user_time(time);
 #endif
 }
 
 unsigned long TDEApplication::userTimestamp() const
 {
 #if defined Q_WS_X11
-    return GET_QT_X_USER_TIME();
+    return get_tqt_x_user_time();
 #else
     return 0;
 #endif
@@ -2300,7 +2300,7 @@ void TDEApplication::updateRemoteUserTimestamp( const TQCString& dcopId, unsigne
 {
 #if defined Q_WS_X11
     if( time == 0 )
-        time = GET_QT_X_USER_TIME();
+        time = get_tqt_x_user_time();
     DCOPRef( dcopId, "MainApplication-Interface" ).call( "updateUserTimestamp", time );
 #endif
 }
diff --git a/tdecore/tdestartupinfo.cpp b/tdecore/tdestartupinfo.cpp
index 2744544a3..99fdefa73 100644
--- a/tdecore/tdestartupinfo.cpp
+++ b/tdecore/tdestartupinfo.cpp
@@ -930,7 +930,7 @@ TQCString TDEStartupInfo::createNewStartupId()
     if (!gethostname( hostname, 255 ))
 	hostname[sizeof(hostname)-1] = '\0';
     TQCString id = TQString(TQString( "%1;%2;%3;%4_TIME%5" ).arg( hostname ).arg( tm.tv_sec )
-        .arg( tm.tv_usec ).arg( getpid()).arg( GET_QT_X_USER_TIME() )).utf8();
+        .arg( tm.tv_usec ).arg( getpid()).arg( get_tqt_x_user_time() )).utf8();
     kdDebug( 172 ) << "[tdecore-tdestartupinfo] creating: " << id << ":" << tqAppName() << endl;
     return id;
     }
diff --git a/tdecore/twin.cpp b/tdecore/twin.cpp
index 308da8c5a..7b59ef7d4 100644
--- a/tdecore/twin.cpp
+++ b/tdecore/twin.cpp
@@ -239,7 +239,7 @@ void KWin::activateWindow( WId win, long time )
 #ifdef Q_WS_X11
     NETRootInfo info( tqt_xdisplay(), 0 );
     if( time == 0 )
-        time = GET_QT_X_USER_TIME();
+        time = get_tqt_x_user_time();
     info.setActiveWindow( win, NET::FromApplication, time,
         kapp->activeWindow() ? kapp->activeWindow()->winId() : 0 );
 #endif // Q_WS_X11 ...
@@ -251,7 +251,7 @@ void KWin::forceActiveWindow( WId win, long time )
 #ifdef Q_WS_X11
     NETRootInfo info( tqt_xdisplay(), 0 );
     if( time == 0 )
-        time = GET_QT_X_TIME();
+        time = get_tqt_x_time();
     info.setActiveWindow( win, NET::FromTool, time, 0 );
 #endif // Q_WS_X11
     KUniqueApplication::setHandleAutoStarted();
-- 
cgit v1.2.1