summaryrefslogtreecommitdiffstats
path: root/src/modules
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/dockwidget/libkvidockwidget_qt3.cpp10
-rw-r--r--src/modules/my/idle_x11.cpp2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
index 169c8279..d286d64c 100644
--- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp
+++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
@@ -302,7 +302,7 @@ static const char * idlemsgs[NIDLEMSGS]=
};
#ifdef COMPILE_TDE_SUPPORT
- extern Time qt_x_time;
+ extern Time tqt_x_time;
#endif
void KviDockWidget::enterEvent( TQEvent* )
@@ -312,15 +312,15 @@ void KviDockWidget::enterEvent( TQEvent* )
{
XEvent ev;
kvi_memset(&ev, 0, sizeof(ev));
- ev.xfocus.display = qt_xdisplay();
+ ev.xfocus.display = tqt_xdisplay();
ev.xfocus.type = XFocusIn;
ev.xfocus.window = winId();
ev.xfocus.mode = NotifyNormal;
ev.xfocus.detail = NotifyAncestor;
- Time time = qt_x_time;
- qt_x_time = 1;
+ Time time = tqt_x_time;
+ tqt_x_time = 1;
g_pApp->x11ProcessEvent( &ev );
- qt_x_time = time;
+ tqt_x_time = time;
}
#endif
}
diff --git a/src/modules/my/idle_x11.cpp b/src/modules/my/idle_x11.cpp
index af29801e..77caef53 100644
--- a/src/modules/my/idle_x11.cpp
+++ b/src/modules/my/idle_x11.cpp
@@ -101,7 +101,7 @@ int IdlePlatform::secondsIdle()
#ifdef COMPILE_USE_QT4
if(!XScreenSaverQueryInfo(TQT_TQPAINTDEVICE(TQApplication::desktop()->screen())->x11Display(), QX11Info::appRootWindow(), d->ss_info))
#else
- if(!XScreenSaverQueryInfo(TQT_TQPAINTDEVICE(TQApplication::desktop()->screen())->x11Display(), qt_xrootwin(), d->ss_info))
+ if(!XScreenSaverQueryInfo(TQT_TQPAINTDEVICE(TQApplication::desktop()->screen())->x11Display(), tqt_xrootwin(), d->ss_info))
#endif
return 0;
return d->ss_info->idle / 1000;