From 1b79089e1b614992ec6c9ba91441a8851030f75b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 2 Mar 2012 02:15:34 -0600
Subject: Rename additional global functions and variables for tqt3

---
 krdc/krdc.cpp         | 18 +++++++++---------
 krdc/vnc/kvncview.cpp |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'krdc')

diff --git a/krdc/krdc.cpp b/krdc/krdc.cpp
index 68c2d333..75fe99a8 100644
--- a/krdc/krdc.cpp
+++ b/krdc/krdc.cpp
@@ -287,7 +287,7 @@ void KRDC::showProgressTimeout() {
 void KRDC::quit() {
 	m_view->releaseKeyboard();
 	hide();
-	vidmodeNormalSwitch(qt_xdisplay(), m_oldResolution);
+	vidmodeNormalSwitch(tqt_xdisplay(), m_oldResolution);
 	if (m_view)
 		m_view->startQuitting();
 	emit disconnected();
@@ -415,7 +415,7 @@ void KRDC::switchToFullscreen(bool scaling)
 
 	if (!fromFullscreen) {
 		hide();
-		m_oldResolution = vidmodeFullscreenSwitch(qt_xdisplay(),
+		m_oldResolution = vidmodeFullscreenSwitch(tqt_xdisplay(),
 							  m_desktopWidget.screenNumber(this),
 							  fbs.width(),
 							  fbs.height(),
@@ -539,7 +539,7 @@ void KRDC::switchToFullscreen(bool scaling)
 
 	if (!fromFullscreen) {
 		if (m_oldResolution.valid)
-			grabInput(qt_xdisplay(), winId());
+			grabInput(tqt_xdisplay(), winId());
 		m_view->grabKeyboard();
 	}
 
@@ -562,8 +562,8 @@ void KRDC::switchToNormal(bool scaling)
 
 	m_view->releaseKeyboard();
 	if (m_oldResolution.valid) {
-		ungrabInput(qt_xdisplay());
-		vidmodeNormalSwitch(qt_xdisplay(), m_oldResolution);
+		ungrabInput(tqt_xdisplay());
+		vidmodeNormalSwitch(tqt_xdisplay(), m_oldResolution);
 		m_oldResolution = Resolution();
 	}
 
@@ -671,9 +671,9 @@ void KRDC::iconify()
 
 	m_view->releaseKeyboard();
 	if (m_oldResolution.valid)
-		ungrabInput(qt_xdisplay());
+		ungrabInput(tqt_xdisplay());
 
-	vidmodeNormalSwitch(qt_xdisplay(), m_oldResolution);
+	vidmodeNormalSwitch(tqt_xdisplay(), m_oldResolution);
 	m_oldResolution = Resolution();
 	showNormal();
 	showMinimized();
@@ -699,7 +699,7 @@ bool KRDC::event(TQEvent *e) {
 
 	m_fullscreenMinimized = false;
 	int x, y;
-	m_oldResolution = vidmodeFullscreenSwitch(qt_xdisplay(),
+	m_oldResolution = vidmodeFullscreenSwitch(tqt_xdisplay(),
 						  m_desktopWidget.screenNumber(this),
 						  m_view->width(),
 						  m_view->height(),
@@ -713,7 +713,7 @@ bool KRDC::event(TQEvent *e) {
 	setGeometry(0, 0, m_fullscreenResolution.width(),
 		    m_fullscreenResolution.height());
 	if (m_oldResolution.valid)
-		grabInput(qt_xdisplay(), winId());
+		grabInput(tqt_xdisplay(), winId());
 	m_view->switchFullscreen( true );
 	KWin::setState(winId(), NET::StaysOnTop);
 
diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp
index 889a5783..6f4066e6 100644
--- a/krdc/vnc/kvncview.cpp
+++ b/krdc/vnc/kvncview.cpp
@@ -88,7 +88,7 @@ KVncView::KVncView(TQWidget *parent,
 {
 	kvncview = this;
 	password = _password.latin1();
-	dpy = qt_xdisplay();
+	dpy = tqt_xdisplay();
 	setFixedSize(16,16);
 	setFocusPolicy(TQ_StrongFocus);
 
-- 
cgit v1.2.1