summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-03-02 02:06:40 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-03-02 02:06:40 -0600
commit73f9b6918e50b0aa8bea0fb46470e0564b78c1b6 (patch)
tree926e1316a1c2213c111d24ff305bf949bdad42ca
parente5b670cbaceda728b0e0a92e9783aafe263da96e (diff)
downloadkvirc-73f9b6918e50b0aa8bea0fb46470e0564b78c1b6.tar.gz
kvirc-73f9b6918e50b0aa8bea0fb46470e0564b78c1b6.zip
Rename additional global functions and variables for tqt3
-rw-r--r--src/kvirc/kernel/kvi_app.cpp6
-rw-r--r--src/kvirc/kernel/kvi_ipc.cpp4
-rw-r--r--src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp2
-rw-r--r--src/modules/dockwidget/libkvidockwidget_qt3.cpp10
-rw-r--r--src/modules/my/idle_x11.cpp2
5 files changed, 12 insertions, 12 deletions
diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp
index f093d33b..47c9836c 100644
--- a/src/kvirc/kernel/kvi_app.cpp
+++ b/src/kvirc/kernel/kvi_app.cpp
@@ -1111,9 +1111,9 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co
#warning "The following warning will disappear soon..."
// FIXME: this form should be used starting from KDE 3.2
unsigned long l = NET::CurrentDesktop;
- NETRootInfo rinfo( qt_xdisplay(), &l ,1 ,-1,true);
+ NETRootInfo rinfo( tqt_xdisplay(), &l ,1 ,-1,true);
#else
- NETRootInfo rinfo(qt_xdisplay(),NET::CurrentDesktop);
+ NETRootInfo rinfo(tqt_xdisplay(),NET::CurrentDesktop);
#endif
rinfo.activate();
@@ -1289,7 +1289,7 @@ void KviApp::kdeRootPixmapChanged(int iDesktop)
#ifdef COMPILE_PSEUDO_TRANSPARENCY
#ifdef COMPILE_TDE_SUPPORT
if(!KVI_OPTION_BOOL(KviOption_boolUpdateKdeBackgroundOnChange))return;
- NETRootInfo rinfo(qt_xdisplay(),NET::CurrentDesktop);
+ NETRootInfo rinfo(tqt_xdisplay(),NET::CurrentDesktop);
rinfo.activate();
if(iDesktop == rinfo.currentDesktop())
updatePseudoTransparency();
diff --git a/src/kvirc/kernel/kvi_ipc.cpp b/src/kvirc/kernel/kvi_ipc.cpp
index 24876178..edb348fb 100644
--- a/src/kvirc/kernel/kvi_ipc.cpp
+++ b/src/kvirc/kernel/kvi_ipc.cpp
@@ -59,8 +59,8 @@
#define kvi_ipc_get_xdisplay QX11Info::display
#define kvi_ipc_get_xrootwin QX11Info::appRootWindow
#else
- #define kvi_ipc_get_xdisplay qt_xdisplay
- #define kvi_ipc_get_xrootwin qt_xrootwin
+ #define kvi_ipc_get_xdisplay tqt_xdisplay
+ #define kvi_ipc_get_xrootwin tqt_xrootwin
#endif
static Atom kvi_atom_ipc_sentinel_window;
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
index 4f11db05..398b11c8 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
@@ -51,7 +51,7 @@
#include <tqx11info_x11.h>
#define get_xdisplay QX11Info::display
#else
- #define get_xdisplay qt_xdisplay
+ #define get_xdisplay tqt_xdisplay
#endif
#endif
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;