summaryrefslogtreecommitdiffstats
path: root/konqueror
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-11-23 10:49:13 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-11-23 11:01:41 +0900
commitbf17c1e94003579e5275d8519fe7144c2caeb52c (patch)
treedf2780659ea95d52d294a0a42b096abf6553c5db /konqueror
parent7272c289be1517c4a4b6ccd35c9d64f8a657593d (diff)
downloadtdebase-bf17c1e94003579e5275d8519fe7144c2caeb52c.tar.gz
tdebase-bf17c1e94003579e5275d8519fe7144c2caeb52c.zip
Replaced time related '#define' with actual strings
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 81ad1f9e3c9d494edc38a7aad96fdcab9d44a795)
Diffstat (limited to 'konqueror')
-rw-r--r--konqueror/KonquerorIface.cpp14
-rw-r--r--konqueror/konq_mainwindow.cpp8
2 files changed, 11 insertions, 11 deletions
diff --git a/konqueror/KonquerorIface.cpp b/konqueror/KonquerorIface.cpp
index 6a164b160..db87e39ed 100644
--- a/konqueror/KonquerorIface.cpp
+++ b/konqueror/KonquerorIface.cpp
@@ -51,7 +51,7 @@ KonquerorIface::~KonquerorIface()
DCOPRef KonquerorIface::openBrowserWindow( const TQString &url )
{
- SET_QT_X_USER_TIME(0);
+ set_tqt_x_user_time(0);
KonqMainWindow *res = KonqMisc::createSimpleWindow( KURL(url) );
if ( !res )
return DCOPRef();
@@ -77,7 +77,7 @@ DCOPRef KonquerorIface::createNewWindowASN( const TQString &url, const TQCString
DCOPRef KonquerorIface::createNewWindowWithSelection( const TQString &url, TQStringList filesToSelect )
{
- SET_QT_X_USER_TIME(0);
+ set_tqt_x_user_time(0);
KonqMainWindow *res = KonqMisc::createNewWindow( KURL(url), KParts::URLArgs(), false, filesToSelect );
if ( !res )
return DCOPRef();
@@ -92,7 +92,7 @@ DCOPRef KonquerorIface::createNewWindowWithSelectionASN( const TQString &url, TQ
DCOPRef KonquerorIface::createNewWindow( const TQString &url, const TQString &mimetype, bool tempFile )
{
- SET_QT_X_USER_TIME(0);
+ set_tqt_x_user_time(0);
KParts::URLArgs args;
args.serviceType = mimetype;
// Filter the URL, so that "kfmclient openURL gg:foo" works also when konq is already running
@@ -112,7 +112,7 @@ DCOPRef KonquerorIface::createNewWindowASN( const TQString &url, const TQString
DCOPRef KonquerorIface::createBrowserWindowFromProfile( const TQString &path )
{
- SET_QT_X_USER_TIME(0);
+ set_tqt_x_user_time(0);
kdDebug(1202) << "void KonquerorIface::createBrowserWindowFromProfile( const TQString &path ) " << endl;
kdDebug(1202) << path << endl;
KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, TQString::null );
@@ -129,7 +129,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileASN( const TQString &path,
DCOPRef KonquerorIface::createBrowserWindowFromProfile( const TQString & path, const TQString &filename )
{
- SET_QT_X_USER_TIME(0);
+ set_tqt_x_user_time(0);
kdDebug(1202) << "void KonquerorIface::createBrowserWindowFromProfile( path, filename ) " << endl;
kdDebug(1202) << path << "," << filename << endl;
KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, filename );
@@ -147,7 +147,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileASN( const TQString &path,
DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const TQString & path, const TQString &filename, const TQString &url )
{
- SET_QT_X_USER_TIME(0);
+ set_tqt_x_user_time(0);
KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, filename, KURL(url) );
if ( !res )
return DCOPRef();
@@ -163,7 +163,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURLASN( const TQString
DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const TQString &path, const TQString &filename, const TQString &url, const TQString &mimetype )
{
- SET_QT_X_USER_TIME(0);
+ set_tqt_x_user_time(0);
KParts::URLArgs args;
args.serviceType = mimetype;
KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, filename, KURL(url), args );
diff --git a/konqueror/konq_mainwindow.cpp b/konqueror/konq_mainwindow.cpp
index 3fbc8ebbe..78238087f 100644
--- a/konqueror/konq_mainwindow.cpp
+++ b/konqueror/konq_mainwindow.cpp
@@ -1310,7 +1310,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
// well. If the WM has support for _NET_WM_USER_TIME, it will be just set to 0 (=don't focus on show),
// and the WM should take care of it itself.
bool wm_usertime_support = false;
- Time saved_last_input_time = GET_QT_X_USER_TIME();
+ Time saved_last_input_time = get_tqt_x_user_time();
if ( windowArgs.lowerWindow )
{
NETRootInfo wm_info( tqt_xdisplay(), NET::Supported );
@@ -1320,7 +1320,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
// *sigh*, and I thought nobody would need TQWidget::dontFocusOnShow().
// Avoid Qt's support for user time by setting it to 0, and
// set the property ourselves.
- SET_QT_X_USER_TIME(0);
+ set_tqt_x_user_time(0);
KWin::setUserTime( mainWindow->winId(), 0 );
}
// Put below the current window before showing, in case that actually works with the WM.
@@ -1333,7 +1333,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
if ( windowArgs.lowerWindow )
{
- SET_QT_X_USER_TIME(saved_last_input_time);
+ set_tqt_x_user_time(saved_last_input_time);
if( !wm_usertime_support )
{ // No WM support. Let's try ugly tricks.
mainWindow->lower();
@@ -5833,7 +5833,7 @@ void KonqMainWindow::resetWindow()
static Atom atom = XInternAtom( tqt_xdisplay(), "_TDE_NET_WM_USER_CREATION_TIME", False );
XChangeProperty( tqt_xdisplay(), winId(), atom, XA_CARDINAL, 32,
PropModeReplace, (unsigned char *) &x_time, 1);
- SET_QT_X_USER_TIME(CurrentTime); // won't have _NET_WM_USER_TIME set
+ set_tqt_x_user_time(CurrentTime); // won't have _NET_WM_USER_TIME set
#if !KDE_IS_VERSION( 3, 2, 90 ) // _KDE_NET_USER_TIME is obsolete
static Atom atom2 = XInternAtom( tqt_xdisplay(), "_KDE_NET_USER_TIME", False );
timeval tv;