Rename old tq methods that no longer need a unique name

(cherry picked from commit 089118c18533dfa3e6ce5065dbebdd4db94051f1)

12 files changed, 49 insertions, 49 deletions

diff --git a/krfb/kcm_krfb/configurationwidget.ui b/krfb/kcm_krfb/configurationwidget.ui
index 7eaf2d96..f4e79d39 100644
--- a/krfb/kcm_krfb/configurationwidget.ui
+++ b/krfb/kcm_krfb/configurationwidget.ui
@@ -247,7 +247,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>0</width>
                                 <height>50</height>
@@ -316,7 +316,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>0</width>
                                 <height>20</height>
@@ -442,7 +442,7 @@ Most VNC clients use a display number instead of the actual port. This display n
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>0</width>
                                 <height>20</height>
diff --git a/krfb/kinetd/kinetd.cpp b/krfb/kinetd/kinetd.cpp
index f20076de..e0d37f61 100644
--- a/krfb/kinetd/kinetd.cpp
+++ b/krfb/kinetd/kinetd.cpp
@@ -181,7 +181,7 @@ void PortListener::loadConfig(KService::Ptr s) {
 	        m_dnssdRegister = false;
 		
 
-	m_slpLifetimeEnd = TQDateTime::tqcurrentDateTime().addSecs(m_serviceLifetime);
+	m_slpLifetimeEnd = TQDateTime::currentDateTime().addSecs(m_serviceLifetime);
 	m_defaultPortBase = m_portBase;
 	m_defaultAutoPortRange = m_autoPortRange;
 
@@ -195,7 +195,7 @@ void PortListener::loadConfig(KService::Ptr s) {
 	TQDateTime nullTime;
 	m_expirationTime = m_config->readDateTimeEntry("enabled_expiration_"+m_serviceName,
 						     &nullTime);
-	if ((!m_expirationTime.isNull()) && (m_expirationTime < TQDateTime::tqcurrentDateTime()))
+	if ((!m_expirationTime.isNull()) && (m_expirationTime < TQDateTime::currentDateTime()))
 		m_enabled = false;
 	m_registerService = m_config->readBoolEntry("enabled_srvreg_"+m_serviceName,
 						     m_registerService);
@@ -356,7 +356,7 @@ void PortListener::setServiceRegistrationEnabledInternal(bool e) {
 		}
 		m_serviceRegistered = true;
 		// make lifetime 30s shorter, because the timeout is not precise
-		m_slpLifetimeEnd = TQDateTime::tqcurrentDateTime().addSecs(m_serviceLifetime-30);
+		m_slpLifetimeEnd = TQDateTime::currentDateTime().addSecs(m_serviceLifetime-30);
 	} else {
 		TQStringList::Iterator it = m_registeredServiceURLs.begin();
 		while (it != m_registeredServiceURLs.end())
@@ -383,7 +383,7 @@ void PortListener::dnssdRegister(bool e) {
 }
 
 void PortListener::refreshRegistration() {
-	if (m_serviceRegistered && (m_slpLifetimeEnd.addSecs(-90) < TQDateTime::tqcurrentDateTime())) {
+	if (m_serviceRegistered && (m_slpLifetimeEnd.addSecs(-90) < TQDateTime::currentDateTime())) {
 		setServiceRegistrationEnabledInternal(false);
 		setServiceRegistrationEnabledInternal(true);
 	}
@@ -458,7 +458,7 @@ void KInetD::expirationTimer() {
 void KInetD::setExpirationTimer() {
 	TQDateTime nextEx = getNextExpirationTime(); // disables expired portlistener!
 	if (!nextEx.isNull())
-		m_expirationTimer.start(TQDateTime::tqcurrentDateTime().secsTo(nextEx)*1000 + 30000,
+		m_expirationTimer.start(TQDateTime::currentDateTime().secsTo(nextEx)*1000 + 30000,
 			false);
 	else
 		m_expirationTimer.stop();
@@ -475,7 +475,7 @@ void KInetD::setReregistrationTimer() {
 	while (pl) {
 		TQDateTime d2 = pl->serviceLifetimeEnd();
 		if (!d2.isNull()) {
-			if (d2 < TQDateTime::tqcurrentDateTime()) {
+			if (d2 < TQDateTime::currentDateTime()) {
 				m_reregistrationTimer.start(0, true);
 				return;
 			}
@@ -486,7 +486,7 @@ void KInetD::setReregistrationTimer() {
 	}
 
 	if (!d.isNull()) {
-		int s = TQDateTime::tqcurrentDateTime().secsTo(d);
+		int s = TQDateTime::currentDateTime().secsTo(d);
 		if (s < 30)
 			s = 30; // max frequency 30s
 		m_reregistrationTimer.start(s*1000, true);
@@ -544,7 +544,7 @@ TQDateTime KInetD::getNextExpirationTime()
 	while (pl) {
 		TQDateTime d2 = pl->expiration();
 		if (!d2.isNull()) {
-			if (d2 < TQDateTime::tqcurrentDateTime())
+			if (d2 < TQDateTime::currentDateTime())
 				pl->setEnabled(false);
 			else if (d.isNull() || (d2 < d))
 				d = d2;
diff --git a/krfb/krfb/configuration.cc b/krfb/krfb/configuration.cc
index 2076c4ed..efab5974 100644
--- a/krfb/krfb/configuration.cc
+++ b/krfb/krfb/configuration.cc
@@ -148,7 +148,7 @@ void Configuration::doKinetdConf() {
 			lastExpiration = t;
 		it++;
 	}
-	if (lastExpiration.isNull() || (lastExpiration < TQDateTime::tqcurrentDateTime())) {
+	if (lastExpiration.isNull() || (lastExpiration < TQDateTime::currentDateTime())) {
 		setKInetdEnabled(false);
 		portNum = -1;
 	}
diff --git a/krfb/krfb/connectionwidget.ui b/krfb/krfb/connectionwidget.ui
index a4a27b02..e5378cbe 100644
--- a/krfb/krfb/connectionwidget.ui
+++ b/krfb/krfb/connectionwidget.ui
@@ -92,13 +92,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>108</width>
                     <height>318</height>
                 </size>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>108</width>
                     <height>318</height>
@@ -178,7 +178,7 @@
             <property name="sizeType">
                 <enum>Minimum</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>84</height>
@@ -195,7 +195,7 @@
             <property name="sizeType">
                 <enum>Minimum</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>80</height>
diff --git a/krfb/krfb/invitation.cc b/krfb/krfb/invitation.cc
index d06feefe..ce7e19d8 100644
--- a/krfb/krfb/invitation.cc
+++ b/krfb/krfb/invitation.cc
@@ -59,8 +59,8 @@ static TQString readableRandomString(int length) {
 Invitation::Invitation() :
 	m_viewItem(0) {
 	m_password = readableRandomString(4)+"-"+readableRandomString(3);
-	m_creationTime = TQDateTime::tqcurrentDateTime();
-	m_expirationTime = TQDateTime::tqcurrentDateTime().addSecs(INVITATION_DURATION);
+	m_creationTime = TQDateTime::currentDateTime();
+	m_expirationTime = TQDateTime::currentDateTime().addSecs(INVITATION_DURATION);
 }
 
 Invitation::Invitation(const Invitation &x) :
@@ -111,7 +111,7 @@ TQDateTime Invitation::creationTime() const {
 }
 
 bool Invitation::isValid() const {
-	return m_expirationTime > TQDateTime::tqcurrentDateTime();
+	return m_expirationTime > TQDateTime::currentDateTime();
 }
 
 void Invitation::setViewItem(KListViewItem *i) {
diff --git a/krfb/krfb/invitewidget.ui b/krfb/krfb/invitewidget.ui
index 46f39fec..e60ee6c8 100644
--- a/krfb/krfb/invitewidget.ui
+++ b/krfb/krfb/invitewidget.ui
@@ -59,13 +59,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>108</width>
                     <height>318</height>
                 </size>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>108</width>
                     <height>318</height>
@@ -94,7 +94,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>40</width>
                     <height>20</height>
@@ -125,7 +125,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>24</height>
@@ -142,7 +142,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>40</width>
                     <height>20</height>
@@ -178,7 +178,7 @@
             <property name="sizeType">
                 <enum>MinimumExpanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>89</height>
diff --git a/krfb/krfb/manageinvitations.ui b/krfb/krfb/manageinvitations.ui
index 807ce195..d6cfa41b 100644
--- a/krfb/krfb/manageinvitations.ui
+++ b/krfb/krfb/manageinvitations.ui
@@ -38,7 +38,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>0</height>
@@ -55,7 +55,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>0</width>
                     <height>20</height>
diff --git a/krfb/krfb/personalinvitewidget.ui b/krfb/krfb/personalinvitewidget.ui
index da8ce9d9..9a4e3cd9 100644
--- a/krfb/krfb/personalinvitewidget.ui
+++ b/krfb/krfb/personalinvitewidget.ui
@@ -55,7 +55,7 @@ Give the information below to the person that you want to invite (&lt;a href="wh
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>34</height>
@@ -74,13 +74,13 @@ Give the information below to the person that you want to invite (&lt;a href="wh
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>108</width>
                     <height>318</height>
                 </size>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>108</width>
                     <height>318</height>
@@ -106,7 +106,7 @@ Give the information below to the person that you want to invite (&lt;a href="wh
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>30</height>
diff --git a/krfb/krfb/rfbcontroller.cc b/krfb/krfb/rfbcontroller.cc
index 93dc5539..81c00da7 100644
--- a/krfb/krfb/rfbcontroller.cc
+++ b/krfb/krfb/rfbcontroller.cc
@@ -761,7 +761,7 @@ enum rfbNewClientAction RFBController::handleNewClient(rfbClientPtr cl)
 
 	dialog.setRemoteHost(remoteIp);
 	dialog.setAllowRemoteControl( true );
-	dialog.setFixedSize(dialog.tqsizeHint());
+	dialog.setFixedSize(dialog.sizeHint());
 	dialog.show();
 	return RFB_CLIENT_ON_HOLD;
 }
diff --git a/krfb/libvncserver/cursor.c b/krfb/libvncserver/cursor.c
index f13eaaf9..ebbaedee 100644
--- a/krfb/libvncserver/cursor.c
+++ b/krfb/libvncserver/cursor.c
@@ -29,7 +29,7 @@
  */
 
 Bool
-rfbSendtqCursorShape(cl)
+rfbSendCursorShape(cl)
     rfbClientPtr cl;
 {
     rfbCursorPtr pCursor;
diff --git a/krfb/libvncserver/rfb.h b/krfb/libvncserver/rfb.h
index 56dce45e..9e097f59 100644
--- a/krfb/libvncserver/rfb.h
+++ b/krfb/libvncserver/rfb.h
@@ -535,7 +535,7 @@ typedef struct _rfbClientRec {
     Bool enableLastRectEncoding;   /* client supports LastRect encoding */
     Bool enableSoftCursorUpdates;  /* client supports softcursor updates */
     Bool disableBackground;        /* client wants to disable background */
-    Bool enabletqCursorShapeUpdates; /* client supports cursor tqshape updates */
+    Bool enableCursorShapeUpdates; /* client supports cursor tqshape updates */
     Bool useRichCursorEncoding;    /* rfbEncodingRichCursor is preferred */
     Bool cursorWasChanged;         /* cursor tqshape update should be sent */
     Bool cursorWasMoved;           /* cursor move tqshape update should be sent */
@@ -569,8 +569,8 @@ typedef struct _rfbClientRec {
  */
 
 #define FB_UPDATE_PENDING(cl)                           \
-     ((!(cl)->enabletqCursorShapeUpdates && !(cl)->screen->cursorIsDrawn) ||   \
-     ((cl)->enabletqCursorShapeUpdates && (cl)->cursorWasChanged) ||      \
+     ((!(cl)->enableCursorShapeUpdates && !(cl)->screen->cursorIsDrawn) ||   \
+     ((cl)->enableCursorShapeUpdates && (cl)->cursorWasChanged) ||      \
      !sraRgnEmpty((cl)->copyRegion) || !sraRgnEmpty((cl)->modifiedRegion))
 
 /*
@@ -733,7 +733,7 @@ typedef struct rfbCursor {
     unsigned char *richSource; /* source bytes for a rich cursor */
 } rfbCursor, *rfbCursorPtr;
 
-extern Bool rfbSendtqCursorShape(rfbClientPtr cl/*, rfbScreenInfoPtr pScreen*/);
+extern Bool rfbSendCursorShape(rfbClientPtr cl/*, rfbScreenInfoPtr pScreen*/);
 extern Bool rfbSendSoftCursor(rfbClientPtr cl, Bool cursorWasChanged);
 extern unsigned char rfbReverseByte[0x100];
 extern void rfbConvertLSBCursorBitmapOrMask(int width,int height,unsigned char* bitmap);
diff --git a/krfb/libvncserver/rfbserver.c b/krfb/libvncserver/rfbserver.c
index 22c9202d..493f22c9 100644
--- a/krfb/libvncserver/rfbserver.c
+++ b/krfb/libvncserver/rfbserver.c
@@ -270,7 +270,7 @@ rfbNewTCPOrUDPClient(rfbScreen,sock,isUDP)
       for (i = 0; i < 4; i++)
         cl->zsActive[i] = FALSE;
 
-      cl->enabletqCursorShapeUpdates = FALSE;
+      cl->enableCursorShapeUpdates = FALSE;
       cl->useRichCursorEncoding = FALSE;
       cl->enableLastRectEncoding = FALSE;
       cl->disableBackground = FALSE;
@@ -663,7 +663,7 @@ rfbProcessClientNormalMessage(cl)
 
         cl->preferredEncoding = -1;
 	cl->useCopyRect = FALSE;
-	cl->enabletqCursorShapeUpdates = FALSE;
+	cl->enableCursorShapeUpdates = FALSE;
 	cl->enableLastRectEncoding = FALSE;
 	cl->disableBackground = FALSE;
 
@@ -729,7 +729,7 @@ rfbProcessClientNormalMessage(cl)
 		if(!cl->screen->dontConvertRichCursorToXCursor) {
 		    rfbLog("Enabling X-style cursor updates for client %s\n",
 			   cl->host);
-		    cl->enabletqCursorShapeUpdates = TRUE;
+		    cl->enableCursorShapeUpdates = TRUE;
 		    cl->cursorWasChanged = TRUE;
 		}
 		break;
@@ -738,7 +738,7 @@ rfbProcessClientNormalMessage(cl)
 		      "%s\n", cl->host);
 		if (cl->enableSoftCursorUpdates)
 		  break;
-		cl->enabletqCursorShapeUpdates = TRUE;
+		cl->enableCursorShapeUpdates = TRUE;
 		cl->useRichCursorEncoding = TRUE;
 		cl->cursorWasChanged = TRUE;
 	        break;
@@ -748,7 +748,7 @@ rfbProcessClientNormalMessage(cl)
 	        cl->enableSoftCursorUpdates = TRUE;
 	        cl->cursorWasChanged = TRUE;
 	        cl->cursorWasMoved = TRUE;
-		cl->enabletqCursorShapeUpdates = FALSE;
+		cl->enableCursorShapeUpdates = FALSE;
 		cl->useRichCursorEncoding = FALSE;
 	        break;
 	    case rfbEncodingLastRect:
@@ -959,7 +959,7 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion)
     rfbFramebufferUpdateMsg *fu = (rfbFramebufferUpdateMsg *)cl->updateBuf;
     sraRegionPtr updateRegion,updateCopyRegion,tmpRegion;
     int dx, dy;
-    Bool sendtqCursorShape = FALSE;
+    Bool sendCursorShape = FALSE;
     int sendSoftCursorRects = 0;
 
     if(cl->screen->displayHook)
@@ -970,13 +970,13 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion)
      * removed from the framebuffer. Otherwise, make sure it's put up.
      */
 
-    if (cl->enabletqCursorShapeUpdates) {
+    if (cl->enableCursorShapeUpdates) {
       if (cl->screen->cursorIsDrawn) {
 	rfbUndrawCursor(cl->screen);
       }
       if (!cl->screen->cursorIsDrawn && cl->cursorWasChanged &&
 	  cl->readyForSetColourMapEntries)
-	  sendtqCursorShape = TRUE;
+	  sendCursorShape = TRUE;
     }
     else if (cl->enableSoftCursorUpdates) {
       if (cl->screen->cursorIsDrawn) {
@@ -1012,7 +1012,7 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion)
     updateRegion = sraRgnCreateRgn(givenUpdateRegion);
     sraRgnOr(updateRegion,cl->copyRegion);
     if(!sraRgnAnd(updateRegion,cl->requestedRegion) && 
-       !(sendtqCursorShape || sendSoftCursorRects)) {
+       !(sendCursorShape || sendSoftCursorRects)) {
       sraRgnDestroy(updateRegion);
       UNLOCK(cl->updateMutex);
       return TRUE;
@@ -1113,15 +1113,15 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion)
     if (nUpdateRegionRects != 0xFFFF) {
 	fu->nRects = Swap16IfLE((CARD16)(sraRgnCountRects(updateCopyRegion)
 				+ nUpdateRegionRects 
-				+ !!sendtqCursorShape + sendSoftCursorRects));
+				+ !!sendCursorShape + sendSoftCursorRects));
     } else {
 	fu->nRects = 0xFFFF;
     }
     cl->ublen = sz_rfbFramebufferUpdateMsg;
 
-   if (sendtqCursorShape) {
+   if (sendCursorShape) {
 	cl->cursorWasChanged = FALSE;
-	if (!rfbSendtqCursorShape(cl)) {
+	if (!rfbSendCursorShape(cl)) {
 	    sraRgnDestroy(updateRegion);
 	    return FALSE;
 	}